Skip to content

chore(config): migrate dataStreamsMonitoringEnabled #4219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtoffl01 merged 12 commits into from
Dec 10, 2025
Merged

chore(config): migrate dataStreamsMonitoringEnabled #4219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c2e12d4
move shared logic to 'get' generic
mtoffl01 Dec 2, 2025
3192654
Make Config mutable: Modify debug field from tracer options
mtoffl01 Dec 2, 2025
d8f7d4b
rename trace_debug_enabled to DD_TRACE_DEBUG
mtoffl01 Dec 2, 2025
63a09e6
introduce usefreshconfig
mtoffl01 Dec 2, 2025
ef4772a
nits
mtoffl01 Dec 3, 2025
b0b138b
delete ResetForTesting
mtoffl01 Dec 3, 2025
e12fcf6
Modify SetDebug to take in an origin
mtoffl01 Dec 3, 2025
19d7eb4
restore configprovider.go to main
mtoffl01 Dec 4, 2025
5ade4e8
Add unit tests for config
mtoffl01 Dec 4, 2025
8eb1f41
Fix config tests
mtoffl01 Dec 5, 2025
04a7611
migrate dataStreamsMonitoringEnabled
mtoffl01 Dec 5, 2025
44b3111
fix merge conflicts
mtoffl01 Dec 9, 2025
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
2 changes: 1 addition & 1 deletion ddtrace/tracer/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func logStartup(t *tracer) {
PropagationStyleExtract: extractorNames,
TracingAsTransport: t.config.tracingAsTransport,
DogstatsdAddr: t.config.dogstatsdAddr,
DataStreamsEnabled: t.config.dataStreamsMonitoringEnabled,
DataStreamsEnabled: t.config.internalConfig.DataStreamsMonitoringEnabled(),
}
if _, _, err := samplingRulesFromEnv(); err != nil {
info.SamplingRulesError = err.Error()
Expand Down
4 changes: 0 additions & 4 deletions ddtrace/tracer/option.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,6 @@ type config struct {
// statsComputationEnabled enables client-side stats computation (aka trace metrics).
statsComputationEnabled bool

// dataStreamsMonitoringEnabled specifies whether the tracer should enable monitoring of data streams
dataStreamsMonitoringEnabled bool

// orchestrionCfg holds Orchestrion (aka auto-instrumentation) configuration.
// Only used for telemetry currently.
orchestrionCfg orchestrionConfig
Expand Down Expand Up @@ -501,7 +498,6 @@ func newConfig(opts ...StartOption) (*config, error) {
c.spanTimeout = internal.DurationEnv("DD_TRACE_ABANDONED_SPAN_TIMEOUT", 10*time.Minute)
}
c.statsComputationEnabled = internal.BoolEnv("DD_TRACE_STATS_COMPUTATION_ENABLED", true)
c.dataStreamsMonitoringEnabled, _, _ = stableconfig.Bool("DD_DATA_STREAMS_ENABLED", false)
c.partialFlushEnabled = internal.BoolEnv("DD_TRACE_PARTIAL_FLUSH_ENABLED", false)
c.partialFlushMinSpans = internal.IntEnv("DD_TRACE_PARTIAL_FLUSH_MIN_SPANS", partialFlushMinSpansDefault)
if c.partialFlushMinSpans <= 0 {
Expand Down
2 changes: 1 addition & 1 deletion ddtrace/tracer/tracer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ func newUnstartedTracer(opts ...StartOption) (t *tracer, err error) {
c.traceSampleRules = newDynamicConfig("trace_sample_rules", c.traceRules,
rulesSampler.traces.setTraceSampleRules, EqualsFalseNegative)
var dataStreamsProcessor *datastreams.Processor
if c.dataStreamsMonitoringEnabled {
if c.internalConfig.DataStreamsMonitoringEnabled() {
dataStreamsProcessor = datastreams.NewProcessor(statsd, c.env, c.serviceName, c.version, c.agentURL, c.httpClient)
}
var logFile *log.ManagedFile
Expand Down
13 changes: 13 additions & 0 deletions internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,16 @@ func (c *Config) SetDebug(enabled bool, origin telemetry.Origin) {
c.debug = enabled
telemetry.RegisterAppConfig("DD_TRACE_DEBUG", enabled, origin)
}

func (c *Config) DataStreamsMonitoringEnabled() bool {
c.mu.RLock()
defer c.mu.RUnlock()
return c.dataStreamsMonitoringEnabled
}

func (c *Config) SetDataStreamsMonitoringEnabled(enabled bool, origin telemetry.Origin) {
c.mu.Lock()
defer c.mu.Unlock()
c.dataStreamsMonitoringEnabled = enabled
telemetry.RegisterAppConfig("DD_DATA_STREAMS_ENABLED", enabled, origin)
}
Loading