Skip to content

Commit 762018e

Browse files
steveraosteverao
committed
Fix failing tests
1 parent 516aafa commit 762018e

File tree

6 files changed

+23
-26
lines changed

6 files changed

+23
-26
lines changed

‎instrumentation/async-http-client/async-http-client-1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/common/ResponseInstrumentation.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@
66
package io.opentelemetry.javaagent.instrumentation.asynchttpclient.common;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
9+
import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.VirtualFieldHelper.ASYNC_HANDLER_DATA;
910
import static net.bytebuddy.matcher.ElementMatchers.hasSuperClass;
1011
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1112
import static net.bytebuddy.matcher.ElementMatchers.named;
1213
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
1314

1415
import com.ning.http.client.AsyncCompletionHandler;
15-
import com.ning.http.client.AsyncHandler;
1616
import com.ning.http.client.Request;
1717
import com.ning.http.client.Response;
1818
import io.opentelemetry.context.Scope;
1919
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
20-
import io.opentelemetry.instrumentation.api.util.VirtualField;
2120
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2221
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
2322
import net.bytebuddy.asm.Advice;
@@ -55,13 +54,11 @@ public static class OnCompletedAdvice {
5554
public static Scope onEnter(
5655
@Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Response response) {
5756

58-
VirtualField<AsyncHandler<?>, AsyncHandlerData> asyncHandlerDataField =
59-
VirtualField.find(AsyncHandler.class, AsyncHandlerData.class);
60-
AsyncHandlerData data = asyncHandlerDataField.get(handler);
57+
AsyncHandlerData data = ASYNC_HANDLER_DATA.get(handler);
6158
if (data == null) {
6259
return null;
6360
}
64-
asyncHandlerDataField.set(handler, null);
61+
ASYNC_HANDLER_DATA.set(handler, null);
6562

6663
Instrumenter<Request, Response> instrumenter = data.getInstrumenter();
6764
if (instrumenter != null) {
@@ -85,13 +82,11 @@ public static class OnThrowableAdvice {
8582
public static Scope onEnter(
8683
@Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Throwable throwable) {
8784

88-
VirtualField<AsyncHandler<?>, AsyncHandlerData> asyncHandlerDataField =
89-
VirtualField.find(AsyncHandler.class, AsyncHandlerData.class);
90-
AsyncHandlerData data = asyncHandlerDataField.get(handler);
85+
AsyncHandlerData data = ASYNC_HANDLER_DATA.get(handler);
9186
if (data == null) {
9287
return null;
9388
}
94-
asyncHandlerDataField.set(handler, null);
89+
ASYNC_HANDLER_DATA.set(handler, null);
9590

9691
Instrumenter<Request, Response> instrumenter = data.getInstrumenter();
9792
if (instrumenter != null) {

‎instrumentation/async-http-client/async-http-client-1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/common/VirtualFieldHelper.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.javaagent.instrumentation.asynchttpclient.common;
7+
8+
import com.ning.http.client.AsyncHandler;
9+
import io.opentelemetry.instrumentation.api.util.VirtualField;
10+
11+
public final class VirtualFieldHelper {
12+
public static final VirtualField<AsyncHandler<?>, AsyncHandlerData> ASYNC_HANDLER_DATA =
13+
VirtualField.find(AsyncHandler.class, AsyncHandlerData.class);
14+
15+
private VirtualFieldHelper() {}
16+
}

‎instrumentation/async-http-client/async-http-client-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_8/AsyncHttpClientSingletons.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55

66
package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_8;
77

8-
import com.ning.http.client.AsyncHandler;
98
import com.ning.http.client.Request;
109
import com.ning.http.client.Response;
1110
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
12-
import io.opentelemetry.instrumentation.api.util.VirtualField;
1311
import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters;
14-
import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.AsyncHandlerData;
1512
import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.AsyncHttpClientHttpAttributesGetter;
1613
import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.HttpHeaderSetter;
1714

@@ -20,8 +17,6 @@ public final class AsyncHttpClientSingletons {
2017

2118
private static final Instrumenter<Request, Response> INSTRUMENTER;
2219

23-
public static final VirtualField<AsyncHandler<?>, AsyncHandlerData> ASYNC_HANDLER_DATA;
24-
2520
static {
2621
AsyncHttpClientHttpAttributesGetter httpAttributesGetter =
2722
new AsyncHttpClientHttpAttributesGetter(AsyncHttpClient18Helper.INSTANCE);
@@ -30,8 +25,6 @@ public final class AsyncHttpClientSingletons {
3025
INSTRUMENTER =
3126
JavaagentHttpClientInstrumenters.create(
3227
INSTRUMENTATION_NAME, httpAttributesGetter, headerSetter);
33-
34-
ASYNC_HANDLER_DATA = VirtualField.find(AsyncHandler.class, AsyncHandlerData.class);
3528
}
3629

3730
public static Instrumenter<Request, Response> instrumenter() {

‎instrumentation/async-http-client/async-http-client-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_8/AsyncHttpProviderInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
10-
import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_8.AsyncHttpClientSingletons.ASYNC_HANDLER_DATA;
10+
import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.VirtualFieldHelper.ASYNC_HANDLER_DATA;
1111
import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_8.AsyncHttpClientSingletons.instrumenter;
1212
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1313
import static net.bytebuddy.matcher.ElementMatchers.named;

‎instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientSingletons.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55

66
package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
77

8-
import com.ning.http.client.AsyncHandler;
98
import com.ning.http.client.Request;
109
import com.ning.http.client.Response;
1110
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
12-
import io.opentelemetry.instrumentation.api.util.VirtualField;
1311
import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters;
14-
import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.AsyncHandlerData;
1512
import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.AsyncHttpClientHttpAttributesGetter;
1613
import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.HttpHeaderSetter;
1714

@@ -20,8 +17,6 @@ public final class AsyncHttpClientSingletons {
2017

2118
private static final Instrumenter<Request, Response> INSTRUMENTER;
2219

23-
public static final VirtualField<AsyncHandler<?>, AsyncHandlerData> ASYNC_HANDLER_DATA;
24-
2520
static {
2621
AsyncHttpClientHttpAttributesGetter httpAttributesGetter =
2722
new AsyncHttpClientHttpAttributesGetter(AsyncHttpClient19Helper.INSTANCE);
@@ -30,8 +25,6 @@ public final class AsyncHttpClientSingletons {
3025
INSTRUMENTER =
3126
JavaagentHttpClientInstrumenters.create(
3227
INSTRUMENTATION_NAME, httpAttributesGetter, headerSetter);
33-
34-
ASYNC_HANDLER_DATA = VirtualField.find(AsyncHandler.class, AsyncHandlerData.class);
3528
}
3629

3730
public static Instrumenter<Request, Response> instrumenter() {

‎instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/RequestInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
77

88
import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
9-
import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientSingletons.ASYNC_HANDLER_DATA;
9+
import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.VirtualFieldHelper.ASYNC_HANDLER_DATA;
1010
import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientSingletons.instrumenter;
1111
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1212
import static net.bytebuddy.matcher.ElementMatchers.named;

0 commit comments

Comments
 (0)