Skip to content

Update OpenTelemetry Java instrumentation to v2.13.1 #4087

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
trask merged 8 commits into from
Feb 19, 2025
Merged

Update OpenTelemetry Java instrumentation to v2.13.1 #4087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0a8c47b
Update otel versions
trask Feb 18, 2025
7aa4ae5
Update lock files
trask Feb 19, 2025
37b4abd
Update license report
trask Feb 18, 2025
8354103
Update semconv
trask Feb 18, 2025
819b295
Fix and properly test azure function integration
trask Feb 19, 2025
baf1fdc
spotless
trask Feb 19, 2025
7b1eb1a
fix
trask Feb 19, 2025
3c57d95
fix
trask Feb 19, 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
8 changes: 4 additions & 4 deletions agent/agent-bootstrap/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
org.junit:junit-bom:5.11.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-for-testing/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
org.junit:junit-bom:5.11.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
org.junit:junit-bom:5.11.4=runtimeClasspath
org.slf4j:slf4j-api:2.0.16=runtimeClasspath
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
Expand Down
8 changes: 4 additions & 4 deletions agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
org.junit:junit-bom:5.11.4=runtimeClasspath
org.slf4j:slf4j-api:2.0.16=runtimeClasspath
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
Expand Down
8 changes: 4 additions & 4 deletions agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
org.junit:junit-bom:5.11.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-alerting-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
org.junit:junit-bom:5.11.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-alerting/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ com.azure:azure-json:1.3.0=runtimeClasspath
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
org.junit:junit-bom:5.11.4=runtimeClasspath
org.slf4j:slf4j-api:2.0.16=runtimeClasspath
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
Expand Down
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
org.junit:junit-bom:5.11.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
org.junit:junit-bom:5.11.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions agent/agent-profiler/agent-diagnostics/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
org.junit:junit-bom:5.11.4=runtimeClasspath
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
empty=
1 change: 1 addition & 0 deletions agent/agent-tooling/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ dependencies {
implementation("com.azure:azure-monitor-opentelemetry-autoconfigure:1.0.0-beta.2")
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling-java9")
compileOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap")
testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")

Expand Down
31 changes: 15 additions & 16 deletions agent/agent-tooling/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,21 @@ io.netty:netty-transport-native-kqueue:4.1.118.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.118.Final=runtimeClasspath
io.netty:netty-transport:4.1.118.Final=runtimeClasspath
io.opentelemetry.contrib:opentelemetry-jfr-connection:1.43.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.29.0-alpha=runtimeClasspath
io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-api-incubator:1.46.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-api:1.46.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
io.opentelemetry:opentelemetry-context:1.46.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-common:1.46.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.46.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.46.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-logs:1.46.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-metrics:1.46.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-trace:1.46.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk:1.46.0=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.30.0-alpha-rc.1=runtimeClasspath
io.opentelemetry.semconv:opentelemetry-semconv:1.30.0-rc.1=runtimeClasspath
io.opentelemetry:opentelemetry-api:1.47.0=runtimeClasspath
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
io.opentelemetry:opentelemetry-context:1.47.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-common:1.47.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.47.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.47.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-logs:1.47.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-metrics:1.47.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-trace:1.47.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk:1.47.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.0.48=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.0.48=runtimeClasspath
io.projectreactor:reactor-core:3.4.41=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentLogExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import io.opentelemetry.sdk.common.CompletableResultCode;
import io.opentelemetry.sdk.logs.data.LogRecordData;
import io.opentelemetry.sdk.logs.export.LogRecordExporter;
import io.opentelemetry.semconv.SemanticAttributes;
import io.opentelemetry.semconv.ExceptionAttributes;
import java.util.Collection;
import java.util.List;
import java.util.function.Consumer;
Expand Down Expand Up @@ -102,7 +102,7 @@ private CompletableResultCode internalExport(Collection<LogRecordData> logs) {
continue;
}

String stack = log.getAttributes().get(SemanticAttributes.EXCEPTION_STACKTRACE);
String stack = log.getAttributes().get(ExceptionAttributes.EXCEPTION_STACKTRACE);

SamplingOverrides samplingOverrides =
stack != null ? exceptionSamplingOverrides : logSamplingOverrides;
Expand Down
5 changes: 3 additions & 2 deletions .../main/java/com/microsoft/applicationinsights/agent/internal/init/AiContextCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.ContextCustomizer;
import io.opentelemetry.semconv.SemanticAttributes;
import io.opentelemetry.semconv.UrlAttributes;
import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes;
import java.util.List;
import javax.annotation.Nullable;

Expand Down Expand Up @@ -42,7 +43,7 @@ public Context onStart(Context context, R request, Attributes startAttributes) {

String path =
getStableAttribute(
startAttributes, SemanticAttributes.URL_PATH, SemanticAttributes.HTTP_TARGET);
startAttributes, UrlAttributes.URL_PATH, HttpIncubatingAttributes.HTTP_TARGET);

String connectionStringOverride = getConnectionStringOverride(path);
if (connectionStringOverride != null) {
Expand Down
36 changes: 31 additions & 5 deletions ...java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@

import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings;
import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper;
import io.opentelemetry.javaagent.bootstrap.ClassFileTransformerHolder;
import io.opentelemetry.javaagent.bootstrap.InstrumentationHolder;
import io.opentelemetry.javaagent.bootstrap.LambdaTransformer;
import io.opentelemetry.javaagent.bootstrap.LambdaTransformerHolder;
import io.opentelemetry.javaagent.tooling.Java8LambdaTransformer;
import io.opentelemetry.javaagent.tooling.Java9LambdaTransformer;
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.Instrumentation;
import javax.annotation.Nullable;
Expand Down Expand Up @@ -49,15 +52,38 @@ public void run() {

private static void disableBytecodeInstrumentation() {
Instrumentation instrumentation = InstrumentationHolder.getInstrumentation();
ClassFileTransformer transformer = ClassFileTransformerHolder.getClassFileTransformer();
if (instrumentation == null || transformer == null) {
LambdaTransformer transformer = LambdaTransformerHolder.getLambdaTransformer();
ClassFileTransformer classFileTransformer = getDelegate(transformer);
if (instrumentation == null || classFileTransformer == null) {
return;
}
if (instrumentation.removeTransformer(transformer)) {
ClassFileTransformerHolder.setClassFileTransformer(null);
if (instrumentation.removeTransformer(classFileTransformer)) {
LambdaTransformerHolder.setLambdaTransformer(null);
}
}

@Nullable
private static ClassFileTransformer getDelegate(LambdaTransformer transformer) {
if (transformer instanceof Java8LambdaTransformer) {
try {
return (ClassFileTransformer)
Java8LambdaTransformer.class.getDeclaredField("delegate").get(transformer);
} catch (ReflectiveOperationException e) {
throw new IllegalStateException(e);
}
}
if (transformer instanceof Java9LambdaTransformer) {
try {
return (ClassFileTransformer)
Java9LambdaTransformer.class.getDeclaredField("delegate").get(transformer);
} catch (ReflectiveOperationException e) {
throw new IllegalStateException(e);
}
}
throw new IllegalStateException(
"Unexpected LambdaTransformer implementation: " + transformer.getClass());
}

private void initialize() {
RuntimeConfiguration runtimeConfig = runtimeConfigurator.getCurrentConfigCopy();

Expand Down
4 changes: 2 additions & 2 deletions .../java/com/microsoft/applicationinsights/agent/internal/init/AzureMonitorLogProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
import com.azure.core.util.logging.ClientLogger;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.OperationNames;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.SemanticAttributes;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan;
import io.opentelemetry.sdk.internal.AttributesMap;
import io.opentelemetry.sdk.logs.LogRecordProcessor;
import io.opentelemetry.sdk.logs.ReadWriteLogRecord;
import io.opentelemetry.sdk.trace.ReadableSpan;
import io.opentelemetry.semconv.ExceptionAttributes;
import java.lang.reflect.Field;
import javax.annotation.Nullable;

Expand Down Expand Up @@ -93,7 +93,7 @@ private static void setAttributeExceptionLogged(Span span, ReadWriteLogRecord lo
// TODO add `getAttribute()` to `ReadWriteLogRecord` upstream
stacktrace =
((AttributesMap) attributesMapField.get(logRecord))
.get(SemanticAttributes.EXCEPTION_STACKTRACE);
.get(ExceptionAttributes.EXCEPTION_STACKTRACE);
}
} catch (Exception e) {
logger.error(e.getMessage(), e);
Expand Down
Loading
Loading