Skip to content

Commit e85067d

Browse files
authored
[chore][exporter/datadog] fix integration test (#38091)
#### Description #36873 the prometheus receiver can now keep dots in metric names rather than converting them to underscores. E.g. say there is a metric `my.metric` scraped from prometheus receiver, its name is `my_metric` before 0.120.0 vs. `my.metric` now. This should have broken some datadog integration tests, but those are skipped in race detector (which is always on in CIs) so the failures did not show up in CIs.
1 parent d7796ae commit e85067d

File tree

1 file changed

+17
-69
lines changed

1 file changed

+17
-69
lines changed

exporter/datadogexporter/integrationtest/no_race_integration_test.go

Lines changed: 17 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -14,81 +14,29 @@ import (
1414

1515
"github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil"
1616
"github.com/stretchr/testify/assert"
17-
"github.com/stretchr/testify/require"
18-
"go.opentelemetry.io/collector/featuregate"
1917

2018
commonTestutil "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil"
21-
pkgdatadog "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog"
2219
)
2320

24-
func TestIntegrationInternalMetrics_WithRemapping(t *testing.T) {
25-
prevVal := pkgdatadog.MetricRemappingDisabledFeatureGate.IsEnabled()
26-
require.NoError(t, featuregate.GlobalRegistry().Set(pkgdatadog.MetricRemappingDisabledFeatureGate.ID(), false))
27-
defer func() {
28-
require.NoError(t, featuregate.GlobalRegistry().Set(pkgdatadog.MetricRemappingDisabledFeatureGate.ID(), prevVal))
29-
}()
30-
31-
expectedMetrics := map[string]struct{}{
32-
// Datadog internal metrics on trace and stats writers, with the otelcol_ prefix
33-
"otelcol_datadog_otlp_translator_resources_missing_source": {},
34-
"otelcol_datadog_trace_agent_stats_writer_bytes": {},
35-
"otelcol_datadog_trace_agent_stats_writer_retries": {},
36-
"otelcol_datadog_trace_agent_stats_writer_stats_buckets": {},
37-
"otelcol_datadog_trace_agent_stats_writer_stats_entries": {},
38-
"otelcol_datadog_trace_agent_stats_writer_payloads": {},
39-
"otelcol_datadog_trace_agent_stats_writer_client_payloads": {},
40-
"otelcol_datadog_trace_agent_stats_writer_errors": {},
41-
"otelcol_datadog_trace_agent_stats_writer_splits": {},
42-
"otelcol_datadog_trace_agent_trace_writer_bytes": {},
43-
"otelcol_datadog_trace_agent_trace_writer_retries": {},
44-
"otelcol_datadog_trace_agent_trace_writer_spans": {},
45-
"otelcol_datadog_trace_agent_trace_writer_traces": {},
46-
"otelcol_datadog_trace_agent_trace_writer_payloads": {},
47-
"otelcol_datadog_trace_agent_trace_writer_errors": {},
48-
"otelcol_datadog_trace_agent_trace_writer_events": {},
49-
50-
// OTel collector internal metrics
51-
"otelcol_process_memory_rss": {},
52-
"otelcol_process_runtime_total_sys_memory_bytes": {},
53-
"otelcol_process_uptime": {},
54-
"otelcol_process_cpu_seconds": {},
55-
"otelcol_process_runtime_heap_alloc_bytes": {},
56-
"otelcol_process_runtime_total_alloc_bytes": {},
57-
"otelcol_receiver_accepted_metric_points": {},
58-
"otelcol_receiver_accepted_spans": {},
59-
"otelcol_exporter_queue_capacity": {},
60-
"otelcol_exporter_queue_size": {},
61-
"otelcol_exporter_sent_spans": {},
62-
"otelcol_exporter_sent_metric_points": {},
63-
}
64-
testIntegrationInternalMetrics(t, expectedMetrics)
65-
}
66-
67-
func TestIntegrationInternalMetrics_WithoutRemapping(t *testing.T) {
68-
prevVal := pkgdatadog.MetricRemappingDisabledFeatureGate.IsEnabled()
69-
require.NoError(t, featuregate.GlobalRegistry().Set(pkgdatadog.MetricRemappingDisabledFeatureGate.ID(), true))
70-
defer func() {
71-
require.NoError(t, featuregate.GlobalRegistry().Set(pkgdatadog.MetricRemappingDisabledFeatureGate.ID(), prevVal))
72-
}()
73-
21+
func TestIntegrationInternalMetrics(t *testing.T) {
7422
expectedMetrics := map[string]struct{}{
7523
// Datadog internal metrics on trace and stats writers
76-
"datadog_otlp_translator_resources_missing_source": {},
77-
"datadog_trace_agent_stats_writer_bytes": {},
78-
"datadog_trace_agent_stats_writer_retries": {},
79-
"datadog_trace_agent_stats_writer_stats_buckets": {},
80-
"datadog_trace_agent_stats_writer_stats_entries": {},
81-
"datadog_trace_agent_stats_writer_payloads": {},
82-
"datadog_trace_agent_stats_writer_client_payloads": {},
83-
"datadog_trace_agent_stats_writer_errors": {},
84-
"datadog_trace_agent_stats_writer_splits": {},
85-
"datadog_trace_agent_trace_writer_bytes": {},
86-
"datadog_trace_agent_trace_writer_retries": {},
87-
"datadog_trace_agent_trace_writer_spans": {},
88-
"datadog_trace_agent_trace_writer_traces": {},
89-
"datadog_trace_agent_trace_writer_payloads": {},
90-
"datadog_trace_agent_trace_writer_errors": {},
91-
"datadog_trace_agent_trace_writer_events": {},
24+
"datadog.otlp_translator.resources.missing_source": {},
25+
"datadog.trace_agent.stats_writer.bytes": {},
26+
"datadog.trace_agent.stats_writer.retries": {},
27+
"datadog.trace_agent.stats_writer.stats_buckets": {},
28+
"datadog.trace_agent.stats_writer.stats_entries": {},
29+
"datadog.trace_agent.stats_writer.payloads": {},
30+
"datadog.trace_agent.stats_writer.client_payloads": {},
31+
"datadog.trace_agent.stats_writer.errors": {},
32+
"datadog.trace_agent.stats_writer.splits": {},
33+
"datadog.trace_agent.trace_writer.bytes": {},
34+
"datadog.trace_agent.trace_writer.retries": {},
35+
"datadog.trace_agent.trace_writer.spans": {},
36+
"datadog.trace_agent.trace_writer.traces": {},
37+
"datadog.trace_agent.trace_writer.payloads": {},
38+
"datadog.trace_agent.trace_writer.errors": {},
39+
"datadog.trace_agent.trace_writer.events": {},
9240

9341
// OTel collector internal metrics
9442
"otelcol_process_memory_rss": {},

0 commit comments

Comments
 (0)