Update to latest opentelemetry-java-instrumentation

Author: trask

.gitmodules

@@ -1,4 +1,4 @@
-[submodule "opentelemetry-auto-instr-java"]
-	path = opentelemetry-auto-instr-java
-	url = https://github.com/trask/opentelemetry-auto-instr-java
+[submodule "opentelemetry-java-instrumentation"]
+	path = opentelemetry-java-instrumentation
+	url = https://github.com/trask/opentelemetry-java-instrumentation
 	branch = applicationinsights

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.5.0-SNAPSHOT') {
+    compile (group: 'io.opentelemetry.instrumentation.auto', name: 'opentelemetry-auto-auto-bootstrap', version: '0.5.0-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,10 @@ dependencies {
 
     compile 'com.google.guava:guava:27.1-android'
 
-    compile 'io.opentelemetry.auto:auto-tooling:0.5.0-SNAPSHOT'
+    compile 'io.opentelemetry.instrumentation.auto:opentelemetry-auto-auto-tooling:0.5.0-SNAPSHOT'
+    // TODO sync bytebuddy version with version from auto-tooling (above)
+    compile group: 'net.bytebuddy', name: 'byte-buddy', version: '1.10.10'
+
     compile 'org.checkerframework:checker-qual-android:3.1.0'
 
     compile(project(':core')) {

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

@@ -2,6 +2,8 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.opentelemetry.common.AttributeValue;
+import io.opentelemetry.common.Attributes;
+import io.opentelemetry.common.ReadableAttributes;
 import io.opentelemetry.sdk.trace.Sampler;
 import io.opentelemetry.trace.Link;
 import io.opentelemetry.trace.Span;
@@ -29,17 +31,18 @@ public final class FixedRateSampler implements Sampler {
 
     public FixedRateSampler(double samplingPercentage) {
         this.samplingPercentage = samplingPercentage;
-        alwaysOnDecision = new FixedRateSamplerDecision(true, ImmutableMap.of("ai.sampling.percentage",
-                AttributeValue.doubleAttributeValue(samplingPercentage)));
-        alwaysOffDecision= new FixedRateSamplerDecision(false, Collections.<String, AttributeValue>emptyMap());
+        Attributes attributes = Attributes.of("ai.sampling.percentage",
+                AttributeValue.doubleAttributeValue(samplingPercentage));
+        alwaysOnDecision = new FixedRateSamplerDecision(true, attributes);
+        alwaysOffDecision= new FixedRateSamplerDecision(false, Attributes.empty());
     }
 
     @Override
     public Decision shouldSample(@Nullable SpanContext parentContext,
                                  TraceId traceId,
                                  String name,
                                  Span.Kind spanKind,
-                                 Map<String, AttributeValue> attributes,
+                                 ReadableAttributes attributes,
                                  List<Link> parentLinks) {
         if (SamplingScoreGeneratorV2.getSamplingScore(traceId.toLowerBase16()) >= samplingPercentage) {
             logger.debug("Item {} sampled out", name);
@@ -56,9 +59,9 @@ public String getDescription() {
     private static final class FixedRateSamplerDecision implements Decision {
 
         private final boolean sampled;
-        private final Map<String, AttributeValue> attributes;
+        private final Attributes attributes;
 
-        private FixedRateSamplerDecision(boolean sampled, Map<String, AttributeValue> attributes) {
+        private FixedRateSamplerDecision(boolean sampled, Attributes attributes) {
             this.sampled = sampled;
             this.attributes = attributes;
         }
@@ -69,7 +72,7 @@ public boolean isSampled() {
         }
 
         @Override
-        public Map<String, AttributeValue> getAttributes() {
+        public Attributes getAttributes() {
             return attributes;
         }
     }

agent/agent/build.gradle

@@ -36,7 +36,7 @@ processResources {
     dependsOn ':agent:instrumentation:shadowJar'
 
     from(zipTree(tasks.getByPath(':agent:instrumentation:shadowJar').archivePath)) {
-        into 'auto-tooling-and-instrumentation.isolated'
+        into 'inst'
         rename '(^.*)\\.class$', '$1.classdata'
     }
 }

agent/agent/jar_contents.regex

@@ -5,8 +5,6 @@ com/microsoft/applicationinsights/agent/.*
 io/
 io/opentelemetry/
 io/opentelemetry/auto/.*
-io/opentelemetry/contrib/
-io/opentelemetry/contrib/auto/.*
 META-INF/
 META-INF/MANIFEST\.MF
 LICENSE
@@ -21,4 +19,4 @@ rp-logger-config/diagnostics\.appender\.xml
 rp-logger-config/etw.appender\.xml
 applicationinsights-java-etw-provider-x86-64\.dll
 applicationinsights-java-etw-provider-x86\.dll
-auto-tooling-and-instrumentation.isolated/.*
+inst/.*

agent/exporter/build.gradle

@@ -9,10 +9,10 @@ repositories {
 }
 
 dependencies {
-    compile 'io.opentelemetry:opentelemetry-sdk:0.5.0'
+    compile 'io.opentelemetry:opentelemetry-sdk:0.6.0'
 
     // this is needed in order to access AiAppId in auto-bootstrap for appId exchange data
-    compileOnly 'io.opentelemetry.auto:auto-bootstrap:0.5.0-SNAPSHOT'
+    compileOnly 'io.opentelemetry.instrumentation.auto:opentelemetry-auto-auto-bootstrap:0.5.0-SNAPSHOT'
 
     compile 'org.slf4j:slf4j-api:1.7.26'
 

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

@@ -47,6 +47,9 @@
 import io.opentelemetry.auto.bootstrap.instrumentation.aiappid.AiAppId;
 import io.opentelemetry.common.AttributeValue;
 import io.opentelemetry.common.AttributeValue.Type;
+import io.opentelemetry.common.Attributes;
+import io.opentelemetry.common.ReadableAttributes;
+import io.opentelemetry.common.ReadableKeyValuePairs.KeyValueConsumer;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.data.SpanData.Event;
 import io.opentelemetry.sdk.trace.data.SpanData.Link;
@@ -125,7 +128,7 @@ private void exportRequest(String stdComponent, SpanData span) {
 
         RequestTelemetry telemetry = new RequestTelemetry();
 
-        Map<String, AttributeValue> attributes = new HashMap<>(span.getAttributes());
+        Map<String, AttributeValue> attributes = getAttributesCopy(span.getAttributes());
 
         String sourceAppId = removeAttributeString(attributes, AiAppId.SPAN_SOURCE_ATTRIBUTE_NAME);
         if (!AiAppId.getAppId().equals(sourceAppId)) {
@@ -204,6 +207,17 @@ private void exportRequest(String stdComponent, SpanData span) {
         }
     }
 
+    private Map<String, AttributeValue> getAttributesCopy(ReadableAttributes attributes) {
+        final Map<String, AttributeValue> copy = new HashMap<>();
+        attributes.forEach(new KeyValueConsumer<AttributeValue>() {
+            @Override
+            public void consume(String key, AttributeValue value) {
+                copy.put(key, value);
+            }
+        });
+        return copy;
+    }
+
     private void exportRemoteDependency(String stdComponent, SpanData span, boolean inProc) {
 
         RemoteDependencyTelemetry telemetry = new RemoteDependencyTelemetry();
@@ -214,7 +228,7 @@ private void exportRemoteDependency(String stdComponent, SpanData span, boolean
 
         span.getInstrumentationLibraryInfo().getName();
 
-        Map<String, AttributeValue> attributes = new HashMap<>(span.getAttributes());
+        Map<String, AttributeValue> attributes = getAttributesCopy(span.getAttributes());
 
         if (inProc) {
             telemetry.setType("InProc");
@@ -278,7 +292,7 @@ private void exportRemoteDependency(String stdComponent, SpanData span, boolean
     }
 
     private void exportLogSpan(SpanData span) {
-        Map<String, AttributeValue> attributes = new HashMap<>(span.getAttributes());
+        Map<String, AttributeValue> attributes = getAttributesCopy(span.getAttributes());
         String message = removeAttributeString(attributes, "message");
         String level = removeAttributeString(attributes, "level");
         String loggerName = removeAttributeString(attributes, "loggerName");
@@ -469,6 +483,18 @@ private static void addExtraAttributes(Map<String, String> properties, Map<Strin
         }
     }
 
+    private static void addExtraAttributes(final Map<String, String> properties, Attributes attributes) {
+        attributes.forEach(new KeyValueConsumer<AttributeValue>() {
+            @Override
+            public void consume(String key, AttributeValue value) {
+                String val = getStringValue(value);
+                if (val != null) {
+                    properties.put(key, val);
+                }
+            }
+        });
+    }
+
     private static Double removeAiSamplingPercentage(Map<String, AttributeValue> attributes) {
         return removeAttributeDouble(attributes, "ai.sampling.percentage");
     }