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.4.0-SNAPSHOT') {
+    compile (group: 'io.opentelemetry.auto', name: '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,7 @@ dependencies {
 
     compile 'com.google.guava:guava:27.1-android'
 
-    compile 'io.opentelemetry.auto:auto-tooling:0.4.0-SNAPSHOT'
+    compile 'io.opentelemetry.auto:auto-tooling:0.5.0-SNAPSHOT'
     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

@@ -1,18 +1,16 @@
 package com.microsoft.applicationinsights.agent.internal.sampling;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nullable;
-
 import com.google.common.collect.ImmutableMap;
-import io.opentelemetry.sdk.trace.Sampler;
 import io.opentelemetry.common.AttributeValue;
+import io.opentelemetry.sdk.trace.Sampler;
 import io.opentelemetry.trace.Link;
-import io.opentelemetry.trace.Span.Kind;
+import io.opentelemetry.trace.Span;
 import io.opentelemetry.trace.SpanContext;
-import io.opentelemetry.trace.SpanId;
 import io.opentelemetry.trace.TraceId;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,8 +35,12 @@ public FixedRateSampler(double samplingPercentage) {
     }
 
     @Override
-    public Decision shouldSample(@Nullable SpanContext parentContext, TraceId traceId, SpanId spanId, String name,
-                                 Kind spanKind, Map<String, AttributeValue> attributes, List<Link> parentLinks) {
+    public Decision shouldSample(@Nullable SpanContext parentContext,
+                                 TraceId traceId,
+                                 String name,
+                                 Span.Kind spanKind,
+                                 Map<String, AttributeValue> attributes,
+                                 List<Link> parentLinks) {
         if (SamplingScoreGeneratorV2.getSamplingScore(traceId.toLowerBase16()) >= samplingPercentage) {
             logger.debug("Item {} sampled out", name);
             return alwaysOffDecision;

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

@@ -9,7 +9,7 @@
 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;
+import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
 
 public class TracerInstaller {
 
@@ -32,7 +32,7 @@ public static void installAgentTracer() {
         }
         // if changing the span processor to something async, flush it in the shutdown hook before flushing TelemetryClient
         OpenTelemetrySdk.getTracerProvider()
-                .addSpanProcessor(SimpleSpansProcessor.create(new Exporter(telemetryClient)));
+                .addSpanProcessor(SimpleSpanProcessor.newBuilder(new Exporter(telemetryClient)).build());
     }
 
     public static void logVersionInfo() {

agent/exporter/build.gradle

@@ -9,10 +9,10 @@ repositories {
 }
 
 dependencies {
-    compile 'io.opentelemetry:opentelemetry-sdk:0.3.0'
+    compile 'io.opentelemetry:opentelemetry-sdk:0.5.0'
 
     // this is needed in order to access AiAppId in auto-bootstrap for appId exchange data
-    compileOnly 'io.opentelemetry.auto:auto-bootstrap:0.4.0-SNAPSHOT'
+    compileOnly 'io.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

@@ -45,8 +45,8 @@
 import io.opentelemetry.common.AttributeValue;
 import io.opentelemetry.common.AttributeValue.Type;
 import io.opentelemetry.sdk.trace.data.SpanData;
+import io.opentelemetry.sdk.trace.data.SpanData.Event;
 import io.opentelemetry.sdk.trace.data.SpanData.Link;
-import io.opentelemetry.sdk.trace.data.SpanData.TimedEvent;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import io.opentelemetry.trace.Span.Kind;
 import io.opentelemetry.trace.SpanId;
@@ -78,7 +78,7 @@ public ResultCode export(Collection<SpanData> spans) {
             return ResultCode.SUCCESS;
         } catch (Throwable t) {
             logger.error(t.getMessage(), t);
-            return ResultCode.FAILED_NOT_RETRYABLE;
+            return ResultCode.FAILURE;
         }
     }
 
@@ -264,7 +264,7 @@ private void exportLogSpan(SpanData span) {
 
     // currently only gRPC instrumentation creates events, which we export here as logs ("traces")
     private void exportEvents(SpanData span, Double samplingPercentage) {
-        for (TimedEvent event : span.getTimedEvents()) {
+        for (Event event : span.getEvents()) {
             String message = event.getName();
             long timeEpochNanos = event.getEpochNanos();
             String level = getString(event, "level");
@@ -439,7 +439,7 @@ private static Double getDouble(SpanData span, String attributeName) {
     }
 
 
-    private static String getString(TimedEvent event, String attributeName) {
+    private static String getString(Event event, String attributeName) {
         AttributeValue attributeValue = event.getAttributes().get(attributeName);
         if (attributeValue == null) {
             return null;
@@ -471,6 +471,11 @@ private void track(Telemetry telemetry, Double samplingPercentage) {
         telemetryClient.track(telemetry);
     }
 
+    @Override
+    public ResultCode flush() {
+        return null;
+    }
+
     @Override
     public void shutdown() {
     }

agent/instrumentation/build.gradle

@@ -8,14 +8,15 @@ repositories {
     mavenLocal()
 }
 
-def instrumentationVersion = '0.4.0-SNAPSHOT'
+def instrumentationVersion = '0.5.0-SNAPSHOT'
 
 dependencies {
     compile project(':agent:agent-tooling')
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-apache-httpasyncclient-4.0', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-apache-httpclient-2.0', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-apache-httpclient-4.0', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-cassandra-3.0', version: instrumentationVersion
+    compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-cassandra-4.0', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-grpc-1.5', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-http-url-connection', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-java-class-loader', version: instrumentationVersion
@@ -32,7 +33,9 @@ dependencies {
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-jms-1.1', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-kafka-clients-0.11', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-kafka-streams-0.11', version: instrumentationVersion
+    compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-lettuce-4.0', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-lettuce-5.0', version: instrumentationVersion
+    compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-lettuce-5.1', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-log4j-1.1', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-log4j-2.0', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-logback-1.0', version: instrumentationVersion
@@ -47,6 +50,7 @@ dependencies {
     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-opentelemetry-api-0.4', version: instrumentationVersion
+    compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-opentelemetry-api-beta', version: instrumentationVersion
     compile group: 'io.opentelemetry.auto.instrumentation', name: 'instrumentation-reactor-3.1', 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

opentelemetry-auto-instr-java

@@ -7,6 +7,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import io.lettuce.core.RedisClient;
+import io.lettuce.core.api.sync.RedisCommands;
 
 @WebServlet("/*")
 public class LettuceTestServlet extends HttpServlet {
@@ -34,7 +35,8 @@ private void doGetInternal(HttpServletRequest req) throws Exception {
     private void lettuce() throws Exception {
         String hostname = System.getenv("REDIS");
         RedisClient redisClient = RedisClient.create("redis://" + hostname);
-        redisClient.connect().sync();
+        RedisCommands<String, String> redisCommands = redisClient.connect().sync();
+        redisCommands.get("test");
         redisClient.shutdown();
     }
 }