Bump Spring Boot to 2.3.4.Release for Jaeger 1.1 (#107)

* Revert "Upgrade to jaeger-client 1.3.2 (#101)"

This reverts commit d35811a

* Revert "Made W3C trace context propagation configurable (#103)"

This reverts commit 0b95db4

* Fix license headers

* Bump to Spring Boot 2.3.4

opentracing-spring-jaeger-starter/src/main/java/io/opentracing/contrib/java/spring/jaeger/starter/JaegerAutoConfiguration.java

@@ -32,7 +32,6 @@
 import io.opentracing.contrib.java.spring.jaeger.starter.customizers.ExpandExceptionLogsTracerBuilderCustomizer;
 import io.opentracing.contrib.java.spring.jaeger.starter.customizers.HigherBitTracerBuilderCustomizer;
 
-import io.opentracing.contrib.java.spring.jaeger.starter.customizers.TraceContextCodecTracerBuilderCustomizer;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -215,16 +214,6 @@ public TracerBuilderCustomizer b3CodecJaegerTracerCustomizer() {
     }
   }
 
-  @Configuration
-  @ConditionalOnProperty(value = "opentracing.jaeger.enable-w3c-propagation")
-  public static class TraceContextCodecConfiguration {
-
-    @Bean
-    public TracerBuilderCustomizer traceContextCodecJaegerTracerCustomizer() {
-      return new TraceContextCodecTracerBuilderCustomizer();
-    }
-  }
-
   @Configuration
   @ConditionalOnProperty(value = "opentracing.jaeger.enable-128-bit-traces")
   public static class HigherBitTraceConfiguration {

opentracing-spring-jaeger-starter/src/test/java/io/opentracing/contrib/java/spring/jaeger/starter/AbstractSenderSpringTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The OpenTracing Authors
+ * Copyright 2018-2020 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
@@ -13,31 +13,39 @@
  */
 package io.opentracing.contrib.java.spring.jaeger.starter;
 
+import static org.assertj.core.api.Assertions.as;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.jaegertracing.internal.reporters.CompositeReporter;
 import io.jaegertracing.internal.reporters.RemoteReporter;
+import io.jaegertracing.spi.Reporter;
 import org.assertj.core.api.Condition;
+import org.assertj.core.api.InstanceOfAssertFactories;
+import org.assertj.core.api.InstanceOfAssertFactory;
 
 public abstract class AbstractSenderSpringTest extends AbstractTracerSpringTest {
 
   protected void assertSenderClass(Class senderClass) {
     assertThat(getTracer())
         .extracting("reporter")
-        .extracting("class")
-        .containsExactly(CompositeReporter.class);
+        .extracting("class", as(InstanceOfAssertFactories.CLASS))
+        .isEqualTo(CompositeReporter.class);
 
     assertThat(getTracer())
-        .extracting("reporter")
-        .flatExtracting("reporters")
-        .filteredOn(new Condition<Object>() {
-          @Override
-          public boolean matches(Object value) {
-            return value.getClass().equals(RemoteReporter.class);
-          }
-        })
-        .extracting("sender")
-        .extracting("class")
-        .containsExactly(senderClass);
+        .extracting("reporter").isInstanceOfSatisfying(CompositeReporter.class, c -> {
+          assertThat(c)
+              .extracting("reporters", as(InstanceOfAssertFactories.list(Reporter.class)))
+              .filteredOn(new Condition<Object>() {
+                  @Override
+                  public boolean matches(Object value) {
+                    return value.getClass().equals(RemoteReporter.class);
+                  }
+              }).allSatisfy(rr -> {
+                assertThat(rr)
+                        .extracting("sender")
+                        .extracting("class", as(InstanceOfAssertFactories.CLASS))
+                        .isEqualTo(senderClass);
+              });
+        });
   }
 }

opentracing-spring-jaeger-starter/src/test/java/io/opentracing/contrib/java/spring/jaeger/starter/customizer/MultipleCustomizersEnabledSpringTest.java

@@ -23,7 +23,6 @@
 import io.opentracing.contrib.java.spring.jaeger.starter.customizers.ExpandExceptionLogsTracerBuilderCustomizer;
 import io.opentracing.contrib.java.spring.jaeger.starter.customizers.HigherBitTracerBuilderCustomizer;
 
-import io.opentracing.contrib.java.spring.jaeger.starter.customizers.TraceContextCodecTracerBuilderCustomizer;
 import java.util.List;
 
 import org.junit.Test;
@@ -42,7 +41,6 @@
         "spring.main.banner-mode=off",
         "opentracing.jaeger.expand-exception-logs=true",
         "opentracing.jaeger.enable-b3-propagation=true",
-        "opentracing.jaeger.enable-w3c-propagation=true",
         "opentracing.jaeger.enable-128-bit-traces=true"
     }
 )
@@ -59,7 +57,6 @@ public void testCustomizersShouldContainB3Customizer() {
         .containsExactlyInAnyOrder(
             ExpandExceptionLogsTracerBuilderCustomizer.class,
             B3CodecTracerBuilderCustomizer.class,
-            TraceContextCodecTracerBuilderCustomizer.class,
             HigherBitTracerBuilderCustomizer.class,
             MockTracerBuilderCustomizer.class);
   }

pom.xml

@@ -65,8 +65,8 @@
 
     <version.io.opentracing>0.33.0</version.io.opentracing>
     <version.io.opentracing.contrib-opentracing-spring-tracer>0.3.1</version.io.opentracing.contrib-opentracing-spring-tracer>
-    <version.org.springframework.boot>2.1.4.RELEASE</version.org.springframework.boot>
-    <version.jaeger>1.3.2</version.jaeger>
+    <version.org.springframework.boot>2.3.4.RELEASE</version.org.springframework.boot>
+    <version.jaeger>1.1.0</version.jaeger>
     <version.org.awaitility-awaitility>3.0.0</version.org.awaitility-awaitility>
     <version.test-containers>1.7.3</version.test-containers>