Skip to content

Commit f8cdbe6

Browse files
committed
use _ instead of - in declarative config
1 parent 5f062cb commit f8cdbe6

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridge.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private <T> T getPropertyValue(
133133
if (!property.startsWith(OTEL_INSTRUMENTATION_PREFIX)) {
134134
return null;
135135
}
136-
String suffix = property.substring(OTEL_INSTRUMENTATION_PREFIX.length());
136+
String suffix = property.substring(OTEL_INSTRUMENTATION_PREFIX.length()).replace('-', '_');
137137
// Split the remainder of the property on ".", and walk to the N-1 entry
138138
String[] segments = suffix.split("\\.");
139139
if (segments.length == 0) {

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridgeTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ class DeclarativeConfigPropertiesBridgeTest {
2929
+ "instrumentation/development:\n"
3030
+ " java:\n"
3131
+ " common:\n"
32-
+ " default-enabled: true\n"
33-
+ " runtime-telemetry:\n"
32+
+ " default_enabled: true\n"
33+
+ " runtime_telemetry:\n"
3434
+ " enabled: false\n"
35-
+ " example-instrumentation:\n"
35+
+ " example_instrumentation:\n"
3636
+ " string_key: value\n"
3737
+ " bool_key: true\n"
3838
+ " int_key: 1\n"

javaagent-tooling/src/test/resources/config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
instrumentation:
22
java:
33
common:
4-
default-enabled: true
5-
runtime-telemetry:
4+
default_enabled: true
5+
runtime_telemetry:
66
enabled: false
7-
external-annotations:
7+
external_annotations:
88
enabled: true
9-
example-instrumentation:
9+
example_instrumentation:
1010
string_key: value
1111
bool_key: true
1212
int_key: 1

0 commit comments

Comments
 (0)