add 1.31 histogram expected files

signalfx · Oct 4, 2024 · 66ff691 · 66ff691
1 parent 03a2626
commit 66ff691
Show file tree

Hide file tree

Showing 8 changed files with 131,686 additions and 8 deletions.
diff --git a/functional_tests/README.md b/functional_tests/README.md
@@ -6,15 +6,15 @@ Run the following commands prior to running the test locally:
 ```
 export KUBECONFIG=/tmp/kube-config-splunk-otel-collector-chart-functional-testing
 export KUBE_TEST_ENV=kind
-export K8S_VERSION=v1.28.0
+export K8S_VERSION=v1.31.0
 kind create cluster --kubeconfig=/tmp/kube-config-splunk-otel-collector-chart-functional-testing --config=.github/workflows/configs/kind-config.yaml --image=kindest/node:$K8S_VERSION
 kubectl get csr -o=jsonpath='{range.items[?(@.spec.signerName=="kubernetes.io/kubelet-serving")]}{.metadata.name}{" "}{end}' | xargs kubectl certificate approve
 make cert-manager
 kind load docker-image quay.io/splunko11ytest/nodejs_test:latest --name kind
 kind load docker-image quay.io/splunko11ytest/java_test:latest --name kind
 kind load docker-image quay.io/splunko11ytest/dotnet_test:latest --name kind
 # On Mac M1s, you can also push this image so kind doesn't get confused with the platform to use:
-kind load docker-image ghcr.io/signalfx/splunk-otel-dotnet/splunk-otel-dotnet:v1.6.0 --name kind
+kind load docker-image ghcr.io/signalfx/splunk-otel-dotnet/splunk-otel-dotnet:v1.7.0 --name kind
 kind load docker-image ghcr.io/signalfx/splunk-otel-js/splunk-otel-js:v2.4.4 --name kind
 kind load docker-image ghcr.io/signalfx/splunk-otel-java/splunk-otel-java:v1.30.0 --name kind
 ```

diff --git a/functional_tests/histogram_test.go b/functional_tests/histogram_test.go
@@ -203,22 +203,22 @@ func testHistogramMetrics(t *testing.T) {
 				for j := 0; j < m.ResourceMetrics().At(i).ScopeMetrics().Len(); j++ {
 					for k := 0; k < m.ResourceMetrics().At(i).ScopeMetrics().At(j).Metrics().Len(); k++ {
 						metricToConsider := m.ResourceMetrics().At(i).ScopeMetrics().At(j).Metrics().At(k)
-						if metricToConsider.Name() == "coredns_dns_request_duration_seconds" && m.MetricCount() == expectedCoreDNSMetrics.MetricCount() && m.ResourceMetrics().Len() == expectedCoreDNSMetrics.ResourceMetrics().Len() {
+						if metricToConsider.Name() == "coredns_dns_request_duration_seconds" { //&& m.MetricCount() == expectedCoreDNSMetrics.MetricCount() && m.ResourceMetrics().Len() == expectedCoreDNSMetrics.ResourceMetrics().Len() {
 							corednsMetrics = &m
 							break OUTER
-						} else if metricToConsider.Name() == "kubeproxy_sync_proxy_rules_iptables_total" && m.MetricCount() == expectedKubeProxyMetrics.MetricCount() && m.ResourceMetrics().Len() == expectedKubeProxyMetrics.ResourceMetrics().Len() {
+						} else if metricToConsider.Name() == "kubeproxy_sync_proxy_rules_iptables_total" { // && m.MetricCount() == expectedKubeProxyMetrics.MetricCount() && m.ResourceMetrics().Len() == expectedKubeProxyMetrics.ResourceMetrics().Len() {
 							kubeProxyMetrics = &m
 							break OUTER
-						} else if metricToConsider.Name() == "scheduler_queue_incoming_pods_total" && m.MetricCount() == expectedKubeSchedulerMetrics.MetricCount() && m.ResourceMetrics().Len() == expectedKubeSchedulerMetrics.ResourceMetrics().Len() {
+						} else if metricToConsider.Name() == "scheduler_queue_incoming_pods_total" { //&& m.MetricCount() == expectedKubeSchedulerMetrics.MetricCount() && m.ResourceMetrics().Len() == expectedKubeSchedulerMetrics.ResourceMetrics().Len() {
 							schedulerMetrics = &m
 							break OUTER
-						} else if metricToConsider.Name() == "apiserver_audit_event_total" && m.MetricCount() == expectedApiMetrics.MetricCount() && m.ResourceMetrics().Len() == expectedApiMetrics.ResourceMetrics().Len() {
+						} else if metricToConsider.Name() == "apiserver_audit_event_total" { //&& m.MetricCount() == expectedApiMetrics.MetricCount() && m.ResourceMetrics().Len() == expectedApiMetrics.ResourceMetrics().Len() {
 							apiMetrics = &m
 							break OUTER
-						} else if metricToConsider.Name() == "workqueue_queue_duration_seconds" && m.MetricCount() == expectedControllerManagerMetrics.MetricCount() && m.ResourceMetrics().Len() == expectedControllerManagerMetrics.ResourceMetrics().Len() {
+						} else if metricToConsider.Name() == "workqueue_queue_duration_seconds" { //&& m.MetricCount() == expectedControllerManagerMetrics.MetricCount() && m.ResourceMetrics().Len() == expectedControllerManagerMetrics.ResourceMetrics().Len() {
 							controllerManagerMetrics = &m
 							break OUTER
-						} else if metricToConsider.Name() == "etcd_cluster_version" && m.MetricCount() == expectedEtcdMetrics.MetricCount() && m.ResourceMetrics().Len() == expectedEtcdMetrics.ResourceMetrics().Len() {
+						} else if metricToConsider.Name() == "etcd_cluster_version" { //&& m.MetricCount() == expectedEtcdMetrics.MetricCount() && m.ResourceMetrics().Len() == expectedEtcdMetrics.ResourceMetrics().Len() {
 							etcdMetrics = &m
 							break OUTER
 						}