Update to latest opentelemetry-auto-instr-java

Author: trask

agent/agent-bootstrap/build.gradle

@@ -24,7 +24,7 @@ task generateVersionProperties(type: PropsFileGen) {
 processResources.dependsOn generateVersionProperties
 
 dependencies {
-    compile (group: 'io.opentelemetry.auto', name: 'auto-bootstrap', version: '0.1.2-SNAPSHOT') {
+    compile (group: 'io.opentelemetry.auto', name: 'auto-bootstrap', version: '0.2.1-SNAPSHOT') {
         exclude group: 'org.slf4j', module: 'slf4j-simple'
     }
     compile 'ch.qos.logback:logback-classic:1.2.3'

agent/agent-tooling/build.gradle

@@ -37,7 +37,7 @@ dependencies {
 
     compile 'com.google.guava:guava:27.1-android'
 
-    compile 'io.opentelemetry.auto:auto-tooling:0.1.2-SNAPSHOT'
+    compile 'io.opentelemetry.auto:auto-tooling:0.2.1-SNAPSHOT'
     compile 'org.checkerframework:checker-qual-android:3.1.0'
 
     compile(project(':core')) {

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

@@ -0,0 +1,25 @@
+package com.microsoft.applicationinsights.agent.internal;
+
+import com.microsoft.applicationinsights.TelemetryConfiguration;
+import com.microsoft.applicationinsights.web.internal.correlation.InstrumentationKeyResolver;
+import io.opentelemetry.auto.bootstrap.instrumentation.aiappid.AiAppId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AppIdSupplier implements AiAppId.Supplier {
+
+    private static final Logger logger = LoggerFactory.getLogger(AppIdSupplier.class);
+
+    public String get() {
+        String instrumentationKey = TelemetryConfiguration.getActive().getInstrumentationKey();
+        String appId = InstrumentationKeyResolver.INSTANCE.resolveInstrumentationKey(instrumentationKey, TelemetryConfiguration.getActive());
+
+        //it's possible the appId returned is null (e.g. async task is still pending or has failed). In this case, just
+        //return and let the next request resolve the ikey.
+        if (appId == null) {
+            logger.debug("Application correlation Id could not be retrieved (e.g. task may be pending or failed)");
+            return "";
+        }
+        return appId;
+    }
+}

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

@@ -55,6 +55,7 @@
 import com.microsoft.applicationinsights.internal.config.TelemetryModulesXmlElement;
 import com.microsoft.applicationinsights.internal.system.SystemInformation;
 import com.microsoft.applicationinsights.internal.util.PropertyHelper;
+import io.opentelemetry.auto.bootstrap.instrumentation.aiappid.AiAppId;
 import io.opentelemetry.auto.config.Config;
 import io.opentelemetry.auto.config.ConfigOverride;
 import org.apache.http.HttpHost;
@@ -141,6 +142,7 @@ private static void start(Instrumentation instrumentation, File agentJarFile) th
         }
         TelemetryClient telemetryClient = new TelemetryClient();
         Global.setTelemetryClient(telemetryClient);
+        AiAppId.setSupplier(new AppIdSupplier());
     }
 
     @Nullable

agent/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/TracerInstaller.java

@@ -4,6 +4,9 @@
 import com.microsoft.applicationinsights.agent.Exporter;
 import com.microsoft.applicationinsights.agent.internal.Global;
 import com.microsoft.applicationinsights.agent.internal.sampling.FixedRateSampler;
+import io.opentelemetry.OpenTelemetry;
+import io.opentelemetry.auto.bootstrap.instrumentation.aiappid.AiHttpTraceContext;
+import io.opentelemetry.context.propagation.DefaultContextPropagators;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.trace.config.TraceConfig;
 import io.opentelemetry.sdk.trace.export.SimpleSpansProcessor;
@@ -16,6 +19,10 @@ public static void installAgentTracer() {
             // agent failed during startup
             return;
         }
+
+        OpenTelemetry.setPropagators(
+                DefaultContextPropagators.builder().addHttpTextFormat(new AiHttpTraceContext()).build());
+
         double fixedRateSamplingPercentage = Global.getFixedRateSamplingPercentage();
         if (fixedRateSamplingPercentage != 100) {
             OpenTelemetrySdk.getTracerProvider().updateActiveTraceConfig(

agent/agent/build.gradle

@@ -67,7 +67,6 @@ shadowJar {
     relocate "io.opentelemetry.common", "io.opentelemetry.auto.shaded.io.opentelemetry.common"
     relocate "io.opentelemetry.context", "io.opentelemetry.auto.shaded.io.opentelemetry.context"
     relocate "io.opentelemetry.correlationcontext", "io.opentelemetry.auto.shaded.io.opentelemetry.correlationcontext"
-    relocate "io.opentelemetry.distributedcontext", "io.opentelemetry.auto.shaded.io.opentelemetry.distributedcontext"
     relocate "io.opentelemetry.internal", "io.opentelemetry.auto.shaded.io.opentelemetry.internal"
     relocate "io.opentelemetry.metrics", "io.opentelemetry.auto.shaded.io.opentelemetry.metrics"
     relocate "io.opentelemetry.trace", "io.opentelemetry.auto.shaded.io.opentelemetry.trace"

agent/exporter/build.gradle

@@ -4,8 +4,15 @@ plugins {
 
 apply from: "$buildScriptsDir/common-java.gradle"
 
+repositories {
+    mavenLocal()
+}
+
 dependencies {
-    compile 'io.opentelemetry:opentelemetry-sdk:0.2.4'
+    compile 'io.opentelemetry:opentelemetry-sdk:0.3.0'
+
+    // this is needed in order to access AiAppId in auto-bootstrap for appId exchange data
+    compileOnly 'io.opentelemetry.auto:auto-bootstrap:0.2.1-SNAPSHOT'
 
     compile 'org.slf4j:slf4j-api:1.7.26'
 

agent/exporter/src/main/java/com/microsoft/applicationinsights/agent/Exporter.java

@@ -23,6 +23,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.SimpleDateFormat;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -40,6 +41,7 @@
 import com.microsoft.applicationinsights.telemetry.SupportSampling;
 import com.microsoft.applicationinsights.telemetry.Telemetry;
 import com.microsoft.applicationinsights.telemetry.TraceTelemetry;
+import io.opentelemetry.auto.bootstrap.instrumentation.aiappid.AiAppId;
 import io.opentelemetry.common.AttributeValue;
 import io.opentelemetry.common.AttributeValue.Type;
 import io.opentelemetry.sdk.trace.data.SpanData;
@@ -67,7 +69,7 @@ public Exporter(TelemetryClient telemetryClient) {
     }
 
     @Override
-    public ResultCode export(List<SpanData> spans) {
+    public ResultCode export(Collection<SpanData> spans) {
         try {
             for (SpanData span : spans) {
                 logger.debug("exporting span: {}", span);
@@ -116,6 +118,11 @@ private void exportRequest(SpanData span) {
 
         RequestTelemetry telemetry = new RequestTelemetry();
 
+        String sourceAppId = getString(span, AiAppId.SPAN_SOURCE_ATTRIBUTE_NAME);
+        if (!AiAppId.getAppId().equals(sourceAppId)) {
+            telemetry.setSource(sourceAppId);
+        }
+
         addLinks(telemetry.getProperties(), span.getLinks());
 
         AttributeValue httpStatusCode = span.getAttributes().get("http.status_code");
@@ -314,7 +321,12 @@ private void applyHttpRequestSpan(SpanData span, RemoteDependencyTelemetry telem
             try {
                 URI uriObject = new URI(url);
                 String target = createTarget(uriObject);
-                telemetry.setTarget(target);
+                String targetAppId = getString(span, AiAppId.SPAN_TARGET_ATTRIBUTE_NAME);
+                if (targetAppId == null || AiAppId.getAppId().equals(targetAppId)) {
+                    telemetry.setTarget(target);
+                } else {
+                    telemetry.setTarget(target + " | " + targetAppId);
+                }
                 // TODO is this right, overwriting name to include the full path?
                 String path = uriObject.getPath();
                 if (Strings.isNullOrEmpty(path)) {

agent/instrumentation/build.gradle

@@ -8,7 +8,7 @@ repositories {
     mavenLocal()
 }
 
-def instrumentationVersion = '0.1.2-SNAPSHOT'
+def instrumentationVersion = '0.2.1-SNAPSHOT'
 
 dependencies {
     compile project(':agent:agent-tooling')
@@ -44,6 +44,7 @@ dependencies {
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-okhttp-3.0', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-opentelemetry-api-0.2.0', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-opentelemetry-api-0.2.4', version: instrumentationVersion
+    compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-opentelemetry-api-0.3', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-request-2.3', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-request-3.0', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-spring-scheduling-3.1', version: instrumentationVersion
@@ -110,13 +111,16 @@ shadowJar {
     relocate "io.opentelemetry.common", "io.opentelemetry.auto.shaded.io.opentelemetry.common"
     relocate "io.opentelemetry.context", "io.opentelemetry.auto.shaded.io.opentelemetry.context"
     relocate "io.opentelemetry.correlationcontext", "io.opentelemetry.auto.shaded.io.opentelemetry.correlationcontext"
-    relocate "io.opentelemetry.distributedcontext", "io.opentelemetry.auto.shaded.io.opentelemetry.distributedcontext"
     relocate "io.opentelemetry.internal", "io.opentelemetry.auto.shaded.io.opentelemetry.internal"
     relocate "io.opentelemetry.metrics", "io.opentelemetry.auto.shaded.io.opentelemetry.metrics"
     relocate "io.opentelemetry.trace", "io.opentelemetry.auto.shaded.io.opentelemetry.trace"
 
+    // relocate OpenTelemetry API dependency usage
+    relocate "io.grpc.Context", "io.opentelemetry.auto.shaded.io.grpc.Context"
+
     // this is for instrumentation on opentelemetry-api itself
     relocate "unshaded.io.opentelemetry", "io.opentelemetry"
+    relocate "unshaded.io.grpc", "io.grpc"
 
     // this is for instrumentation on logback
     relocate "unshaded.ch.qos.logback", "ch.qos.logback"