Skip to content

Commit ca58eff

Browse files
committed
translate internal "experimental", too
1 parent 3adc07e commit ca58eff

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,12 @@ 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
186-
.replaceAll(".experimental[.-]([^.]+)", ".$1/development")
185+
String[] s = property
186+
.replaceAll("\\.experimental[.-]([^.]+)", ".$1/development")
187+
.replaceAll("\\.([^.]+experimental[^.]+)", ".$1/development")
187188
.replace('-', '_')
188189
.split("\\.");
190+
return s;
189191
}
190192

191193
private String translateProperty(String property) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ instrumentation/development:
77
agent:
88
indy/development: true
99
runtime_telemetry:
10-
emit_experimental_telemetry: true
10+
emit_experimental_telemetry/development: true
1111
enabled: true
1212
gc_profiler/development:
1313
metrics/development: true

instrumentation-api-incubator/javaagent-testing/src/test/resources/declarative-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ instrumentation/development:
55
java:
66
http:
77
client:
8-
emit_experimental_telemetry: true
8+
emit_experimental_telemetry/development: true
99
url_template_rules:
1010
- pattern: "http://localhost:.*/hello/.*"
1111
template: "/hello/*"

smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig/resources/application.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ otel:
4141
instrumentation/development:
4242
java:
4343
runtime-telemetry:
44-
emit_experimental_telemetry: true
44+
emit_experimental_telemetry/development: true
4545
http:
4646
client:
47-
emit_experimental_telemetry: true
47+
emit_experimental_telemetry/development: true

smoke-tests-otel-starter/spring-boot-3.2/src/main/resources/application.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ otel:
4141
instrumentation/development:
4242
java:
4343
runtime-telemetry:
44-
emit_experimental_telemetry: true
44+
emit_experimental_telemetry/development: true
4545
http:
4646
client:
47-
emit_experimental_telemetry: true
47+
emit_experimental_telemetry/development: true

0 commit comments

Comments
 (0)