Skip to content

Commit 11369bc

Browse files
otelbot-java-instrumentation[bot]otelbot[bot]Copilot
authored
Module cleanup: batch of modules (run 25590902041) (open-telemetry#18654)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 2f2abe9 commit 11369bc

5 files changed

Lines changed: 17 additions & 7 deletions

File tree

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/client/AkkaHttpClientUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import javax.annotation.Nullable;
1515

1616
public class AkkaHttpClientUtil {
17-
@Nullable private static final MethodHandle actorSystemAccessor = findActorSystemAccessor();
17+
@Nullable private static final MethodHandle ACTOR_SYSTEM_ACCESSOR = findActorSystemAccessor();
1818

1919
@Nullable
2020
private static MethodHandle findActorSystemAccessor() {
@@ -37,12 +37,12 @@ private static MethodHandle findActorSystemAccessor(Class<?> type) {
3737

3838
@Nullable
3939
public static ActorSystem getActorSystem(HttpExt httpExt) {
40-
if (actorSystemAccessor == null) {
40+
if (ACTOR_SYSTEM_ACCESSOR == null) {
4141
return null;
4242
}
4343

4444
try {
45-
return (ActorSystem) actorSystemAccessor.invoke(httpExt);
45+
return (ActorSystem) ACTOR_SYSTEM_ACCESSOR.invoke(httpExt);
4646
} catch (Throwable ignored) {
4747
return null;
4848
}

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/AkkaHttpResponseMutator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.ArrayList;
1313
import java.util.List;
1414

15-
final class AkkaHttpResponseMutator implements HttpServerResponseMutator<HttpResponse> {
15+
class AkkaHttpResponseMutator implements HttpServerResponseMutator<HttpResponse> {
1616

1717
private final List<HttpHeader> headers = new ArrayList<>();
1818

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/AkkaHttpServerHeaders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.stream.StreamSupport;
2020
import javax.annotation.Nullable;
2121

22-
final class AkkaHttpServerHeaders implements TextMapGetter<HttpRequest> {
22+
class AkkaHttpServerHeaders implements TextMapGetter<HttpRequest> {
2323

2424
@Override
2525
public Iterable<String> keys(HttpRequest httpRequest) {

instrumentation/akka/akka-http-10.0/metadata.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,55 @@ features:
1313
- CONTEXT_PROPAGATION
1414
configurations:
1515
- name: otel.instrumentation.http.known-methods
16+
declarative_name: java.common.http.known_methods
1617
description: >
1718
Configures the instrumentation to recognize an alternative set of HTTP request methods. All
1819
other methods will be treated as `_OTHER`.
1920
type: list
2021
default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
2122
- name: otel.instrumentation.http.client.capture-request-headers
23+
declarative_name: general.http.client.request_captured_headers
2224
description: List of HTTP request headers to capture in HTTP client telemetry.
2325
type: list
2426
default: ""
2527
- name: otel.instrumentation.http.client.capture-response-headers
28+
declarative_name: general.http.client.response_captured_headers
2629
description: List of HTTP response headers to capture in HTTP client telemetry.
2730
type: list
2831
default: ""
2932
- name: otel.instrumentation.common.peer-service-mapping
33+
declarative_name: java.common.peer_service_mapping
3034
description: Used to specify a mapping from host names or IP addresses to peer services.
3135
type: map
3236
default: ""
3337
- name: otel.instrumentation.http.client.emit-experimental-telemetry
38+
declarative_name: java.common.http.client.emit_experimental_telemetry/development
3439
description: >
3540
Enable the capture of experimental HTTP client telemetry. Adds the `http.request.body.size`
3641
and `http.response.body.size` attributes to spans, and records `http.client.request.size` and
3742
`http.client.response.size` metrics.
3843
type: boolean
3944
default: false
4045
- name: otel.instrumentation.http.server.capture-request-headers
46+
declarative_name: general.http.server.request_captured_headers
4147
description: List of HTTP request headers to capture in HTTP server telemetry.
4248
type: list
4349
default: ""
4450
- name: otel.instrumentation.http.server.capture-response-headers
51+
declarative_name: general.http.server.response_captured_headers
4552
description: List of HTTP response headers to capture in HTTP server telemetry.
4653
type: list
4754
default: ""
4855
- name: otel.instrumentation.http.server.emit-experimental-telemetry
56+
declarative_name: java.common.http.server.emit_experimental_telemetry/development
4957
description: >
5058
Enable the capture of experimental HTTP server telemetry. Adds the `http.request.body.size`
5159
and `http.response.body.size` attributes to spans, and records `http.server.request.size` and
5260
`http.server.response.size` metrics.
5361
type: boolean
5462
default: false
5563
- name: otel.instrumentation.sanitization.url.experimental.sensitive-query-parameters
64+
declarative_name: general.sanitization.url.sensitive_query_parameters/development
5665
description: List of URL query parameter names whose values are redacted in URL attributes. See https://opentelemetry.io/docs/specs/semconv/http/http-spans.
5766
type: list
5867
default: "AWSAccessKeyId,Signature,sig,X-Goog-Signature"

instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@
2020
public final class ApacheHttpClientTelemetryBuilder {
2121

2222
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-4.3";
23-
private final DefaultHttpClientInstrumenterBuilder<ApacheHttpClientRequest, HttpResponse> builder;
24-
private final OpenTelemetry openTelemetry;
2523

2624
static {
2725
Experimental.internalSetEmitExperimentalTelemetry(
2826
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientTelemetry(emit));
2927
}
3028

29+
private final DefaultHttpClientInstrumenterBuilder<ApacheHttpClientRequest, HttpResponse> builder;
30+
private final OpenTelemetry openTelemetry;
31+
3132
ApacheHttpClientTelemetryBuilder(OpenTelemetry openTelemetry) {
3233
builder =
3334
DefaultHttpClientInstrumenterBuilder.create(

0 commit comments

Comments
 (0)