bump SB version to 2.1.4 and spring cloud Greenwhich SR1. (opentracing-contrib#209)

* bump SB version to 2.1.4 and spring cloud Greenwhich SR1.

* add finchley make goal.

Author: ask4gilles

.travis.yml

@@ -30,9 +30,12 @@ install:
 jobs:
   include:
     - stage: test
-      env: [ NAME=finchley ]
+      env: [ NAME=greenwhich ]
       script: make default
 
+    - env: [ NAME=finchley ]
+      script: make finchley
+
     - env: [ NAME=classpath-no-dependencies ]
       script: PROFILES=nodeps make classpath
 

Makefile

@@ -5,6 +5,9 @@ ALL: default classpath
 default:
 	@./mvnw clean install
 
+finchley:
+	@./mvnw clean test -Dversion.org.springframework.boot=2.0.3.RELEASE -Dversion.org.springframework.cloud-spring-cloud-dependencies=Finchley.RELEASE
+
 classpath:
 	@for profile in $(PROFILES) ; do \
 		echo "---> Executing profile $$profile"; \

README.md

@@ -21,7 +21,7 @@ It contains auto-configurations which instruments and trace following Spring Boo
 * Spring Messaging - trace messages being sent through [Messaging Channels](https://docs.spring.io/spring-integration/reference/html/messaging-channels-section.html)
 * RabbitMQ
 
-This library is compatible with [Spring Cloud](http://projects.spring.io/spring-cloud/) `Finchley` (version `0.2.x`) and `Dalston` and `Edgware`(version `0.1.x` in branch [release-0.1](https://github.com/opentracing-contrib/java-spring-cloud/tree/release-0.1))
+This library is compatible with [Spring Cloud](http://projects.spring.io/spring-cloud/) `Finchley` and `Greenwhich` (version `0.2.x`) and `Dalston` and `Edgware` (version `0.1.x` in branch [release-0.1](https://github.com/opentracing-contrib/java-spring-cloud/tree/release-0.1))
 
 ## Comparison to `spring-cloud-sleuth`
 This project is similar to [spring-cloud-sleuth](https://github.com/spring-cloud/spring-cloud-sleuth), 

instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml

@@ -72,6 +72,11 @@
       <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+      <optional>true</optional>
+    </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>

instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignDefinedUrlTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 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
@@ -32,6 +32,7 @@
 
 /**
  * @author Pavol Loffay
+ * @author Gilles Robert
  */
 @SpringBootTest(
     webEnvironment = WebEnvironment.DEFINED_PORT,
@@ -49,7 +50,7 @@ static class FeignWithoutRibbonConfiguration {
 
   }
 
-  @FeignClient(value = "localService", url = "localhost:13598")
+  @FeignClient(value = "nottraced", url = "localhost:13598")
   interface FeignInterface {
 
     @RequestMapping(method = RequestMethod.GET, value = "/notTraced")
@@ -67,4 +68,4 @@ public void testTracedRequestDefinedUrl() throws InterruptedException {
     feignInterface.hello();
     verify(mockTracer);
   }
-}
+}

instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignHystrixTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 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
@@ -26,6 +26,7 @@
 
 /**
  * @author Pavol Loffay
+ * @author Gilles Robert
  */
 @TestPropertySource(properties = {
     "feign.hystrix.enabled=true",
@@ -39,7 +40,7 @@ public static void beforeClass() {
   }
 
   @Test
-  public void testParentSpanRequest() throws InterruptedException {
+  public void testParentSpanRequest() {
     // create parent span to verify that Hystrix is instrumented and it propagates spans to callables
     MockSpan parentSpan = mockTracer.buildSpan("parent").startManual();
     try (Scope scope = mockTracer.scopeManager().activate(parentSpan, true)) {
@@ -51,4 +52,4 @@ public void testParentSpanRequest() throws InterruptedException {
       assertEquals(parentSpan.context().spanId(), mockSpans.get(0).parentId());
     }
   }
-}
+}

instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignManualTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 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
@@ -34,6 +34,7 @@
 
 /**
  * @author Pavol Loffay
+ * @author Gilles Robert
  */
 @SpringBootTest(
     webEnvironment = WebEnvironment.RANDOM_PORT,
@@ -53,7 +54,7 @@ public ManualFeignConfiguration(Client client) {
     }
   }
 
-  @FeignClient(value = "localService")
+  @FeignClient(value = "manualLocalService")
   interface FeignInterface {
 
     @RequestLine("GET /notTraced")
@@ -72,4 +73,4 @@ public void testTracedRequestDefinedUrl() throws InterruptedException {
     feignInterface.hello();
     verify(mockTracer);
   }
-}
+}

instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignManualWithSpanDecoratorsTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 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
@@ -25,6 +25,7 @@
 
 /**
  * @author Emerson Oliveira
+ * @author Gilles Robert
  */
 @SpringBootTest(
     webEnvironment = WebEnvironment.RANDOM_PORT,
@@ -35,9 +36,10 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 public class FeignManualWithSpanDecoratorsTest extends FeignManualTest {
 
+  @Override
   @Test
-  public void testTracedRequestDefinedUrl() throws InterruptedException {
+  public void testTracedRequestDefinedUrl() {
     feignInterface.hello();
     verifyWithSpanDecorators(mockTracer);
   }
-}
+}

instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 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
@@ -43,6 +43,7 @@
 
 /**
  * @author Pavol Loffay
+ * @author Gilles Robert
  */
 @SpringBootTest(
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
@@ -92,7 +93,7 @@ public void before() {
   }
 
   @Test
-  public void testTracedRequest() throws InterruptedException {
+  public void testTracedRequest() {
     feignInterface.hello();
     verify(mockTracer);
   }
@@ -103,4 +104,4 @@ static void verify(MockTracer mockTracer) {
     assertEquals(1, mockSpans.size());
     assertEquals(Tags.SPAN_KIND_CLIENT, mockSpans.get(0).tags().get(Tags.SPAN_KIND.getKey()));
   }
-}
+}

instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignTracingAutoConfigurationTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 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
@@ -20,14 +20,15 @@
 
 import io.opentracing.Tracer;
 import org.junit.Test;
-import org.springframework.boot.test.util.EnvironmentTestUtils;
+import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.cloud.openfeign.FeignContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * @author Eddú Meléndez
+ * @author Gilles Robert
  */
 public class FeignTracingAutoConfigurationTest {
 
@@ -45,7 +46,7 @@ public void loadFeignTracingByDefault() {
   public void disableFeignTracing() {
     AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
     context.register(TracerConfig.class, FeignTracingAutoConfiguration.class);
-    EnvironmentTestUtils.addEnvironment(context, "opentracing.spring.cloud.feign.enabled:false");
+    TestPropertyValues.of("opentracing.spring.cloud.feign.enabled:false").applyTo(context);
     context.refresh();
     String[] feignContextBeans = context.getBeanNamesForType(TraceFeignContext.class);
     assertThat(feignContextBeans.length, is(0));

instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignWithSpanDecoratorsTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 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
@@ -23,6 +23,7 @@
 
 /**
  * @author Emerson Oliveira
+ * @author Gilles Robert
  */
 @SpringBootTest(
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
@@ -32,6 +33,7 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 public class FeignWithSpanDecoratorsTest extends FeignTest {
 
+  @Override
   @Test
   public void testTracedRequest() {
     feignInterface.hello();

instrument-starters/opentracing-spring-cloud-jms-starter/src/test/java/io/opentracing/contrib/spring/cloud/jms/JmsTracingAutoConfigurationTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2018 The OpenTracing Authors
+ * Copyright 2017-2019 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
@@ -21,7 +21,7 @@
 import io.opentracing.Tracer;
 import io.opentracing.contrib.jms.spring.TracingJmsTemplate;
 import org.junit.Test;
-import org.springframework.boot.test.util.EnvironmentTestUtils;
+import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -44,7 +44,7 @@ public void loadJmsTracingByDefault() {
   public void disableJmsTracing() {
     AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
     context.register(TracerConfig.class, JmsAutoConfiguration.class);
-    EnvironmentTestUtils.addEnvironment(context, "opentracing.spring.cloud.jms.enabled:false");
+    TestPropertyValues.of("opentracing.spring.cloud.jms.enabled:false").applyTo(context);
     context.refresh();
     String[] tracingJmsTemplateBeans = context.getBeanNamesForType(TracingJmsTemplate.class);
     assertThat(tracingJmsTemplateBeans.length, is(0));

pom.xml

@@ -76,7 +76,7 @@
     <version.io.opentracing.contrib-opentracing-spring-web>1.1.1</version.io.opentracing.contrib-opentracing-spring-web>
     <version.io.opentracing.contrib-opentracing-spring-jms>0.0.10</version.io.opentracing.contrib-opentracing-spring-jms>
     <version.io.opentracing.contrib-opentracing-spring-messaging>0.0.5</version.io.opentracing.contrib-opentracing-spring-messaging>
-    <version.io.opentracing.contrib-opentracing-spring-rabbitmq>0.1.1</version.io.opentracing.contrib-opentracing-spring-rabbitmq>
+    <version.io.opentracing.contrib-opentracing-spring-rabbitmq>1.0.1</version.io.opentracing.contrib-opentracing-spring-rabbitmq>
     <version.io.opentracing.contrib-java-jdbc>0.0.12</version.io.opentracing.contrib-java-jdbc>
     <version.io.opentracing.contrib-opentracing-spring-redis>0.0.10</version.io.opentracing.contrib-opentracing-spring-redis>
     <version.io.opentracing.contrib-java-concurrent>0.2.0</version.io.opentracing.contrib-java-concurrent>
@@ -87,8 +87,8 @@
     <version.io.github.openfeign.opentracing>0.1.0</version.io.github.openfeign.opentracing>
     <!-- spring-boot-starter-parent is a module of spring-boot-dependencies
         https://github.com/spring-projects/spring-boot/blob/master/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
-    <version.org.springframework.boot>2.0.3.RELEASE</version.org.springframework.boot>
-    <version.org.springframework.cloud-spring-cloud-dependencies>Finchley.RELEASE</version.org.springframework.cloud-spring-cloud-dependencies>
+    <version.org.springframework.boot>2.1.4.RELEASE</version.org.springframework.boot>
+    <version.org.springframework.cloud-spring-cloud-dependencies>Greenwich.SR1</version.org.springframework.cloud-spring-cloud-dependencies>
     <version.org.awaitility-awaitility>3.0.0</version.org.awaitility-awaitility>
     <version.de.flapdoodle-embed.mongo>2.0.3</version.de.flapdoodle-embed.mongo>
     <version.cz.jirutka.spring-embedmongo-spring>1.3.1</version.cz.jirutka.spring-embedmongo-spring>