Skip to content

Commit 438d6eb

Browse files
committed
translate /development in DeclarativeConfigPropertiesBridge
1 parent f5491e1 commit 438d6eb

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridge.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,10 @@ static String[] getSegments(String property) {
182182
property = property.substring(OTEL_INSTRUMENTATION_PREFIX.length());
183183
}
184184
// Split the remainder of the property on "."
185-
return property.replace('-', '_').split("\\.");
185+
return property
186+
.replaceAll("experimental[.-]([^.]+)", "$1/development")
187+
.replace('-', '_')
188+
.split("\\.");
186189
}
187190

188191
private String translateProperty(String property) {

declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeTest.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void getProperties() {
6060
.isTrue();
6161

6262
// common cases
63-
assertThat(bridge.getBoolean("otel.instrumentation.runtime-telemetry.enabled")).isFalse();
63+
assertThat(bridge.getBoolean("otel.instrumentation.runtime-telemetry.enabled")).isTrue();
6464

6565
// check all the types
6666
Map<String, String> expectedMap = new HashMap<>();
@@ -141,4 +141,13 @@ void agentTranslation() {
141141
assertThat(bridge.getBoolean("otel.javaagent.experimental.indy")).isTrue();
142142
assertThat(bridge.getString("otel.javaagent.logging")).isEqualTo("application");
143143
}
144+
145+
@Test
146+
void developmentTranslation() {
147+
String prefix = "otel.instrumentation.runtime-telemetry";
148+
assertThat(bridge.getBoolean(prefix + ".experimental-gc-profiler.experimental-metrics"))
149+
.isTrue();
150+
assertThat(bridge.getBoolean(prefix + ".experimental.gc-profiler.experimental.metrics"))
151+
.isTrue();
152+
}
144153
}

declarative-config-bridge/src/test/resources/config.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ instrumentation/development:
55
full_name:
66
preserved: true
77
agent:
8-
experimental:
9-
indy: true
8+
indy/development: true
109
runtime_telemetry:
11-
enabled: false
10+
enabled: true
11+
gc_profiler/development:
12+
metrics/development: true
1213
example_instrumentation:
1314
string_key: value
1415
bool_key: true

0 commit comments

Comments
 (0)