Skip to content

Commit 90e030f

Browse files
authored
Handle instrumentation node changes in yaml config file format 0.4 (#7357)
1 parent 03e7f98 commit 90e030f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

api/incubator/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class InstrumentationConfigUtilTest {
2424
* href="https://github.com/open-telemetry/opentelemetry-configuration/blob/main/examples/kitchen-sink.yaml">kitchen-sink.yaml</a>.
2525
*/
2626
private static final String kitchenSinkInstrumentationConfig =
27-
"instrumentation:\n"
27+
"instrumentation/development:\n"
2828
+ " general:\n"
2929
+ " peer:\n"
3030
+ " service_mapping:\n"
@@ -54,11 +54,11 @@ class InstrumentationConfigUtilTest {
5454
private static final ConfigProvider kitchenSinkConfigProvider =
5555
toConfigProvider(kitchenSinkInstrumentationConfig);
5656
private static final ConfigProvider emptyInstrumentationConfigProvider =
57-
toConfigProvider("instrumentation:\n");
57+
toConfigProvider("instrumentation/development:\n");
5858
private static final ConfigProvider emptyGeneralConfigProvider =
59-
toConfigProvider("instrumentation:\n general:\n");
59+
toConfigProvider("instrumentation/development:\n general:\n");
6060
private static final ConfigProvider emptyHttpConfigProvider =
61-
toConfigProvider("instrumentation:\n general:\n http:\n");
61+
toConfigProvider("instrumentation/development:\n general:\n http:\n");
6262

6363
private static ConfigProvider toConfigProvider(String configYaml) {
6464
OpenTelemetryConfigurationModel configuration =

sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void setup() throws IOException {
7272
+ " - simple:\n"
7373
+ " exporter:\n"
7474
+ " console: {}\n"
75-
+ "instrumentation:\n"
75+
+ "instrumentation/development:\n"
7676
+ " general:\n"
7777
+ " http:\n"
7878
+ " client:\n"

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SdkConfigProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public final class SdkConfigProvider implements ConfigProvider {
1818
private SdkConfigProvider(OpenTelemetryConfigurationModel model) {
1919
DeclarativeConfigProperties configProperties =
2020
DeclarativeConfiguration.toConfigProperties(model);
21-
this.instrumentationConfig = configProperties.getStructured("instrumentation");
21+
this.instrumentationConfig = configProperties.getStructured("instrumentation/development");
2222
}
2323

2424
/**

0 commit comments

Comments
 (0)