Skip to content

Handle instrumentation node changes in yaml config file format 0.4 #7357

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
jack-berg merged 2 commits into from
May 27, 2025
Merged

Handle instrumentation node changes in yaml config file format 0.4 #7357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1488e63
Fix for yaml config file format 0.4
robsunday May 20, 2025
07af33d
Fix for yaml config file format 0.4
robsunday May 20, 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
8 changes: 4 additions & 4 deletions ...or/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class InstrumentationConfigUtilTest {
* href="https://github.com/open-telemetry/opentelemetry-configuration/blob/main/examples/kitchen-sink.yaml">kitchen-sink.yaml</a>.
*/
private static final String kitchenSinkInstrumentationConfig =
"instrumentation:\n"
"instrumentation/development:\n"
+ " general:\n"
+ " peer:\n"
+ " service_mapping:\n"
Expand Down Expand Up @@ -54,11 +54,11 @@ class InstrumentationConfigUtilTest {
private static final ConfigProvider kitchenSinkConfigProvider =
toConfigProvider(kitchenSinkInstrumentationConfig);
private static final ConfigProvider emptyInstrumentationConfigProvider =
toConfigProvider("instrumentation:\n");
toConfigProvider("instrumentation/development:\n");
private static final ConfigProvider emptyGeneralConfigProvider =
toConfigProvider("instrumentation:\n general:\n");
toConfigProvider("instrumentation/development:\n general:\n");
private static final ConfigProvider emptyHttpConfigProvider =
toConfigProvider("instrumentation:\n general:\n http:\n");
toConfigProvider("instrumentation/development:\n general:\n http:\n");

private static ConfigProvider toConfigProvider(String configYaml) {
OpenTelemetryConfigurationModel configuration =
Expand Down
2 changes: 1 addition & 1 deletion .../testIncubating/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void setup() throws IOException {
+ " - simple:\n"
+ " exporter:\n"
+ " console: {}\n"
+ "instrumentation:\n"
+ "instrumentation/development:\n"
+ " general:\n"
+ " http:\n"
+ " client:\n"
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SdkConfigProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public final class SdkConfigProvider implements ConfigProvider {
private SdkConfigProvider(OpenTelemetryConfigurationModel model) {
DeclarativeConfigProperties configProperties =
DeclarativeConfiguration.toConfigProperties(model);
this.instrumentationConfig = configProperties.getStructured("instrumentation");
this.instrumentationConfig = configProperties.getStructured("instrumentation/development");
}

/**
Expand Down
Loading