Update to latest OTel (#1719)

* Update OTel

* Suppress 2.x request name handler

* Remove retry

* Suppress CDS Profile endpoint warning in smoke tests

* Bump timeout to avoid sporadic failures

Author: trask

agent/agent-bootstrap/gradle/dependency-locks/compileClasspath.lockfile

@@ -7,12 +7,12 @@ ch.qos.logback:logback-classic:1.2.3
 ch.qos.logback:logback-core:1.2.3
 com.squareup.moshi:moshi:1.9.3
 com.squareup.okio:okio:1.16.0
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-caching:1.0.0+ai.patch.1-alpha
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.0.0+ai.patch.1-alpha
-io.opentelemetry.javaagent:opentelemetry-javaagent-api:1.0.0+ai.patch.1-alpha
-io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.0.0+ai.patch.1-alpha
-io.opentelemetry:opentelemetry-api-metrics:1.0.1-alpha
-io.opentelemetry:opentelemetry-api:1.0.1
-io.opentelemetry:opentelemetry-context:1.0.1
-io.opentelemetry:opentelemetry-semconv:1.0.1-alpha
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-caching:1.2.0+ai.patch.1-alpha
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.2.0+ai.patch.1-alpha
+io.opentelemetry.javaagent:opentelemetry-javaagent-api:1.2.0+ai.patch.1-alpha
+io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.2.0+ai.patch.1-alpha
+io.opentelemetry:opentelemetry-api-metrics:1.2.0-alpha
+io.opentelemetry:opentelemetry-api:1.2.0
+io.opentelemetry:opentelemetry-context:1.2.0
+io.opentelemetry:opentelemetry-semconv:1.2.0-alpha
 org.slf4j:slf4j-api:1.7.25

agent/agent-bootstrap/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -7,12 +7,12 @@ ch.qos.logback:logback-classic:1.2.3
 ch.qos.logback:logback-core:1.2.3
 com.squareup.moshi:moshi:1.9.3
 com.squareup.okio:okio:1.16.0
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-caching:1.0.0+ai.patch.1-alpha
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.0.0+ai.patch.1-alpha
-io.opentelemetry.javaagent:opentelemetry-javaagent-api:1.0.0+ai.patch.1-alpha
-io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.0.0+ai.patch.1-alpha
-io.opentelemetry:opentelemetry-api-metrics:1.0.1-alpha
-io.opentelemetry:opentelemetry-api:1.0.1
-io.opentelemetry:opentelemetry-context:1.0.1
-io.opentelemetry:opentelemetry-semconv:1.0.1-alpha
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-caching:1.2.0+ai.patch.1-alpha
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.2.0+ai.patch.1-alpha
+io.opentelemetry.javaagent:opentelemetry-javaagent-api:1.2.0+ai.patch.1-alpha
+io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.2.0+ai.patch.1-alpha
+io.opentelemetry:opentelemetry-api-metrics:1.2.0-alpha
+io.opentelemetry:opentelemetry-api:1.2.0
+io.opentelemetry:opentelemetry-context:1.2.0
+io.opentelemetry:opentelemetry-semconv:1.2.0-alpha
 org.slf4j:slf4j-api:1.7.30

agent/agent-tooling/build.gradle

@@ -52,7 +52,7 @@ dependencies {
         exclude group: 'io.opentelemetry', module: 'opentelemetry-exporter-zipkin'
         exclude group: 'io.grpc', module: 'grpc-netty'
     }
-    implementation group: 'io.opentelemetry.javaagent', name: 'opentelemetry-javaagent-spi', version: versions.opentelemetryInstrumentationAlpha
+    implementation group: 'io.opentelemetry.javaagent', name: 'opentelemetry-javaagent-extension-api', version: versions.opentelemetryInstrumentationAlpha
     implementation group: 'net.bytebuddy', name: 'byte-buddy', version: versions.bytebuddy
 
     implementation group: 'commons-codec', name: 'commons-codec', version: versions.commonsCodec

agent/agent-tooling/gradle/dependency-locks/compileClasspath.lockfile

@@ -15,20 +15,20 @@ com.squareup.moshi:moshi:1.9.3
 com.squareup.okio:okio:1.16.0
 commons-codec:commons-codec:1.13
 commons-logging:commons-logging:1.2
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-caching:1.0.0+ai.patch.1-alpha
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.0.0+ai.patch.1-alpha
-io.opentelemetry.javaagent:opentelemetry-javaagent-spi:1.0.0+ai.patch.1-alpha
-io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:1.0.0+ai.patch.1-alpha
-io.opentelemetry:opentelemetry-api-metrics:1.0.0-alpha
-io.opentelemetry:opentelemetry-api:1.0.1
-io.opentelemetry:opentelemetry-context:1.0.1
-io.opentelemetry:opentelemetry-sdk-common:1.0.0
-io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.0.0-alpha
-io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator:1.0.0-alpha
-io.opentelemetry:opentelemetry-sdk-metrics:1.0.0-alpha
-io.opentelemetry:opentelemetry-sdk-trace:1.0.0
-io.opentelemetry:opentelemetry-sdk:1.0.0
-io.opentelemetry:opentelemetry-semconv:1.0.1-alpha
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-caching:1.2.0+ai.patch.1-alpha
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.2.0+ai.patch.1-alpha
+io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:1.2.0+ai.patch.1-alpha
+io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:1.2.0+ai.patch.1-alpha
+io.opentelemetry:opentelemetry-api-metrics:1.2.0-alpha
+io.opentelemetry:opentelemetry-api:1.2.0
+io.opentelemetry:opentelemetry-context:1.2.0
+io.opentelemetry:opentelemetry-sdk-common:1.2.0
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.2.0-alpha
+io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator:1.2.0-alpha
+io.opentelemetry:opentelemetry-sdk-metrics:1.2.0-alpha
+io.opentelemetry:opentelemetry-sdk-trace:1.2.0
+io.opentelemetry:opentelemetry-sdk:1.2.0
+io.opentelemetry:opentelemetry-semconv:1.2.0-alpha
 net.bytebuddy:byte-buddy:1.10.18
 org.apache.commons:commons-lang3:3.7
 org.apache.httpcomponents:httpclient:4.5.13

agent/agent-tooling/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -5,13 +5,13 @@ ch.qos.logback.contrib:logback-json-classic:0.1.5
 ch.qos.logback.contrib:logback-json-core:0.1.5
 ch.qos.logback:logback-classic:1.2.3
 ch.qos.logback:logback-core:1.2.3
-com.blogspot.mydailyjava:weak-lock-free:0.15
 com.github.oshi:oshi-core:5.6.0
+com.google.android:annotations:4.1.1.4
 com.google.auto.service:auto-service-annotations:1.0-rc7
 com.google.auto.service:auto-service:1.0-rc7
 com.google.auto:auto-common:0.10
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.8.2
+com.google.code.gson:gson:2.8.6
 com.google.errorprone:error_prone_annotations:2.5.1
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -22,26 +22,31 @@ com.squareup.okio:okio:1.16.0
 commons-codec:commons-codec:1.13
 commons-io:commons-io:2.7
 commons-logging:commons-logging:1.2
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-caching:1.0.0+ai.patch.1-alpha
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.0.0+ai.patch.1-alpha
-io.opentelemetry.javaagent:opentelemetry-javaagent-api:1.0.0+ai.patch.1-alpha
-io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.0.0+ai.patch.1-alpha
-io.opentelemetry.javaagent:opentelemetry-javaagent-spi:1.0.0+ai.patch.1-alpha
-io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:1.0.0+ai.patch.1-alpha
-io.opentelemetry:opentelemetry-api-metrics:1.0.1-alpha
-io.opentelemetry:opentelemetry-api:1.0.1
-io.opentelemetry:opentelemetry-context:1.0.1
-io.opentelemetry:opentelemetry-extension-aws:1.0.1
-io.opentelemetry:opentelemetry-extension-kotlin:1.0.1
-io.opentelemetry:opentelemetry-extension-trace-propagators:1.0.1
-io.opentelemetry:opentelemetry-sdk-common:1.0.1
-io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.0.1-alpha
-io.opentelemetry:opentelemetry-sdk-extension-resources:1.0.1
-io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator:1.0.0-alpha
-io.opentelemetry:opentelemetry-sdk-metrics:1.0.1-alpha
-io.opentelemetry:opentelemetry-sdk-trace:1.0.1
-io.opentelemetry:opentelemetry-sdk:1.0.1
-io.opentelemetry:opentelemetry-semconv:1.0.1-alpha
+io.grpc:grpc-api:1.35.1
+io.grpc:grpc-context:1.35.1
+io.grpc:grpc-core:1.35.1
+io.grpc:grpc-netty-shaded:1.35.1
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-caching:1.2.0+ai.patch.1-alpha
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.2.0+ai.patch.1-alpha
+io.opentelemetry.javaagent:opentelemetry-javaagent-api:1.2.0+ai.patch.1-alpha
+io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.2.0+ai.patch.1-alpha
+io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:1.2.0+ai.patch.1-alpha
+io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:1.2.0+ai.patch.1-alpha
+io.opentelemetry:opentelemetry-api-metrics:1.2.0-alpha
+io.opentelemetry:opentelemetry-api:1.2.0
+io.opentelemetry:opentelemetry-context:1.2.0
+io.opentelemetry:opentelemetry-extension-aws:1.2.0
+io.opentelemetry:opentelemetry-extension-kotlin:1.2.0
+io.opentelemetry:opentelemetry-extension-trace-propagators:1.2.0
+io.opentelemetry:opentelemetry-sdk-common:1.2.0
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.2.0-alpha
+io.opentelemetry:opentelemetry-sdk-extension-resources:1.2.0
+io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator:1.2.0-alpha
+io.opentelemetry:opentelemetry-sdk-metrics:1.2.0-alpha
+io.opentelemetry:opentelemetry-sdk-trace:1.2.0
+io.opentelemetry:opentelemetry-sdk:1.2.0
+io.opentelemetry:opentelemetry-semconv:1.2.0-alpha
+io.perfmark:perfmark-api:0.23.0
 io.prometheus:simpleclient:0.9.0
 io.prometheus:simpleclient_common:0.9.0
 io.prometheus:simpleclient_httpserver:0.9.0
@@ -54,6 +59,8 @@ org.apache.commons:commons-text:1.9
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.4.13
 org.checkerframework:checker-qual:3.12.0
+org.codehaus.mojo:animal-sniffer-annotations:1.19
+org.jctools:jctools-core:3.3.0
 org.jetbrains.kotlin:kotlin-bom:1.4.21
 org.slf4j:jcl-over-slf4j:1.7.30
 org.slf4j:slf4j-api:1.7.30

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/AiComponentInstaller.java

@@ -27,15 +27,7 @@
 import com.microsoft.applicationinsights.agent.bootstrap.BytecodeUtil;
 import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper;
 import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.SdkVersionFinder;
-import com.microsoft.applicationinsights.agent.internal.instrumentation.sdk.ApplicationInsightsAppenderClassFileTransformer;
-import com.microsoft.applicationinsights.agent.internal.instrumentation.sdk.BytecodeUtilImpl;
-import com.microsoft.applicationinsights.agent.internal.instrumentation.sdk.DependencyTelemetryClassFileTransformer;
-import com.microsoft.applicationinsights.agent.internal.instrumentation.sdk.HeartBeatModuleClassFileTransformer;
-import com.microsoft.applicationinsights.agent.internal.instrumentation.sdk.PerformanceCounterModuleClassFileTransformer;
-import com.microsoft.applicationinsights.agent.internal.instrumentation.sdk.QuickPulseClassFileTransformer;
-import com.microsoft.applicationinsights.agent.internal.instrumentation.sdk.RequestTelemetryClassFileTransformer;
-import com.microsoft.applicationinsights.agent.internal.instrumentation.sdk.TelemetryClientClassFileTransformer;
-import com.microsoft.applicationinsights.agent.internal.instrumentation.sdk.WebRequestTrackingFilterClassFileTransformer;
+import com.microsoft.applicationinsights.agent.internal.instrumentation.sdk.*;
 import com.microsoft.applicationinsights.agent.internal.wasbootstrap.MainEntryPoint;
 import com.microsoft.applicationinsights.agent.internal.wasbootstrap.configuration.Configuration;
 import com.microsoft.applicationinsights.agent.internal.wasbootstrap.configuration.Configuration.JmxMetric;
@@ -62,6 +54,7 @@
 import com.microsoft.applicationinsights.internal.util.PropertyHelper;
 import com.microsoft.applicationinsights.profiler.config.ServiceProfilerServiceConfig;
 import io.opentelemetry.instrumentation.api.aisdk.AiLazyConfiguration;
+import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.javaagent.spi.ComponentInstaller;
 import org.apache.http.HttpHost;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -90,7 +83,7 @@ public static void setInstrumentation(Instrumentation inst) {
     }
 
     @Override
-    public void beforeByteBuddyAgent() {
+    public void beforeByteBuddyAgent(Config config) {
         start(instrumentation);
         // add sdk instrumentation after ensuring Global.getTelemetryClient() will not return null
         instrumentation.addTransformer(new TelemetryClientClassFileTransformer());
@@ -101,11 +94,12 @@ public void beforeByteBuddyAgent() {
         instrumentation.addTransformer(new HeartBeatModuleClassFileTransformer());
         instrumentation.addTransformer(new ApplicationInsightsAppenderClassFileTransformer());
         instrumentation.addTransformer(new WebRequestTrackingFilterClassFileTransformer());
+        instrumentation.addTransformer(new RequestNameHandlerClassFileTransformer());
         instrumentation.addTransformer(new DuplicateAgentClassFileTransformer());
     }
 
     @Override
-    public void afterByteBuddyAgent() {
+    public void afterByteBuddyAgent(Config config) {
         // only safe now to resolve app id because SSL initialization
         // triggers loading of java.util.logging (starting with Java 8u231)
         // and JBoss/Wildfly need to install their own JUL manager before JUL is initialized

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/instrumentation/sdk/RequestNameHandlerClassFileTransformer.java

@@ -0,0 +1,90 @@
+/*
+ * ApplicationInsights-Java
+ * Copyright (c) Microsoft Corporation
+ * All rights reserved.
+ *
+ * MIT License
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
+ * software and associated documentation files (the ""Software""), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do so, subject to the following conditions:
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+ * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+package com.microsoft.applicationinsights.agent.internal.instrumentation.sdk;
+
+import net.bytebuddy.jar.asm.ClassReader;
+import net.bytebuddy.jar.asm.ClassVisitor;
+import net.bytebuddy.jar.asm.ClassWriter;
+import net.bytebuddy.jar.asm.MethodVisitor;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.instrument.ClassFileTransformer;
+import java.security.ProtectionDomain;
+
+import static net.bytebuddy.jar.asm.Opcodes.*;
+
+public class RequestNameHandlerClassFileTransformer implements ClassFileTransformer {
+
+    private static final Logger logger = LoggerFactory.getLogger(RequestNameHandlerClassFileTransformer.class);
+
+    private final String unshadedClassName = UnshadedSdkPackageName.get() + "/web/spring/RequestNameHandlerInterceptorAdapter";
+
+    @Override
+    public byte /*@Nullable*/[] transform(@Nullable ClassLoader loader, @Nullable String className,
+                                          @Nullable Class<?> classBeingRedefined,
+                                          @Nullable ProtectionDomain protectionDomain,
+                                          byte[] classfileBuffer) {
+        if (!unshadedClassName.equals(className)) {
+            return null;
+        }
+
+        try {
+            ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
+            ClassVisitor cv = new RequestNameHandlerClassVisitor(cw);
+            ClassReader cr = new ClassReader(classfileBuffer);
+            cr.accept(cv, 0);
+            return cw.toByteArray();
+        } catch (Throwable t) {
+            logger.error(t.getMessage(), t);
+            return null;
+        }
+    }
+
+    private static class RequestNameHandlerClassVisitor extends ClassVisitor {
+
+        private final ClassWriter cw;
+
+        private RequestNameHandlerClassVisitor(ClassWriter cw) {
+            super(ASM7, cw);
+            this.cw = cw;
+        }
+
+        @Override
+        public MethodVisitor visitMethod(int access, String name, String descriptor, @Nullable String signature,
+                                         String /*@Nullable*/[] exceptions) {
+            MethodVisitor mv = cw.visitMethod(access, name, descriptor, signature, exceptions);
+            if (name.equals("preHandle")
+                    && descriptor.equals("(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljava/lang/Object;)Z")) {
+                // no-op the preHandle() method
+                mv.visitCode();
+                mv.visitInsn(ICONST_1);
+                mv.visitInsn(IRETURN);
+                mv.visitMaxs(1, 4);
+                mv.visitEnd();
+                return null;
+            } else {
+                return mv;
+            }
+        }
+    }
+}

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/instrumentation/sdk/WebRequestTrackingFilterClassFileTransformer.java

@@ -40,14 +40,14 @@ public class WebRequestTrackingFilterClassFileTransformer implements ClassFileTr
 
     private static final Logger logger = LoggerFactory.getLogger(WebRequestTrackingFilterClassFileTransformer.class);
 
-    private final String unshadedClassNameLogback = UnshadedSdkPackageName.get() + "/web/internal/WebRequestTrackingFilter";
+    private final String unshadedClassName = UnshadedSdkPackageName.get() + "/web/internal/WebRequestTrackingFilter";
 
     @Override
     public byte /*@Nullable*/[] transform(@Nullable ClassLoader loader, @Nullable String className,
                                           @Nullable Class<?> classBeingRedefined,
                                           @Nullable ProtectionDomain protectionDomain,
                                           byte[] classfileBuffer) {
-        if (!unshadedClassNameLogback.equals(className)) {
+        if (!unshadedClassName.equals(className)) {
             return null;
         }
 

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/wasbootstrap/ConfigOverride.java

@@ -50,8 +50,6 @@ static Config getConfig(Configuration config) {
             properties.put("otel.instrumentation.azure-core.enabled", "false");
         }
         if (!config.preview.instrumentation.javaHttpClient.enabled) {
-            properties.put("otel.instrumentation.httpclient.enabled", "false");
-            // this is going to be the future name shortly
             properties.put("otel.instrumentation.java-http-client.enabled", "false");
         }
         if (!config.preview.instrumentation.rabbitmq.enabled) {

agent/agent/gradle/dependency-locks/compileClasspath.lockfile

@@ -1,7 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.0.0+ai.patch.1-alpha
-io.opentelemetry:opentelemetry-api-metrics:1.0.1-alpha
-io.opentelemetry:opentelemetry-api:1.0.1
-io.opentelemetry:opentelemetry-context:1.0.1
+io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.2.0+ai.patch.1-alpha
+io.opentelemetry:opentelemetry-api-metrics:1.2.0-alpha
+io.opentelemetry:opentelemetry-api:1.2.0
+io.opentelemetry:opentelemetry-context:1.2.0