Skip to content

Commit 987f13c

Browse files
gbbrgbbr
committed
exporter/datadog: disable APM stats via feature flag
This change adds the "exporter.datadogexporter.disable_apm_stats" feature flag, which can be enabled to disable APM stats computation. Updates open-telemetry#28615
1 parent b3328a7 commit 987f13c

File tree

19 files changed

+189
-84
lines changed

19 files changed

+189
-84
lines changed

‎.chloggen/gbbr_nostats.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: exporter/datadog
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Added the "exporter.datadogexporter.disable_apm_stats" feature gate to disable APM stats computation.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [28615]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

‎cmd/configschema/go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,14 @@ require (
213213
github.com/ClickHouse/ch-go v0.58.2 // indirect
214214
github.com/ClickHouse/clickhouse-go/v2 v2.15.0 // indirect
215215
github.com/DataDog/agent-payload/v5 v5.0.89 // indirect
216-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 // indirect
217-
github.com/DataDog/datadog-agent/pkg/proto v0.48.1 // indirect
218-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect
219-
github.com/DataDog/datadog-agent/pkg/trace v0.48.1 // indirect
220-
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 // indirect
221-
github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 // indirect
222-
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 // indirect
223-
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect
216+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 // indirect
217+
github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 // indirect
218+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 // indirect
219+
github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 // indirect
220+
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 // indirect
221+
github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 // indirect
222+
github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 // indirect
223+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect
224224
github.com/DataDog/datadog-api-client-go/v2 v2.18.0 // indirect
225225
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
226226
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect

‎cmd/configschema/go.sum

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcontribcol/go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -252,14 +252,14 @@ require (
252252
github.com/ClickHouse/ch-go v0.58.2 // indirect
253253
github.com/ClickHouse/clickhouse-go/v2 v2.15.0 // indirect
254254
github.com/DataDog/agent-payload/v5 v5.0.89 // indirect
255-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 // indirect
256-
github.com/DataDog/datadog-agent/pkg/proto v0.48.1 // indirect
257-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect
258-
github.com/DataDog/datadog-agent/pkg/trace v0.48.1 // indirect
259-
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 // indirect
260-
github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 // indirect
261-
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 // indirect
262-
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect
255+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 // indirect
256+
github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 // indirect
257+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 // indirect
258+
github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 // indirect
259+
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 // indirect
260+
github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 // indirect
261+
github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 // indirect
262+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect
263263
github.com/DataDog/datadog-api-client-go/v2 v2.18.0 // indirect
264264
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
265265
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect

‎cmd/otelcontribcol/go.sum

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎connector/datadogconnector/go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/connector/datad
33
go 1.20
44

55
require (
6-
github.com/DataDog/datadog-agent/pkg/proto v0.48.1
6+
github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2
77
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0
88
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.88.0
99
github.com/stretchr/testify v1.8.4
@@ -15,13 +15,13 @@ require (
1515
)
1616

1717
require (
18-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 // indirect
19-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect
20-
github.com/DataDog/datadog-agent/pkg/trace v0.48.1 // indirect
21-
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 // indirect
22-
github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 // indirect
23-
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 // indirect
24-
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect
18+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 // indirect
19+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 // indirect
20+
github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 // indirect
21+
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 // indirect
22+
github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 // indirect
23+
github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 // indirect
24+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect
2525
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
2626
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
2727
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 // indirect

‎connector/datadogconnector/go.sum

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/datadogexporter/factory.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ var mertricExportNativeClientFeatureGate = featuregate.GlobalRegistry().MustRegi
3535
featuregate.WithRegisterDescription("When enabled, metric export in datadogexporter uses native Datadog client APIs instead of Zorkian APIs."),
3636
)
3737

38+
// noAPMStatsFeatureGate causes the trace consumer to skip APM stats computation.
39+
var noAPMStatsFeatureGate = featuregate.GlobalRegistry().MustRegister(
40+
"exporter.datadogexporter.disable_apm_stats",
41+
featuregate.StageAlpha,
42+
featuregate.WithRegisterDescription("Datadog Exporter will not compute APM Stats"),
43+
)
44+
3845
// isMetricExportV2Enabled returns true if metric export in datadogexporter uses native Datadog client APIs, false if it uses Zorkian APIs
3946
func isMetricExportV2Enabled() bool {
4047
return mertricExportNativeClientFeatureGate.IsEnabled()

‎exporter/datadogexporter/go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.20
44

55
require (
66
github.com/DataDog/agent-payload/v5 v5.0.89
7-
github.com/DataDog/datadog-agent/pkg/proto v0.48.1
8-
github.com/DataDog/datadog-agent/pkg/trace v0.48.1
7+
github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2
8+
github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7
99
github.com/DataDog/datadog-api-client-go/v2 v2.18.0
1010
github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc
1111
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0
@@ -54,12 +54,12 @@ require (
5454
cloud.google.com/go/compute v1.23.0 // indirect
5555
cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect
5656
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
57-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 // indirect
58-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect
59-
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 // indirect
60-
github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 // indirect
61-
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 // indirect
62-
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect
57+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 // indirect
58+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 // indirect
59+
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 // indirect
60+
github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 // indirect
61+
github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 // indirect
62+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect
6363
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
6464
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
6565
github.com/DataDog/zstd v1.5.2 // indirect
@@ -72,7 +72,7 @@ require (
7272
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
7373
github.com/cespare/xxhash/v2 v2.2.0 // indirect
7474
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
75-
github.com/containerd/cgroups v1.0.4 // indirect
75+
github.com/containerd/cgroups/v3 v3.0.2 // indirect
7676
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7777
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7878
github.com/docker/distribution v2.8.2+incompatible // indirect

0 commit comments

Comments
 (0)