Update to Otel-java-instrumentation 0.13 (#70)

signalfx · Dec 22, 2020 · f7f4435 · f7f4435
1 parent 60a44c3
commit f7f4435
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -15,8 +15,8 @@ group = "com.splunk.public"
 boolean snapshot = getProperty("snapshot") == 'yes'
 
 def versions = [
-    'opentelemetry'         : snapshot ? "0.13.0-SNAPSHOT" : "0.12.0",
-    'opentelemetryJavaagent': snapshot ? "0.13.0-SNAPSHOT" : '0.12.0'
+    'opentelemetry'         : snapshot ? "0.14.0-SNAPSHOT" : "0.13.1",
+    'opentelemetryJavaagent': snapshot ? "0.14.0-SNAPSHOT" : '0.13.0'
 ]
 
 subprojects {

diff --git a/custom/src/main/java/com/splunk/opentelemetry/SplunkTracerCustomizer.java b/custom/src/main/java/com/splunk/opentelemetry/SplunkTracerCustomizer.java
@@ -17,13 +17,13 @@
 package com.splunk.opentelemetry;
 
 import io.opentelemetry.javaagent.spi.TracerCustomizer;
-import io.opentelemetry.sdk.trace.TracerSdkManagement;
+import io.opentelemetry.sdk.trace.SdkTracerManagement;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 
 public class SplunkTracerCustomizer implements TracerCustomizer {
 
   @Override
-  public void configure(TracerSdkManagement tracerManagement) {
+  public void configure(SdkTracerManagement tracerManagement) {
     tracerManagement.updateActiveTraceConfig(
         tracerManagement.getActiveTraceConfig().toBuilder().setSampler(Sampler.alwaysOn()).build());
   }

diff --git a/custom/src/main/java/com/splunk/opentelemetry/jaeger/JaegerThriftSpanExporterFactory.java b/custom/src/main/java/com/splunk/opentelemetry/jaeger/JaegerThriftSpanExporterFactory.java
@@ -18,6 +18,7 @@
 
 import io.jaegertracing.thrift.internal.senders.HttpSender;
 import io.opentelemetry.exporter.jaeger.thrift.JaegerThriftSpanExporter;
+import io.opentelemetry.exporter.jaeger.thrift.JaegerThriftSpanExporterBuilder;
 import io.opentelemetry.javaagent.spi.exporter.SpanExporterFactory;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import java.util.Collections;
@@ -35,7 +36,7 @@ public class JaegerThriftSpanExporterFactory implements SpanExporterFactory {
 
   @Override
   public SpanExporter fromConfig(Properties config) {
-    JaegerThriftSpanExporter.Builder builder =
+    JaegerThriftSpanExporterBuilder builder =
         JaegerThriftSpanExporter.builder().readProperties(config);
 
     String token = config.getProperty(SIGNALFX_AUTH_TOKEN, "");

diff --git a/custom/src/main/java/com/splunk/opentelemetry/middleware/MiddlewareTracerCustomizer.java b/custom/src/main/java/com/splunk/opentelemetry/middleware/MiddlewareTracerCustomizer.java
@@ -18,13 +18,13 @@
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.spi.TracerCustomizer;
-import io.opentelemetry.sdk.trace.TracerSdkManagement;
+import io.opentelemetry.sdk.trace.SdkTracerManagement;
 
 @AutoService(TracerCustomizer.class)
 public class MiddlewareTracerCustomizer implements TracerCustomizer {
 
   @Override
-  public void configure(TracerSdkManagement tracerManagement) {
+  public void configure(SdkTracerManagement tracerManagement) {
     tracerManagement.addSpanProcessor(new MiddlewareAttributeSpanProcessor());
   }
 }