From b1fb4d4fd7c77be0cf5b06b1cfaa100bded7baba Mon Sep 17 00:00:00 2001 From: jvoravong Date: Mon, 9 Sep 2024 17:16:29 -0600 Subject: [PATCH] patch --- .github/workflows/functional_test_v2.yaml | 2 +- functional_tests/functional_test.go | 20 ++++++++++---------- functional_tests/histogram_test.go | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/functional_test_v2.yaml b/.github/workflows/functional_test_v2.yaml index 8227a6d9a..e29791b43 100644 --- a/.github/workflows/functional_test_v2.yaml +++ b/.github/workflows/functional_test_v2.yaml @@ -7,7 +7,7 @@ on: workflow_dispatch: inputs: UPDATE_EXPECTED_RESULTS: - description: 'Set this to true to update expected results and collect new test output.' + description: 'Set this to true to update expected results and collect updated test output as a Github workflow artifact.' required: false default: false diff --git a/functional_tests/functional_test.go b/functional_tests/functional_test.go index caba40935..7fbb174ec 100644 --- a/functional_tests/functional_test.go +++ b/functional_tests/functional_test.go @@ -612,7 +612,7 @@ func testNodeJSTraces(t *testing.T) { ptracetest.IgnoreScopeSpansOrder(), ) if err != nil && os.Getenv("UPDATE_EXPECTED_RESULTS") == "true" { - writeNewExpectedMetricsResult(t, expectedTracesFile, *selectedTrace) + writeNewExpectedTracesResult(t, expectedTracesFile, selectedTrace) } require.NoError(t, err) } @@ -676,7 +676,7 @@ func testJavaTraces(t *testing.T) { ptracetest.IgnoreScopeSpansOrder(), ) if err != nil && os.Getenv("UPDATE_EXPECTED_RESULTS") == "true" { - writeNewExpectedMetricsResult(t, expectedTracesFile, *selectedTrace) + writeNewExpectedTracesResult(t, expectedTracesFile, selectedTrace) } require.NoError(t, err) } @@ -741,7 +741,7 @@ func testDotNetTraces(t *testing.T) { ptracetest.IgnoreScopeSpansOrder(), ) if err != nil && os.Getenv("UPDATE_EXPECTED_RESULTS") == "true" { - writeNewExpectedMetricsResult(t, expectedTracesFile, *selectedTrace) + writeNewExpectedTracesResult(t, expectedTracesFile, selectedTrace) } require.NoError(t, err) } @@ -799,7 +799,7 @@ func testK8sClusterReceiverMetrics(t *testing.T) { replaceWithStar := func(string) string { return "*" } - var selected *pmetric.Metrics + var selectedMetrics *pmetric.Metrics for h := len(metricsConsumer.AllMetrics()) - 1; h >= 0; h-- { m := metricsConsumer.AllMetrics()[h] foundCorrectSet := false @@ -819,15 +819,15 @@ func testK8sClusterReceiverMetrics(t *testing.T) { continue } if m.ResourceMetrics().Len() == expectedMetrics.ResourceMetrics().Len() && m.MetricCount() == expectedMetrics.MetricCount() { - selected = &m + selectedMetrics = &m break } } - require.NotNil(t, selected) + require.NotNil(t, selectedMetrics) metricNames := []string{"k8s.node.condition_ready", "k8s.namespace.phase", "k8s.pod.phase", "k8s.replicaset.desired", "k8s.replicaset.available", "k8s.daemonset.ready_nodes", "k8s.daemonset.misscheduled_nodes", "k8s.daemonset.desired_scheduled_nodes", "k8s.daemonset.current_scheduled_nodes", "k8s.container.ready", "k8s.container.memory_request", "k8s.container.memory_limit", "k8s.container.cpu_request", "k8s.container.cpu_limit", "k8s.deployment.desired", "k8s.deployment.available", "k8s.container.restarts", "k8s.container.cpu_request", "k8s.container.memory_request", "k8s.container.memory_limit"} - err = pmetrictest.CompareMetrics(expectedMetrics, *selected, + err = pmetrictest.CompareMetrics(expectedMetrics, *selectedMetrics, pmetrictest.IgnoreTimestamp(), pmetrictest.IgnoreStartTimestamp(), pmetrictest.IgnoreMetricAttributeValue("container.id", metricNames...), @@ -864,7 +864,7 @@ func testK8sClusterReceiverMetrics(t *testing.T) { pmetrictest.IgnoreSubsequentDataPoints("k8s.container.ready", "k8s.container.restarts"), ) if err != nil && os.Getenv("UPDATE_EXPECTED_RESULTS") == "true" { - writeNewExpectedTracesResult(t, expectedMetricsFile, *selectedMetric) + writeNewExpectedMetricsResult(t, expectedMetricsFile, selectedMetrics) } require.NoError(t, err) } @@ -1170,7 +1170,7 @@ func testAgentMetrics(t *testing.T) { pmetrictest.IgnoreMetricDataPointsOrder(), ) if err != nil && os.Getenv("UPDATE_EXPECTED_RESULTS") == "true" { - writeNewExpectedTracesResult(t, expectedMetricsFile, *selectedMetric) + writeNewExpectedMetricsResult(t, expectedInternalMetricsFile, selectedInternalMetrics) } assert.NoError(t, err) @@ -1224,7 +1224,7 @@ func testAgentMetrics(t *testing.T) { pmetrictest.IgnoreMetricDataPointsOrder(), ) if err != nil && os.Getenv("UPDATE_EXPECTED_RESULTS") == "true" { - writeNewExpectedTracesResult(t, expectedMetricsFile, *selectedMetric) + writeNewExpectedMetricsResult(t, expectedKubeletStatsMetricsFile, *selectedKubeletstatsMetrics) t.Skipf("we have trouble identifying exact payloads right now: %v", err) } else { assert.NoError(t, err) diff --git a/functional_tests/histogram_test.go b/functional_tests/histogram_test.go index d8249cd76..5f5ebdfe8 100644 --- a/functional_tests/histogram_test.go +++ b/functional_tests/histogram_test.go @@ -265,7 +265,7 @@ func testHistogramMetrics(t *testing.T) { ) assert.NoError(t, err) if err != nil && os.Getenv("UPDATE_EXPECTED_RESULTS") == "true" { - writeNewExpectedMetricsResult(t, expectedCoreDNSMetricsFile, *corednsMetrics) + writeNewExpectedMetricsResult(t, expectedCoreDNSMetricsFile, corednsMetrics) } err = pmetrictest.CompareMetrics(expectedKubeSchedulerMetrics, *schedulerMetrics, @@ -293,7 +293,7 @@ func testHistogramMetrics(t *testing.T) { ) assert.NoError(t, err) if err != nil && os.Getenv("UPDATE_EXPECTED_RESULTS") == "true" { - writeNewExpectedMetricsResult(t, expectedKubeSchedulerMetricsFile, *etcdMetrics) + writeNewExpectedMetricsResult(t, expectedKubeSchedulerMetricsFile, etcdMetrics) } err = pmetrictest.CompareMetrics(expectedKubeProxyMetrics, *kubeProxyMetrics, @@ -321,7 +321,7 @@ func testHistogramMetrics(t *testing.T) { ) assert.NoError(t, err) if err != nil && os.Getenv("UPDATE_EXPECTED_RESULTS") == "true" { - writeNewExpectedMetricsResult(t, expectedKubeProxyMetricsFile, *selected) + writeNewExpectedMetricsResult(t, expectedKubeProxyMetricsFile, &expectedKubeProxyMetrics) } err = pmetrictest.CompareMetrics(expectedApiMetrics, *apiMetrics, @@ -341,7 +341,7 @@ func testHistogramMetrics(t *testing.T) { ) assert.NoError(t, err) if err != nil && os.Getenv("UPDATE_EXPECTED_RESULTS") == "true" { - writeNewExpectedMetricsResult(t, expectedApiMetricsFile, *apiMetrics) + writeNewExpectedMetricsResult(t, expectedApiMetricsFile, apiMetrics) } err = pmetrictest.CompareMetrics(expectedControllerManagerMetrics, *controllerManagerMetrics, @@ -369,7 +369,7 @@ func testHistogramMetrics(t *testing.T) { ) assert.NoError(t, err) if err != nil && os.Getenv("UPDATE_EXPECTED_RESULTS") == "true" { - writeNewExpectedMetricsResult(t, expectedControllerManagerMetricsFile, *controllerManagerMetrics) + writeNewExpectedMetricsResult(t, expectedControllerManagerMetricsFile, controllerManagerMetrics) } err = pmetrictest.CompareMetrics(expectedEtcdMetrics, *etcdMetrics, @@ -399,6 +399,6 @@ func testHistogramMetrics(t *testing.T) { ) assert.NoError(t, err) if err != nil && os.Getenv("UPDATE_EXPECTED_RESULTS") == "true" { - writeNewExpectedMetricsResult(t, expectedEtcdMetricsFile, *etcdMetrics) + writeNewExpectedMetricsResult(t, expectedEtcdMetricsFile, etcdMetrics) } }