Skip to content

feat: add instrumentation for AsyncHttpClient version 1.8 #15195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Nov 6, 2025
Merged

feat: add instrumentation for AsyncHttpClient version 1.8 #15195

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
afb34c9
feat: add instrumentation for AsyncHttpClient version 1.8
steverao Oct 31, 2025
1465440
fix: clean up imports and formatting in AsyncHttpClient classes
steverao Oct 31, 2025
1fe088b
Fix CI failings
steverao Nov 1, 2025
f799ac5
Fix CI failings
steverao Nov 1, 2025
45e9b8b
feat: introduce common helper interface
steverao Nov 4, 2025
f69e6b3
Enhance AsyncHandlerData to include Instrumenter
steverao Nov 4, 2025
5dbca0f
./gradlew spotlessApply
otelbot[bot] Nov 4, 2025
1fc77fe
Optimize code
steverao Nov 4, 2025
c1887ae
Fix CI failing
steverao Nov 4, 2025
516aafa
refactor: clean up AsyncHttpClientHelper interface
steverao Nov 4, 2025
762018e
Fix failing tests
steverao Nov 4, 2025
cf202b2
Solved review comments
steverao Nov 5, 2025
71afc51
Address review comments
steverao Nov 6, 2025
d22c846
Address review comments
steverao Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...a/io/opentelemetry/javaagent/instrumentation/asynchttpclient/common/AsyncHandlerData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,11 @@ public static AsyncHandlerData create(
public abstract Request getRequest();

public abstract Instrumenter<Request, Response> getInstrumenter();

public void end(Response response, Throwable throwable) {
Instrumenter<Request, Response> instrumenter = getInstrumenter();
if (instrumenter != null) {
instrumenter.end(getContext(), getRequest(), response, throwable);
}
}
}
4 changes: 2 additions & 2 deletions ...javaagent/instrumentation/asynchttpclient/common/AsyncHttpClientHttpAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
import java.util.List;
import javax.annotation.Nullable;

public final class AsyncHttpClientHttpAttributesGetter
final class AsyncHttpClientHttpAttributesGetter
implements HttpClientAttributesGetter<Request, Response> {

private final AsyncHttpClientHelper helper;

public AsyncHttpClientHttpAttributesGetter(AsyncHttpClientHelper helper) {
AsyncHttpClientHttpAttributesGetter(AsyncHttpClientHelper helper) {
this.helper = helper;
}

Expand Down
26 changes: 26 additions & 0 deletions .../javaagent/instrumentation/asynchttpclient/common/AsyncHttpClientInstrumenterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.asynchttpclient.common;

import com.ning.http.client.Request;
import com.ning.http.client.Response;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters;

public final class AsyncHttpClientInstrumenterFactory {

public static Instrumenter<Request, Response> create(
String instrumentationName, AsyncHttpClientHelper helper) {
AsyncHttpClientHttpAttributesGetter httpAttributesGetter =
new AsyncHttpClientHttpAttributesGetter(helper);
HttpHeaderSetter headerSetter = new HttpHeaderSetter(helper);

return JavaagentHttpClientInstrumenters.create(
instrumentationName, httpAttributesGetter, headerSetter);
}

private AsyncHttpClientInstrumenterFactory() {}
}
4 changes: 2 additions & 2 deletions ...a/io/opentelemetry/javaagent/instrumentation/asynchttpclient/common/HttpHeaderSetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
import com.ning.http.client.Request;
import io.opentelemetry.context.propagation.TextMapSetter;

public final class HttpHeaderSetter implements TextMapSetter<Request> {
final class HttpHeaderSetter implements TextMapSetter<Request> {

private final AsyncHttpClientHelper helper;

public HttpHeaderSetter(AsyncHttpClientHelper helper) {
HttpHeaderSetter(AsyncHttpClientHelper helper) {
this.helper = helper;
}

Expand Down
12 changes: 2 additions & 10 deletions ...entelemetry/javaagent/instrumentation/asynchttpclient/common/ResponseInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;

import com.ning.http.client.AsyncCompletionHandler;
import com.ning.http.client.Request;
import com.ning.http.client.Response;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
Expand Down Expand Up @@ -60,10 +58,7 @@ public static Scope onEnter(
}
ASYNC_HANDLER_DATA.set(handler, null);

Instrumenter<Request, Response> instrumenter = data.getInstrumenter();
if (instrumenter != null) {
instrumenter.end(data.getContext(), data.getRequest(), response, null);
}
data.end(response, null);
return data.getParentContext().makeCurrent();
}

Expand All @@ -88,10 +83,7 @@ public static Scope onEnter(
}
ASYNC_HANDLER_DATA.set(handler, null);

Instrumenter<Request, Response> instrumenter = data.getInstrumenter();
if (instrumenter != null) {
instrumenter.end(data.getContext(), data.getRequest(), null, throwable);
}
data.end(null, throwable);
return data.getParentContext().makeCurrent();
}

Expand Down
1 change: 0 additions & 1 deletion instrumentation/async-http-client/async-http-client-1.8/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ tasks {
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")

systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
systemProperty("async.https.skip", "true")

systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
}
Expand Down
12 changes: 3 additions & 9 deletions ...entelemetry/javaagent/instrumentation/asynchttpclient/v1_8/AsyncHttpClientSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,17 @@
import com.ning.http.client.Request;
import com.ning.http.client.Response;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters;
import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.AsyncHttpClientHttpAttributesGetter;
import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.HttpHeaderSetter;
import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.AsyncHttpClientInstrumenterFactory;

public final class AsyncHttpClientSingletons {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.async-http-client-1.8";

private static final Instrumenter<Request, Response> INSTRUMENTER;

static {
AsyncHttpClientHttpAttributesGetter httpAttributesGetter =
new AsyncHttpClientHttpAttributesGetter(AsyncHttpClient18Helper.INSTANCE);
HttpHeaderSetter headerSetter = new HttpHeaderSetter(AsyncHttpClient18Helper.INSTANCE);

INSTRUMENTER =
JavaagentHttpClientInstrumenters.create(
INSTRUMENTATION_NAME, httpAttributesGetter, headerSetter);
AsyncHttpClientInstrumenterFactory.create(
INSTRUMENTATION_NAME, AsyncHttpClient18Helper.INSTANCE);
}

public static Instrumenter<Request, Response> instrumenter() {
Expand Down
12 changes: 3 additions & 9 deletions ...entelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,17 @@
import com.ning.http.client.Request;
import com.ning.http.client.Response;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters;
import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.AsyncHttpClientHttpAttributesGetter;
import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.HttpHeaderSetter;
import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.AsyncHttpClientInstrumenterFactory;

public final class AsyncHttpClientSingletons {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.async-http-client-1.9";

private static final Instrumenter<Request, Response> INSTRUMENTER;

static {
AsyncHttpClientHttpAttributesGetter httpAttributesGetter =
new AsyncHttpClientHttpAttributesGetter(AsyncHttpClient19Helper.INSTANCE);
HttpHeaderSetter headerSetter = new HttpHeaderSetter(AsyncHttpClient19Helper.INSTANCE);

INSTRUMENTER =
JavaagentHttpClientInstrumenters.create(
INSTRUMENTATION_NAME, httpAttributesGetter, headerSetter);
AsyncHttpClientInstrumenterFactory.create(
INSTRUMENTATION_NAME, AsyncHttpClient19Helper.INSTANCE);
}

public static Instrumenter<Request, Response> instrumenter() {
Expand Down
Loading