|
11 | 11 | import static java.util.Collections.emptyList; |
12 | 12 |
|
13 | 13 | import io.opentelemetry.api.GlobalOpenTelemetry; |
14 | | -import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; |
15 | 14 | import io.opentelemetry.api.trace.Span; |
16 | 15 | import io.opentelemetry.api.trace.SpanContext; |
17 | 16 | import io.opentelemetry.context.Context; |
|
33 | 32 | import java.security.Principal; |
34 | 33 | import java.util.List; |
35 | 34 | import java.util.function.Function; |
36 | | -import java.util.logging.Logger; |
37 | 35 | import javax.annotation.Nullable; |
38 | 36 |
|
39 | 37 | public abstract class BaseServletHelper<REQUEST, RESPONSE> { |
40 | | - private static final Logger logger = Logger.getLogger(BaseServletHelper.class.getName()); |
41 | | - |
42 | 38 | private static final List<String> CAPTURE_REQUEST_PARAMETERS = |
43 | 39 | DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "servlet") |
44 | 40 | .getScalarList("capture_request_parameters/development", String.class, emptyList()); |
@@ -66,24 +62,9 @@ protected BaseServletHelper( |
66 | 62 | } |
67 | 63 |
|
68 | 64 | 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") |
81 | 66 | .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()); |
87 | 68 | } |
88 | 69 |
|
89 | 70 | public boolean shouldStart(Context parentContext, ServletRequestContext<REQUEST> requestContext) { |
|
0 commit comments