Skip to content

Commit e050cb4

Browse files
committed
Remove deprecated otel.instrumentation.servlet.experimental.add-trace-id-request-attribute property
1 parent e707056 commit e050cb4

2 files changed

Lines changed: 5 additions & 21 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
- Removed previously deprecated experimental config property
2626
`otel.instrumentation.common.experimental.db-sqlcommenter.enabled`; use
2727
`otel.instrumentation.common.db.experimental.sqlcommenter.enabled` instead.
28+
- Removed previously deprecated experimental config property
29+
`otel.instrumentation.servlet.experimental.add-trace-id-request-attribute`; use
30+
`otel.instrumentation.servlet.experimental.trace-id-request-attribute.enabled` instead.
2831

2932
## Version 2.27.0 (2026-04-21)
3033

instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/BaseServletHelper.java

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import static java.util.Collections.emptyList;
1212

1313
import io.opentelemetry.api.GlobalOpenTelemetry;
14-
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
1514
import io.opentelemetry.api.trace.Span;
1615
import io.opentelemetry.api.trace.SpanContext;
1716
import io.opentelemetry.context.Context;
@@ -33,12 +32,9 @@
3332
import java.security.Principal;
3433
import java.util.List;
3534
import java.util.function.Function;
36-
import java.util.logging.Logger;
3735
import javax.annotation.Nullable;
3836

3937
public abstract class BaseServletHelper<REQUEST, RESPONSE> {
40-
private static final Logger logger = Logger.getLogger(BaseServletHelper.class.getName());
41-
4238
private static final List<String> CAPTURE_REQUEST_PARAMETERS =
4339
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "servlet")
4440
.getScalarList("capture_request_parameters/development", String.class, emptyList());
@@ -66,24 +62,9 @@ protected BaseServletHelper(
6662
}
6763

6864
private static boolean readTraceIdRequestAttributeEnabled() {
69-
DeclarativeConfigProperties config =
70-
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "servlet");
71-
Boolean deprecatedTraceIdRequestAttributeEnabled =
72-
config.getBoolean("add_trace_id_request_attribute/development");
73-
if (deprecatedTraceIdRequestAttributeEnabled != null) {
74-
logger.warning(
75-
"The otel.instrumentation.servlet.experimental.add-trace-id-request-attribute"
76-
+ " setting is deprecated and will be removed in a future version."
77-
+ " Use otel.instrumentation.servlet.experimental.trace-id-request-attribute.enabled"
78-
+ " instead.");
79-
}
80-
return config
65+
return DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "servlet")
8166
.get("trace_id_request_attribute/development")
82-
.getBoolean(
83-
"enabled",
84-
deprecatedTraceIdRequestAttributeEnabled != null
85-
? deprecatedTraceIdRequestAttributeEnabled
86-
: !AgentCommonConfig.get().isV3Preview());
67+
.getBoolean("enabled", !AgentCommonConfig.get().isV3Preview());
8768
}
8869

8970
public boolean shouldStart(Context parentContext, ServletRequestContext<REQUEST> requestContext) {

0 commit comments

Comments
 (0)