Skip to content
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

Jump to bottom

Map OpenTelemetry environment variables to their Datadog equivalents #7184

Merged
merged 3 commits into from
Jun 13, 2024
Merged

Map OpenTelemetry environment variables to their Datadog equivalents #7184

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d6eb3f
Map OpenTelemetry environment variables and system properties to thei…
mcculls Jun 12, 2024
1fdd703
Check optional Datadog configuration file for Datadog properties
mcculls Jun 13, 2024
138a373
Register OtelEnvironmentConfigSource with GraalVM for build-time
mcculls Jun 13, 2024
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
3 changes: 3 additions & 0 deletions dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,6 +1052,9 @@ private static void configureLogger() {
logLevel = "DEBUG";
} else {
logLevel = ddGetProperty("dd.log.level");
if (null == logLevel) {
logLevel = System.getenv("OTEL_LOG_LEVEL");
}
}

if (null == logLevel && !isFeatureEnabled(AgentFeature.STARTUP_LOGS)) {
Expand Down
2 changes: 1 addition & 1 deletion dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public final class ConfigDefaults {

static final boolean DEFAULT_SPAN_ORIGIN_ENABLED = false;
static final boolean DEFAULT_TRACE_ENABLED = true;
static final boolean DEFAULT_TRACE_OTEL_ENABLED = false;
public static final boolean DEFAULT_TRACE_OTEL_ENABLED = false;
static final boolean DEFAULT_INTEGRATIONS_ENABLED = true;

static final boolean DEFAULT_RUNTIME_CONTEXT_FIELD_INJECTION = true;
Expand Down
6 changes: 6 additions & 0 deletions internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,12 +357,14 @@ public static ConfigProvider createDefault() {
return new ConfigProvider(
new SystemPropertiesConfigSource(),
new EnvironmentConfigSource(),
new OtelEnvironmentConfigSource(),
new CapturedEnvironmentConfigSource());
} else {
return new ConfigProvider(
new SystemPropertiesConfigSource(),
new EnvironmentConfigSource(),
new PropertiesConfigSource(configProperties, true),
new OtelEnvironmentConfigSource(),
new CapturedEnvironmentConfigSource());
}
}
Expand All @@ -377,13 +379,15 @@ public static ConfigProvider withoutCollector() {
false,
new SystemPropertiesConfigSource(),
new EnvironmentConfigSource(),
new OtelEnvironmentConfigSource(),
new CapturedEnvironmentConfigSource());
} else {
return new ConfigProvider(
false,
new SystemPropertiesConfigSource(),
new EnvironmentConfigSource(),
new PropertiesConfigSource(configProperties, true),
new OtelEnvironmentConfigSource(),
new CapturedEnvironmentConfigSource());
}
}
Expand All @@ -401,13 +405,15 @@ public static ConfigProvider withPropertiesOverride(Properties properties) {
new SystemPropertiesConfigSource(),
new EnvironmentConfigSource(),
providedConfigSource,
new OtelEnvironmentConfigSource(),
new CapturedEnvironmentConfigSource());
} else {
return new ConfigProvider(
providedConfigSource,
new SystemPropertiesConfigSource(),
new EnvironmentConfigSource(),
new PropertiesConfigSource(configProperties, true),
new OtelEnvironmentConfigSource(),
new CapturedEnvironmentConfigSource());
}
}
Expand Down
Loading
Loading