Skip to content

Commit be79dde

Browse files
author
Mateusz Rzeszutek
authored
Remove old experimental properties in CapturedHttpHeaders (#5524)
1 parent 9904352 commit be79dde

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/CapturedHttpHeaders.java

+4-24
Original file line numberDiff line numberDiff line change
@@ -39,51 +39,31 @@ public static CapturedHttpHeaders empty() {
3939
private static final String CLIENT_RESPONSE_PROPERTY =
4040
"otel.instrumentation.http.capture-headers.client.response";
4141

42-
// TODO: remove the experimental properties after 1.8.0 release
43-
private static final String EXPERIMENTAL_CLIENT_REQUEST_PROPERTY =
44-
"otel.instrumentation.common.experimental.capture-http-headers.client.request";
45-
private static final String EXPERIMENTAL_CLIENT_RESPONSE_PROPERTY =
46-
"otel.instrumentation.common.experimental.capture-http-headers.client.response";
47-
4842
/**
4943
* Returns a configuration that captures HTTP client request and response headers as configured in
5044
* the received {@code config}.
5145
*/
5246
public static CapturedHttpHeaders client(Config config) {
5347
// fall back to the experimental properties if the stable one isn't supplied
5448
return CapturedHttpHeaders.create(
55-
config.getList(
56-
CLIENT_REQUEST_PROPERTY,
57-
config.getList(EXPERIMENTAL_CLIENT_REQUEST_PROPERTY, emptyList())),
58-
config.getList(
59-
CLIENT_RESPONSE_PROPERTY,
60-
config.getList(EXPERIMENTAL_CLIENT_RESPONSE_PROPERTY, emptyList())));
49+
config.getList(CLIENT_REQUEST_PROPERTY, emptyList()),
50+
config.getList(CLIENT_RESPONSE_PROPERTY, emptyList()));
6151
}
6252

6353
private static final String SERVER_REQUEST_PROPERTY =
6454
"otel.instrumentation.http.capture-headers.server.request";
6555
private static final String SERVER_RESPONSE_PROPERTY =
6656
"otel.instrumentation.http.capture-headers.server.response";
6757

68-
// TODO: remove the experimental properties after 1.8.0 release
69-
private static final String EXPERIMENTAL_SERVER_REQUEST_PROPERTY =
70-
"otel.instrumentation.common.experimental.capture-http-headers.server.request";
71-
private static final String EXPERIMENTAL_SERVER_RESPONSE_PROPERTY =
72-
"otel.instrumentation.common.experimental.capture-http-headers.server.response";
73-
7458
/**
7559
* Returns a configuration that captures HTTP server request and response headers as configured in
7660
* the received {@code config}.
7761
*/
7862
public static CapturedHttpHeaders server(Config config) {
7963
// fall back to the experimental properties if the stable one isn't supplied
8064
return CapturedHttpHeaders.create(
81-
config.getList(
82-
SERVER_REQUEST_PROPERTY,
83-
config.getList(EXPERIMENTAL_SERVER_REQUEST_PROPERTY, emptyList())),
84-
config.getList(
85-
SERVER_RESPONSE_PROPERTY,
86-
config.getList(EXPERIMENTAL_SERVER_RESPONSE_PROPERTY, emptyList())));
65+
config.getList(SERVER_REQUEST_PROPERTY, emptyList()),
66+
config.getList(SERVER_RESPONSE_PROPERTY, emptyList()));
8767
}
8868

8969
/**

0 commit comments

Comments
 (0)