Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .chloggen/mx-psi_move-feature-gates-exporter.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
component: exporter/datadog

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Remove stable feature gates `exporter.datadogexporter.UseLogsAgentExporter` and `exporter.datadogexporter.metricexportnativeclient`"

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

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
3 changes: 0 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,6 @@ linters:
- linters:
- forbidigo
path: exporter/clickhouseexporter/
- linters:
- forbidigo
path: exporter/datadogexporter/
- linters:
- forbidigo
path: exporter/googlecloudexporter/
Expand Down
15 changes: 15 additions & 0 deletions exporter/datadogexporter/documentation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[comment]: <> (Code generated by mdatagen. DO NOT EDIT.)

# datadog

## Feature Gates

This component has the following feature gates:

| Feature Gate | Stage | Description | From Version | To Version | Reference |
| ------------ | ----- | ----------- | ------------ | ---------- | --------- |
| `exporter.datadogexporter.DisableAPMStats` | beta | Datadog Exporter will not compute APM Stats | v0.89.0 | N/A | [Link](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/28616) |
| `exporter.datadogexporter.TraceExportUseCustomHTTPClient` | alpha | When enabled, trace export uses the HTTP client from the exporter HTTP configs | v0.105.0 | N/A | [Link](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34025) |
| `exporter.datadogexporter.metricexportserializerclient` | beta | When enabled, metric export in datadogexporter uses the serializer exporter from the Datadog Agent. | v0.122.0 | N/A | [Link](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/37930) |

For more information about feature gates, see the [Feature Gates](https://github.com/open-telemetry/opentelemetry-collector/blob/main/featuregate/README.md) documentation.
34 changes: 3 additions & 31 deletions exporter/datadogexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,40 +46,12 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry"
)

var _ = featuregate.GlobalRegistry().MustRegister(
"exporter.datadogexporter.UseLogsAgentExporter",
featuregate.StageStable,
featuregate.WithRegisterDescription("When enabled, datadogexporter uses the Datadog agent logs pipeline for exporting logs."),
featuregate.WithRegisterFromVersion("v0.100.0"),
featuregate.WithRegisterToVersion("v0.129.0"),
)

var _ = featuregate.GlobalRegistry().MustRegister(
"exporter.datadogexporter.metricexportnativeclient",
featuregate.StageStable,
featuregate.WithRegisterToVersion("v0.135.0"),
featuregate.WithRegisterDescription("When enabled, metric export in datadogexporter uses native Datadog client APIs instead of Zorkian APIs."),
)

// noAPMStatsFeatureGate causes the trace consumer to skip APM stats computation.
var noAPMStatsFeatureGate = featuregate.GlobalRegistry().MustRegister(
"exporter.datadogexporter.DisableAPMStats",
featuregate.StageBeta,
featuregate.WithRegisterDescription("Datadog Exporter will not compute APM Stats"),
)

var metricExportSerializerClientFeatureGate = featuregate.GlobalRegistry().MustRegister(
"exporter.datadogexporter.metricexportserializerclient",
featuregate.StageBeta,
featuregate.WithRegisterDescription("When enabled, metric export in datadogexporter uses the serializer exporter from the Datadog Agent."),
)

func init() {
log.SetupLogger(log.Disabled(), "off")
}

func isMetricExportSerializerEnabled() bool {
return metricExportSerializerClientFeatureGate.IsEnabled()
return metadata.ExporterDatadogexporterMetricexportserializerclientFeatureGate.IsEnabled()
}

func consumeResource(metadataReporter *inframetadata.Reporter, res pcommon.Resource, logger *zap.Logger) {
Expand Down Expand Up @@ -410,11 +382,11 @@ func (f *factory) createTracesExporter(
return nil, err
}
cfg.LogWarnings(set.Logger)
if noAPMStatsFeatureGate.IsEnabled() {
if metadata.ExporterDatadogexporterDisableAPMStatsFeatureGate.IsEnabled() {
set.Logger.Info(
"Trace metrics are now disabled in the Datadog Exporter by default. To continue receiving Trace Metrics, configure the Datadog Connector or disable the feature gate.",
zap.String("documentation", "https://docs.datadoghq.com/opentelemetry/guide/migration/"),
zap.String("feature gate ID", noAPMStatsFeatureGate.ID()),
zap.String("feature gate ID", metadata.ExporterDatadogexporterDisableAPMStatsFeatureGate.ID()),
)
}

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions exporter/datadogexporter/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,28 @@ status:
active: [mx-psi, dineshg13, liustanley, songy23, mackjmr, jade-guiton-dd, IbraheemA]
emeritus: [gbbr, jackgopack4, ankitpatel96]

feature_gates:
- id: exporter.datadogexporter.DisableAPMStats
stage: beta
description: >-
Datadog Exporter will not compute APM Stats
from_version: v0.89.0
reference_url: https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/28616

- id: exporter.datadogexporter.TraceExportUseCustomHTTPClient
stage: alpha
description: >-
When enabled, trace export uses the HTTP client from the exporter HTTP configs
from_version: v0.105.0
reference_url: https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34025

- id: exporter.datadogexporter.metricexportserializerclient
stage: beta
description: >-
When enabled, metric export in datadogexporter uses the serializer exporter from the Datadog Agent.
from_version: v0.122.0
reference_url: https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/37930

tests:
config:
hostname: customhostname
Expand Down
13 changes: 3 additions & 10 deletions exporter/datadogexporter/traces_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
"github.com/DataDog/datadog-go/v5/statsd"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/metrics"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog/clientutil"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog/hostmetadata"
Expand All @@ -38,13 +38,6 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog/featuregates"
)

var traceCustomHTTPFeatureGate = featuregate.GlobalRegistry().MustRegister(
"exporter.datadogexporter.TraceExportUseCustomHTTPClient",
featuregate.StageAlpha,
featuregate.WithRegisterDescription("When enabled, trace export uses the HTTP client from the exporter HTTP configs"),
featuregate.WithRegisterFromVersion("v0.105.0"),
)

type traceExporter struct {
params exporter.Settings
cfg *datadogconfig.Config
Expand Down Expand Up @@ -131,7 +124,7 @@ func (exp *traceExporter) consumeTraces(
hosts := make(map[string]struct{})
tags := make(map[string]struct{})
header := make(http.Header)
if noAPMStatsFeatureGate.IsEnabled() {
if metadata.ExporterDatadogexporterDisableAPMStatsFeatureGate.IsEnabled() {
header[headerComputedStats] = []string{"true"}
}
for i := 0; i < rspans.Len(); i++ {
Expand Down Expand Up @@ -212,7 +205,7 @@ func newTraceAgentConfig(ctx context.Context, params exporter.Settings, cfg *dat
acfg.PeerTagsAggregation = cfg.Traces.PeerTagsAggregation
acfg.PeerTags = cfg.Traces.PeerTags
acfg.MaxSenderRetries = 4
if traceCustomHTTPFeatureGate.IsEnabled() {
if metadata.ExporterDatadogexporterTraceExportUseCustomHTTPClientFeatureGate.IsEnabled() {
params.Logger.Info("Experimental feature: datadog exporter trace export uses a custom HTTP transport from the exporter HTTP configs")
acfg.HTTPTransportFunc = func() *http.Transport {
return clientutil.NewHTTPTransport(cfg.ClientConfig)
Expand Down
Loading