Skip to content

Commit deddaa1

Browse files
committed
use "/development" instead of "experimental" in declarative config
1 parent 0c2d2a3 commit deddaa1

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ConfigPropertiesUtil.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,12 @@ private static DeclarativeConfigProperties getDeclarativeConfigNode(
165165
}
166166

167167
public static String toSystemProperty(String[] propertyName) {
168+
for (int i = 0; i < propertyName.length; i++) {
169+
if (propertyName[i].endsWith("/development")) {
170+
propertyName[i] =
171+
"experimental-" + propertyName[i].substring(0, propertyName[i].length() - 12);
172+
}
173+
}
168174
return "otel.instrumentation." + String.join(".", propertyName).replace('_', '-');
169175
}
170176

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/ConfigPropertiesUtilTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ private static OpenTelemetryConfigurationModel model(Object value) {
175175
void toSystemProperty() {
176176
assertThat(ConfigPropertiesUtil.toSystemProperty(new String[] {"a_b", "c", "d"}))
177177
.isEqualTo("otel.instrumentation.a-b.c.d");
178+
assertThat(ConfigPropertiesUtil.toSystemProperty(new String[] {"a_b/development", "c", "d"}))
179+
.isEqualTo("otel.instrumentation.experimental-a-b.c.d");
178180
}
179181

180182
@SetEnvironmentVariable(key = "OTEL_INSTRUMENTATION_TEST_PROPERTY_LIST", value = "a,b,c")

instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/autoconfigure/TracingRequestHandler.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,14 @@ public class TracingRequestHandler extends RequestHandler2 {
2424
private static RequestHandler2 buildDelegate(OpenTelemetry openTelemetry) {
2525
return AwsSdkTelemetry.builder(openTelemetry)
2626
.setCaptureExperimentalSpanAttributes(
27-
ConfigPropertiesUtil.getBoolean(
28-
openTelemetry, "aws_sdk", "experimental_span_attributes")
27+
ConfigPropertiesUtil.getBoolean(openTelemetry, "aws_sdk", "span_attributes/development")
2928
.orElse(false))
3029
.setMessagingReceiveInstrumentationEnabled(
3130
ConfigPropertiesUtil.getBoolean(
32-
openTelemetry, "messaging", "experimental", "receive_telemetry", "enabled")
31+
openTelemetry, "messaging", "receive_telemetry/development", "enabled")
3332
.orElse(false))
3433
.setCapturedHeaders(
35-
ConfigPropertiesUtil.getList(
36-
openTelemetry, "messaging", "experimental", "capture_headers"))
34+
ConfigPropertiesUtil.getList(openTelemetry, "messaging", "capture_headers/development"))
3735
.build()
3836
.newRequestHandler();
3937
}

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AbstractAwsSdkTelemetryFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ public abstract class AbstractAwsSdkTelemetryFactory {
1717
protected abstract List<String> getCapturedHeaders();
1818

1919
private boolean captureExperimentalSpanAttributes() {
20-
return getBoolean(false, "aws_sdk", "experimental_span_attributes");
20+
return getBoolean(false, "aws_sdk", "span_attributes/development");
2121
}
2222

2323
protected abstract boolean messagingReceiveInstrumentationEnabled();
2424

2525
private boolean useMessagingPropagator() {
26-
return getBoolean(false, "aws_sdk", "experimental_use_propagator_for_messaging");
26+
return getBoolean(false, "aws_sdk", "use_propagator_for_messaging/development");
2727
}
2828

2929
private boolean recordIndividualHttpError() {
30-
return getBoolean(false, "aws_sdk", "experimental_record_individual_http_error");
30+
return getBoolean(false, "aws_sdk", "record_individual_http_error/development");
3131
}
3232

3333
private boolean genaiCaptureMessageContent() {

0 commit comments

Comments
 (0)