upgrade to jaeger 0.31.0

stagemonitor · Sep 6, 2018 · 5096dcc · 5096dcc
1 parent 098ffbb
commit 5096dcc
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -56,7 +56,7 @@ ext {
 	esVersion = '6.2.4'
 	byteBuddyVersion = '1.8.11'
 	opentracingVersion = '0.31.0'
-	jaegerVersion = '0.24.0'
+	jaegerVersion = '0.31.0'
 	jettyVersion = '9.3.13.v20161014'
 	getProjectsToRelease = this.&getProjectsToRelease
 }

diff --git a/stagemonitor-tracing-elasticsearch/build.gradle b/stagemonitor-tracing-elasticsearch/build.gradle
@@ -1,6 +1,9 @@
 dependencies {
 	compile project(":stagemonitor-tracing")
-	compile "com.uber.jaeger:jaeger-b3:$jaegerVersion"
+
+	compile "io.jaegertracing:jaeger-core:$jaegerVersion"
+	compile "io.jaegertracing:jaeger-thrift:$jaegerVersion"
+	compile "io.jaegertracing:jaeger-zipkin:$jaegerVersion"
 
 	compileOnly "org.elasticsearch:elasticsearch:$esVersion"
 

diff --git a/...search/src/main/java/org/stagemonitor/tracing/elasticsearch/impl/JaegerTracerFactory.java b/...search/src/main/java/org/stagemonitor/tracing/elasticsearch/impl/JaegerTracerFactory.java
@@ -1,9 +1,9 @@
 package org.stagemonitor.tracing.elasticsearch.impl;
 
-import com.uber.jaeger.propagation.b3.B3TextMapCodec;
-import com.uber.jaeger.reporters.NoopReporter;
-import com.uber.jaeger.samplers.ConstSampler;
-
+import io.jaegertracing.internal.JaegerTracer;
+import io.jaegertracing.internal.propagation.B3TextMapCodec;
+import io.jaegertracing.internal.reporters.NoopReporter;
+import io.jaegertracing.internal.samplers.ConstSampler;
 import org.stagemonitor.core.StagemonitorPlugin;
 import org.stagemonitor.tracing.B3HeaderFormat;
 import org.stagemonitor.tracing.TracerFactory;
@@ -17,11 +17,11 @@ public class JaegerTracerFactory extends TracerFactory {
 
 	@Override
 	public Tracer getTracer(StagemonitorPlugin.InitArguments initArguments) {
-		final B3TextMapCodec b3TextMapCodec = new B3TextMapCodec();
-		final com.uber.jaeger.Tracer.Builder builder = new com.uber.jaeger.Tracer.Builder(
-				initArguments.getMeasurementSession().getApplicationName(),
-				new NoopReporter(),
-				new ConstSampler(true))
+		final B3TextMapCodec b3TextMapCodec = new B3TextMapCodec.Builder().build();
+		final JaegerTracer.Builder builder = new JaegerTracer.Builder(
+				initArguments.getMeasurementSession().getApplicationName())
+				.withReporter(new NoopReporter())
+				.withSampler(new ConstSampler(true))
 				.registerInjector(B3HeaderFormat.INSTANCE, b3TextMapCodec)
 				.registerInjector(Format.Builtin.HTTP_HEADERS, b3TextMapCodec)
 				.registerExtractor(Format.Builtin.HTTP_HEADERS, b3TextMapCodec);
@@ -34,21 +34,21 @@ public boolean isRoot(Span span) {
 		if (span instanceof SpanWrapper) {
 			span = ((SpanWrapper) span).getDelegate();
 		}
-		if (span instanceof com.uber.jaeger.Span) {
-			final com.uber.jaeger.Span jaegerSpan = (com.uber.jaeger.Span) span;
+		if (span instanceof io.jaegertracing.internal.JaegerSpan) {
+			final io.jaegertracing.internal.JaegerSpan jaegerSpan = (io.jaegertracing.internal.JaegerSpan) span;
 			return jaegerSpan.context().getParentId() == 0;
 		}
 		return false;
 	}
 
 	@Override
 	public boolean isSampled(Span span) {
-		// TODO replace with Span#unwrap once https://github.com/opentracing/opentracing-java/pull/211 is merged
 		if (span instanceof SpanWrapper) {
-			span = ((SpanWrapper) span).getDelegate();
+			span = ((SpanWrapper) span).unwrap(Span.class);
 		}
-		if (span instanceof com.uber.jaeger.Span) {
-			final com.uber.jaeger.Span jaegerSpan = (com.uber.jaeger.Span) span;
+
+		if (span instanceof io.jaegertracing.internal.JaegerSpan) {
+			final io.jaegertracing.internal.JaegerSpan jaegerSpan = (io.jaegertracing.internal.JaegerSpan) span;
 			return jaegerSpan.context().isSampled();
 		}
 		return false;

diff --git a/...rc/main/java/org/stagemonitor/tracing/elasticsearch/impl/Metric2RegistryStatsFactory.java b/...rc/main/java/org/stagemonitor/tracing/elasticsearch/impl/Metric2RegistryStatsFactory.java
@@ -1,10 +1,9 @@
 package org.stagemonitor.tracing.elasticsearch.impl;
 
-import com.uber.jaeger.metrics.Counter;
-import com.uber.jaeger.metrics.Gauge;
-import com.uber.jaeger.metrics.StatsFactory;
-import com.uber.jaeger.metrics.Timer;
-
+import io.jaegertracing.internal.metrics.Counter;
+import io.jaegertracing.internal.metrics.Gauge;
+import io.jaegertracing.internal.metrics.Timer;
+import io.jaegertracing.spi.MetricsFactory;
 import org.stagemonitor.core.metrics.metrics2.Metric2Registry;
 
 import java.util.Map;
@@ -13,7 +12,7 @@
 
 import static org.stagemonitor.core.metrics.metrics2.MetricName.name;
 
-public class Metric2RegistryStatsFactory implements StatsFactory {
+public class Metric2RegistryStatsFactory implements MetricsFactory {
 
 	private final Metric2Registry metric2Registry;
 

diff --git a/...java/org/stagemonitor/tracing/elasticsearch/ElasticsearchSpanReporterIntegrationTest.java b/...java/org/stagemonitor/tracing/elasticsearch/ElasticsearchSpanReporterIntegrationTest.java
@@ -108,7 +108,7 @@ public void testUpdateSpan() throws Exception {
 	public void testUpdateNotYetExistentSpan_eventuallyUpdates() throws Exception {
 		final Span span = tracer.buildSpan("Test#test")
 				.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_SERVER)
-				.startManual();
+				.start();
 		reporter.updateSpan(B3HeaderFormat.getB3Identifiers(tracer, span), null, Collections.singletonMap("foo", "bar"));
 
 		span.finish();