Bump jaeger client (#128)

* Bump jaeger client Fixes #121 See jaegertracing/jaeger-client-java#768 * Add throws for new Exception from Jaeger client Also fix assert to not strip leading zeros, see jaegertracing/jaeger-client-java#746
opentracing-contrib · Jun 3, 2021 · 85da526 · 85da526
1 parent 7cd7ce0
commit 85da526
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.../main/java/io/opentracing/contrib/java/spring/jaeger/starter/JaegerAutoConfiguration.java b/.../main/java/io/opentracing/contrib/java/spring/jaeger/starter/JaegerAutoConfiguration.java
@@ -37,6 +37,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.thrift.transport.TTransportException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -83,7 +84,7 @@ public io.opentracing.Tracer tracer(Sampler sampler,
   @Bean
   public Reporter reporter(JaegerConfigurationProperties properties,
                            Metrics metrics,
-                           @Autowired(required = false) ReporterAppender reporterAppender) {
+                           @Autowired(required = false) ReporterAppender reporterAppender) throws TTransportException {
 
     List<Reporter> reporters = new LinkedList<>();
     RemoteReporter remoteReporter = properties.getRemoteReporter();
@@ -108,7 +109,7 @@ public Reporter reporter(JaegerConfigurationProperties properties,
 
   private Reporter getUdpReporter(Metrics metrics,
                                   RemoteReporter remoteReporter,
-                                  JaegerConfigurationProperties.UdpSender udpSenderProperties) {
+                                  JaegerConfigurationProperties.UdpSender udpSenderProperties) throws TTransportException {
     io.jaegertracing.thrift.internal.senders.UdpSender udpSender =
         new io.jaegertracing.thrift.internal.senders.UdpSender(
             udpSenderProperties.getHost(), udpSenderProperties.getPort(),
@@ -119,7 +120,7 @@ private Reporter getUdpReporter(Metrics metrics,
 
   private Reporter getHttpReporter(Metrics metrics,
                                    RemoteReporter remoteReporter,
-                                   JaegerConfigurationProperties.HttpSender httpSenderProperties) {
+                                   JaegerConfigurationProperties.HttpSender httpSenderProperties) throws TTransportException {
     io.jaegertracing.thrift.internal.senders.HttpSender.Builder builder =
         new io.jaegertracing.thrift.internal.senders.HttpSender.Builder(httpSenderProperties.getUrl());
     if (httpSenderProperties.getMaxPayload() != null) {

diff --git a/...ntrib/java/spring/jaeger/starter/customizer/JaegerTracerB3CustomizerCustomSpringTest.java b/...ntrib/java/spring/jaeger/starter/customizer/JaegerTracerB3CustomizerCustomSpringTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018-2019 The OpenTracing Authors
+ * Copyright 2018-2021 The OpenTracing Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -84,7 +84,7 @@ private void assertOnB3Headers(JaegerSpanContext context) {
     // Note: This test ensures that B3 codec actually works
     // If it would not, values would never be extracted from B3 headers and context will be null
     assertThat(context).isNotNull();
-    assertThat(context.getTraceId()).isEqualTo("abc");
+    assertThat(context.getTraceId()).isEqualTo("0000000000000abc");
     assertThat(context.getSpanId()).isEqualTo(3567L);
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -67,7 +67,7 @@
     <version.io.opentracing.contrib-opentracing-spring-tracer>0.4.0</version.io.opentracing.contrib-opentracing-spring-tracer>
     <version.io.opentracing.contrib-opentracing-spring-web-starter>4.0.0</version.io.opentracing.contrib-opentracing-spring-web-starter>
     <version.org.springframework.boot>2.3.4.RELEASE</version.org.springframework.boot>
-    <version.jaeger>1.3.2</version.jaeger>
+    <version.jaeger>1.6.0</version.jaeger>
     <version.org.awaitility-awaitility>3.0.0</version.org.awaitility-awaitility>
     <version.test-containers>1.7.3</version.test-containers>