From e98875eb77a31627e81fd21b346c673468531b9f Mon Sep 17 00:00:00 2001
From: Luca Preziati <luca.preziati@accenture.com>
Date: Tue, 23 Jul 2019 14:15:09 +0200
Subject: [PATCH 1/3] adding spring boot autoconfigure dependency

---
 opentracing-jms-spring/pom.xml                | 170 +++++++++---------
 .../jms/spring/TracingJmsConfiguration.java   |   9 +
 2 files changed, 97 insertions(+), 82 deletions(-)

diff --git a/opentracing-jms-spring/pom.xml b/opentracing-jms-spring/pom.xml
index c3bc53e..c2f9dcb 100644
--- a/opentracing-jms-spring/pom.xml
+++ b/opentracing-jms-spring/pom.xml
@@ -1,82 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software distributed under the License
-    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-    or implied. See the License for the specific language governing permissions and limitations under
-    the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>io.opentracing.contrib</groupId>
-    <artifactId>opentracing-jms-parent</artifactId>
-    <version>0.1.5-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>opentracing-jms-spring</artifactId>
-  <name>OpenTracing Instrumentation for Spring JMS API</name>
-  <description>OpenTracing Instrumentation for Spring JMS API</description>
-
-  <properties>
-    <spring.version>5.1.8.RELEASE</spring.version>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.opentracing.contrib</groupId>
-      <artifactId>opentracing-jms-2</artifactId>
-      <version>0.1.5-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jms</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>${spring.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-broker</artifactId>
-      <version>${activemq.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-kahadb-store</artifactId>
-      <version>${activemq.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>2.25.1</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software distributed under the License
+    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+    or implied. See the License for the specific language governing permissions and limitations under
+    the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.opentracing.contrib</groupId>
+    <artifactId>opentracing-jms-parent</artifactId>
+    <version>0.1.5-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>opentracing-jms-spring</artifactId>
+  <name>OpenTracing Instrumentation for Spring JMS API</name>
+  <description>OpenTracing Instrumentation for Spring JMS API</description>
+
+  <properties>
+    <spring.version>5.1.8.RELEASE</spring.version>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.opentracing.contrib</groupId>
+      <artifactId>opentracing-jms-2</artifactId>
+      <version>0.1.5-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
+      <version>2.1.6.RELEASE</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jms</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-broker</artifactId>
+      <version>${activemq.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-kahadb-store</artifactId>
+      <version>${activemq.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.25.1</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+</project>
diff --git a/opentracing-jms-spring/src/main/java/io/opentracing/contrib/jms/spring/TracingJmsConfiguration.java b/opentracing-jms-spring/src/main/java/io/opentracing/contrib/jms/spring/TracingJmsConfiguration.java
index d3b56f5..eadc81d 100644
--- a/opentracing-jms-spring/src/main/java/io/opentracing/contrib/jms/spring/TracingJmsConfiguration.java
+++ b/opentracing-jms-spring/src/main/java/io/opentracing/contrib/jms/spring/TracingJmsConfiguration.java
@@ -14,11 +14,13 @@
 package io.opentracing.contrib.jms.spring;
 
 import io.opentracing.Tracer;
+
 import javax.jms.ConnectionFactory;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.target.AbstractLazyCreationTargetSource;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jms.annotation.JmsListenerConfigurer;
@@ -35,24 +37,31 @@ public TracingJmsConfiguration(ObjectProvider<MessageConverter> messageConverter
   }
 
   @Bean
+  @ConditionalOnMissingBean
   public TracingMessagingMessageListenerAdapter createTracingMessagingMessageListenerAdapter(
       Tracer tracer) {
     return new TracingMessagingMessageListenerAdapter(tracer);
   }
 
   @Bean
+  @ConditionalOnMissingBean
   public TracingJmsListenerEndpointRegistry createTracingJmsListenerEndpointRegistry(
       TracingMessagingMessageListenerAdapter listenerAdapter) {
     return new TracingJmsListenerEndpointRegistry(listenerAdapter);
   }
 
   @Bean
+  @ConditionalOnMissingBean
   public JmsListenerConfigurer createTracingJmsListenerConfigurer(
       TracingJmsListenerEndpointRegistry registry) {
     return new TracingJmsListenerConfigurer(registry);
   }
 
+ 
+  
+  
   @Bean
+  @ConditionalOnMissingBean
   public JmsTemplate jmsTemplate(BeanFactory beanFactory, Tracer tracer) {
     // we create lazy proxy, to avoid dependency and config order
     // if JMS is used, and ConnectionFactory bean is not present,

From d39fbce0da066a1a09340590acea7ee884686f99 Mon Sep 17 00:00:00 2001
From: Luca Preziati <luca.preziati@accenture.com>
Date: Tue, 23 Jul 2019 14:40:13 +0200
Subject: [PATCH 2/3] added conditional generation of the Bean

---
 opentracing-jms-spring/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/opentracing-jms-spring/pom.xml b/opentracing-jms-spring/pom.xml
index c2f9dcb..edbf8c8 100644
--- a/opentracing-jms-spring/pom.xml
+++ b/opentracing-jms-spring/pom.xml
@@ -42,6 +42,7 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
       <version>2.1.6.RELEASE</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>

From 9b6da8fcb659d958f0704bc6e43caa8a9042e86a Mon Sep 17 00:00:00 2001
From: Luca Preziati <luca.preziati@accenture.com>
Date: Tue, 23 Jul 2019 14:46:21 +0200
Subject: [PATCH 3/3] fix on configuration

---
 opentracing-jms-spring/pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/opentracing-jms-spring/pom.xml b/opentracing-jms-spring/pom.xml
index edbf8c8..2512343 100644
--- a/opentracing-jms-spring/pom.xml
+++ b/opentracing-jms-spring/pom.xml
@@ -38,13 +38,6 @@
       <version>0.1.5-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-autoconfigure</artifactId>
-      <version>2.1.6.RELEASE</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jms</artifactId>
@@ -63,6 +56,13 @@
       <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
+	
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
+      <version>2.1.6.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.activemq</groupId>
@@ -86,4 +86,4 @@
     </dependency>
 
   </dependencies>
-</project>
+</project>
\ No newline at end of file