open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make azure-core indy-ready (#14681)

This commit is contained in:
SylvainJuge 2025-09-18 14:00:03 +02:00 committed by GitHub
parent 7b00732fa8
commit 2caff625dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
instrumentation/azure-core/azure-core-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureHttpClientInstrumentation.java
View File

@ -15,6 +15,7 @@ import com.azure.core.http.HttpResponse;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.asm.Advice.AssignReturned;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
import reactor.core.publisher.Mono;
@ -39,9 +40,10 @@ public class AzureHttpClientInstrumentation implements TypeInstrumentation {
@SuppressWarnings("unused")
public static class SuppressNestedClientAdvice {
@AssignReturned.ToReturned
@Advice.OnMethodExit(suppress = Throwable.class)
public static void methodExit(@Advice.Return(readOnly = false) Mono<HttpResponse> mono) {
mono = new SuppressNestedClientMono<>(mono);
public static Mono<HttpResponse> methodExit(@Advice.Return Mono<HttpResponse> mono) {
return new SuppressNestedClientMono<>(mono);
}
}
}

5
instrumentation/azure-core/azure-core-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureSdkInstrumentationModule.java
View File

@ -77,4 +77,9 @@ public class AzureSdkInstrumentationModule extends InstrumentationModule
// Nothing to instrument, no methods to match
}
}
@Override
public boolean isIndyReady() {
return true;
}
}

6
instrumentation/azure-core/azure-core-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureHttpClientInstrumentation.java
View File

@ -15,6 +15,7 @@ import com.azure.core.http.HttpResponse;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.asm.Advice.AssignReturned;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
import reactor.core.publisher.Mono;
@ -39,9 +40,10 @@ public class AzureHttpClientInstrumentation implements TypeInstrumentation {
@SuppressWarnings("unused")
public static class SuppressNestedClientAdvice {
@AssignReturned.ToReturned
@Advice.OnMethodExit(suppress = Throwable.class)
public static void methodExit(@Advice.Return(readOnly = false) Mono<HttpResponse> mono) {
mono = new SuppressNestedClientMono<>(mono);
public static Mono<HttpResponse> methodExit(@Advice.Return Mono<HttpResponse> mono) {
return new SuppressNestedClientMono<>(mono);
}
}
}

5
instrumentation/azure-core/azure-core-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureSdkInstrumentationModule.java
View File

@ -77,4 +77,9 @@ public class AzureSdkInstrumentationModule extends InstrumentationModule
// Nothing to instrument, no methods to match
}
}
@Override
public boolean isIndyReady() {
return true;
}
}

19
instrumentation/azure-core/azure-core-1.36/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureHttpClientInstrumentation.java
View File

@ -18,7 +18,9 @@ import com.azure.core.http.HttpResponse;
import io.opentelemetry.context.Scope;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import javax.annotation.Nullable;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.asm.Advice.AssignReturned;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
import reactor.core.publisher.Mono;
@ -50,27 +52,26 @@ public class AzureHttpClientInstrumentation implements TypeInstrumentation {
@SuppressWarnings("unused")
public static class SuppressNestedClientMonoAdvice {
@AssignReturned.ToReturned
@Advice.OnMethodExit(suppress = Throwable.class)
public static void asyncSendExit(
public static Mono<HttpResponse> asyncSendExit(
@Advice.Argument(1) com.azure.core.util.Context azContext,
@Advice.Return(readOnly = false) Mono<HttpResponse> mono) {
mono = disallowNestedClientSpanMono(mono, azContext);
@Advice.Return Mono<HttpResponse> mono) {
return disallowNestedClientSpanMono(mono, azContext);
}
}
@SuppressWarnings("unused")
public static class SuppressNestedClientSyncAdvice {
@Nullable
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void syncSendEnter(
@Advice.Argument(1) com.azure.core.util.Context azContext,
@Advice.Local("otelScope") Scope scope) {
scope = disallowNestedClientSpanSync(azContext);
public static Scope syncSendEnter(@Advice.Argument(1) com.azure.core.util.Context azContext) {
return disallowNestedClientSpanSync(azContext);
}
@Advice.OnMethodExit(suppress = Throwable.class)
public static void syncSendExit(
@Advice.Return HttpResponse response, @Advice.Local("otelScope") Scope scope) {
public static void syncSendExit(@Advice.Enter @Nullable Scope scope) {
if (scope != null) {
scope.close();
}

5
instrumentation/azure-core/azure-core-1.36/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkInstrumentationModule.java
View File

@ -77,4 +77,9 @@ public class AzureSdkInstrumentationModule extends InstrumentationModule
// Nothing to instrument, no methods to match
}
}
@Override
public boolean isIndyReady() {
return true;
}
}

2
instrumentation/azure-core/azure-core-1.36/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/SuppressNestedClientHelper.java
View File

@ -11,11 +11,13 @@ import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.api.internal.SpanKey;
import javax.annotation.Nullable;
import reactor.core.CoreSubscriber;
import reactor.core.publisher.Mono;
public class SuppressNestedClientHelper {
@Nullable
public static Scope disallowNestedClientSpanSync(com.azure.core.util.Context azContext) {
Context parentContext = currentContext();
boolean hasAzureClientSpan = azContext.getData("client-method-call-flag").isPresent();