Skip to content

Commit c416184

Browse files
committed
Use getter instead of passing as argument
1 parent 658d5e6 commit c416184

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

instrumentation/httpurlconnection/library/src/main/java/io/opentelemetry/instrumentation/library/httpurlconnection/HttpUrlInstrumentation.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ public void addAttributesExtractor(AttributesExtractor<URLConnection, Integer> e
4141
additionalExtractors.add(extractor);
4242
}
4343

44+
public List<AttributesExtractor<URLConnection, Integer>> getAdditionalExtractors() {
45+
return additionalExtractors;
46+
}
47+
4448
/**
4549
* Configures the HTTP request headers that will be captured as span attributes as described in
4650
* <a
@@ -132,7 +136,7 @@ public boolean emitExperimentalHttpClientMetrics() {
132136

133137
@Override
134138
public void install(@NotNull InstallationContext ctx) {
135-
HttpUrlConnectionSingletons.configure(this, ctx.getOpenTelemetry(), additionalExtractors);
139+
HttpUrlConnectionSingletons.configure(this, ctx.getOpenTelemetry());
136140
}
137141

138142
/**

instrumentation/httpurlconnection/library/src/main/java/io/opentelemetry/instrumentation/library/httpurlconnection/internal/HttpUrlConnectionSingletons.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
2121
import io.opentelemetry.instrumentation.library.httpurlconnection.HttpUrlInstrumentation;
2222
import java.net.URLConnection;
23-
import java.util.List;
2423

2524
public final class HttpUrlConnectionSingletons {
2625

@@ -30,9 +29,7 @@ public final class HttpUrlConnectionSingletons {
3029
private static OpenTelemetry openTelemetryInstance;
3130

3231
public static void configure(
33-
HttpUrlInstrumentation instrumentation,
34-
OpenTelemetry openTelemetry,
35-
List<AttributesExtractor<URLConnection, Integer>> additionalExtractors) {
32+
HttpUrlInstrumentation instrumentation, OpenTelemetry openTelemetry) {
3633

3734
HttpUrlHttpAttributesGetter httpAttributesGetter = new HttpUrlHttpAttributesGetter();
3835

@@ -67,7 +64,8 @@ public static void configure(
6764
.addAttributesExtractor(httpClientPeerServiceAttributesExtractor)
6865
.addOperationMetrics(HttpClientMetrics.get());
6966

70-
for (AttributesExtractor<URLConnection, Integer> extractor : additionalExtractors) {
67+
for (AttributesExtractor<URLConnection, Integer> extractor :
68+
instrumentation.getAdditionalExtractors()) {
7169
builder.addAttributesExtractor(extractor);
7270
}
7371

instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/library/okhttp/v3_0/OkHttpInstrumentation.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ public void addAttributesExtractor(AttributesExtractor<Interceptor.Chain, Respon
3838
additionalExtractors.add(extractor);
3939
}
4040

41+
public List<AttributesExtractor<Interceptor.Chain, Response>> getAdditionalExtractors() {
42+
return additionalExtractors;
43+
}
44+
4145
/**
4246
* Configures the HTTP request headers that will be captured as span attributes as described in
4347
* <a
@@ -133,6 +137,6 @@ public boolean emitExperimentalHttpClientMetrics() {
133137

134138
@Override
135139
public void install(@NotNull InstallationContext ctx) {
136-
OkHttp3Singletons.configure(this, ctx.getOpenTelemetry(), additionalExtractors);
140+
OkHttp3Singletons.configure(this, ctx.getOpenTelemetry());
137141
}
138142
}

instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/library/okhttp/v3_0/internal/OkHttp3Singletons.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.opentelemetry.instrumentation.okhttp.v3_0.internal.OkHttpAttributesGetter;
2020
import io.opentelemetry.instrumentation.okhttp.v3_0.internal.OkHttpClientInstrumenterBuilderFactory;
2121
import io.opentelemetry.instrumentation.okhttp.v3_0.internal.TracingInterceptor;
22-
import java.util.List;
2322
import okhttp3.Interceptor;
2423
import okhttp3.Request;
2524
import okhttp3.Response;
@@ -34,9 +33,7 @@ public final class OkHttp3Singletons {
3433
public static Interceptor TRACING_INTERCEPTOR = NOOP_INTERCEPTOR;
3534

3635
public static void configure(
37-
OkHttpInstrumentation instrumentation,
38-
OpenTelemetry openTelemetry,
39-
List<AttributesExtractor<Interceptor.Chain, Response>> additionalExtractors) {
36+
OkHttpInstrumentation instrumentation, OpenTelemetry openTelemetry) {
4037
DefaultHttpClientInstrumenterBuilder<Interceptor.Chain, Response> instrumenterBuilder =
4138
OkHttpClientInstrumenterBuilderFactory.create(openTelemetry)
4239
.setCapturedRequestHeaders(instrumentation.getCapturedRequestHeaders())
@@ -58,7 +55,8 @@ public static void configure(
5855
.setEmitExperimentalHttpClientMetrics(
5956
instrumentation.emitExperimentalHttpClientMetrics());
6057

61-
for (AttributesExtractor<Interceptor.Chain, Response> extractor : additionalExtractors) {
58+
for (AttributesExtractor<Interceptor.Chain, Response> extractor :
59+
instrumentation.getAdditionalExtractors()) {
6260
instrumenterBuilder = instrumenterBuilder.addAttributesExtractor(extractor);
6361
}
6462

0 commit comments

Comments
 (0)