Skip to content

Commit c2e417e

Browse files
committed
rename feature gate to metricremappingdisabled
1 parent b3f33f9 commit c2e417e

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

.chloggen/munir_add-option-to-avoid-remapping.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ change_type: enhancement
44
component: datadogexporter
55

66
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
7+
<<<<<<< HEAD
78
note: "Adds a featuregate that controls remapping metrics to match Datadog semantics"
9+
=======
10+
note: "Add exporter.datadogexporter.metricremappingdisabled featuregate which disables renaming OpenTelemetry metrics to match Datadog semantics"
11+
>>>>>>> 5b1533b3bc (rename feature gate to metricremappingdisabled)
812

913
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
1014
issues: [35025]

exporter/datadogexporter/factory.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,18 @@ var metricExportNativeClientFeatureGate = featuregate.GlobalRegistry().MustRegis
5353
featuregate.WithRegisterDescription("When enabled, metric export in datadogexporter uses native Datadog client APIs instead of Zorkian APIs."),
5454
)
5555

56+
<<<<<<< HEAD
5657
var metricRemappingEnabledFeatureGate = featuregate.GlobalRegistry().MustRegister(
5758
"exporter.datadogexporter.metricremappingenabled",
5859
featuregate.StageBeta,
5960
featuregate.WithRegisterDescription("When enabled the Datadog Exporter remaps Opentelemetry metrics to Datadog semantics."),
61+
=======
62+
var metricRemappingDisableddFeatureGate = featuregate.GlobalRegistry().MustRegister(
63+
"exporter.datadogexporter.metricremappingdisabled",
64+
featuregate.StageAlpha,
65+
featuregate.WithRegisterDescription("When enabled the Datadog Exporter remaps OpenTelemetry semantic conventions to Datadog semantic conventions."),
66+
featuregate.WithRegisterReferenceURL("https://docs.datadoghq.com/opentelemetry/schema_semantics/metrics_mapping/"),
67+
>>>>>>> 5b1533b3bc (rename feature gate to metricremappingdisabled)
6068
)
6169

6270
// noAPMStatsFeatureGate causes the trace consumer to skip APM stats computation.
@@ -71,9 +79,9 @@ func isMetricExportV2Enabled() bool {
7179
return metricExportNativeClientFeatureGate.IsEnabled()
7280
}
7381

74-
// isMetricRemappingEnabled returns true if the datadogexporter should generate Datadog-compliant metrics from OpenTelemetry metrics
75-
func isMetricRemappingEnabled() bool {
76-
return metricRemappingEnabledFeatureGate.IsEnabled()
82+
// isMetricRemappingDisabled returns true if the datadogexporter should generate Datadog-compliant metrics from OpenTelemetry metrics
83+
func isMetricRemappingDisabled() bool {
84+
return metricRemappingDisableddFeatureGate.IsEnabled()
7785
}
7886

7987
func isLogsAgentExporterEnabled() bool {

exporter/datadogexporter/metrics_exporter.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ func translatorFromConfig(set component.TelemetrySettings, cfg *Config, attrsTra
5757
otlpmetrics.WithFallbackSourceProvider(sourceProvider),
5858
}
5959

60-
if isMetricRemappingEnabled() {
61-
options = append(options, otlpmetrics.WithRemapping())
60+
if isMetricRemappingDisabled() {
61+
set.Logger.Warn("Metric remapping is disabled in the Datadog exporter. OpenTelemetry metrics must be mapped to Datadog semantics before metrics are exported to Datadog (ex: via a processor).")
6262
} else {
63-
set.Logger.Warn("Metric remapping is disabled in the Datadog exporter. OpenTelemetry metrics must be mapped to Datadog semantics.")
63+
options = append(options, otlpmetrics.WithRemapping())
6464
}
6565

6666
if cfg.Metrics.HistConfig.SendAggregations {

0 commit comments

Comments
 (0)