From be79dde0f6740675cf98e567de8b08c72b66516c Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Tue, 8 Mar 2022 09:54:06 +0100 Subject: [PATCH] Remove old experimental properties in CapturedHttpHeaders (#5524) --- .../http/CapturedHttpHeaders.java | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/CapturedHttpHeaders.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/CapturedHttpHeaders.java index b3f3f311efd2..fc7b8c3185d6 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/CapturedHttpHeaders.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/CapturedHttpHeaders.java @@ -39,12 +39,6 @@ public static CapturedHttpHeaders empty() { private static final String CLIENT_RESPONSE_PROPERTY = "otel.instrumentation.http.capture-headers.client.response"; - // TODO: remove the experimental properties after 1.8.0 release - private static final String EXPERIMENTAL_CLIENT_REQUEST_PROPERTY = - "otel.instrumentation.common.experimental.capture-http-headers.client.request"; - private static final String EXPERIMENTAL_CLIENT_RESPONSE_PROPERTY = - "otel.instrumentation.common.experimental.capture-http-headers.client.response"; - /** * Returns a configuration that captures HTTP client request and response headers as configured in * the received {@code config}. @@ -52,12 +46,8 @@ public static CapturedHttpHeaders empty() { public static CapturedHttpHeaders client(Config config) { // fall back to the experimental properties if the stable one isn't supplied return CapturedHttpHeaders.create( - config.getList( - CLIENT_REQUEST_PROPERTY, - config.getList(EXPERIMENTAL_CLIENT_REQUEST_PROPERTY, emptyList())), - config.getList( - CLIENT_RESPONSE_PROPERTY, - config.getList(EXPERIMENTAL_CLIENT_RESPONSE_PROPERTY, emptyList()))); + config.getList(CLIENT_REQUEST_PROPERTY, emptyList()), + config.getList(CLIENT_RESPONSE_PROPERTY, emptyList())); } private static final String SERVER_REQUEST_PROPERTY = @@ -65,12 +55,6 @@ public static CapturedHttpHeaders client(Config config) { private static final String SERVER_RESPONSE_PROPERTY = "otel.instrumentation.http.capture-headers.server.response"; - // TODO: remove the experimental properties after 1.8.0 release - private static final String EXPERIMENTAL_SERVER_REQUEST_PROPERTY = - "otel.instrumentation.common.experimental.capture-http-headers.server.request"; - private static final String EXPERIMENTAL_SERVER_RESPONSE_PROPERTY = - "otel.instrumentation.common.experimental.capture-http-headers.server.response"; - /** * Returns a configuration that captures HTTP server request and response headers as configured in * the received {@code config}. @@ -78,12 +62,8 @@ public static CapturedHttpHeaders client(Config config) { public static CapturedHttpHeaders server(Config config) { // fall back to the experimental properties if the stable one isn't supplied return CapturedHttpHeaders.create( - config.getList( - SERVER_REQUEST_PROPERTY, - config.getList(EXPERIMENTAL_SERVER_REQUEST_PROPERTY, emptyList())), - config.getList( - SERVER_RESPONSE_PROPERTY, - config.getList(EXPERIMENTAL_SERVER_RESPONSE_PROPERTY, emptyList()))); + config.getList(SERVER_REQUEST_PROPERTY, emptyList()), + config.getList(SERVER_RESPONSE_PROPERTY, emptyList())); } /**