Skip to content

Commit 7760022

Browse files
anuragagarwal561994anuragagarwal561994
committed
Runs spotless
1 parent b91a928 commit 7760022

File tree

25 files changed

+138
-43
lines changed

25 files changed

+138
-43
lines changed

‎instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/WrappedContentDecoder.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
27

38
import static io.opentelemetry.javaagent.instrumentation.apachehttpclient.commons.BytesTransferMetrics.createOrGetWithParentContext;

‎instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/WrappedContentEncoder.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
27

38
import static io.opentelemetry.javaagent.instrumentation.apachehttpclient.commons.BytesTransferMetrics.createOrGetWithParentContext;

‎instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/WrappedFutureCallback.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
27

38
import static io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientSingletons.helper;

‎instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/WrappedRequestProducer.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
27

38
import static io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientSingletons.helper;
@@ -60,9 +65,7 @@ public HttpRequest generateRequest() throws IOException, HttpException {
6065

6166
@Override
6267
public void produceContent(ContentEncoder encoder, IOControl ioctrl) throws IOException {
63-
delegate.produceContent(
64-
new WrappedContentEncoder(parentContext, encoder),
65-
ioctrl);
68+
delegate.produceContent(new WrappedContentEncoder(parentContext, encoder), ioctrl);
6669
}
6770

6871
@Override

‎instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/WrappedResponseConsumer.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
27

38
import io.opentelemetry.context.Context;
@@ -26,9 +31,7 @@ public void responseReceived(HttpResponse httpResponse) throws IOException, Http
2631
@Override
2732
public void consumeContent(ContentDecoder contentDecoder, IOControl ioControl)
2833
throws IOException {
29-
delegate.consumeContent(
30-
new WrappedContentDecoder(parentContext,
31-
contentDecoder), ioControl);
34+
delegate.consumeContent(new WrappedContentDecoder(parentContext, contentDecoder), ioControl);
3235
}
3336

3437
@Override

‎instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientContextManager.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
27

38
import io.opentelemetry.javaagent.instrumentation.apachehttpclient.commons.OtelHttpContextManager;

‎instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientInernalEntityStorage.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
27

38
import io.opentelemetry.context.Context;
@@ -6,7 +11,8 @@
611
import org.apache.hc.core5.http.HttpRequest;
712
import org.apache.hc.core5.http.HttpResponse;
813

9-
public final class ApacheHttpClientInernalEntityStorage extends OtelHttpInternalEntityStorage<HttpRequest, HttpResponse> {
14+
public final class ApacheHttpClientInernalEntityStorage
15+
extends OtelHttpInternalEntityStorage<HttpRequest, HttpResponse> {
1016
private static final ApacheHttpClientInernalEntityStorage INSTANCE;
1117

1218
static {
@@ -16,8 +22,7 @@ public final class ApacheHttpClientInernalEntityStorage extends OtelHttpInternal
1622
private ApacheHttpClientInernalEntityStorage() {
1723
super(
1824
VirtualField.find(Context.class, HttpRequest.class),
19-
VirtualField.find(Context.class, HttpResponse.class)
20-
);
25+
VirtualField.find(Context.class, HttpResponse.class));
2126
}
2227

2328
public static OtelHttpInternalEntityStorage<HttpRequest, HttpResponse> storage() {

‎instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientInstrumentationHelper.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
public final class ApacheHttpClientInstrumentationHelper {
2323
private final Instrumenter<OtelHttpRequest, OtelHttpResponse> instrumenter;
2424

25-
public ApacheHttpClientInstrumentationHelper(Instrumenter<OtelHttpRequest, OtelHttpResponse> instrumenter) {
25+
public ApacheHttpClientInstrumentationHelper(
26+
Instrumenter<OtelHttpRequest, OtelHttpResponse> instrumenter) {
2627
this.instrumenter = instrumenter;
2728
}
2829

‎instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientResponse.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
27

38
import io.opentelemetry.javaagent.instrumentation.apachehttpclient.commons.OtelHttpResponse;

‎instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/WrappedDataStreamChannel.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
27

38
import static io.opentelemetry.javaagent.instrumentation.apachehttpclient.commons.BytesTransferMetrics.createOrGetWithParentContext;

‎instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/WrappedFutureCallback.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
27

38
import static io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0.ApacheHttpClientContextManager.httpContextManager;

‎instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/WrappedRequestChannel.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
27

38
import static io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0.ApacheHttpClientContextManager.httpContextManager;
@@ -26,8 +31,7 @@ public WrappedRequestChannel(
2631
}
2732

2833
@Override
29-
public void sendRequest(
30-
HttpRequest request, EntityDetails entityDetails, HttpContext httpContext)
34+
public void sendRequest(HttpRequest request, EntityDetails entityDetails, HttpContext httpContext)
3135
throws HttpException, IOException {
3236
ApacheHttpClientRequest otelRequest = new ApacheHttpClientRequest(parentContext, request);
3337
Context context = helper().startInstrumentation(parentContext, request, otelRequest);

‎instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/WrappedRequestProducer.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
27

38
import io.opentelemetry.context.Context;
@@ -14,8 +19,7 @@ public final class WrappedRequestProducer implements AsyncRequestProducer {
1419
private final WrappedFutureCallback<?> callback;
1520

1621
public WrappedRequestProducer(
17-
Context parentContext, AsyncRequestProducer delegate,
18-
WrappedFutureCallback<?> callback) {
22+
Context parentContext, AsyncRequestProducer delegate, WrappedFutureCallback<?> callback) {
1923
this.parentContext = parentContext;
2024
this.delegate = delegate;
2125
this.callback = callback;
@@ -30,8 +34,7 @@ public void failed(Exception ex) {
3034
public void sendRequest(RequestChannel channel, HttpContext context)
3135
throws HttpException, IOException {
3236
RequestChannel requestChannel;
33-
requestChannel = new WrappedRequestChannel(channel,
34-
parentContext, callback);
37+
requestChannel = new WrappedRequestChannel(channel, parentContext, callback);
3538
delegate.sendRequest(requestChannel, context);
3639
}
3740

@@ -47,8 +50,7 @@ public int available() {
4750

4851
@Override
4952
public void produce(DataStreamChannel channel) throws IOException {
50-
delegate.produce(
51-
new WrappedDataStreamChannel(parentContext, channel));
53+
delegate.produce(new WrappedDataStreamChannel(parentContext, channel));
5254
}
5355

5456
@Override

‎instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/WrappedResponseConsumer.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
27

38
import static io.opentelemetry.javaagent.instrumentation.apachehttpclient.commons.BytesTransferMetrics.createOrGetWithParentContext;

‎instrumentation/apache-httpclient/commons-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/commons/ApacheHttpClientContextManager.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0.commons;
27

38
import io.opentelemetry.javaagent.instrumentation.apachehttpclient.commons.OtelHttpContextManager;

‎instrumentation/apache-httpclient/commons-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/commons/ApacheHttpClientInernalEntityStorage.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0.commons;
27

38
import io.opentelemetry.context.Context;
@@ -6,7 +11,8 @@
611
import org.apache.http.HttpRequest;
712
import org.apache.http.HttpResponse;
813

9-
public final class ApacheHttpClientInernalEntityStorage extends OtelHttpInternalEntityStorage<HttpRequest, HttpResponse> {
14+
public final class ApacheHttpClientInernalEntityStorage
15+
extends OtelHttpInternalEntityStorage<HttpRequest, HttpResponse> {
1016
private static final ApacheHttpClientInernalEntityStorage INSTANCE;
1117

1218
static {
@@ -16,8 +22,7 @@ public final class ApacheHttpClientInernalEntityStorage extends OtelHttpInternal
1622
private ApacheHttpClientInernalEntityStorage() {
1723
super(
1824
VirtualField.find(Context.class, HttpRequest.class),
19-
VirtualField.find(Context.class, HttpResponse.class)
20-
);
25+
VirtualField.find(Context.class, HttpResponse.class));
2126
}
2227

2328
public static OtelHttpInternalEntityStorage<HttpRequest, HttpResponse> storage() {

‎instrumentation/apache-httpclient/commons-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/commons/ApacheHttpClientInstrumentationHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private static OtelHttpRequest getFinalRequest(ApacheHttpClientRequest request,
6161
return request;
6262
}
6363

64-
private static <T> OtelHttpResponse getFinalResponse(T result, Context context) {
64+
private static <T> OtelHttpResponse getFinalResponse(T result, Context context) {
6565
HttpResponse internalResponse = storage().getInternalResponse(context);
6666
if (internalResponse != null) {
6767
return new ApacheHttpClientResponse(internalResponse);

‎instrumentation/apache-httpclient/commons-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/commons/ApacheHttpClientResponse.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0.commons;
27

38
import io.opentelemetry.javaagent.instrumentation.apachehttpclient.commons.OtelHttpResponse;

‎instrumentation/apache-httpclient/commons/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/commons/ApacheHttpClientHttpAttributesGetter.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
import java.util.List;
1010
import javax.annotation.Nullable;
1111

12-
public final class ApacheHttpClientHttpAttributesGetter implements HttpClientAttributesGetter<OtelHttpRequest, OtelHttpResponse> {
12+
public final class ApacheHttpClientHttpAttributesGetter
13+
implements HttpClientAttributesGetter<OtelHttpRequest, OtelHttpResponse> {
1314
@Override
1415
public String getMethod(OtelHttpRequest request) {
1516
return request.getMethod();
@@ -26,7 +27,8 @@ public List<String> getRequestHeader(OtelHttpRequest request, String name) {
2627
}
2728

2829
@Override
29-
public Integer getStatusCode(OtelHttpRequest request, OtelHttpResponse response, @Nullable Throwable error) {
30+
public Integer getStatusCode(
31+
OtelHttpRequest request, OtelHttpResponse response, @Nullable Throwable error) {
3032
return response.statusCode();
3133
}
3234

@@ -37,14 +39,15 @@ public String getFlavor(OtelHttpRequest request, @Nullable OtelHttpResponse resp
3739
if (flavor == null && response != null) {
3840
String responseFlavour = response.getFlavour();
3941
if (responseFlavour != null) {
40-
flavor = responseFlavour;
42+
flavor = responseFlavour;
4143
}
4244
}
4345
return flavor;
4446
}
4547

4648
@Override
47-
public List<String> getResponseHeader(OtelHttpRequest request, OtelHttpResponse response, String name) {
49+
public List<String> getResponseHeader(
50+
OtelHttpRequest request, OtelHttpResponse response, String name) {
4851
return response.getHeader(name);
4952
}
5053
}

‎instrumentation/apache-httpclient/commons/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/commons/ApacheHttpClientInstrumenter.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@ public static Instrumenter<OtelHttpRequest, OtelHttpResponse> create(String inst
2323
netAttributesGetter = new ApacheHttpClientNetAttributesGetter();
2424

2525
return Instrumenter.<OtelHttpRequest, OtelHttpResponse>builder(
26-
GlobalOpenTelemetry.get(),
27-
instrumentationName,
28-
HttpSpanNameExtractor.create(httpAttributesGetter))
29-
.setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
30-
.addAttributesExtractor(
31-
HttpClientAttributesExtractor.builder(httpAttributesGetter, netAttributesGetter)
32-
.setCapturedRequestHeaders(CommonConfig.get().getClientRequestHeaders())
33-
.setCapturedResponseHeaders(CommonConfig.get().getClientResponseHeaders())
34-
.build())
35-
.addAttributesExtractor(
36-
PeerServiceAttributesExtractor.create(
37-
netAttributesGetter, CommonConfig.get().getPeerServiceMapping()))
38-
.addAttributesExtractor(new ApacheHttpClientContentLengthAttributesGetter())
39-
.addOperationMetrics(HttpClientMetrics.get())
40-
.buildClientInstrumenter(new HttpHeaderSetter());
26+
GlobalOpenTelemetry.get(),
27+
instrumentationName,
28+
HttpSpanNameExtractor.create(httpAttributesGetter))
29+
.setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
30+
.addAttributesExtractor(
31+
HttpClientAttributesExtractor.builder(httpAttributesGetter, netAttributesGetter)
32+
.setCapturedRequestHeaders(CommonConfig.get().getClientRequestHeaders())
33+
.setCapturedResponseHeaders(CommonConfig.get().getClientResponseHeaders())
34+
.build())
35+
.addAttributesExtractor(
36+
PeerServiceAttributesExtractor.create(
37+
netAttributesGetter, CommonConfig.get().getPeerServiceMapping()))
38+
.addAttributesExtractor(new ApacheHttpClientContentLengthAttributesGetter())
39+
.addOperationMetrics(HttpClientMetrics.get())
40+
.buildClientInstrumenter(new HttpHeaderSetter());
4141
}
4242

4343
private ApacheHttpClientInstrumenter() {}

‎instrumentation/apache-httpclient/commons/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/commons/OtelHttpContext.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.commons;
27

38
import io.opentelemetry.context.Context;

‎instrumentation/apache-httpclient/commons/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/commons/OtelHttpContextManager.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.commons;
27

38
import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;

‎instrumentation/apache-httpclient/commons/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/commons/OtelHttpInternalEntityStorage.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ public abstract class OtelHttpInternalEntityStorage<REQ, RES> {
1313
private final VirtualField<Context, RES> responseStorage;
1414

1515
protected OtelHttpInternalEntityStorage(
16-
VirtualField<Context, REQ> requestStorage,
17-
VirtualField<Context, RES> responseStorage) {
16+
VirtualField<Context, REQ> requestStorage, VirtualField<Context, RES> responseStorage) {
1817
this.requestStorage = requestStorage;
1918
this.responseStorage = responseStorage;
2019
}

‎instrumentation/apache-httpclient/commons/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/commons/OtelHttpRequest.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.commons;
27

38
import java.net.InetSocketAddress;

‎instrumentation/apache-httpclient/commons/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/commons/OtelHttpResponse.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.commons;
27

38
import java.util.List;

0 commit comments

Comments
 (0)