From 78363079f989b7dcd3931918cce0cef5a435d966 Mon Sep 17 00:00:00 2001 From: wuyupengwoaini <1145048406@qq.com> Date: Sun, 13 Oct 2019 16:02:41 +0800 Subject: [PATCH 01/60] Fix Async instrumentation when using AsyncConfigurerSupport (#251) * fix issue-183(@Async instrumentation not working when using AsyncConfigurerSupport) --- ...ustomAsyncConfigurerAutoConfiguration.java | 12 +++- .../cloud/async/AsyncConfigurerTest.java | 63 +++++++++++++++++++ 2 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/AsyncConfigurerTest.java diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/CustomAsyncConfigurerAutoConfiguration.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/CustomAsyncConfigurerAutoConfiguration.java index 30c04b00..a1654410 100644 --- a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/CustomAsyncConfigurerAutoConfiguration.java +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/CustomAsyncConfigurerAutoConfiguration.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 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; +import org.springframework.core.PriorityOrdered; import org.springframework.scheduling.annotation.AsyncConfigurer; /** @@ -39,7 +40,7 @@ @AutoConfigureBefore(DefaultAsyncAutoConfiguration.class) @AutoConfigureAfter(TracerAutoConfiguration.class) @ConditionalOnProperty(name = "opentracing.spring.cloud.async.enabled", havingValue = "true", matchIfMissing = true) -public class CustomAsyncConfigurerAutoConfiguration implements BeanPostProcessor { +public class CustomAsyncConfigurerAutoConfiguration implements BeanPostProcessor,PriorityOrdered { @Autowired private Tracer tracer; @@ -52,10 +53,15 @@ public Object postProcessBeforeInitialization(Object bean, String beanName) @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { - if (bean instanceof AsyncConfigurer) { + if (bean instanceof AsyncConfigurer && !(bean instanceof TracedAsyncConfigurer)) { AsyncConfigurer configurer = (AsyncConfigurer) bean; return new TracedAsyncConfigurer(tracer, configurer); } return bean; } + + @Override + public int getOrder() { + return PriorityOrdered.LOWEST_PRECEDENCE; + } } diff --git a/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/AsyncConfigurerTest.java b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/AsyncConfigurerTest.java new file mode 100644 index 00000000..37b37ed9 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/AsyncConfigurerTest.java @@ -0,0 +1,63 @@ +/** + * 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. + */ +package io.opentracing.contrib.spring.cloud.async; + +import io.opentracing.contrib.spring.cloud.MockTracingConfiguration; +import io.opentracing.contrib.spring.cloud.async.instrument.TracedAsyncConfigurer; +import java.util.concurrent.Executor; +import org.assertj.core.api.BDDAssertions; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.AsyncConfigurer; +import org.springframework.scheduling.annotation.AsyncConfigurerSupport; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + + + + +/** + * @Author wuyupeng + **/ +@SpringBootTest(classes = {AsyncConfigurerTest.AsyncConfigurerConfig.class, MockTracingConfiguration.class, CustomAsyncConfigurerAutoConfiguration.class}) +@RunWith(SpringJUnit4ClassRunner.class) +public class AsyncConfigurerTest { + + @Autowired + private AsyncConfigurer asyncConfigurer; + + + @Configuration + @EnableAsync + static class AsyncConfigurerConfig extends AsyncConfigurerSupport { + @Override + public Executor getAsyncExecutor() { + ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + executor.initialize(); + return executor; + } + } + + /** + * Test if the AsyncConfigurer configured by developer can be replaced with TracedAsyncConfigurer by CustomAsyncConfigurerAutoConfiguration + */ + @Test + public void testIsTracedAsyncConfigurer() { + BDDAssertions.then(asyncConfigurer).isInstanceOf(TracedAsyncConfigurer.class); + } +} From c4079a9c8e048cc7df4a574267ba3e070a837cb7 Mon Sep 17 00:00:00 2001 From: bono007 Date: Fri, 18 Oct 2019 03:43:09 -0500 Subject: [PATCH 02/60] Add tracing for ThreadPoolTaskScheduler (#250) --- .../async/ExecutorBeanPostProcessor.java | 16 + .../TracedThreadPoolTaskScheduler.java | 286 ++++++++++++ ...hreadPoolTaskSchedulerIntegrationTest.java | 129 ++++++ .../TracedThreadPoolTaskSchedulerTest.java | 413 ++++++++++++++++++ 4 files changed, 844 insertions(+) create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/instrument/TracedThreadPoolTaskScheduler.java create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/instrument/TracedThreadPoolTaskSchedulerIntegrationTest.java create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/instrument/TracedThreadPoolTaskSchedulerTest.java diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/ExecutorBeanPostProcessor.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/ExecutorBeanPostProcessor.java index b4ab9ac3..03613c87 100644 --- a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/ExecutorBeanPostProcessor.java +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/ExecutorBeanPostProcessor.java @@ -17,6 +17,7 @@ import io.opentracing.contrib.concurrent.TracedExecutor; import io.opentracing.contrib.concurrent.TracedExecutorService; import io.opentracing.contrib.spring.cloud.async.instrument.TracedThreadPoolTaskExecutor; +import io.opentracing.contrib.spring.cloud.async.instrument.TracedThreadPoolTaskScheduler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -33,6 +34,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.ReflectionUtils; /** @@ -65,6 +67,20 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw TracedExecutorService::new, shouldUseCGLibProxy(executorService, ExecutorService.class) ); + } else if (bean instanceof ThreadPoolTaskScheduler) { + ThreadPoolTaskScheduler threadPoolTaskScheduler = (ThreadPoolTaskScheduler) bean; + boolean classNotFinal = !Modifier.isFinal(threadPoolTaskScheduler.getClass().getModifiers()); + if (classNotFinal) { + return proxify( + threadPoolTaskScheduler, + (e, t) -> new TracedThreadPoolTaskScheduler(t, e), + true + ); + } else { + // Bean class is final, and extends ThreadPoolTaskScheduler + // Can't use cglib, nor jdk proxy. + return bean; + } } else if (bean instanceof ThreadPoolTaskExecutor) { ThreadPoolTaskExecutor threadPoolTaskExecutor = (ThreadPoolTaskExecutor) bean; boolean classNotFinal = !Modifier.isFinal(threadPoolTaskExecutor.getClass().getModifiers()); diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/instrument/TracedThreadPoolTaskScheduler.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/instrument/TracedThreadPoolTaskScheduler.java new file mode 100644 index 00000000..3bf47d5a --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/instrument/TracedThreadPoolTaskScheduler.java @@ -0,0 +1,286 @@ +/** + * 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. + */ +package io.opentracing.contrib.spring.cloud.async.instrument; + +import io.opentracing.Tracer; +import io.opentracing.contrib.concurrent.TracedCallable; +import io.opentracing.contrib.concurrent.TracedRunnable; +import java.time.Duration; +import java.time.Instant; +import java.util.Date; +import java.util.concurrent.Callable; +import java.util.concurrent.Future; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.ThreadFactory; +import org.springframework.lang.Nullable; +import org.springframework.scheduling.Trigger; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import org.springframework.util.ErrorHandler; +import org.springframework.util.concurrent.ListenableFuture; + + +/** + * A traced version of {@code TracedThreadPoolTaskScheduler}. + * + * @author cbono + */ +public class TracedThreadPoolTaskScheduler + extends ThreadPoolTaskScheduler { + + private final Tracer tracer; + private final ThreadPoolTaskScheduler delegate; + + public TracedThreadPoolTaskScheduler(Tracer tracer, ThreadPoolTaskScheduler delegate) { + this.tracer = tracer; + this.delegate = delegate; + } + + @Override + public void setPoolSize(int poolSize) { + delegate.setPoolSize(poolSize); + } + + @Override + public void setRemoveOnCancelPolicy(boolean removeOnCancelPolicy) { + delegate.setRemoveOnCancelPolicy(removeOnCancelPolicy); + } + + @Override + public void setErrorHandler(ErrorHandler errorHandler) { + delegate.setErrorHandler(errorHandler); + } + + @Override + public ScheduledExecutorService getScheduledExecutor() + throws IllegalStateException { + return delegate.getScheduledExecutor(); + } + + @Override + public ScheduledThreadPoolExecutor getScheduledThreadPoolExecutor() + throws IllegalStateException { + return delegate.getScheduledThreadPoolExecutor(); + } + + @Override + public int getPoolSize() { + return delegate.getPoolSize(); + } + + @Override + public boolean isRemoveOnCancelPolicy() { + return delegate.isRemoveOnCancelPolicy(); + } + + @Override + public int getActiveCount() { + return delegate.getActiveCount(); + } + + @Override + public void execute(Runnable task) { + delegate.execute(new TracedRunnable(task, tracer)); + } + + @Override + public void execute(Runnable task, long startTimeout) { + delegate.execute(new TracedRunnable(task, tracer), startTimeout); + } + + @Override + public Future submit(Runnable task) { + return delegate.submit(new TracedRunnable(task, tracer)); + } + + @Override + public Future submit(Callable task) { + return delegate.submit(new TracedCallable<>(task, tracer)); + } + + @Override + public ListenableFuture submitListenable(Runnable task) { + return delegate.submitListenable(new TracedRunnable(task, tracer)); + } + + @Override + public ListenableFuture submitListenable(Callable task) { + return delegate.submitListenable(new TracedCallable<>(task, tracer)); + } + + @Override + @Nullable + public ScheduledFuture schedule(Runnable task, Trigger trigger) { + return delegate.schedule(new TracedRunnable(task, tracer), trigger); + } + + @Override + public ScheduledFuture schedule(Runnable task, Date startTime) { + return delegate.schedule(new TracedRunnable(task, tracer), startTime); + } + + @Override + public ScheduledFuture schedule(Runnable task, Instant startTime) { + return delegate.schedule(new TracedRunnable(task, tracer), startTime); + } + + @Override + public ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period) { + return delegate.scheduleAtFixedRate(new TracedRunnable(task, tracer), startTime, period); + } + + @Override + public ScheduledFuture scheduleAtFixedRate(Runnable task, Instant startTime, Duration period) { + return delegate.scheduleAtFixedRate(new TracedRunnable(task, tracer), startTime, period); + } + + @Override + public ScheduledFuture scheduleAtFixedRate(Runnable task, long period) { + return delegate.scheduleAtFixedRate(new TracedRunnable(task, tracer), period); + } + + @Override + public ScheduledFuture scheduleAtFixedRate(Runnable task, Duration period) { + return delegate.scheduleAtFixedRate(new TracedRunnable(task, tracer), period); + } + + @Override + public ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay) { + return delegate.scheduleWithFixedDelay(new TracedRunnable(task, tracer), startTime, delay); + } + + @Override + public ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay) { + return delegate.scheduleWithFixedDelay(new TracedRunnable(task, tracer), delay); + } + + @Override + public ScheduledFuture scheduleWithFixedDelay(Runnable task, Instant startTime, + Duration delay) { + return delegate.scheduleWithFixedDelay(new TracedRunnable(task, tracer), startTime, delay); + } + + @Override + public ScheduledFuture scheduleWithFixedDelay(Runnable task, Duration delay) { + return delegate.scheduleWithFixedDelay(new TracedRunnable(task, tracer), delay); + } + + @Override + public void setThreadFactory(ThreadFactory threadFactory) { + delegate.setThreadFactory(threadFactory); + } + + @Override + public void setThreadNamePrefix(String threadNamePrefix) { + delegate.setThreadNamePrefix(threadNamePrefix); + } + + @Override + public void setRejectedExecutionHandler(RejectedExecutionHandler rejectedExecutionHandler) { + delegate.setRejectedExecutionHandler(rejectedExecutionHandler); + } + + @Override + public void setWaitForTasksToCompleteOnShutdown(boolean waitForJobsToCompleteOnShutdown) { + delegate.setWaitForTasksToCompleteOnShutdown(waitForJobsToCompleteOnShutdown); + } + + @Override + public void setAwaitTerminationSeconds(int awaitTerminationSeconds) { + delegate.setAwaitTerminationSeconds(awaitTerminationSeconds); + } + + @Override + public void setBeanName(String name) { + delegate.setBeanName(name); + } + + @Override + public void afterPropertiesSet() { + delegate.afterPropertiesSet(); + } + + @Override + public void initialize() { + delegate.initialize(); + } + + @Override + public void destroy() { + delegate.destroy(); + } + + @Override + public void shutdown() { + delegate.shutdown(); + } + + @Override + public Thread newThread(Runnable runnable) { + return delegate.newThread(runnable); + } + + @Override + public String getThreadNamePrefix() { + return delegate.getThreadNamePrefix(); + } + + @Override + public void setThreadPriority(int threadPriority) { + delegate.setThreadPriority(threadPriority); + } + + @Override + public int getThreadPriority() { + return delegate.getThreadPriority(); + } + + @Override + public void setDaemon(boolean daemon) { + delegate.setDaemon(daemon); + } + + @Override + public boolean isDaemon() { + return delegate.isDaemon(); + } + + @Override + public void setThreadGroupName(String name) { + delegate.setThreadGroupName(name); + } + + @Override + public void setThreadGroup(ThreadGroup threadGroup) { + delegate.setThreadGroup(threadGroup); + } + + @Override + @Nullable + public ThreadGroup getThreadGroup() { + return delegate.getThreadGroup(); + } + + @Override + public Thread createThread(Runnable runnable) { + return delegate.createThread(runnable); + } + + @Override + public boolean prefersShortLivedTasks() { + return delegate.prefersShortLivedTasks(); + } +} diff --git a/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/instrument/TracedThreadPoolTaskSchedulerIntegrationTest.java b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/instrument/TracedThreadPoolTaskSchedulerIntegrationTest.java new file mode 100644 index 00000000..f5e7a205 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/instrument/TracedThreadPoolTaskSchedulerIntegrationTest.java @@ -0,0 +1,129 @@ +/** + * 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. + */ +package io.opentracing.contrib.spring.cloud.async.instrument; + +import static org.awaitility.Awaitility.await; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import io.opentracing.Scope; +import io.opentracing.Span; +import io.opentracing.contrib.spring.cloud.MockTracingConfiguration; +import io.opentracing.contrib.spring.cloud.TestUtils; +import io.opentracing.mock.MockSpan; +import io.opentracing.mock.MockTracer; +import java.time.Instant; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.RejectedExecutionException; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.task.SimpleAsyncTaskExecutor; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * @author cbono + */ +@SpringBootTest(classes = { + MockTracingConfiguration.class, + TracedThreadPoolTaskSchedulerIntegrationTest.TestConfiguration.class +}) +@RunWith(SpringJUnit4ClassRunner.class) +public class TracedThreadPoolTaskSchedulerIntegrationTest { + + @Configuration + static class TestConfiguration { + + @Bean + public ThreadPoolTaskScheduler threadPoolTaskScheduler() { + final ThreadPoolTaskScheduler executor = new ThreadPoolTaskScheduler(); + executor.initialize(); + return executor; + } + } + + @Autowired + private MockTracer mockTracer; + + @Autowired + @Qualifier("threadPoolTaskScheduler") + private ThreadPoolTaskScheduler threadPoolTaskScheduler; + + @Before + public void before() { + mockTracer.reset(); + } + + @Test + public void testExecute() { + final Span span = mockTracer.buildSpan("5150").start(); + try (Scope scope = mockTracer.activateSpan(span)) { + final CompletableFuture completableFuture = CompletableFuture.supplyAsync(() -> { + mockTracer.buildSpan("child").start().finish(); + return "ok"; + }, threadPoolTaskScheduler); + completableFuture.join(); + } + span.finish(); + await().until(() -> mockTracer.finishedSpans().size() == 2); + + final List mockSpans = mockTracer.finishedSpans(); + assertEquals(2, mockSpans.size()); + TestUtils.assertSameTraceId(mockSpans); + } + + @Test + public void testSumbit() throws Exception { + final Span span = mockTracer.buildSpan("5150").start(); + try (Scope scope = mockTracer.activateSpan(span)) { + final Future child = threadPoolTaskScheduler.submit(() -> mockTracer.buildSpan("child").start().finish()); + child.get(); + } + span.finish(); + await().until(() -> mockTracer.finishedSpans().size() == 2); + + final List mockSpans = mockTracer.finishedSpans(); + assertEquals(2, mockSpans.size()); + TestUtils.assertSameTraceId(mockSpans); + } + + @Test + public void testSchedule() throws Exception { + final Span span = mockTracer.buildSpan("5150").start(); + try (Scope scope = mockTracer.activateSpan(span)) { + final Future child = threadPoolTaskScheduler.schedule( + () -> mockTracer.buildSpan("child").start().finish(), + Instant.now().plusSeconds(5)); + child.get(); + } + span.finish(); + await().until(() -> mockTracer.finishedSpans().size() == 2); + + final List mockSpans = mockTracer.finishedSpans(); + assertEquals(2, mockSpans.size()); + TestUtils.assertSameTraceId(mockSpans); + } +} diff --git a/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/instrument/TracedThreadPoolTaskSchedulerTest.java b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/instrument/TracedThreadPoolTaskSchedulerTest.java new file mode 100644 index 00000000..4a1fc473 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/instrument/TracedThreadPoolTaskSchedulerTest.java @@ -0,0 +1,413 @@ +/** + * 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. + */ +package io.opentracing.contrib.spring.cloud.async.instrument; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +import io.opentracing.Tracer; +import io.opentracing.contrib.concurrent.TracedCallable; +import io.opentracing.contrib.concurrent.TracedRunnable; +import io.opentracing.contrib.spring.cloud.async.TracedExecutorTest; +import java.lang.reflect.Field; +import java.time.Duration; +import java.time.Instant; +import java.util.Date; +import java.util.concurrent.Callable; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ThreadFactory; +import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.springframework.scheduling.Trigger; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import org.springframework.util.ErrorHandler; +import org.springframework.util.ReflectionUtils; + + +/** + * Unit tests all API surface area for TracedThreadPoolTaskScheduler. There is value in integration testing these + * via {@code SpringBootTest} but due to the amount of methods we rely on unit tests as a whole and then run a + * couple of the methods through integration tests in {@link TracedThreadPoolTaskSchedulerIntegrationTest}. The + * thinking is that the plumping that makes it all work is the wrapping in TracedRunnable/TracedCallable so + * long as we verify that in unit tests all should be good. + * + * @author cbono + */ +public class TracedThreadPoolTaskSchedulerTest { + + private static final Field TRACED_RUNNABLE_DELEGATE_FIELD = ReflectionUtils.findField(TracedRunnable.class, "delegate"); + private static final Field TRACED_RUNNABLE_TRACER_FIELD = ReflectionUtils.findField(TracedRunnable.class, "tracer"); + private static final Field TRACED_CALLABLE_DELEGATE_FIELD = ReflectionUtils.findField(TracedCallable.class, "delegate"); + private static final Field TRACED_CALLABLE_TRACER_FIELD = ReflectionUtils.findField(TracedCallable.class, "tracer"); + static { + ReflectionUtils.makeAccessible(TRACED_RUNNABLE_DELEGATE_FIELD); + ReflectionUtils.makeAccessible(TRACED_RUNNABLE_TRACER_FIELD); + ReflectionUtils.makeAccessible(TRACED_CALLABLE_DELEGATE_FIELD); + ReflectionUtils.makeAccessible(TRACED_CALLABLE_TRACER_FIELD); + } + + private final Runnable mockRunnable = mock(Runnable.class); + private final Callable mockCallable = mock(Callable.class); + private final Tracer mockTracer = mock(Tracer.class); + private final ThreadPoolTaskScheduler delegate = mock(ThreadPoolTaskScheduler.class); + private final TracedThreadPoolTaskScheduler scheduler = new TracedThreadPoolTaskScheduler( + mockTracer, delegate); + + @Test + public void setPoolSize() { + scheduler.setPoolSize(10); + verify(delegate).setPoolSize(10); + } + + @Test + public void setRemoveOnCancelPolicy() { + scheduler.setRemoveOnCancelPolicy(true); + verify(delegate).setRemoveOnCancelPolicy(true); + } + + @Test + public void setErrorHandler() { + final ErrorHandler errorHandler = mock(ErrorHandler.class); + scheduler.setErrorHandler(errorHandler); + verify(delegate).setErrorHandler(errorHandler); + } + + @Test + public void getScheduledExecutor() { + scheduler.getScheduledExecutor(); + verify(delegate).getScheduledExecutor(); + } + + @Test + public void getScheduledThreadPoolExecutor() { + scheduler.getScheduledThreadPoolExecutor(); + verify(delegate).getScheduledThreadPoolExecutor(); + } + + @Test + public void getPoolSize() { + scheduler.getPoolSize(); + verify(delegate).getPoolSize(); + } + + @Test + public void isRemoveOnCancelPolicy() { + scheduler.isRemoveOnCancelPolicy(); + verify(delegate).isRemoveOnCancelPolicy(); + } + + @Test + public void getActiveCount() { + scheduler.getActiveCount(); + verify(delegate).getActiveCount(); + } + + @Test + public void execute() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + scheduler.execute(mockRunnable); + verify(delegate).execute(argumentCaptor.capture()); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void executeWithTimeout() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + scheduler.execute(mockRunnable, 1000L); + verify(delegate).execute(argumentCaptor.capture(), eq(1000L)); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void submitRunnable() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + scheduler.submit(mockRunnable); + verify(delegate).submit(argumentCaptor.capture()); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void submitCallable() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedCallable.class); + scheduler.submit(mockCallable); + verify(delegate).submit(argumentCaptor.capture()); + verifyTracedCallable(argumentCaptor.getValue(), mockCallable, mockTracer); + } + + @Test + public void submitListenableRunnable() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + scheduler.submitListenable(mockRunnable); + verify(delegate).submitListenable(argumentCaptor.capture()); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void submitListenableCallable() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedCallable.class); + scheduler.submitListenable(mockCallable); + verify(delegate).submitListenable(argumentCaptor.capture()); + verifyTracedCallable(argumentCaptor.getValue(), mockCallable, mockTracer); + } + + @Test + public void scheduleWithTrigger() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + final Trigger trigger = mock(Trigger.class); + scheduler.schedule(mockRunnable, trigger); + verify(delegate).schedule(argumentCaptor.capture(), eq(trigger)); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void scheduleWithDate() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + final Date date = mock(Date.class); + scheduler.schedule(mockRunnable, date); + verify(delegate).schedule(argumentCaptor.capture(), eq(date)); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void scheduleWithInstant() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + final Instant instant = Instant.now(); + scheduler.schedule(mockRunnable, instant); + verify(delegate).schedule(argumentCaptor.capture(), eq(instant)); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void scheduleAtFixedRateWithDateAndLong() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + final Date date = new Date(); + scheduler.scheduleAtFixedRate(mockRunnable, date, 1000L); + verify(delegate).scheduleAtFixedRate(argumentCaptor.capture(), eq(date), eq(1000L)); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void scheduleAtFixedRateWithInstantAndDuration() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + final Instant instant = Instant.now(); + final Duration duration = Duration.ofMinutes(1); + scheduler.scheduleAtFixedRate(mockRunnable, instant, duration); + verify(delegate).scheduleAtFixedRate(argumentCaptor.capture(), eq(instant), eq(duration)); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void scheduleAtFixedRateWithLong() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + scheduler.scheduleAtFixedRate(mockRunnable, 1000L); + verify(delegate).scheduleAtFixedRate(argumentCaptor.capture(), eq(1000L)); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void scheduleAtFixedRateWithDuration() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + final Duration duration = Duration.ofMinutes(5); + scheduler.scheduleAtFixedRate(mockRunnable, duration); + verify(delegate).scheduleAtFixedRate(argumentCaptor.capture(), eq(duration)); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void scheduleWithFixedDelayWithDateAndLong() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + final Date date = new Date(); + scheduler.scheduleWithFixedDelay(mockRunnable, date, 1000L); + verify(delegate).scheduleWithFixedDelay(argumentCaptor.capture(), eq(date), eq(1000L)); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void scheduleWithFixedDelayWithLong() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + scheduler.scheduleWithFixedDelay(mockRunnable, 1000L); + verify(delegate).scheduleWithFixedDelay(argumentCaptor.capture(), eq(1000L)); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void scheduleWithFixedDelayWithInstantAndDuration() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + final Instant instant = Instant.now(); + final Duration duration = Duration.ofMinutes(1); + scheduler.scheduleWithFixedDelay(mockRunnable, instant, duration); + verify(delegate).scheduleWithFixedDelay(argumentCaptor.capture(), eq(instant), eq(duration)); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + @Test + public void scheduleWithFixedDelayWithDuration() { + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TracedRunnable.class); + final Duration duration = Duration.ofMinutes(5); + scheduler.scheduleWithFixedDelay(mockRunnable, duration); + verify(delegate).scheduleWithFixedDelay(argumentCaptor.capture(), eq(duration)); + verifyTracedRunnable(argumentCaptor.getValue(), mockRunnable, mockTracer); + } + + private void verifyTracedRunnable(final TracedRunnable tracedRunnable, final Runnable task, final Tracer tracer) { + final Runnable actualTask = (Runnable) ReflectionUtils.getField(TRACED_RUNNABLE_DELEGATE_FIELD, tracedRunnable); + final Tracer actualTracer = (Tracer) ReflectionUtils.getField(TRACED_RUNNABLE_TRACER_FIELD, tracedRunnable); + assertThat(actualTask).isEqualTo(task); + assertThat(actualTracer).isEqualTo(tracer); + } + + private void verifyTracedCallable(final TracedCallable tracedCallable, final Callable task, final Tracer tracer) { + final Callable actualTask = (Callable) ReflectionUtils.getField(TRACED_CALLABLE_DELEGATE_FIELD, tracedCallable); + final Tracer actualTracer = (Tracer) ReflectionUtils.getField(TRACED_CALLABLE_TRACER_FIELD, tracedCallable); + assertThat(actualTask).isEqualTo(task); + assertThat(actualTracer).isEqualTo(tracer); + } + + @Test + public void setThreadFactory() { + final ThreadFactory threadFactory = mock(ThreadFactory.class); + scheduler.setThreadFactory(threadFactory); + verify(delegate).setThreadFactory(threadFactory); + } + + @Test + public void setThreadNamePrefix() { + final String threadNamePrefix = "c137"; + scheduler.setThreadNamePrefix(threadNamePrefix); + verify(delegate).setThreadNamePrefix(threadNamePrefix); + } + + @Test + public void setRejectedExecutionHandler() { + final RejectedExecutionHandler rejectedExecutionHandler = mock(RejectedExecutionHandler.class); + scheduler.setRejectedExecutionHandler(rejectedExecutionHandler); + verify(delegate).setRejectedExecutionHandler(rejectedExecutionHandler); + } + + @Test + public void setWaitForTasksToCompleteOnShutdown() { + scheduler.setWaitForTasksToCompleteOnShutdown(true); + verify(delegate).setWaitForTasksToCompleteOnShutdown(true); + } + + @Test + public void setAwaitTerminationSeconds() { + scheduler.setAwaitTerminationSeconds(5); + verify(delegate).setAwaitTerminationSeconds(5); + } + + @Test + public void setBeanName() { + final String name = "gazorp"; + scheduler.setBeanName(name); + verify(delegate).setBeanName(name); + } + + @Test + public void afterPropertiesSet() { + scheduler.afterPropertiesSet(); + verify(delegate).afterPropertiesSet(); + } + + @Test + public void initialize() { + scheduler.initialize(); + verify(delegate).initialize(); + } + + @Test + public void destroy() { + scheduler.destroy(); + verify(delegate).destroy(); + } + + @Test + public void shutdown() { + scheduler.shutdown(); + verify(delegate).shutdown(); + } + + @Test + public void newThread() { + final Runnable runnable = mock(Runnable.class); + scheduler.newThread(runnable); + verify(delegate).newThread(runnable); + } + + @Test + public void getThreadNamePrefix() { + scheduler.getThreadNamePrefix(); + verify(delegate).getThreadNamePrefix(); + } + + @Test + public void setThreadPriority() { + final int threadPriority = 5150; + scheduler.setThreadPriority(threadPriority); + verify(delegate).setThreadPriority(threadPriority); + } + + @Test + public void getThreadPriority() { + scheduler.getThreadPriority(); + verify(delegate).getThreadPriority(); + } + + @Test + public void setDaemon() { + scheduler.setDaemon(true); + verify(delegate).setDaemon(true); + } + + @Test + public void isDaemon() { + scheduler.isDaemon(); + verify(delegate).isDaemon(); + } + + @Test + public void setThreadGroupName() { + final String name = "crombopulous"; + scheduler.setThreadGroupName(name); + verify(delegate).setThreadGroupName(name); + } + + @Test + public void setThreadGroup() { + final ThreadGroup threadGroup = mock(ThreadGroup.class); + scheduler.setThreadGroup(threadGroup); + verify(delegate).setThreadGroup(threadGroup); + } + + @Test + public void getThreadGroup() { + scheduler.getThreadGroup(); + verify(delegate).getThreadGroup(); + } + + @Test + public void createThread() { + final Runnable runnable = mock(Runnable.class); + scheduler.createThread(runnable); + verify(delegate).createThread(runnable); + } + + @Test + public void prefersShortLivedTasks() { + scheduler.prefersShortLivedTasks(); + verify(delegate).prefersShortLivedTasks(); + } +} From c0241cda46ed86cfec980bc3850b965089861ba9 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Thu, 24 Oct 2019 09:05:28 +0000 Subject: [PATCH 03/60] [maven-release-plugin] prepare release 0.3.8 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 3d9dcb7c..e77ef824 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.8-SNAPSHOT + 0.3.8 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 593c3888..45c8c15d 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8-SNAPSHOT + 0.3.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 7cf20934..5ea85333 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8-SNAPSHOT + 0.3.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index d7bfd250..476a5553 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8-SNAPSHOT + 0.3.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index b6e1fe3c..2a500503 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8-SNAPSHOT + 0.3.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 70900a49..ce8ad8fa 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8-SNAPSHOT + 0.3.8 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index fb3e0611..12569ea5 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8-SNAPSHOT + 0.3.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index ba676142..962a989c 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8-SNAPSHOT + 0.3.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index e2900d8a..1fdda550 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8-SNAPSHOT + 0.3.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index a253ed60..c9b9590d 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8-SNAPSHOT + 0.3.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 3503f61f..49a2e3ed 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8-SNAPSHOT + 0.3.8 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 25e811c4..7b743e01 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.8-SNAPSHOT + 0.3.8 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index dc201774..e622a659 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.8-SNAPSHOT + 0.3.8 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -44,7 +44,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.3.8 From 5259b9844221d4d28328707e02be1532f1b754ee Mon Sep 17 00:00:00 2001 From: opentracingci Date: Thu, 24 Oct 2019 09:05:34 +0000 Subject: [PATCH 04/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index e77ef824..3a8bad07 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.8 + 0.3.9-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 45c8c15d..b51ec0d8 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8 + 0.3.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 5ea85333..b240796f 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8 + 0.3.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 476a5553..93274dd5 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8 + 0.3.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 2a500503..fe1e82dd 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8 + 0.3.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index ce8ad8fa..bc55b661 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8 + 0.3.9-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 12569ea5..f9898d37 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8 + 0.3.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 962a989c..ec932529 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8 + 0.3.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 1fdda550..d6b1e96e 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8 + 0.3.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index c9b9590d..6ca34752 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8 + 0.3.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 49a2e3ed..c88aebb3 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.8 + 0.3.9-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 7b743e01..e1943dbd 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.8 + 0.3.9-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index e622a659..e44fd427 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.8 + 0.3.9-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -44,7 +44,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.3.8 + HEAD From 42be20bd0eed24c5717ecc5f80c60bcd1ef17088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20L=C3=B6fgren?= Date: Thu, 31 Oct 2019 16:10:53 +0100 Subject: [PATCH 05/60] Use mongo.getServerAddressList() instead of getAllAddress (#256) This allows a "mongodb+srv://" URI to be used. Use embedded mongo in tests as getServerAddressList requires a working connection to return a proper list of addresses. Fixes #255 --- .../TracingMongoClientPostProcessor.java | 2 +- .../MongoTracingAutoConfigurationTest.java | 11 ++++++-- .../TracingMongoClientPostProcessorTest.java | 25 ++++++++++++++++++- pom.xml | 2 +- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/src/main/java/io/opentracing/contrib/spring/cloud/mongo/TracingMongoClientPostProcessor.java b/instrument-starters/opentracing-spring-cloud-mongo-starter/src/main/java/io/opentracing/contrib/spring/cloud/mongo/TracingMongoClientPostProcessor.java index b1d9c36f..7723d935 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/src/main/java/io/opentracing/contrib/spring/cloud/mongo/TracingMongoClientPostProcessor.java +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/src/main/java/io/opentracing/contrib/spring/cloud/mongo/TracingMongoClientPostProcessor.java @@ -37,7 +37,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw final TracingCommandListener commandListener = new TracingCommandListener.Builder(tracer) .build(); - return new TracingMongoClient(commandListener, client.getAllAddress(), client.getCredentialsList(), client.getMongoClientOptions()); + return new TracingMongoClient(commandListener, client.getServerAddressList(), client.getCredentialsList(), client.getMongoClientOptions()); } return bean; diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/src/test/java/io/opentracing/contrib/spring/cloud/mongo/MongoTracingAutoConfigurationTest.java b/instrument-starters/opentracing-spring-cloud-mongo-starter/src/test/java/io/opentracing/contrib/spring/cloud/mongo/MongoTracingAutoConfigurationTest.java index 1d9beb7b..0f343eba 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/src/test/java/io/opentracing/contrib/spring/cloud/mongo/MongoTracingAutoConfigurationTest.java +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/src/test/java/io/opentracing/contrib/spring/cloud/mongo/MongoTracingAutoConfigurationTest.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration; import org.springframework.boot.context.annotation.UserConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; @@ -36,8 +37,12 @@ public class MongoTracingAutoConfigurationTest { @Test public void createsTracingPostProcessor() { final ApplicationContextRunner contextRunner = new ApplicationContextRunner() + .withPropertyValues("spring.data.mongodb.port=27017") // Otherwise a random embedded mongo port is used .withConfiguration(UserConfigurations.of(TracerConfig.class, MongoConfig.class)) - .withConfiguration(AutoConfigurations.of(MongoTracingAutoConfiguration.class)); + .withConfiguration(AutoConfigurations.of( + MongoTracingAutoConfiguration.class, + EmbeddedMongoAutoConfiguration.class + )); contextRunner.run(context -> Assertions.assertThat(context).hasSingleBean(TracingMongoClientPostProcessor.class)); } @@ -73,10 +78,12 @@ public void doesNotCreateTracingPostProcessorWhenDisabled() { @Test public void createsTracingPostProcessorWhenAutoConfigured() { final ApplicationContextRunner contextRunner = new ApplicationContextRunner() + .withPropertyValues("spring.data.mongodb.port=27017") // Otherwise a random embedded mongo port is used .withConfiguration(AutoConfigurations.of( MongoTracingAutoConfiguration.class, TracerAutoConfiguration.class, - MongoAutoConfiguration.class + MongoAutoConfiguration.class, + EmbeddedMongoAutoConfiguration.class )); contextRunner.run(context -> Assertions.assertThat(context).hasSingleBean(TracingMongoClientPostProcessor.class)); diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/src/test/java/io/opentracing/contrib/spring/cloud/mongo/TracingMongoClientPostProcessorTest.java b/instrument-starters/opentracing-spring-cloud-mongo-starter/src/test/java/io/opentracing/contrib/spring/cloud/mongo/TracingMongoClientPostProcessorTest.java index 5979ab86..ad43e84d 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/src/test/java/io/opentracing/contrib/spring/cloud/mongo/TracingMongoClientPostProcessorTest.java +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/src/test/java/io/opentracing/contrib/spring/cloud/mongo/TracingMongoClientPostProcessorTest.java @@ -18,8 +18,17 @@ import com.mongodb.MongoClient; import com.mongodb.MongoClientOptions; import com.mongodb.MongoClientURI; +import de.flapdoodle.embed.mongo.MongodExecutable; +import de.flapdoodle.embed.mongo.MongodProcess; +import de.flapdoodle.embed.mongo.MongodStarter; +import de.flapdoodle.embed.mongo.config.MongodConfigBuilder; +import de.flapdoodle.embed.mongo.config.Net; +import de.flapdoodle.embed.mongo.distribution.Version; +import de.flapdoodle.embed.process.runtime.Network; import io.opentracing.Tracer; import io.opentracing.contrib.mongo.TracingMongoClient; +import java.io.IOException; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -34,9 +43,23 @@ public class TracingMongoClientPostProcessorTest { private TracingMongoClientPostProcessor processor; + private MongodProcess process; + @Before - public void setup() { + public void setup() throws IOException { processor = new TracingMongoClientPostProcessor(tracer); + + MongodStarter starter = MongodStarter.getDefaultInstance(); + MongodExecutable executable = starter.prepare(new MongodConfigBuilder() + .version(Version.Main.PRODUCTION) + .net(new Net(27017, Network.localhostIsIPv6())) + .build()); + process = executable.start(); + } + + @After + public void tearDown() { + process.stop(); } @Test diff --git a/pom.xml b/pom.xml index e44fd427..9ec16c19 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 2.1.5.RELEASE Greenwich.SR1 3.0.0 - 2.0.3 + 2.2.0 1.3.1 1.7.25 3.2.8.RELEASE From 930685aa9e22b72422bbf829b81cd13ff44c671c Mon Sep 17 00:00:00 2001 From: opentracingci Date: Fri, 1 Nov 2019 12:13:11 +0000 Subject: [PATCH 06/60] [maven-release-plugin] prepare release 0.3.9 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 3a8bad07..e688a40a 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.9-SNAPSHOT + 0.3.9 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index b51ec0d8..6d62af81 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9-SNAPSHOT + 0.3.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index b240796f..23deb709 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9-SNAPSHOT + 0.3.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 93274dd5..3b802140 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9-SNAPSHOT + 0.3.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index fe1e82dd..403d2e6d 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9-SNAPSHOT + 0.3.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index bc55b661..11190647 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9-SNAPSHOT + 0.3.9 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index f9898d37..10b48aff 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9-SNAPSHOT + 0.3.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index ec932529..950a437d 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9-SNAPSHOT + 0.3.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index d6b1e96e..190c98c6 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9-SNAPSHOT + 0.3.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 6ca34752..bc43c87d 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9-SNAPSHOT + 0.3.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index c88aebb3..dafe2bb4 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9-SNAPSHOT + 0.3.9 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index e1943dbd..8fce21ff 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.9-SNAPSHOT + 0.3.9 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 9ec16c19..d4359237 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.9-SNAPSHOT + 0.3.9 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -44,7 +44,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.3.9 From f852a6061c374031c70165abfe2297adc8943b0f Mon Sep 17 00:00:00 2001 From: opentracingci Date: Fri, 1 Nov 2019 12:13:17 +0000 Subject: [PATCH 07/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index e688a40a..20c9107e 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.9 + 0.3.10-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 6d62af81..3b9c6c07 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9 + 0.3.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 23deb709..e9df9cd6 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9 + 0.3.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 3b802140..d71b89c7 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9 + 0.3.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 403d2e6d..8c89b9ff 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9 + 0.3.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 11190647..2a7b5d31 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9 + 0.3.10-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 10b48aff..cbc7dff7 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9 + 0.3.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 950a437d..66ea3a81 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9 + 0.3.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 190c98c6..a9be0bda 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9 + 0.3.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index bc43c87d..9082ab95 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9 + 0.3.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index dafe2bb4..f51c3c6c 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.9 + 0.3.10-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 8fce21ff..9ec7757e 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.9 + 0.3.10-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index d4359237..fdfa5d13 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.9 + 0.3.10-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -44,7 +44,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.3.9 + HEAD From 738a49df0f38a881c8a516ca1010ca14228e3ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E5=86=8D=E8=B5=B7=E6=97=B6?= Date: Wed, 20 Nov 2019 14:21:31 +0800 Subject: [PATCH 08/60] Add instrumentation for spring-cloud-gateway (#247) * feat(spring-cloud-gateway): add instrument --- .../pom.xml | 74 ++++++++++++++ .../gateway/AbstractHttpHeadersFilter.java | 44 +++++++++ .../GatewayTracingAutoConfiguration.java | 54 +++++++++++ .../TraceRequestHttpHeadersFilter.java | 97 +++++++++++++++++++ .../TraceResponseHttpHeadersFilter.java | 59 +++++++++++ ...itional-spring-configuration-metadata.json | 10 ++ .../main/resources/META-INF/spring.factories | 2 + opentracing-spring-cloud-starter/pom.xml | 4 + pom.xml | 6 ++ 9 files changed, 350 insertions(+) create mode 100644 instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml create mode 100644 instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/AbstractHttpHeadersFilter.java create mode 100644 instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/GatewayTracingAutoConfiguration.java create mode 100644 instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/TraceRequestHttpHeadersFilter.java create mode 100644 instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/TraceResponseHttpHeadersFilter.java create mode 100644 instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json create mode 100644 instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/resources/META-INF/spring.factories diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml new file mode 100644 index 00000000..8db8dabc --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -0,0 +1,74 @@ + + + + 4.0.0 + + io.opentracing.contrib + opentracing-spring-cloud-parent + 0.3.8-SNAPSHOT + ../../ + + + opentracing-spring-cloud-gateway-starter + + + ${project.basedir}/../../ + + + + + io.opentracing.contrib + opentracing-spring-tracer-configuration-starter + + + + org.springframework + spring-web + + + + org.springframework.cloud + spring-cloud-gateway-core + true + + + + io.opentracing.contrib + opentracing-spring-web-starter + ${version.io.opentracing.contrib-opentracing-spring-web} + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.boot + spring-boot-starter-web + test + + + io.opentracing.contrib + opentracing-spring-cloud-core + test + + + + diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/AbstractHttpHeadersFilter.java b/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/AbstractHttpHeadersFilter.java new file mode 100644 index 00000000..12821096 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/AbstractHttpHeadersFilter.java @@ -0,0 +1,44 @@ +/** + * 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. + */ +package io.opentracing.contrib.spring.cloud.gateway; + +import io.opentracing.Span; +import io.opentracing.Tracer; +import org.springframework.cloud.gateway.filter.headers.HttpHeadersFilter; +import org.springframework.cloud.gateway.support.ServerWebExchangeUtils; +import org.springframework.http.server.reactive.ServerHttpRequest; + +/** + * AbstractHttpHeadersFilter + * + * @author Weichao Li (liweichao0102@gmail.com) + * @since 2019/9/28 + */ +public abstract class AbstractHttpHeadersFilter implements HttpHeadersFilter { + + protected static final String SPAN_ATTRIBUTE = Span.class.getName(); + + protected static final String ROUTE_ATTRIBUTE = ServerWebExchangeUtils.class.getName() + ".gatewayRoute"; + + protected final Tracer tracer; + + protected AbstractHttpHeadersFilter(Tracer tracer) { + this.tracer = tracer; + } + + public String path(ServerHttpRequest.Builder request) { + return request.build().getPath().value(); + } + +} diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/GatewayTracingAutoConfiguration.java b/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/GatewayTracingAutoConfiguration.java new file mode 100644 index 00000000..3db7acb7 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/GatewayTracingAutoConfiguration.java @@ -0,0 +1,54 @@ +/** + * 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. + */ +package io.opentracing.contrib.spring.cloud.gateway; + +import io.opentracing.Tracer; +import io.opentracing.contrib.spring.tracer.configuration.TracerAutoConfiguration; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.headers.HttpHeadersFilter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * GatewayTracingAutoConfiguration + * + * @author Weichao Li (liweichao0102@gmail.com) + * @since 2019/9/27 + */ +@Configuration +@ConditionalOnWebApplication +@AutoConfigureAfter(TracerAutoConfiguration.class) +@ConditionalOnClass(GatewayFilterChain.class) +@ConditionalOnProperty(name = "opentracing.spring.cloud.gateway.enabled", havingValue = "true", matchIfMissing = true) +public class GatewayTracingAutoConfiguration { + + @Bean + @ConditionalOnClass(HttpHeadersFilter.class) + @ConditionalOnBean(Tracer.class) + HttpHeadersFilter traceRequestHttpHeadersFilter(Tracer tracer) { + return new TraceRequestHttpHeadersFilter(tracer); + } + + @Bean + @ConditionalOnClass(HttpHeadersFilter.class) + @ConditionalOnBean(Tracer.class) + HttpHeadersFilter traceResponseHttpHeadersFilter(Tracer tracer) { + return new TraceResponseHttpHeadersFilter(tracer); + } +} diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/TraceRequestHttpHeadersFilter.java b/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/TraceRequestHttpHeadersFilter.java new file mode 100644 index 00000000..19e0ebe5 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/TraceRequestHttpHeadersFilter.java @@ -0,0 +1,97 @@ +/** + * 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. + */ +package io.opentracing.contrib.spring.cloud.gateway; + +import io.opentracing.Span; +import io.opentracing.Tracer; +import io.opentracing.contrib.spring.web.client.HttpHeadersCarrier; +import io.opentracing.propagation.Format; +import io.opentracing.tag.Tags; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.gateway.route.Route; +import org.springframework.http.HttpHeaders; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.web.server.ServerWebExchange; + + + +/** + * TraceRequestHttpHeadersFilter + * + * @author Weichao Li (liweichao0102@gmail.com) + * @since 2019/9/26 + */ +final class TraceRequestHttpHeadersFilter extends AbstractHttpHeadersFilter { + + private final Logger log = LoggerFactory.getLogger(TraceRequestHttpHeadersFilter.class); + + private static final String ROUTE_ID = "route.id"; + + private static final String COMPONENT = "java-spring-cloud-gateway"; + + protected TraceRequestHttpHeadersFilter(Tracer tracer) { + super(tracer); + } + + @Override + public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) { + log.debug("Will instrument spring cloud gateway the HTTP request headers"); + ServerHttpRequest.Builder builder = exchange.getRequest().mutate(); + Span span = this.tracer.buildSpan(path(builder)) + .asChildOf(tracer.activeSpan()) + .withTag(Tags.COMPONENT.getKey(), COMPONENT) + .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) + .withTag(ROUTE_ID, getRouteId(exchange)) + .start(); + log.debug("Client span {} created for the request. New headers are {}", span, builder.build().getHeaders().toSingleValueMap()); + exchange.getAttributes().put(SPAN_ATTRIBUTE, span); + HttpHeaders headersWithInput = new HttpHeaders(); + try { + this.tracer.inject(span.context(), Format.Builtin.HTTP_HEADERS, new HttpHeadersCarrier(headersWithInput)); + } catch (Exception ignore) { + log.error("TraceRequestHttpHeadersFilter error", ignore); + } + headersWithInput.addAll(input); + addHeadersWithInput(builder, headersWithInput); + return headersWithInput; + } + + private String getRouteId(ServerWebExchange exchange) { + String routeId = "unknown"; + Route route = exchange.getAttribute(ROUTE_ATTRIBUTE); + if (Objects.nonNull(route)) { + return route.getId(); + } + return routeId; + } + + private void addHeadersWithInput(ServerHttpRequest.Builder builder, + HttpHeaders headersWithInput) { + for (Map.Entry> entry : builder.build().getHeaders() + .entrySet()) { + String key = entry.getKey(); + List value = entry.getValue(); + headersWithInput.put(key, value); + } + } + + @Override + public boolean supports(Type type) { + return type.equals(Type.REQUEST); + } +} diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/TraceResponseHttpHeadersFilter.java b/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/TraceResponseHttpHeadersFilter.java new file mode 100644 index 00000000..10fa2d0b --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/java/io/opentracing/contrib/spring/cloud/gateway/TraceResponseHttpHeadersFilter.java @@ -0,0 +1,59 @@ +/** + * 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. + */ +package io.opentracing.contrib.spring.cloud.gateway; + +import io.opentracing.Span; +import io.opentracing.Tracer; +import java.util.Objects; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpHeaders; +import org.springframework.web.server.ServerWebExchange; + + + +/** + * TraceResponseHttpHeadersFilter + * + * @author Weichao Li (liweichao0102@gmail.com) + * @since 2019/9/28 + */ +public class TraceResponseHttpHeadersFilter extends AbstractHttpHeadersFilter { + + private final Logger log = LoggerFactory.getLogger(TraceResponseHttpHeadersFilter.class); + + protected TraceResponseHttpHeadersFilter(Tracer tracer) { + super(tracer); + } + + @Override + public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) { + Object storedSpan = exchange.getAttribute(SPAN_ATTRIBUTE); + if (storedSpan == null) { + return input; + } + log.debug("Will instrument the response"); + Span span = (Span) storedSpan; + if (Objects.nonNull(span)) { + span.finish(); + } + log.debug("The response was handled for span " + storedSpan); + return input; + } + + @Override + public boolean supports(Type type) { + return type.equals(Type.RESPONSE); + } +} diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 00000000..73899c38 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,10 @@ +{ + "properties": [ + { + "name": "opentracing.spring.cloud.gateway.enabled", + "type": "java.lang.Boolean", + "description": "Add standard logging output to tracing system.", + "defaultValue": true + } + ] +} diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/resources/META-INF/spring.factories b/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..1943fde3 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +io.opentracing.contrib.spring.cloud.gateway.GatewayTracingAutoConfiguration diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 9ec7757e..88718e6a 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -86,6 +86,10 @@ ${project.groupId} opentracing-spring-cloud-zuul-starter + + ${project.groupId} + opentracing-spring-cloud-gateway-starter + junit diff --git a/pom.xml b/pom.xml index fdfa5d13..94357d91 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,7 @@ instrument-starters/opentracing-spring-cloud-reactor-starter instrument-starters/opentracing-spring-cloud-rxjava-starter instrument-starters/opentracing-spring-cloud-redis-starter + instrument-starters/opentracing-spring-cloud-gateway-starter pom @@ -173,6 +174,11 @@ opentracing-spring-cloud-zuul-starter ${project.version} + + ${project.groupId} + opentracing-spring-cloud-gateway-starter + ${project.version} + io.opentracing From 12c2a3573ece08c2cc525638972ceffd916c3108 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Thu, 21 Nov 2019 14:37:31 +0200 Subject: [PATCH 09/60] Fix broken build (#259) --- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 8db8dabc..729942be 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -20,7 +20,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.8-SNAPSHOT + 0.3.10-SNAPSHOT ../../ From d290378102bef88b7c762fce1ad1944705830d93 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Thu, 21 Nov 2019 12:51:39 +0000 Subject: [PATCH 10/60] [maven-release-plugin] prepare release 0.3.10 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 5 ++--- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 14 files changed, 16 insertions(+), 17 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 20c9107e..f8edfc6c 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.10-SNAPSHOT + 0.3.10 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 3b9c6c07..8013cdbc 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10-SNAPSHOT + 0.3.10 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 729942be..26012c07 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -14,13 +14,12 @@ the License. --> - + 4.0.0 io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.10-SNAPSHOT + 0.3.10 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index e9df9cd6..b7017644 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10-SNAPSHOT + 0.3.10 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index d71b89c7..4b5889c9 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10-SNAPSHOT + 0.3.10 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 8c89b9ff..b43ba4ca 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10-SNAPSHOT + 0.3.10 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 2a7b5d31..1b9849fd 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10-SNAPSHOT + 0.3.10 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index cbc7dff7..bd37e112 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10-SNAPSHOT + 0.3.10 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 66ea3a81..cf318dad 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10-SNAPSHOT + 0.3.10 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index a9be0bda..c2940fac 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10-SNAPSHOT + 0.3.10 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 9082ab95..a904a07a 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10-SNAPSHOT + 0.3.10 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index f51c3c6c..369bdbf5 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10-SNAPSHOT + 0.3.10 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 88718e6a..4cfd9428 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.10-SNAPSHOT + 0.3.10 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 94357d91..3106fe9c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.10-SNAPSHOT + 0.3.10 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -45,7 +45,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.3.10 From ddbf804986c032e50251183c6017b3f20e0df822 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Thu, 21 Nov 2019 12:51:45 +0000 Subject: [PATCH 11/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index f8edfc6c..ef17d786 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.10 + 0.3.11-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 8013cdbc..c5225ad4 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10 + 0.3.11-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 26012c07..01029744 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.10 + 0.3.11-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index b7017644..26b2a196 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10 + 0.3.11-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 4b5889c9..b238bad1 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10 + 0.3.11-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index b43ba4ca..46a0921e 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10 + 0.3.11-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 1b9849fd..74dd9da8 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10 + 0.3.11-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index bd37e112..98388e46 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10 + 0.3.11-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index cf318dad..570d6e8f 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10 + 0.3.11-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index c2940fac..7436882b 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10 + 0.3.11-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index a904a07a..0e0e58e8 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10 + 0.3.11-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 369bdbf5..ddd88175 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.10 + 0.3.11-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 4cfd9428..9cf6fe7a 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.10 + 0.3.11-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 3106fe9c..dc495fd9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.10 + 0.3.11-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -45,7 +45,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.3.10 + HEAD From d9fa60fc207ec7db909a449624a689f58ae2f7c8 Mon Sep 17 00:00:00 2001 From: Tadaya Tsuyukubo Date: Tue, 3 Dec 2019 02:30:09 -0800 Subject: [PATCH 12/60] Lazily lookup Tracer in CustomAsyncConfigurerAutoConfiguration (#260) Instead of using @Autowired, lazily lookup Tracer bean from BeanFactory. --- .../CustomAsyncConfigurerAutoConfiguration.java | 16 ++++++++++++---- .../spring/cloud/async/AsyncConfigurerTest.java | 17 +++++++++++++---- ...tomAsyncConfigurerAutoConfigurationTest.java | 11 ++++++++++- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/CustomAsyncConfigurerAutoConfiguration.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/CustomAsyncConfigurerAutoConfiguration.java index a1654410..a78a313c 100644 --- a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/CustomAsyncConfigurerAutoConfiguration.java +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/async/CustomAsyncConfigurerAutoConfiguration.java @@ -18,7 +18,8 @@ import io.opentracing.contrib.spring.tracer.configuration.TracerAutoConfiguration; import org.springframework.beans.BeansException; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; @@ -33,6 +34,7 @@ * TracedAsyncConfigurer} * * @author Pavol Loffay + * @author Tadaya Tsuyukubo */ @Configuration @ConditionalOnBean(AsyncConfigurer.class) @@ -40,10 +42,9 @@ @AutoConfigureBefore(DefaultAsyncAutoConfiguration.class) @AutoConfigureAfter(TracerAutoConfiguration.class) @ConditionalOnProperty(name = "opentracing.spring.cloud.async.enabled", havingValue = "true", matchIfMissing = true) -public class CustomAsyncConfigurerAutoConfiguration implements BeanPostProcessor,PriorityOrdered { +public class CustomAsyncConfigurerAutoConfiguration implements BeanPostProcessor, PriorityOrdered, BeanFactoryAware { - @Autowired - private Tracer tracer; + private BeanFactory beanFactory; @Override public Object postProcessBeforeInitialization(Object bean, String beanName) @@ -55,6 +56,7 @@ public Object postProcessBeforeInitialization(Object bean, String beanName) public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof AsyncConfigurer && !(bean instanceof TracedAsyncConfigurer)) { AsyncConfigurer configurer = (AsyncConfigurer) bean; + Tracer tracer = this.beanFactory.getBean(Tracer.class); return new TracedAsyncConfigurer(tracer, configurer); } return bean; @@ -64,4 +66,10 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw public int getOrder() { return PriorityOrdered.LOWEST_PRECEDENCE; } + + @Override + public void setBeanFactory(BeanFactory beanFactory) throws BeansException { + this.beanFactory = beanFactory; + } + } diff --git a/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/AsyncConfigurerTest.java b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/AsyncConfigurerTest.java index 37b37ed9..c668a05c 100644 --- a/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/AsyncConfigurerTest.java +++ b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/AsyncConfigurerTest.java @@ -13,6 +13,10 @@ */ package io.opentracing.contrib.spring.cloud.async; +import static org.assertj.core.api.Assertions.assertThat; + +import io.opentracing.Tracer; +import io.opentracing.contrib.concurrent.TracedExecutor; import io.opentracing.contrib.spring.cloud.MockTracingConfiguration; import io.opentracing.contrib.spring.cloud.async.instrument.TracedAsyncConfigurer; import java.util.concurrent.Executor; @@ -27,12 +31,11 @@ import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - - - +import org.springframework.test.util.ReflectionTestUtils; /** - * @Author wuyupeng + * @author wuyupeng + * @author Tadaya Tsuyukubo **/ @SpringBootTest(classes = {AsyncConfigurerTest.AsyncConfigurerConfig.class, MockTracingConfiguration.class, CustomAsyncConfigurerAutoConfiguration.class}) @RunWith(SpringJUnit4ClassRunner.class) @@ -59,5 +62,11 @@ public Executor getAsyncExecutor() { @Test public void testIsTracedAsyncConfigurer() { BDDAssertions.then(asyncConfigurer).isInstanceOf(TracedAsyncConfigurer.class); + + assertThat(this.asyncConfigurer.getAsyncExecutor()).isInstanceOfSatisfying(TracedExecutor.class, tracedExecutor -> { + Tracer tracer = (Tracer) ReflectionTestUtils.getField(tracedExecutor, "tracer"); + assertThat(tracer).isNotNull(); + }); + } } diff --git a/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/CustomAsyncConfigurerAutoConfigurationTest.java b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/CustomAsyncConfigurerAutoConfigurationTest.java index ab2c610d..abe75a37 100644 --- a/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/CustomAsyncConfigurerAutoConfigurationTest.java +++ b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/async/CustomAsyncConfigurerAutoConfigurationTest.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 @@ -15,9 +15,13 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import io.opentracing.Tracer; import io.opentracing.contrib.spring.cloud.async.instrument.TracedAsyncConfigurer; +import io.opentracing.mock.MockTracer; import org.junit.Test; +import org.springframework.beans.factory.BeanFactory; import org.springframework.scheduling.annotation.AsyncConfigurer; /** @@ -34,7 +38,12 @@ public void should_return_bean_when_its_not_async_configurer() { @Test public void should_return_async_configurer_when_bean_instance_of_it() { + BeanFactory beanFactory = mock(BeanFactory.class); + when(beanFactory.getBean(Tracer.class)).thenReturn(new MockTracer()); + CustomAsyncConfigurerAutoConfiguration configuration = new CustomAsyncConfigurerAutoConfiguration(); + configuration.setBeanFactory(beanFactory); + Object bean = configuration .postProcessAfterInitialization(mock(AsyncConfigurer.class), "myAsync"); then(bean).isInstanceOf(TracedAsyncConfigurer.class); From 40d9ca837e1c17b18dda445547556e9c7e9702ba Mon Sep 17 00:00:00 2001 From: opentracingci Date: Tue, 3 Dec 2019 11:05:23 +0000 Subject: [PATCH 13/60] [maven-release-plugin] prepare release 0.3.11 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index ef17d786..05f5d44b 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.11-SNAPSHOT + 0.3.11 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index c5225ad4..592792b6 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11-SNAPSHOT + 0.3.11 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 01029744..91eed2da 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.11-SNAPSHOT + 0.3.11 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 26b2a196..838d0d9a 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11-SNAPSHOT + 0.3.11 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index b238bad1..7126d46d 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11-SNAPSHOT + 0.3.11 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 46a0921e..9fcbd8a3 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11-SNAPSHOT + 0.3.11 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 74dd9da8..ba6fddc1 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11-SNAPSHOT + 0.3.11 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 98388e46..12217d3c 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11-SNAPSHOT + 0.3.11 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 570d6e8f..52c8d19b 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11-SNAPSHOT + 0.3.11 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 7436882b..21992954 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11-SNAPSHOT + 0.3.11 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 0e0e58e8..8b5acf13 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11-SNAPSHOT + 0.3.11 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index ddd88175..b9546cf8 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11-SNAPSHOT + 0.3.11 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 9cf6fe7a..2885dd1b 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.11-SNAPSHOT + 0.3.11 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index dc495fd9..698d1684 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.11-SNAPSHOT + 0.3.11 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -45,7 +45,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.3.11 From 3c9e85e2161b458e95358e9829bc43b5f99c8332 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Tue, 3 Dec 2019 11:05:28 +0000 Subject: [PATCH 14/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 05f5d44b..2e676442 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.11 + 0.3.12-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 592792b6..a25e921d 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11 + 0.3.12-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 91eed2da..01ac587e 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.11 + 0.3.12-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 838d0d9a..425c2fed 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11 + 0.3.12-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 7126d46d..d57d969e 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11 + 0.3.12-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 9fcbd8a3..78ec7f70 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11 + 0.3.12-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index ba6fddc1..1703919e 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11 + 0.3.12-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 12217d3c..338a8742 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11 + 0.3.12-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 52c8d19b..4e04aac6 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11 + 0.3.12-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 21992954..572fe907 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11 + 0.3.12-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 8b5acf13..69c51d9d 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11 + 0.3.12-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index b9546cf8..4dbe0a37 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.11 + 0.3.12-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 2885dd1b..4a7fb64d 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.11 + 0.3.12-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 698d1684..d18c9928 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.11 + 0.3.12-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -45,7 +45,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.3.11 + HEAD From 930f7cc66199f59eb6ad781e403014b0a9cace25 Mon Sep 17 00:00:00 2001 From: ghilainm Date: Wed, 18 Dec 2019 16:30:17 +0100 Subject: [PATCH 15/60] Openfeign integration not working when using hard-coded URLs (#262) * Issue #261: Openfeign integration not working when using hard-coded URLs * Added unit test for the case where we do not have any FeignClient in Spring context * Simplified implementation to avoid wrapping Feign.Builder --- .../spring/cloud/feign/TraceFeignContext.java | 57 +++----------- .../cloud/feign/TracedFeignBeanFactory.java | 76 +++++++++++++++++++ .../cloud/feign/TracingClientBuilder.java | 6 +- ...FeignClientWithoutClientInContextTest.java | 71 +++++++++++++++++ .../cloud/feign/FeignDefinedUrlTest.java | 4 +- .../cloud/feign/MockTracingConfiguration.java | 16 +--- ...racingWithoutFeignClientConfiguration.java | 33 ++++++++ 7 files changed, 199 insertions(+), 64 deletions(-) create mode 100644 instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TracedFeignBeanFactory.java create mode 100644 instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignClientWithoutClientInContextTest.java create mode 100644 instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/MockTracingWithoutFeignClientConfiguration.java diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TraceFeignContext.java b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TraceFeignContext.java index fc530c71..c61e9f7b 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TraceFeignContext.java +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TraceFeignContext.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 @@ -15,38 +15,34 @@ import feign.Client; import feign.opentracing.FeignSpanDecorator; -import feign.opentracing.TracingClient; import io.opentracing.Tracer; import java.util.HashMap; import java.util.List; import java.util.Map; import org.springframework.beans.factory.BeanFactory; -import org.springframework.cloud.netflix.ribbon.SpringClientFactory; import org.springframework.cloud.openfeign.FeignContext; -import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory; -import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient; /** * @author Pavol Loffay */ -public class TraceFeignContext extends FeignContext { +class TraceFeignContext extends FeignContext { - private FeignContext delegate; - private Tracer tracer; - private BeanFactory beanFactory; - private List spanDecorators; + private final FeignContext delegate; + private final TracedFeignBeanFactory tracedFeignBeanFactory; TraceFeignContext(Tracer tracer, FeignContext delegate, BeanFactory beanFactory, - List spanDecorators) { + List spanDecorators) { this.delegate = delegate; - this.tracer = tracer; - this.beanFactory = beanFactory; - this.spanDecorators = spanDecorators; + this.tracedFeignBeanFactory = new TracedFeignBeanFactory(tracer, beanFactory, spanDecorators); } + @SuppressWarnings("unchecked") @Override public T getInstance(String name, Class type) { T object = this.delegate.getInstance(name, type); + if (object == null && type.isAssignableFrom(Client.class)) { + object = (T) new Client.Default(null, null); + } return (T) this.addTracingClient(object); } @@ -65,38 +61,7 @@ public Map getInstances(String name, Class type) { } private Object addTracingClient(Object bean) { - if (bean instanceof TracingClient || bean instanceof LoadBalancedTracedFeign) { - return bean; - } - - if (bean instanceof Client) { - if (bean instanceof LoadBalancerFeignClient && !(bean instanceof LoadBalancedTracedFeign)) { - return new LoadBalancedTracedFeign( - buildTracingClient(((LoadBalancerFeignClient) bean).getDelegate(), tracer), - beanFactory.getBean(CachingSpringLoadBalancerFactory.class), - beanFactory.getBean(SpringClientFactory.class)); - } - return buildTracingClient((Client) bean, tracer); - } - - return bean; + return tracedFeignBeanFactory.from(bean); } - private TracingClient buildTracingClient(Client delegate, Tracer tracer) { - return new TracingClientBuilder(delegate, tracer) - .withFeignSpanDecorators(spanDecorators) - .build(); - } - - /** - * Needed for cast in {@link org.springframework.cloud.openfeign.FeignClientFactoryBean} - */ - static class LoadBalancedTracedFeign extends LoadBalancerFeignClient { - - public LoadBalancedTracedFeign(Client delegate, - CachingSpringLoadBalancerFactory lbClientFactory, - SpringClientFactory clientFactory) { - super(delegate, lbClientFactory, clientFactory); - } - } } diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TracedFeignBeanFactory.java b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TracedFeignBeanFactory.java new file mode 100644 index 00000000..b4c38e29 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TracedFeignBeanFactory.java @@ -0,0 +1,76 @@ +/** + * 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. + */ +package io.opentracing.contrib.spring.cloud.feign; + +import feign.Client; +import feign.opentracing.FeignSpanDecorator; +import feign.opentracing.TracingClient; +import io.opentracing.Tracer; +import java.util.List; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.cloud.netflix.ribbon.SpringClientFactory; +import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory; +import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient; +import org.springframework.context.annotation.Lazy; + +class TracedFeignBeanFactory { + + private final Tracer tracer; + private final BeanFactory beanFactory; + private final List spanDecorators; + + public TracedFeignBeanFactory(Tracer tracer, BeanFactory beanFactory, @Lazy List spanDecorators) { + this.tracer = tracer; + this.beanFactory = beanFactory; + this.spanDecorators = spanDecorators; + } + + public Object from(Object bean) { + if (bean instanceof TracingClient || bean instanceof LoadBalancedTracedFeign) { + return bean; + } + + if (bean instanceof Client) { + if (bean instanceof LoadBalancerFeignClient) { + return new LoadBalancedTracedFeign( + buildTracingClient(((LoadBalancerFeignClient) bean).getDelegate(), tracer), + beanFactory.getBean(CachingSpringLoadBalancerFactory.class), + beanFactory.getBean(SpringClientFactory.class)); + } + return buildTracingClient((Client) bean, tracer); + } + + return bean; + } + + + private TracingClient buildTracingClient(Client delegate, Tracer tracer) { + return new io.opentracing.contrib.spring.cloud.feign.TracingClientBuilder(delegate, tracer) + .withFeignSpanDecorators(spanDecorators) + .build(); + } + + /** + * Needed for cast in {@link org.springframework.cloud.openfeign.FeignClientFactoryBean} + */ + static class LoadBalancedTracedFeign extends LoadBalancerFeignClient { + + public LoadBalancedTracedFeign(Client delegate, + CachingSpringLoadBalancerFactory lbClientFactory, + SpringClientFactory clientFactory) { + super(delegate, lbClientFactory, clientFactory); + } + } + +} diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TracingClientBuilder.java b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TracingClientBuilder.java index 63048540..479ca281 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TracingClientBuilder.java +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TracingClientBuilder.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 @@ -17,7 +17,9 @@ import feign.opentracing.FeignSpanDecorator; import feign.opentracing.TracingClient; import io.opentracing.Tracer; + import java.util.List; + /** * @author Emerson Oliveira */ @@ -32,7 +34,7 @@ class TracingClientBuilder { this.tracer = tracer; } - TracingClientBuilder withFeignSpanDecorators(List decorators) { + io.opentracing.contrib.spring.cloud.feign.TracingClientBuilder withFeignSpanDecorators(List decorators) { this.decorators = decorators; return this; } diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignClientWithoutClientInContextTest.java b/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignClientWithoutClientInContextTest.java new file mode 100644 index 00000000..44024df2 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignClientWithoutClientInContextTest.java @@ -0,0 +1,71 @@ +/** + * 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. + */ +package io.opentracing.contrib.spring.cloud.feign; + +import static io.opentracing.contrib.spring.cloud.feign.FeignTest.verify; + +import io.opentracing.mock.MockTracer; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +/** + * @author Matthieu Ghilain + */ +@SpringBootTest( + classes = {MockTracingWithoutFeignClientConfiguration.class, TestController.class, FeignClientWithoutClientInContextTest.FeignClientWithoutClientInContextTestConfiguration.class}, + webEnvironment = WebEnvironment.DEFINED_PORT) +@TestPropertySource(properties = { + "opentracing.spring.web.skipPattern=/notTraced", + "server.port=13599"}) +@RunWith(SpringJUnit4ClassRunner.class) +public class FeignClientWithoutClientInContextTest { + + @Autowired + MockTracer mockTracer; + + @Autowired + protected FeignInterface feignInterface; + + @Configuration + @EnableFeignClients + static class FeignClientWithoutClientInContextTestConfiguration { + + } + + @FeignClient(value = "FeignClientWithoutClientInContextTestFeignClient", url = "localhost:13599") + interface FeignInterface { + + @RequestMapping(method = RequestMethod.GET, value = "/notTraced") + String hello(); + } + + @Test + public void testTracedRequestWithoutFeignClientInContext() { + feignInterface.hello(); + verify(mockTracer); + } + + +} diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignDefinedUrlTest.java b/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignDefinedUrlTest.java index c9382f69..238529b1 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignDefinedUrlTest.java +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/FeignDefinedUrlTest.java @@ -45,12 +45,12 @@ public class FeignDefinedUrlTest { @Configuration - @EnableFeignClients + @EnableFeignClients(clients = FeignInterface.class) static class FeignWithoutRibbonConfiguration { } - @FeignClient(value = "nottraced", url = "localhost:13598") + @FeignClient(value = "FeignDefinedUrlTestClient", url = "localhost:13598") interface FeignInterface { @RequestMapping(method = RequestMethod.GET, value = "/notTraced") diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/MockTracingConfiguration.java b/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/MockTracingConfiguration.java index 3b1c79c8..9ed02984 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/MockTracingConfiguration.java +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/MockTracingConfiguration.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 Pavol Loffay + * @author Matthieu Ghilain */ @Configuration @EnableAutoConfiguration @@ -36,17 +37,4 @@ public MockTracer mockTracer() { return new MockTracer(); } - @Bean - public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) { - return restTemplateBuilder.build(); - } - - @Bean - public AsyncRestTemplate asyncRestTemplate() { - return new AsyncRestTemplate(); - } - - public static TestRestTemplate createNotTracedRestTemplate(int port) { - return new TestRestTemplate(new RestTemplateBuilder().rootUri("http://localhost/" + port)); - } } diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/MockTracingWithoutFeignClientConfiguration.java b/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/MockTracingWithoutFeignClientConfiguration.java new file mode 100644 index 00000000..6daf9c96 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/src/test/java/io/opentracing/contrib/spring/cloud/feign/MockTracingWithoutFeignClientConfiguration.java @@ -0,0 +1,33 @@ +/** + * 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. + */ +package io.opentracing.contrib.spring.cloud.feign; + +import io.opentracing.mock.MockTracer; +import io.opentracing.util.GlobalTracerTestUtil; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @author Matthieu Ghilain + */ +@Configuration +@EnableAutoConfiguration(excludeName = "org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration") +public class MockTracingWithoutFeignClientConfiguration { + @Bean + public MockTracer mockTracer() { + GlobalTracerTestUtil.resetGlobalTracer(); + return new MockTracer(); + } +} From b64d67472eae317479d8da514e66847dce0757aa Mon Sep 17 00:00:00 2001 From: opentracingci Date: Wed, 18 Dec 2019 15:40:36 +0000 Subject: [PATCH 16/60] [maven-release-plugin] prepare release 0.3.12 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 2e676442..d1b3289c 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.12-SNAPSHOT + 0.3.12 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index a25e921d..bd00e05c 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12-SNAPSHOT + 0.3.12 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 01ac587e..076ddd0b 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.12-SNAPSHOT + 0.3.12 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 425c2fed..72372f5a 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12-SNAPSHOT + 0.3.12 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index d57d969e..f544b889 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12-SNAPSHOT + 0.3.12 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 78ec7f70..f7515126 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12-SNAPSHOT + 0.3.12 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 1703919e..f54189c0 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12-SNAPSHOT + 0.3.12 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 338a8742..17107ae9 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12-SNAPSHOT + 0.3.12 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 4e04aac6..0f5c3f01 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12-SNAPSHOT + 0.3.12 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 572fe907..3bf4110a 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12-SNAPSHOT + 0.3.12 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 69c51d9d..d6909d6f 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12-SNAPSHOT + 0.3.12 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 4dbe0a37..e0e86ebb 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12-SNAPSHOT + 0.3.12 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 4a7fb64d..0b128fec 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.12-SNAPSHOT + 0.3.12 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index d18c9928..302d2eff 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.12-SNAPSHOT + 0.3.12 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -45,7 +45,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.3.12 From e5a18cef4d69510b1910a8291352f37df6c6b118 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Wed, 18 Dec 2019 15:40:42 +0000 Subject: [PATCH 17/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index d1b3289c..66b52edb 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.12 + 0.3.13-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index bd00e05c..31c0f18f 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12 + 0.3.13-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 076ddd0b..477932c9 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.12 + 0.3.13-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 72372f5a..3d56052b 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12 + 0.3.13-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index f544b889..ade27515 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12 + 0.3.13-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index f7515126..ad293652 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12 + 0.3.13-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index f54189c0..a35d3580 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12 + 0.3.13-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 17107ae9..93469b20 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12 + 0.3.13-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 0f5c3f01..98a947cf 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12 + 0.3.13-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 3bf4110a..6d695a4b 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12 + 0.3.13-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index d6909d6f..72052fec 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12 + 0.3.13-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index e0e86ebb..bdd0fa0d 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.3.12 + 0.3.13-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 0b128fec..6fcd4c41 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.12 + 0.3.13-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 302d2eff..1807883e 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.3.12 + 0.3.13-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -45,7 +45,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.3.12 + HEAD From b39a9ba4cd335f47eaeee9f0c583246c63f4bd92 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Mon, 27 Jan 2020 15:56:35 +0100 Subject: [PATCH 18/60] Consume reactor version from SB bom (#269) * Consumer reactor version from SB bom Signed-off-by: Pavol Loffay * Remove finchley * Fix license Signed-off-by: Pavol Loffay --- .travis.yml | 3 --- README.md | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 3 +-- pom.xml | 3 +-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2afd757c..4f47ae14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,9 +33,6 @@ jobs: env: [ NAME=greenwhich ] script: make default - - env: [ NAME=finchley ] - script: make finchley - - env: [ NAME=classpath-no-dependencies ] script: PROFILES=nodeps make classpath diff --git a/README.md b/README.md index 78f16e1a..87d0255b 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ The following table shows versions with compatible [Spring Cloud](http://project opentracing-spring-cloud version | OpenTracing API | Spring Cloud version --- | --- | --- -0.3.x | 0.32.0 | `Finchley`, `Greenwhich` +0.3.x | 0.32.0 | `Greenwhich` 0.2.x | 0.31.0 | `Finchley`, `Greenwhich` 0.1.x | 0.31.0 | `Dalston`, `Edgware` diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 93469b20..9fa00de1 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -1,7 +1,7 @@ - 2.1.5.RELEASE - Greenwich.SR1 + 2.2.0.RELEASE + Hoxton.SR1 3.0.0 2.2.0 1.3.1 From 2451e1eab40d3746643ea0c825bd0f344b1ff06b Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Tue, 28 Jan 2020 13:41:41 +0100 Subject: [PATCH 20/60] Adjusts copyright headers for this year Signed-off-by: Pavol Loffay --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 66b52edb..5f72d140 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -1,7 +1,7 @@ 2.2.0.RELEASE @@ -212,7 +213,7 @@ io.opentracing.contrib - opentracing-jms-1 + opentracing-jms-2 ${version.io.opentracing.contrib-opentracing-spring-jms} From ef7f0be4179d317c46e1a23de5fffd0f805a39ba Mon Sep 17 00:00:00 2001 From: opentracingci Date: Wed, 26 Feb 2020 13:50:27 +0000 Subject: [PATCH 24/60] [maven-release-plugin] prepare release 0.5.0 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 54c76485..be065a2d 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.4.1-SNAPSHOT + 0.5.0 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index d3021948..b8b2afea 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.4.1-SNAPSHOT + 0.5.0 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index e1c8cbe8..2bfc85a8 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.4.1-SNAPSHOT + 0.5.0 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 14b97016..63064196 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.4.1-SNAPSHOT + 0.5.0 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 09c21f43..92c2515d 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.4.1-SNAPSHOT + 0.5.0 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index c7f7bdde..307ccea2 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.4.1-SNAPSHOT + 0.5.0 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index cecbe201..3a4321be 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.4.1-SNAPSHOT + 0.5.0 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index d0e0cfec..dc6e4f36 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.4.1-SNAPSHOT + 0.5.0 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index b585598b..97abb326 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.4.1-SNAPSHOT + 0.5.0 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index fc6efbb5..124788c2 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.4.1-SNAPSHOT + 0.5.0 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index daa0267d..5edd8625 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.4.1-SNAPSHOT + 0.5.0 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index e39dfa7e..1226b53b 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.4.1-SNAPSHOT + 0.5.0 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index d3c8b808..68c43a23 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.4.1-SNAPSHOT + 0.5.0 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 9f0758ca..d848d48d 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.4.1-SNAPSHOT + 0.5.0 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -45,7 +45,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.5.0 From 4697c1bf1e3905d0f0af7d6800da6b5edcb378c8 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Wed, 26 Feb 2020 13:50:33 +0000 Subject: [PATCH 25/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index be065a2d..e339a989 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.0 + 0.5.1-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index b8b2afea..60946128 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.0 + 0.5.1-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 2bfc85a8..027222c2 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.0 + 0.5.1-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 63064196..8e8c68c9 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.0 + 0.5.1-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 92c2515d..dd30ccf0 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.0 + 0.5.1-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 307ccea2..2c77d519 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.0 + 0.5.1-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 3a4321be..ea655f86 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.0 + 0.5.1-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index dc6e4f36..46352f07 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.0 + 0.5.1-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 97abb326..2b4b67e1 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.0 + 0.5.1-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 124788c2..17f48375 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.0 + 0.5.1-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 5edd8625..18cadded 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.0 + 0.5.1-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 1226b53b..5222b20b 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.0 + 0.5.1-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 68c43a23..74dd5a9a 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.0 + 0.5.1-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index d848d48d..3b063b13 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.0 + 0.5.1-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -45,7 +45,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.5.0 + HEAD From 895fbb027d56a2346eafbeeb10f83cbe3d6f3a6f Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 26 Feb 2020 16:36:22 +0100 Subject: [PATCH 26/60] Document 0.5.0 version Signed-off-by: Pavol Loffay --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c271e125..0851cb04 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ The following table shows versions with compatible [Spring Cloud](http://project opentracing-spring-cloud version | OpenTracing API | Spring Cloud version --- | --- | --- +0.5.x | 0.33.0 | `Hoxton` 0.4.x | 0.32.0 | `Hoxton` 0.3.x | 0.32.0 | `Greenwhich` 0.2.x | 0.31.0 | `Finchley`, `Greenwhich` From d6b9ead3cad6af58a8dc64f638552d4546775b16 Mon Sep 17 00:00:00 2001 From: Jonah Back Date: Thu, 26 Mar 2020 01:37:29 -0700 Subject: [PATCH 27/60] Add Spring Kafka starter (#280) * Add Spring Kafka starter * Address review comments * Add exclusions in POM --- README.md | 1 + .../pom.xml | 91 ++++++++++ .../cloud/kafka/KafkaAutoConfiguration.java | 73 ++++++++ ...itional-spring-configuration-metadata.json | 10 ++ .../main/resources/META-INF/spring.factories | 2 + .../kafka/KafkaAutoConfigurationTest.java | 159 ++++++++++++++++++ opentracing-spring-cloud-starter/pom.xml | 4 + .../contrib/spring/cloud/NoDepsTest.java | 7 +- pom.xml | 17 ++ 9 files changed, 363 insertions(+), 1 deletion(-) create mode 100644 instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml create mode 100644 instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/java/io/opentracing/contrib/spring/cloud/kafka/KafkaAutoConfiguration.java create mode 100644 instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json create mode 100644 instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/resources/META-INF/spring.factories create mode 100644 instrument-starters/opentracing-spring-cloud-kafka-starter/src/test/java/io/opentracing/contrib/spring/cloud/kafka/KafkaAutoConfigurationTest.java diff --git a/README.md b/README.md index 0851cb04..1e8b2952 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ It contains auto-configurations which instruments and trace following Spring Boo * Hystrix * JMS * JDBC +* Kafka * Mongo * Zuul * Reactor diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml new file mode 100644 index 00000000..ebda17c9 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -0,0 +1,91 @@ + + + + + opentracing-spring-cloud-parent + io.opentracing.contrib + 0.5.1-SNAPSHOT + ../../ + + 4.0.0 + + opentracing-spring-cloud-kafka-starter + + + ${project.basedir}/../.. + + + + + org.springframework.boot + spring-boot-autoconfigure + + + io.opentracing.contrib + opentracing-spring-tracer-configuration-starter + + + + io.opentracing.contrib + opentracing-kafka-spring + + + * + * + + + + + io.opentracing.contrib + opentracing-kafka-client + + + * + * + + + + + + org.springframework.kafka + spring-kafka + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.maven-surefire-plugin} + + always + + + + + diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/java/io/opentracing/contrib/spring/cloud/kafka/KafkaAutoConfiguration.java b/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/java/io/opentracing/contrib/spring/cloud/kafka/KafkaAutoConfiguration.java new file mode 100644 index 00000000..4f5a8c94 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/java/io/opentracing/contrib/spring/cloud/kafka/KafkaAutoConfiguration.java @@ -0,0 +1,73 @@ +/** + * Copyright 2017-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 + * + * 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. + */ +package io.opentracing.contrib.spring.cloud.kafka; + +import io.opentracing.Tracer; +import io.opentracing.contrib.kafka.spring.TracingConsumerFactory; +import io.opentracing.contrib.kafka.spring.TracingProducerFactory; +import io.opentracing.contrib.spring.tracer.configuration.TracerAutoConfiguration; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.kafka.core.ConsumerFactory; +import org.springframework.kafka.core.ProducerFactory; + +@Configuration +@ConditionalOnClass(ProducerFactory.class) +@ConditionalOnBean(Tracer.class) +@AutoConfigureAfter(TracerAutoConfiguration.class) +@ConditionalOnProperty(name = "opentracing.spring.cloud.kafka.enabled", havingValue = "true", matchIfMissing = true) +class KafkaAutoConfiguration { + + @Bean + public BeanPostProcessor kafkaProducerPostProcessor(Tracer tracer) { + return new BeanPostProcessor() { + @Override + public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { + return bean; + } + + @Override + public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { + if (bean instanceof ProducerFactory && !(bean instanceof TracingProducerFactory)) { + return new TracingProducerFactory((ProducerFactory)bean, tracer); + } + return bean; + } + }; + } + + @Bean + public BeanPostProcessor kafkaConsumerPostProcessor(Tracer tracer) { + return new BeanPostProcessor() { + @Override + public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { + return bean; + } + + @Override + public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { + if (bean instanceof ConsumerFactory && !(bean instanceof TracingConsumerFactory)) { + return new TracingConsumerFactory((ConsumerFactory) bean, tracer); + } + return bean; + } + }; + } +} diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 00000000..471d9053 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,10 @@ +{ + "properties": [ + { + "name": "opentracing.spring.cloud.kafka.enabled", + "type": "java.lang.Boolean", + "description": "Enable Kafka tracing.", + "defaultValue": true + } + ] +} diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/resources/META-INF/spring.factories b/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..37d6bfb4 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +io.opentracing.contrib.spring.cloud.kafka.KafkaAutoConfiguration diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/src/test/java/io/opentracing/contrib/spring/cloud/kafka/KafkaAutoConfigurationTest.java b/instrument-starters/opentracing-spring-cloud-kafka-starter/src/test/java/io/opentracing/contrib/spring/cloud/kafka/KafkaAutoConfigurationTest.java new file mode 100644 index 00000000..76cde9e2 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/src/test/java/io/opentracing/contrib/spring/cloud/kafka/KafkaAutoConfigurationTest.java @@ -0,0 +1,159 @@ +/** + * Copyright 2017-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 + * + * 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. + */ +package io.opentracing.contrib.spring.cloud.kafka; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; + +import io.opentracing.Tracer; +import io.opentracing.contrib.kafka.spring.TracingConsumerFactory; +import io.opentracing.contrib.kafka.spring.TracingProducerFactory; +import java.util.Map; +import java.util.Properties; +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.producer.Producer; +import org.apache.kafka.common.serialization.Deserializer; +import org.junit.Test; +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; +import org.springframework.kafka.core.ConsumerFactory; +import org.springframework.kafka.core.ProducerFactory; + +public class KafkaAutoConfigurationTest { + + @Test + public void loadKafkaTracingProducerFactory() { + AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); + context.register(TracerConfig.class, FakeKafkaConfig.class, KafkaAutoConfiguration.class); + context.refresh(); + ProducerFactory tracingProducerFactory = context.getBean(ProducerFactory.class); + assertTrue(tracingProducerFactory instanceof TracingProducerFactory); + } + + @Test + public void loadNormalProducerFactoryWhenDisabled() { + AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); + context.register(TracerConfig.class, FakeKafkaConfig.class, KafkaAutoConfiguration.class); + TestPropertyValues.of("opentracing.spring.cloud.kafka.enabled:false").applyTo(context); + context.refresh(); + ProducerFactory tracingProducerFactory = context.getBean(ProducerFactory.class); + assertFalse(tracingProducerFactory instanceof TracingProducerFactory); + } + + @Test + public void loadTracingConsumerFactory() { + AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); + context.register(TracerConfig.class, FakeKafkaConfig.class, KafkaAutoConfiguration.class); + context.refresh(); + ConsumerFactory tracingConsumerFactory = context.getBean(ConsumerFactory.class); + assertTrue(tracingConsumerFactory instanceof TracingConsumerFactory); + } + + @Test + public void loadNormalConsumerFactoryWhenDisabled() { + AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); + context.register(TracerConfig.class, FakeKafkaConfig.class, KafkaAutoConfiguration.class); + TestPropertyValues.of("opentracing.spring.cloud.kafka.enabled:false").applyTo(context); + context.refresh(); + ConsumerFactory consumerFactory = context.getBean(ConsumerFactory.class); + assertFalse(consumerFactory instanceof TracingConsumerFactory); + } + + @Test + public void loadNormalConsumerFactoryWhenTracerNotPresent() { + AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); + context.register(FakeKafkaConfig.class, KafkaAutoConfiguration.class); + context.refresh(); + ConsumerFactory consumerFactory = context.getBean(ConsumerFactory.class); + assertFalse(consumerFactory instanceof TracingConsumerFactory); + } + + + + + @Configuration + static class TracerConfig { + + @Bean + public Tracer tracer() { + return mock(Tracer.class); + } + } + + static class FakeKafkaConfig { + + @Bean + public ProducerFactory producerFactory() { + return new ProducerFactory() { + @Override + public Producer createProducer() { + return null; + } + }; + } + + @Bean + public ConsumerFactory consumerFactory() { + return new ConsumerFactory() { + @Override + public Consumer createConsumer() { + return null; + } + + @Override + public Consumer createConsumer(String clientIdSuffix) { + return null; + } + + @Override + public Consumer createConsumer(String groupId, String clientIdSuffix) { + return null; + } + + @Override + public Consumer createConsumer(String s, String s1, String s2) { + return null; + } + + @Override + public Consumer createConsumer(String groupId, String clientIdPrefix, String clientIdSuffix, Properties properties) { + return null; + } + + @Override + public boolean isAutoCommit() { + return false; + } + + @Override + public Map getConfigurationProperties() { + return null; + } + + @Override + public Deserializer getKeyDeserializer() { + return null; + } + + @Override + public Deserializer getValueDeserializer() { + return null; + } + }; + } + } +} diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 74dd5a9a..79ce3d06 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -54,6 +54,10 @@ ${project.groupId} opentracing-spring-cloud-jms-starter + + ${project.groupId} + opentracing-spring-cloud-kafka-starter + ${project.groupId} opentracing-spring-cloud-feign-starter diff --git a/opentracing-spring-cloud-starter/src/test/java/io/opentracing/contrib/spring/cloud/NoDepsTest.java b/opentracing-spring-cloud-starter/src/test/java/io/opentracing/contrib/spring/cloud/NoDepsTest.java index 56df3c08..815728a6 100644 --- a/opentracing-spring-cloud-starter/src/test/java/io/opentracing/contrib/spring/cloud/NoDepsTest.java +++ b/opentracing-spring-cloud-starter/src/test/java/io/opentracing/contrib/spring/cloud/NoDepsTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2018 The OpenTracing Authors + * Copyright 2017-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 @@ -75,4 +75,9 @@ public void testNoWebsocketMessageBroker() throws ClassNotFoundException { public void testNoMongoClient() throws ClassNotFoundException { this.getClass().getClassLoader().loadClass("com.mongodb.MongoClient"); } + + @Test(expected = ClassNotFoundException.class) + public void testNoKafkaProducer() throws ClassNotFoundException { + this.getClass().getClassLoader().loadClass("org.apache.kafka.clients.producer.KafkaProducer"); + } } diff --git a/pom.xml b/pom.xml index 3b063b13..3dac39eb 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ /instrument-starters/opentracing-spring-cloud-core instrument-starters/opentracing-spring-cloud-jdbc-starter instrument-starters/opentracing-spring-cloud-jms-starter + instrument-starters/opentracing-spring-cloud-kafka-starter instrument-starters/opentracing-spring-cloud-feign-starter instrument-starters/opentracing-spring-cloud-mongo-starter instrument-starters/opentracing-spring-cloud-websocket-starter @@ -87,6 +88,7 @@ 0.1.5 10.2.0 0.4.0 + 0.1.12 2.2.0.RELEASE @@ -134,6 +136,11 @@ opentracing-spring-cloud-jms-starter ${project.version} + + ${project.groupId} + opentracing-spring-cloud-kafka-starter + ${project.version} + ${project.groupId} opentracing-spring-cloud-feign-starter @@ -216,6 +223,16 @@ opentracing-jms-2 ${version.io.opentracing.contrib-opentracing-spring-jms} + + io.opentracing.contrib + opentracing-kafka-spring + ${version.io.opentracing.contrib-opentracing-kafka-spring} + + + io.opentracing.contrib + opentracing-kafka-client + ${version.io.opentracing.contrib-opentracing-kafka-spring} + io.opentracing.contrib opentracing-spring-tracer-configuration-starter From 4e48c94983acbe6be209dc682950adc732b71113 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Thu, 26 Mar 2020 08:51:03 +0000 Subject: [PATCH 28/60] [maven-release-plugin] prepare release 0.5.1 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index e339a989..a9c9a6a0 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.1-SNAPSHOT + 0.5.1 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 60946128..eec8c2ec 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1-SNAPSHOT + 0.5.1 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 027222c2..2b2b8f85 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.1-SNAPSHOT + 0.5.1 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 8e8c68c9..4dc76592 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1-SNAPSHOT + 0.5.1 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index dd30ccf0..83e330c7 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1-SNAPSHOT + 0.5.1 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 2c77d519..34212ad1 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1-SNAPSHOT + 0.5.1 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index ebda17c9..a7a62be6 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1-SNAPSHOT + 0.5.1 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index ea655f86..56dc676b 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1-SNAPSHOT + 0.5.1 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 46352f07..7e4d036b 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1-SNAPSHOT + 0.5.1 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 2b4b67e1..544f2b38 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1-SNAPSHOT + 0.5.1 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 17f48375..b5c35da9 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1-SNAPSHOT + 0.5.1 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 18cadded..a98a1bf6 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1-SNAPSHOT + 0.5.1 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 5222b20b..cceb0ecf 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1-SNAPSHOT + 0.5.1 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 79ce3d06..568f999d 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.1-SNAPSHOT + 0.5.1 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 3dac39eb..fab8a2b9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.1-SNAPSHOT + 0.5.1 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.5.1 From d32439f2cbb5c6321c359ff4abb3012e53d7fe2a Mon Sep 17 00:00:00 2001 From: opentracingci Date: Thu, 26 Mar 2020 08:51:13 +0000 Subject: [PATCH 29/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index a9c9a6a0..b70bf65a 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.1 + 0.5.2-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index eec8c2ec..b0b11790 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1 + 0.5.2-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 2b2b8f85..4fda09f8 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.1 + 0.5.2-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 4dc76592..e91becf6 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1 + 0.5.2-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 83e330c7..d196f07e 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1 + 0.5.2-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 34212ad1..9efd7f05 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1 + 0.5.2-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index a7a62be6..819d357a 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1 + 0.5.2-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 56dc676b..db68e8b2 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1 + 0.5.2-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 7e4d036b..fe03d0c2 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1 + 0.5.2-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 544f2b38..8dbd58d7 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1 + 0.5.2-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index b5c35da9..fc52baa2 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1 + 0.5.2-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index a98a1bf6..944d4d01 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1 + 0.5.2-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index cceb0ecf..1f55db0a 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.1 + 0.5.2-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 568f999d..1ba14f65 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.1 + 0.5.2-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index fab8a2b9..a0870b23 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.1 + 0.5.2-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.5.1 + HEAD From 2df7504879c80260a587fb925a77942ebc3cd75c Mon Sep 17 00:00:00 2001 From: Jonah Back Date: Mon, 30 Mar 2020 02:17:43 -0700 Subject: [PATCH 30/60] Bump configuration starter to 0.33 compatible version (#284) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0870b23..fd97f6cb 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ ${project.basedir} 0.33.0 - 0.2.0 + 0.3.1 3.0.1 0.1.7 1.0.0 From 32c74787e591143a89a94a421bad9d9de6576e39 Mon Sep 17 00:00:00 2001 From: Neptune <42354711+HaojunRen@users.noreply.github.com> Date: Mon, 30 Mar 2020 17:19:58 +0800 Subject: [PATCH 31/60] Upgrade opentracing-spring-rabbitmq-starter to 3.0.0 (#282) Upgrade opentracing-spring-rabbitmq-starter to 3.0.0 to resolve incompatible problem --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd97f6cb..f359912c 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 3.0.1 0.1.7 1.0.0 - 2.0.5 + 3.0.0 0.2.8 0.1.4 0.1.14 From c000f1d8622d16073295f422f41053f2d6145329 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Mon, 30 Mar 2020 05:37:19 -0400 Subject: [PATCH 32/60] Use HTTPS instead of HTTP to resolve dependencies (#274) This fixes a security vulnerability in this project where the `pom.xml` files were configuring Maven to resolve dependencies over HTTP instead of HTTPS. Signed-off-by: Jonathan Leitschuh --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f359912c..19e89600 100644 --- a/pom.xml +++ b/pom.xml @@ -324,7 +324,7 @@ jfrog-snapshots - http://oss.jfrog.org/artifactory/oss-snapshot-local + https://oss.jfrog.org/artifactory/oss-snapshot-local From 23e0c9eb1bb729bce0121de5f687fc29e7e5e009 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Mon, 30 Mar 2020 10:01:01 +0000 Subject: [PATCH 33/60] [maven-release-plugin] prepare release 0.5.2 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index b70bf65a..305fc2ba 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.2-SNAPSHOT + 0.5.2 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index b0b11790..f9e5430a 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2-SNAPSHOT + 0.5.2 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 4fda09f8..5e61375d 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.2-SNAPSHOT + 0.5.2 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index e91becf6..81b19e5e 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2-SNAPSHOT + 0.5.2 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index d196f07e..8944e737 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2-SNAPSHOT + 0.5.2 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 9efd7f05..48f9e4d9 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2-SNAPSHOT + 0.5.2 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index 819d357a..e2ca0e19 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2-SNAPSHOT + 0.5.2 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index db68e8b2..153cb89b 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2-SNAPSHOT + 0.5.2 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index fe03d0c2..eb629dfd 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2-SNAPSHOT + 0.5.2 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 8dbd58d7..e8b33810 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2-SNAPSHOT + 0.5.2 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index fc52baa2..6dd4efd0 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2-SNAPSHOT + 0.5.2 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 944d4d01..f7086347 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2-SNAPSHOT + 0.5.2 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 1f55db0a..6267710e 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2-SNAPSHOT + 0.5.2 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 1ba14f65..cb373899 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.2-SNAPSHOT + 0.5.2 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 19e89600..5a62a912 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.2-SNAPSHOT + 0.5.2 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.5.2 From 99a6b11406c5cb4d1f4c8cdb6a6b09db31212e4f Mon Sep 17 00:00:00 2001 From: opentracingci Date: Mon, 30 Mar 2020 10:01:09 +0000 Subject: [PATCH 34/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 305fc2ba..e30b3809 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.2 + 0.5.3-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index f9e5430a..9c4f538f 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2 + 0.5.3-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 5e61375d..6894f0b0 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.2 + 0.5.3-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 81b19e5e..7deb4bff 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2 + 0.5.3-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 8944e737..0ee53d1c 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2 + 0.5.3-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 48f9e4d9..0912d8e7 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2 + 0.5.3-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index e2ca0e19..94c1bfb9 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2 + 0.5.3-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 153cb89b..7e865879 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2 + 0.5.3-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index eb629dfd..b06a6add 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2 + 0.5.3-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index e8b33810..7446c2b0 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2 + 0.5.3-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 6dd4efd0..bcc00d5c 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2 + 0.5.3-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index f7086347..f85f3319 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2 + 0.5.3-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 6267710e..57624f8a 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.2 + 0.5.3-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index cb373899..0ad03e5f 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.2 + 0.5.3-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 5a62a912..624b7c1f 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.2 + 0.5.3-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.5.2 + HEAD From 408de20b755e45bba682a7459d1e7929c90e9814 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Mon, 6 Apr 2020 09:22:17 +0000 Subject: [PATCH 35/60] [maven-release-plugin] prepare release 0.5.3 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index e30b3809..72d71ece 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.3-SNAPSHOT + 0.5.3 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 9c4f538f..277e7bf6 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3-SNAPSHOT + 0.5.3 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 6894f0b0..c9a03ab7 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.3-SNAPSHOT + 0.5.3 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 7deb4bff..84175887 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3-SNAPSHOT + 0.5.3 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 0ee53d1c..a3e6fd77 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3-SNAPSHOT + 0.5.3 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 0912d8e7..c0068ec6 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3-SNAPSHOT + 0.5.3 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index 94c1bfb9..67293a96 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3-SNAPSHOT + 0.5.3 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 7e865879..95406f6a 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3-SNAPSHOT + 0.5.3 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index b06a6add..8da9e556 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3-SNAPSHOT + 0.5.3 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 7446c2b0..454ee18c 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3-SNAPSHOT + 0.5.3 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index bcc00d5c..8b8c87d2 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3-SNAPSHOT + 0.5.3 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index f85f3319..834b17c7 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3-SNAPSHOT + 0.5.3 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 57624f8a..47ccd969 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3-SNAPSHOT + 0.5.3 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 0ad03e5f..0a838ac0 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.3-SNAPSHOT + 0.5.3 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 624b7c1f..a09d2cc7 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.3-SNAPSHOT + 0.5.3 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.5.3 From 5a11a1341089fc664860a31b21f83931e80b9fc0 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Mon, 6 Apr 2020 09:22:24 +0000 Subject: [PATCH 36/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 72d71ece..2b1e2825 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.3 + 0.5.4-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 277e7bf6..5f0fd476 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3 + 0.5.4-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index c9a03ab7..816f434f 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.3 + 0.5.4-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 84175887..77f11625 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3 + 0.5.4-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index a3e6fd77..e8f39253 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3 + 0.5.4-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index c0068ec6..a3478290 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3 + 0.5.4-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index 67293a96..094982c3 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3 + 0.5.4-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 95406f6a..5b93ea39 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3 + 0.5.4-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 8da9e556..7f3efd15 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3 + 0.5.4-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 454ee18c..d0849802 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3 + 0.5.4-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 8b8c87d2..9237e8c3 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3 + 0.5.4-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 834b17c7..1cdb79b0 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3 + 0.5.4-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 47ccd969..482245e2 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.3 + 0.5.4-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 0a838ac0..7a6bbbfd 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.3 + 0.5.4-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index a09d2cc7..10182a2f 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.3 + 0.5.4-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.5.3 + HEAD From 3853ad9b88a37e401b6d695913ef19ac5f23cc60 Mon Sep 17 00:00:00 2001 From: Luram Archanjo Date: Mon, 8 Jun 2020 05:11:37 -0300 Subject: [PATCH 37/60] Add support to set prefix Redis operation name (#292) * [Redis] Add support to set prefix operation name * [Redis] Add support to set prefix operation name * [Redis] Add support to set prefix operation name * [Redis] Add support to set prefix operation name * [Redis] Add support to set prefix operation name * [Redis] Add support to set prefix operation name Co-authored-by: Luram Archanjo --- .../spring/cloud/redis/RedisAspect.java | 31 +++-- .../cloud/redis/RedisAutoConfiguration.java | 7 +- .../cloud/redis/RedisTracingProperties.java | 45 ++++++ ...itional-spring-configuration-metadata.json | 6 + .../spring/cloud/redis/IntegrationTest.java | 2 +- ...ntegrationTestWithPrefixOperationName.java | 129 ++++++++++++++++++ 6 files changed, 208 insertions(+), 12 deletions(-) create mode 100644 instrument-starters/opentracing-spring-cloud-redis-starter/src/main/java/io/opentracing/contrib/spring/cloud/redis/RedisTracingProperties.java create mode 100644 instrument-starters/opentracing-spring-cloud-redis-starter/src/test/java/io/opentracing/contrib/spring/cloud/redis/IntegrationTestWithPrefixOperationName.java diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/java/io/opentracing/contrib/spring/cloud/redis/RedisAspect.java b/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/java/io/opentracing/contrib/spring/cloud/redis/RedisAspect.java index 266c99a7..eeed40d9 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/java/io/opentracing/contrib/spring/cloud/redis/RedisAspect.java +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/java/io/opentracing/contrib/spring/cloud/redis/RedisAspect.java @@ -14,6 +14,7 @@ package io.opentracing.contrib.spring.cloud.redis; import io.opentracing.Tracer; +import io.opentracing.contrib.redis.common.RedisSpanNameProvider; import io.opentracing.contrib.redis.common.TracingConfiguration; import io.opentracing.contrib.redis.spring.data2.connection.TracingRedisClusterConnection; import io.opentracing.contrib.redis.spring.data2.connection.TracingRedisConnection; @@ -21,8 +22,6 @@ import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; -import org.aspectj.weaver.tools.Trace; -import org.springframework.context.annotation.Bean; import org.springframework.data.redis.connection.RedisClusterConnection; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; @@ -32,14 +31,18 @@ * OpenTracing Java Redis framework integration. * * @author Daniel del Castillo + * @author Luram Archanjo */ @Aspect public class RedisAspect { private final Tracer tracer; - RedisAspect(Tracer tracer) { + private final RedisTracingProperties properties; + + RedisAspect(Tracer tracer, RedisTracingProperties properties) { this.tracer = tracer; + this.properties = properties; } @Pointcut("target(org.springframework.data.redis.connection.RedisConnectionFactory)") @@ -51,8 +54,6 @@ public void getConnection() {} @Pointcut("execution(org.springframework.data.redis.connection.RedisClusterConnection *.getClusterConnection(..))") public void getClusterConnection() {} - - /** * Intercepts calls to {@link RedisConnectionFactory#getConnection()} (and related), wrapping the * outcome in a {@link TracingRedisConnection} @@ -62,8 +63,14 @@ public void getClusterConnection() {} */ @Around("getConnection() && connectionFactory()") public Object aroundGetConnection(final ProceedingJoinPoint pjp) throws Throwable { - RedisConnection connection = (RedisConnection) pjp.proceed(); - return new TracingRedisConnection(connection, new TracingConfiguration.Builder(tracer).build()); + final RedisConnection connection = (RedisConnection) pjp.proceed(); + + final String prefixOperationName = this.properties.getPrefixOperationName(); + final TracingConfiguration tracingConfiguration = new TracingConfiguration.Builder(tracer) + .withSpanNameProvider(RedisSpanNameProvider.PREFIX_OPERATION_NAME(prefixOperationName)) + .build(); + + return new TracingRedisConnection(connection, tracingConfiguration); } /** @@ -75,8 +82,14 @@ public Object aroundGetConnection(final ProceedingJoinPoint pjp) throws Throwabl */ @Around("getClusterConnection() && connectionFactory()") public Object aroundGetClusterConnection(final ProceedingJoinPoint pjp) throws Throwable { - RedisClusterConnection clusterConnection = (RedisClusterConnection) pjp.proceed(); - return new TracingRedisClusterConnection(clusterConnection, new TracingConfiguration.Builder(tracer).build()); + final RedisClusterConnection clusterConnection = (RedisClusterConnection) pjp.proceed(); + + final String prefixOperationName = this.properties.getPrefixOperationName(); + final TracingConfiguration tracingConfiguration = new TracingConfiguration.Builder(tracer) + .withSpanNameProvider(RedisSpanNameProvider.PREFIX_OPERATION_NAME(prefixOperationName)) + .build(); + + return new TracingRedisClusterConnection(clusterConnection, tracingConfiguration); } } diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/java/io/opentracing/contrib/spring/cloud/redis/RedisAutoConfiguration.java b/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/java/io/opentracing/contrib/spring/cloud/redis/RedisAutoConfiguration.java index 6a5f9d0a..dabaeca3 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/java/io/opentracing/contrib/spring/cloud/redis/RedisAutoConfiguration.java +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/java/io/opentracing/contrib/spring/cloud/redis/RedisAutoConfiguration.java @@ -18,6 +18,7 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; @@ -26,16 +27,18 @@ * Loads the integration with OpenTracing Redis if it's included in the classpath. * * @author Daniel del Castillo + * @author Luram Archanjo */ @Configuration @AutoConfigureAfter({TracerRegisterAutoConfiguration.class, org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration.class}) @ConditionalOnBean(RedisConnectionFactory.class) @ConditionalOnProperty(name = "opentracing.spring.cloud.redis.enabled", havingValue = "true", matchIfMissing = true) +@EnableConfigurationProperties(RedisTracingProperties.class) public class RedisAutoConfiguration { @Bean - public RedisAspect openTracingRedisAspect(Tracer tracer) { - return new RedisAspect(tracer); + public RedisAspect openTracingRedisAspect(Tracer tracer, RedisTracingProperties properties) { + return new RedisAspect(tracer, properties); } } diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/java/io/opentracing/contrib/spring/cloud/redis/RedisTracingProperties.java b/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/java/io/opentracing/contrib/spring/cloud/redis/RedisTracingProperties.java new file mode 100644 index 00000000..4d893b5d --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/java/io/opentracing/contrib/spring/cloud/redis/RedisTracingProperties.java @@ -0,0 +1,45 @@ +/** + * Copyright 2017-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 + * + * 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. + */ +package io.opentracing.contrib.spring.cloud.redis; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * + * @author Luram Archanjo + */ +@ConfigurationProperties("opentracing.spring.cloud.redis") +public class RedisTracingProperties { + + private boolean enabled = true; + + private String prefixOperationName; + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public String getPrefixOperationName() { + return prefixOperationName; + } + + public void setPrefixOperationName(String prefixOperationName) { + this.prefixOperationName = prefixOperationName; + } + +} diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 16a030ee..a81b5e55 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -5,6 +5,12 @@ "type": "java.lang.Boolean", "description": "Enable Redis tracing.", "defaultValue": true + }, + { + "name": "opentracing.spring.cloud.redis.prefixOperationName", + "type": "java.lang.String", + "description": "Set a prefix for each Redis operation, e.g: MyPrefix.SET.", + "defaultValue": "" } ] } diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/src/test/java/io/opentracing/contrib/spring/cloud/redis/IntegrationTest.java b/instrument-starters/opentracing-spring-cloud-redis-starter/src/test/java/io/opentracing/contrib/spring/cloud/redis/IntegrationTest.java index 1e70d843..c4049da9 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/src/test/java/io/opentracing/contrib/spring/cloud/redis/IntegrationTest.java +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/src/test/java/io/opentracing/contrib/spring/cloud/redis/IntegrationTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2019 The OpenTracing Authors + * Copyright 2017-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 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/src/test/java/io/opentracing/contrib/spring/cloud/redis/IntegrationTestWithPrefixOperationName.java b/instrument-starters/opentracing-spring-cloud-redis-starter/src/test/java/io/opentracing/contrib/spring/cloud/redis/IntegrationTestWithPrefixOperationName.java new file mode 100644 index 00000000..e67da65d --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/src/test/java/io/opentracing/contrib/spring/cloud/redis/IntegrationTestWithPrefixOperationName.java @@ -0,0 +1,129 @@ +/** + * Copyright 2017-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 + * + * 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. + */ +package io.opentracing.contrib.spring.cloud.redis; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import ai.grakn.redismock.RedisServer; +import io.opentracing.Scope; +import io.opentracing.mock.MockSpan; +import io.opentracing.mock.MockTracer; +import io.opentracing.tag.Tags; +import io.opentracing.util.GlobalTracerTestUtil; +import java.util.Optional; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * @author Luram Archanjo + */ +@SpringBootTest(classes = {IntegrationTestWithPrefixOperationName.IntegrationTestConfiguration.class}) +@RunWith(SpringJUnit4ClassRunner.class) +@TestPropertySource(properties = { + "opentracing.spring.cloud.redis.prefixOperationName=REDIS." +}) +public class IntegrationTestWithPrefixOperationName { + + @Configuration + @EnableAutoConfiguration + public static class IntegrationTestConfiguration { + + public @Bean MockTracer mockTracer() { + GlobalTracerTestUtil.resetGlobalTracer(); + return new MockTracer(); + } + + public @Bean RedisConnectionFactory redisConnectionFactory() { + RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); + config.setHostName(redis.getHost()); + config.setPort(redis.getBindPort()); + return new JedisConnectionFactory(config); + } + + } + + private static RedisServer redis; + + @Autowired + MockTracer tracer; + + @Autowired + RedisTemplate redisTemplate; + + @BeforeClass + public static void setup() throws Exception { + redis = RedisServer.newRedisServer(); + redis.start(); + } + + @AfterClass + public static void teardown() { + redis.stop(); + } + + @Before + public void init() { + tracer.reset(); + } + + @Test + public void commandCreatesNewSpan() { + redisTemplate.opsForValue().set(100L, "Some value here"); + assertEquals(1, tracer.finishedSpans().size()); + assertEquals("REDIS.SET", tracer.finishedSpans().get(0).operationName()); + } + + @Test + public void spanJoinsActiveSpan() { + MockSpan span = tracer.buildSpan("parent").start(); + try (Scope ignored = tracer.activateSpan(span)) { + redisTemplate.opsForList().leftPushAll("test-list", 1, 2, 3); + assertEquals(1, tracer.finishedSpans().size()); + assertEquals("REDIS.LPUSH", tracer.finishedSpans().get(0).operationName()); + } finally { + span.finish(); + } + + assertEquals(2, tracer.finishedSpans().size()); + Optional redisSpan = tracer.finishedSpans().stream() + .filter((s) -> "java-redis".equals(s.tags().get(Tags.COMPONENT.getKey()))).findFirst(); + + Optional parentSpan = + tracer.finishedSpans().stream().filter((s) -> "parent".equals(s.operationName())).findFirst(); + + assertTrue(redisSpan.isPresent()); + assertTrue(parentSpan.isPresent()); + + assertEquals(redisSpan.get().context().traceId(), parentSpan.get().context().traceId()); + assertEquals(redisSpan.get().parentId(), parentSpan.get().context().spanId()); + } + + // Cluster operations can be tested once https://github.com/kstyrc/embedded-redis/issues/79 is fixed + +} From eedc860e6459c95e426d0d74d6ff62024ce249e2 Mon Sep 17 00:00:00 2001 From: Luram Archanjo Date: Tue, 9 Jun 2020 05:00:57 -0300 Subject: [PATCH 38/60] Document autoconfiguration properties (#290) * Adding properties at documentation * Adding properties at documentation * Adding properties at documentation Co-authored-by: Luram Archanjo --- README.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/README.md b/README.md index 1e8b2952..94f1d171 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,30 @@ public io.opentracing.Tracer tracer() { } ``` +### Properties + +Property| Default| Description +------------- | ------------- | ------------- +opentracing.spring.cloud.reactor.enabled|true|Enable Reactor tracing. +opentracing.spring.cloud.async.enabled|true|Enable tracing for @Async, Executor and WebAsyncTask/Callable. +opentracing.spring.cloud.log.enabled|true|Add standard logging output to tracing system. +opentracing.spring.cloud.scheduled.enabled|true|Enable @Scheduled tracing. +opentracing.spring.cloud.feign.enabled|true|Enable Feign tracing. +opentracing.spring.cloud.gateway.enabled|true|Enable Gateway tracing. +opentracing.spring.cloud.hystrix.strategy.enabled|true|Enable Propagation of spans across threads using in Hystrix command tracing. +opentracing.spring.cloud.jdbc.enabled|true|Enable JDBC tracing. +opentracing.spring.cloud.jms.enabled|true|Enable JMS tracing. +opentracing.spring.cloud.kafka.enabled|true|Enable Kafka tracing. +opentracing.spring.cloud.mongo.enabled|true|Enable MongoDB tracing. +opentracing.spring.cloud.reactor.enabled|true|Enable Reactor tracing. +opentracing.spring.cloud.rxjava.enabled|true|Enable RxJava tracing. +opentracing.spring.cloud.websocket.enabled|true|Enable Websocket tracing. +opentracing.spring.cloud.zuul.enabled|true|Enable Zuul tracing. +opentracing.spring.cloud.redis.enabled|true|Enable Redis tracing. +opentracing.spring.cloud.redis.prefixOperationName|""|Set a prefix for each Redis operation, e.g: MyPrefix.SET. +opentracing.spring.cloud.jdbc.withActiveSpanOnly|false|Only trace JDBC calls if they are part of an active Span. +opentracing.spring.cloud.jdbc.ignoreStatements|null|Set of JDBC statements to not trace. + ## Development Maven checkstyle plugin is used to maintain consistent code style based on [Google Style Guides](https://github.com/google/styleguide) From dfe7587e607575e33227e7447658077d25be2d6b Mon Sep 17 00:00:00 2001 From: opentracingci Date: Tue, 9 Jun 2020 08:11:32 +0000 Subject: [PATCH 39/60] [maven-release-plugin] prepare release 0.5.4 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 2b1e2825..04e3a6d1 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.4-SNAPSHOT + 0.5.4 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 5f0fd476..7de8354e 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4-SNAPSHOT + 0.5.4 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 816f434f..0f29dfe0 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.4-SNAPSHOT + 0.5.4 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 77f11625..0640e6a3 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4-SNAPSHOT + 0.5.4 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index e8f39253..323f14a7 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4-SNAPSHOT + 0.5.4 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index a3478290..433f2c21 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4-SNAPSHOT + 0.5.4 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index 094982c3..40325d10 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4-SNAPSHOT + 0.5.4 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 5b93ea39..1be88f91 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4-SNAPSHOT + 0.5.4 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 7f3efd15..3e684442 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4-SNAPSHOT + 0.5.4 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index d0849802..bbe07c15 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4-SNAPSHOT + 0.5.4 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 9237e8c3..5cca38cd 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4-SNAPSHOT + 0.5.4 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 1cdb79b0..00170836 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4-SNAPSHOT + 0.5.4 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 482245e2..f7c6eba7 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4-SNAPSHOT + 0.5.4 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 7a6bbbfd..e8fae7ad 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.4-SNAPSHOT + 0.5.4 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 10182a2f..64291ab9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.4-SNAPSHOT + 0.5.4 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.5.4 From 9c9674d307f487ed6e952b2590c633354e7be819 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Tue, 9 Jun 2020 08:11:39 +0000 Subject: [PATCH 40/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 04e3a6d1..09e6e333 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.4 + 0.5.5-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 7de8354e..e39c6179 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4 + 0.5.5-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 0f29dfe0..c98d7662 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.4 + 0.5.5-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 0640e6a3..44aeda80 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4 + 0.5.5-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 323f14a7..562c9531 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4 + 0.5.5-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 433f2c21..be1e2464 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4 + 0.5.5-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index 40325d10..a02ff096 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4 + 0.5.5-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 1be88f91..07c1c1f0 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4 + 0.5.5-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 3e684442..ac443073 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4 + 0.5.5-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index bbe07c15..617a4cf0 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4 + 0.5.5-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 5cca38cd..0395b7d6 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4 + 0.5.5-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 00170836..c1a1802c 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4 + 0.5.5-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index f7c6eba7..26308773 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.4 + 0.5.5-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index e8fae7ad..adbedbd9 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.4 + 0.5.5-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 64291ab9..8c5540ad 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.4 + 0.5.5-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.5.4 + HEAD From 0e04e220bbe2d34fc76975de1670de4ef73576ca Mon Sep 17 00:00:00 2001 From: jagdishkulkarni <65419048+jagdishkulkarni@users.noreply.github.com> Date: Mon, 29 Jun 2020 04:47:20 -0400 Subject: [PATCH 41/60] Bump jdbc instrumentation to 0.2.11 that fixes issues with Oracle drivers (#296) --- .../io/opentracing/contrib/spring/cloud/jdbc/JdbcAspect.java | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/src/main/java/io/opentracing/contrib/spring/cloud/jdbc/JdbcAspect.java b/instrument-starters/opentracing-spring-cloud-jdbc-starter/src/main/java/io/opentracing/contrib/spring/cloud/jdbc/JdbcAspect.java index 8ffe1cc6..170d8104 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/src/main/java/io/opentracing/contrib/spring/cloud/jdbc/JdbcAspect.java +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/src/main/java/io/opentracing/contrib/spring/cloud/jdbc/JdbcAspect.java @@ -58,7 +58,7 @@ public Object getConnection(final ProceedingJoinPoint pjp) throws Throwable { return conn; } String url = conn.getMetaData().getURL(); - ConnectionInfo connectionInfo = URLParser.parser(url); + ConnectionInfo connectionInfo = URLParser.parse(url); return WrapperProxy.wrap(conn, new TracingConnection(conn, connectionInfo, withActiveSpanOnly, ignoredStatements, GlobalTracer.get())); } diff --git a/pom.xml b/pom.xml index 8c5540ad..dfdd7333 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 0.1.7 1.0.0 3.0.0 - 0.2.8 + 0.2.11 0.1.4 0.1.14 0.4.0 From c835c4d806067d7653b44287320cbc40082708b0 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Mon, 29 Jun 2020 08:57:02 +0000 Subject: [PATCH 42/60] [maven-release-plugin] prepare release 0.5.5 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 09e6e333..86f4bbce 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.5-SNAPSHOT + 0.5.5 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index e39c6179..534913bb 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5-SNAPSHOT + 0.5.5 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index c98d7662..09f198e3 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.5-SNAPSHOT + 0.5.5 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 44aeda80..65739fca 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5-SNAPSHOT + 0.5.5 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 562c9531..73940fcd 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5-SNAPSHOT + 0.5.5 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index be1e2464..fae33761 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5-SNAPSHOT + 0.5.5 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index a02ff096..fc6e55fa 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5-SNAPSHOT + 0.5.5 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 07c1c1f0..184d04a6 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5-SNAPSHOT + 0.5.5 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index ac443073..876029e6 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5-SNAPSHOT + 0.5.5 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 617a4cf0..353e0427 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5-SNAPSHOT + 0.5.5 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 0395b7d6..2db146c5 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5-SNAPSHOT + 0.5.5 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index c1a1802c..6d378ddf 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5-SNAPSHOT + 0.5.5 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 26308773..d6b10dfc 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5-SNAPSHOT + 0.5.5 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index adbedbd9..a068e0b8 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.5-SNAPSHOT + 0.5.5 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index dfdd7333..a2b406cc 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.5-SNAPSHOT + 0.5.5 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.5.5 From 328e7f480cfd8444fc34177799275b15541ae7a2 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Mon, 29 Jun 2020 08:57:09 +0000 Subject: [PATCH 43/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 86f4bbce..9a6c08c5 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.5 + 0.5.6-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 534913bb..7b3044cc 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5 + 0.5.6-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 09f198e3..3cb63746 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.5 + 0.5.6-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 65739fca..c5674678 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5 + 0.5.6-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 73940fcd..b5f4b9d5 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5 + 0.5.6-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index fae33761..dfab06a0 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5 + 0.5.6-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index fc6e55fa..e5c1ae6a 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5 + 0.5.6-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 184d04a6..32f67200 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5 + 0.5.6-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 876029e6..9846cab6 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5 + 0.5.6-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 353e0427..e2cc6a56 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5 + 0.5.6-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 2db146c5..aa4ad10f 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5 + 0.5.6-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 6d378ddf..bbda2bdd 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5 + 0.5.6-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index d6b10dfc..e77827da 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.5 + 0.5.6-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index a068e0b8..6e192030 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.5 + 0.5.6-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index a2b406cc..ef545e9c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.5 + 0.5.6-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.5.5 + HEAD From 1df2e211e8ac29c1854da8d0d3d9319d4b4c1773 Mon Sep 17 00:00:00 2001 From: mayankvaid88 <54495306+mayankvaid88@users.noreply.github.com> Date: Fri, 17 Jul 2020 15:07:57 +0530 Subject: [PATCH 44/60] Use spring-webmvc in gateway-starter (#298) Co-authored-by: Mayank Vaid --- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 3cb63746..cfe70831 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -37,7 +37,7 @@ org.springframework - spring-web + spring-webmvc From 577bb16ec0eb67ae9842994d586907f06ab9db88 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Fri, 17 Jul 2020 09:48:54 +0000 Subject: [PATCH 45/60] [maven-release-plugin] prepare release 0.5.6 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 9a6c08c5..9d90b3df 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.6-SNAPSHOT + 0.5.6 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 7b3044cc..b3693ea0 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6-SNAPSHOT + 0.5.6 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index cfe70831..80781c63 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.6-SNAPSHOT + 0.5.6 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index c5674678..cc495a3d 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6-SNAPSHOT + 0.5.6 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index b5f4b9d5..626ae391 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6-SNAPSHOT + 0.5.6 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index dfab06a0..7ba3def7 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6-SNAPSHOT + 0.5.6 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index e5c1ae6a..714764ff 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6-SNAPSHOT + 0.5.6 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 32f67200..9e151b0c 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6-SNAPSHOT + 0.5.6 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 9846cab6..2f9aa20c 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6-SNAPSHOT + 0.5.6 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index e2cc6a56..12b5d6da 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6-SNAPSHOT + 0.5.6 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index aa4ad10f..6f1fcef9 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6-SNAPSHOT + 0.5.6 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index bbda2bdd..dca4de7f 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6-SNAPSHOT + 0.5.6 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index e77827da..2def90b2 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6-SNAPSHOT + 0.5.6 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 6e192030..6aa33dab 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.6-SNAPSHOT + 0.5.6 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index ef545e9c..2b6df797 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.6-SNAPSHOT + 0.5.6 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.5.6 From d4c4d90ba081373267da55ef2b9874a49fc2fb07 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Fri, 17 Jul 2020 09:49:02 +0000 Subject: [PATCH 46/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 9d90b3df..ac0b4266 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.6 + 0.5.7-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index b3693ea0..e7ed9fee 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6 + 0.5.7-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 80781c63..4157e8ae 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.6 + 0.5.7-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index cc495a3d..f70fd496 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6 + 0.5.7-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 626ae391..7e1120f9 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6 + 0.5.7-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 7ba3def7..57b05d51 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6 + 0.5.7-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index 714764ff..80499d8d 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6 + 0.5.7-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 9e151b0c..7e9c2dfd 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6 + 0.5.7-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 2f9aa20c..e234aa52 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6 + 0.5.7-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 12b5d6da..2ee86b4e 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6 + 0.5.7-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 6f1fcef9..85fe15b1 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6 + 0.5.7-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index dca4de7f..9db9808c 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6 + 0.5.7-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 2def90b2..d67d5d6a 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.6 + 0.5.7-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 6aa33dab..464ba843 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.6 + 0.5.7-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 2b6df797..f7405ee2 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.6 + 0.5.7-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.5.6 + HEAD From e4588199f7ab29d4850594fbc286b7152b70a3c1 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 20 Aug 2020 17:55:09 +0200 Subject: [PATCH 47/60] Upgrade opentracing-reactor to 0.2.0 (#300) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7405ee2..c4d191ec 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 0.1.4 0.1.14 0.4.0 - 0.1.2 + 0.2.0 0.1.3 0.1.5 10.2.0 From 2afd3ef8c3a17252025b95cb32cd931f30e9ba1c Mon Sep 17 00:00:00 2001 From: Peter van Zetten Date: Thu, 20 Aug 2020 16:56:21 +0100 Subject: [PATCH 48/60] Fix spring-web/wembvc dependency for opentracing-spring-cloud-gateway-starter (#299) Ensure that the Spring Cloud Gateway instrumentation starter does not pull in the incompatible spring-webmvc dependency. Mark the correct spring-web dependency as optional, to avoid polluting downstream classpath. Fixes #297, amends #298 --- .../opentracing-spring-cloud-gateway-starter/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 4157e8ae..ae337e3f 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -37,7 +37,8 @@ org.springframework - spring-webmvc + spring-web + true From d1078aee7d4686ea4913b58c2e104fd7babe238c Mon Sep 17 00:00:00 2001 From: opentracingci Date: Thu, 20 Aug 2020 17:02:07 +0000 Subject: [PATCH 49/60] [maven-release-plugin] prepare release 0.5.7 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index ac0b4266..9d7a24d4 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.7-SNAPSHOT + 0.5.7 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index e7ed9fee..af908072 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7-SNAPSHOT + 0.5.7 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index ae337e3f..0bc9fd8d 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.7-SNAPSHOT + 0.5.7 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index f70fd496..bf88d1c0 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7-SNAPSHOT + 0.5.7 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 7e1120f9..0042e126 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7-SNAPSHOT + 0.5.7 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 57b05d51..24843086 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7-SNAPSHOT + 0.5.7 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index 80499d8d..fe524217 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7-SNAPSHOT + 0.5.7 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 7e9c2dfd..3b2b42d4 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7-SNAPSHOT + 0.5.7 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index e234aa52..fb8d5828 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7-SNAPSHOT + 0.5.7 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 2ee86b4e..98be5a8f 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7-SNAPSHOT + 0.5.7 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 85fe15b1..393b71a2 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7-SNAPSHOT + 0.5.7 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 9db9808c..7b6e9585 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7-SNAPSHOT + 0.5.7 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index d67d5d6a..249455c1 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7-SNAPSHOT + 0.5.7 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 464ba843..a20d3234 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.7-SNAPSHOT + 0.5.7 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index c4d191ec..68095218 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.7-SNAPSHOT + 0.5.7 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.5.7 From 1b0a84665cfd7df122b7e0cf9ffed6caabfca474 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Thu, 20 Aug 2020 17:02:13 +0000 Subject: [PATCH 50/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 9d7a24d4..505a054b 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.7 + 0.5.8-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index af908072..b5dfa0aa 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7 + 0.5.8-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 0bc9fd8d..84541d88 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.7 + 0.5.8-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index bf88d1c0..728fcda2 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7 + 0.5.8-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 0042e126..dc5af703 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7 + 0.5.8-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 24843086..e67f2c61 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7 + 0.5.8-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index fe524217..abcf0a0a 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7 + 0.5.8-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index 3b2b42d4..ef9eeb93 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7 + 0.5.8-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index fb8d5828..bcb4fa75 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7 + 0.5.8-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 98be5a8f..d5c11e3e 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7 + 0.5.8-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 393b71a2..13eca7b7 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7 + 0.5.8-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 7b6e9585..74d933a4 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7 + 0.5.8-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 249455c1..9e56fdf0 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.7 + 0.5.8-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index a20d3234..1a320d40 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.7 + 0.5.8-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 68095218..9f765deb 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.7 + 0.5.8-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.5.7 + HEAD From eaf753fd5c1471602a4ecfebff5ba168016a16b3 Mon Sep 17 00:00:00 2001 From: Wh1te Date: Wed, 23 Sep 2020 18:10:55 +0800 Subject: [PATCH 51/60] Fix typo (#303) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 94f1d171..bb81c478 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ opentracing-spring-cloud version | OpenTracing API | Spring Cloud version --- | --- | --- 0.5.x | 0.33.0 | `Hoxton` 0.4.x | 0.32.0 | `Hoxton` -0.3.x | 0.32.0 | `Greenwhich` -0.2.x | 0.31.0 | `Finchley`, `Greenwhich` +0.3.x | 0.32.0 | `Greenwich` +0.2.x | 0.31.0 | `Finchley`, `Greenwich` 0.1.x | 0.31.0 | `Dalston`, `Edgware` From 7223494577a10b6cddbb427504a1107a00d0b11f Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 21 Oct 2020 11:56:33 +0200 Subject: [PATCH 52/60] Upgrade opentracing-spring-web to 4.1.0 (#305) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f765deb..281b91ac 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 0.33.0 0.3.1 - 3.0.1 + 4.1.0 0.1.7 1.0.0 3.0.0 From b4f4f248368cca295724167321ba5cccfdcfac76 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Wed, 21 Oct 2020 10:28:53 +0000 Subject: [PATCH 53/60] [maven-release-plugin] prepare release 0.5.8 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 505a054b..c8ecdfbf 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.8-SNAPSHOT + 0.5.8 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index b5dfa0aa..e5a12754 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8-SNAPSHOT + 0.5.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 84541d88..5526063e 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.8-SNAPSHOT + 0.5.8 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 728fcda2..0621143d 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8-SNAPSHOT + 0.5.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index dc5af703..a53a722b 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8-SNAPSHOT + 0.5.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index e67f2c61..60fafb83 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8-SNAPSHOT + 0.5.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index abcf0a0a..6d84785b 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8-SNAPSHOT + 0.5.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index ef9eeb93..a3b4b355 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8-SNAPSHOT + 0.5.8 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index bcb4fa75..b939e6b0 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8-SNAPSHOT + 0.5.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index d5c11e3e..0a043e5f 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8-SNAPSHOT + 0.5.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 13eca7b7..9f6cb091 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8-SNAPSHOT + 0.5.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 74d933a4..48b8bbda 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8-SNAPSHOT + 0.5.8 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 9e56fdf0..5df39275 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8-SNAPSHOT + 0.5.8 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 1a320d40..1d75bcf2 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.8-SNAPSHOT + 0.5.8 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 281b91ac..d17c8e27 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.8-SNAPSHOT + 0.5.8 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.5.8 From c179980b80f4cde7891beea106cd0b0277d7a270 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Wed, 21 Oct 2020 10:28:59 +0000 Subject: [PATCH 54/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index c8ecdfbf..6ef1d0c0 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.8 + 0.5.9-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index e5a12754..6102a99f 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8 + 0.5.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 5526063e..0f351797 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.8 + 0.5.9-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 0621143d..83e13792 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8 + 0.5.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index a53a722b..8c10f25d 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8 + 0.5.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 60fafb83..2ceead20 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8 + 0.5.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index 6d84785b..feb94400 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8 + 0.5.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index a3b4b355..d4cd9f1e 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8 + 0.5.9-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index b939e6b0..70dd7b9f 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8 + 0.5.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 0a043e5f..52d59f0d 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8 + 0.5.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index 9f6cb091..b2404adf 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8 + 0.5.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 48b8bbda..cdee7b56 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8 + 0.5.9-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 5df39275..edde9ef6 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.8 + 0.5.9-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 1d75bcf2..b7755eb5 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.8 + 0.5.9-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index d17c8e27..3d09477b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.8 + 0.5.9-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.5.8 + HEAD From b4d1431fec76c9773b5552ccbac7afda2ed53056 Mon Sep 17 00:00:00 2001 From: Bogdan Ilchyshyn Date: Fri, 30 Oct 2020 18:22:12 +1100 Subject: [PATCH 55/60] Adding support for `@KafkaListener` instrumentation via upgrade to `opentracing-contrib/java-kafka-client:0.1.15`. (#306) Fixes #295. --- .../opentracing-spring-cloud-kafka-starter/pom.xml | 6 ++++++ .../spring/cloud/kafka/KafkaAutoConfiguration.java | 8 ++++++++ pom.xml | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index feb94400..9b55e547 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -66,6 +66,12 @@ true + + org.springframework + spring-aspects + true + + org.springframework.boot spring-boot-starter-test diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/java/io/opentracing/contrib/spring/cloud/kafka/KafkaAutoConfiguration.java b/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/java/io/opentracing/contrib/spring/cloud/kafka/KafkaAutoConfiguration.java index 4f5a8c94..b5bf2b15 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/java/io/opentracing/contrib/spring/cloud/kafka/KafkaAutoConfiguration.java +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/src/main/java/io/opentracing/contrib/spring/cloud/kafka/KafkaAutoConfiguration.java @@ -15,8 +15,10 @@ import io.opentracing.Tracer; import io.opentracing.contrib.kafka.spring.TracingConsumerFactory; +import io.opentracing.contrib.kafka.spring.TracingKafkaAspect; import io.opentracing.contrib.kafka.spring.TracingProducerFactory; import io.opentracing.contrib.spring.tracer.configuration.TracerAutoConfiguration; +import org.springframework.aop.framework.ProxyFactoryBean; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -70,4 +72,10 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw } }; } + + @Bean + @ConditionalOnClass(ProxyFactoryBean.class) + public TracingKafkaAspect tracingKafkaAspect(Tracer tracer) { + return new TracingKafkaAspect(tracer); + } } diff --git a/pom.xml b/pom.xml index 3d09477b..8f7a57de 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 0.1.5 10.2.0 0.4.0 - 0.1.12 + 0.1.15 2.2.0.RELEASE From 0b411d7e1be8d306d8d4782b8dd2da5415abdd8d Mon Sep 17 00:00:00 2001 From: opentracingci Date: Fri, 30 Oct 2020 08:15:26 +0000 Subject: [PATCH 56/60] [maven-release-plugin] prepare release 0.5.9 --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 6ef1d0c0..c8e8e6f6 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.9-SNAPSHOT + 0.5.9 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index 6102a99f..ef50391f 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9-SNAPSHOT + 0.5.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index 0f351797..a3b446a1 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.9-SNAPSHOT + 0.5.9 ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index 83e13792..b3ccb7e1 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9-SNAPSHOT + 0.5.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index 8c10f25d..c51359f7 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9-SNAPSHOT + 0.5.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index 2ceead20..b5d512c0 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9-SNAPSHOT + 0.5.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index 9b55e547..13dfed00 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9-SNAPSHOT + 0.5.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index d4cd9f1e..ef34ecde 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9-SNAPSHOT + 0.5.9 ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 70dd7b9f..1c1ab6ea 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9-SNAPSHOT + 0.5.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 52d59f0d..2e596720 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9-SNAPSHOT + 0.5.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index b2404adf..b42001bc 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9-SNAPSHOT + 0.5.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index cdee7b56..144f5af1 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9-SNAPSHOT + 0.5.9 ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index edde9ef6..5e31e055 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9-SNAPSHOT + 0.5.9 ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index b7755eb5..33048922 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.9-SNAPSHOT + 0.5.9 opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 8f7a57de..6b334a91 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.9-SNAPSHOT + 0.5.9 opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - HEAD + 0.5.9 From 82964f0fb2bada86c818e70b0c00961ddd19e213 Mon Sep 17 00:00:00 2001 From: opentracingci Date: Fri, 30 Oct 2020 08:15:32 +0000 Subject: [PATCH 57/60] [maven-release-plugin] prepare for next development iteration --- instrument-starters/opentracing-spring-cloud-core/pom.xml | 2 +- .../opentracing-spring-cloud-feign-starter/pom.xml | 2 +- .../opentracing-spring-cloud-gateway-starter/pom.xml | 2 +- .../opentracing-spring-cloud-hystrix-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jdbc-starter/pom.xml | 2 +- .../opentracing-spring-cloud-jms-starter/pom.xml | 2 +- .../opentracing-spring-cloud-kafka-starter/pom.xml | 2 +- .../opentracing-spring-cloud-mongo-starter/pom.xml | 2 +- .../opentracing-spring-cloud-reactor-starter/pom.xml | 2 +- .../opentracing-spring-cloud-redis-starter/pom.xml | 2 +- .../opentracing-spring-cloud-rxjava-starter/pom.xml | 2 +- .../opentracing-spring-cloud-websocket-starter/pom.xml | 2 +- .../opentracing-spring-cloud-zuul-starter/pom.xml | 2 +- opentracing-spring-cloud-starter/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index c8e8e6f6..7b466654 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.9 + 0.5.10-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml index ef50391f..8631099d 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9 + 0.5.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml index a3b446a1..9a558ee3 100644 --- a/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-gateway-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.9 + 0.5.10-SNAPSHOT ../../ diff --git a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml index b3ccb7e1..9a39faa8 100644 --- a/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-hystrix-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9 + 0.5.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml index c51359f7..4b493ff3 100644 --- a/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jdbc-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9 + 0.5.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml index b5d512c0..9ec1baf4 100644 --- a/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-jms-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9 + 0.5.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml index 13dfed00..adfa218d 100644 --- a/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-kafka-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9 + 0.5.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml index ef34ecde..06c632b3 100644 --- a/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-mongo-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9 + 0.5.10-SNAPSHOT ../.. 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml index 1c1ab6ea..dd40f68b 100644 --- a/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-reactor-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9 + 0.5.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml index 2e596720..4883d338 100644 --- a/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9 + 0.5.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml index b42001bc..9102bebb 100644 --- a/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-rxjava-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9 + 0.5.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml index 144f5af1..96cc9bcc 100644 --- a/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9 + 0.5.10-SNAPSHOT ../../ 4.0.0 diff --git a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml index 5e31e055..8592d7a5 100644 --- a/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml @@ -18,7 +18,7 @@ opentracing-spring-cloud-parent io.opentracing.contrib - 0.5.9 + 0.5.10-SNAPSHOT ../../ 4.0.0 diff --git a/opentracing-spring-cloud-starter/pom.xml b/opentracing-spring-cloud-starter/pom.xml index 33048922..c21abe66 100644 --- a/opentracing-spring-cloud-starter/pom.xml +++ b/opentracing-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.9 + 0.5.10-SNAPSHOT opentracing-spring-cloud-starter diff --git a/pom.xml b/pom.xml index 6b334a91..3026a85b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.opentracing.contrib opentracing-spring-cloud-parent - 0.5.9 + 0.5.10-SNAPSHOT opentracing-spring-cloud-starter /instrument-starters/opentracing-spring-cloud-core @@ -46,7 +46,7 @@ https://github.com/opentracing-contrib/java-spring-cloud scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git scm:git:https://github.com/opentracing-contrib/java-spring-cloud.git - 0.5.9 + HEAD From 76fc7de41a7c26590c9fff59d7ef211d87f7cc3f Mon Sep 17 00:00:00 2001 From: Louis-Etienne Date: Thu, 14 Jan 2021 02:08:03 -0500 Subject: [PATCH 58/60] Add @Traced plus MethodInterceptorSpanDecorator with a standard implementation and move shared logic from @Scheduled/@Traced to a base class (#302) --- .../opentracing-spring-cloud-aop/pom.xml | 33 ++++ .../contrib/spring/cloud/aop/Traced.java | 29 ++++ .../opentracing-spring-cloud-core/pom.xml | 16 +- .../cloud/aop/AopTracingProperties.java | 34 +++++ .../spring/cloud/aop/BaseTracingAspect.java | 121 +++++++++++++++ .../aop/MethodInterceptorSpanDecorator.java | 77 ++++++++++ .../cloud/scheduled/ScheduledAspect.java | 37 ++--- .../scheduled/ScheduledAutoConfiguration.java | 24 ++- .../spring/cloud/traced/TracedAspect.java | 59 +++++++ .../cloud/traced/TracedAutoConfiguration.java | 67 ++++++++ .../cloud/traced/TracedTracingProperties.java | 49 ++++++ .../main/resources/META-INF/spring.factories | 3 +- .../cloud/aop/BaseTracingAspectTest.java | 139 +++++++++++++++++ .../spring/cloud/scheduled/ScheduledTest.java | 2 +- .../spring/cloud/traced/TracedAspectTest.java | 108 +++++++++++++ .../traced/TracedAutoConfigurationTest.java | 144 ++++++++++++++++++ .../src/test/resources/application.yml | 2 + pom.xml | 15 +- 18 files changed, 923 insertions(+), 36 deletions(-) create mode 100644 instrument-starters/opentracing-spring-cloud-aop/pom.xml create mode 100644 instrument-starters/opentracing-spring-cloud-aop/src/main/java/io/opentracing/contrib/spring/cloud/aop/Traced.java create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/AopTracingProperties.java create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/BaseTracingAspect.java create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/MethodInterceptorSpanDecorator.java create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedAspect.java create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedAutoConfiguration.java create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedTracingProperties.java create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/aop/BaseTracingAspectTest.java create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/traced/TracedAspectTest.java create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/traced/TracedAutoConfigurationTest.java create mode 100644 instrument-starters/opentracing-spring-cloud-core/src/test/resources/application.yml diff --git a/instrument-starters/opentracing-spring-cloud-aop/pom.xml b/instrument-starters/opentracing-spring-cloud-aop/pom.xml new file mode 100644 index 00000000..02a99dfa --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-aop/pom.xml @@ -0,0 +1,33 @@ + + + + 4.0.0 + + io.opentracing.contrib + opentracing-spring-cloud-parent + 0.5.8-SNAPSHOT + ../../ + + + opentracing-spring-cloud-aop + + + ${project.basedir}/../../ + + + + diff --git a/instrument-starters/opentracing-spring-cloud-aop/src/main/java/io/opentracing/contrib/spring/cloud/aop/Traced.java b/instrument-starters/opentracing-spring-cloud-aop/src/main/java/io/opentracing/contrib/spring/cloud/aop/Traced.java new file mode 100644 index 00000000..dfe3555a --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-aop/src/main/java/io/opentracing/contrib/spring/cloud/aop/Traced.java @@ -0,0 +1,29 @@ +/** + * Copyright 2017-2018 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. + */ +package io.opentracing.contrib.spring.cloud.aop; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface Traced { + + String component() default "traced"; + + String operationName() default ""; + +} diff --git a/instrument-starters/opentracing-spring-cloud-core/pom.xml b/instrument-starters/opentracing-spring-cloud-core/pom.xml index 7b466654..0e0c734d 100644 --- a/instrument-starters/opentracing-spring-cloud-core/pom.xml +++ b/instrument-starters/opentracing-spring-cloud-core/pom.xml @@ -30,6 +30,11 @@ + + + io.opentracing.contrib + opentracing-spring-cloud-aop + io.opentracing.contrib opentracing-spring-tracer-configuration-starter @@ -54,6 +59,12 @@ spring-boot-starter-web true + + io.opentracing.contrib + opentracing-spring-web-starter + ${version.io.opentracing.contrib-opentracing-spring-web} + true + io.opentracing @@ -85,9 +96,8 @@ test - io.opentracing.contrib - opentracing-spring-web-starter - ${version.io.opentracing.contrib-opentracing-spring-web} + org.assertj + assertj-core test diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/AopTracingProperties.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/AopTracingProperties.java new file mode 100644 index 00000000..f7eec9ab --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/AopTracingProperties.java @@ -0,0 +1,34 @@ +/** + * Copyright 2017-2018 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. + */ +package io.opentracing.contrib.spring.cloud.aop; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("opentracing.spring.cloud.aop") +public class AopTracingProperties { + + /** + * Enable tracing for {@link org.springframework.scheduling.annotation.Scheduled} + */ + private boolean enabled = true; + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + +} diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/BaseTracingAspect.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/BaseTracingAspect.java new file mode 100644 index 00000000..8e047a17 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/BaseTracingAspect.java @@ -0,0 +1,121 @@ +/** + * Copyright 2017-2018 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. + */ +package io.opentracing.contrib.spring.cloud.aop; + +import io.opentracing.Scope; +import io.opentracing.Span; +import io.opentracing.Tracer; +import io.opentracing.contrib.spring.cloud.ExtensionTags; +import io.opentracing.tag.Tags; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.reflect.MethodSignature; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class BaseTracingAspect { + + private static final Logger log = LoggerFactory.getLogger(BaseTracingAspect.class); + private final Tracer tracer; + private final Class annotation; + private final List decorators; + private Pattern skipPattern; + + public BaseTracingAspect(Tracer tracer, List decorators, + Class annotation, Pattern skipPattern) { + this.tracer = tracer; + this.decorators = decorators != null ? decorators : new ArrayList<>(); + this.annotation = annotation; + this.skipPattern = skipPattern; + } + + /** + * This method should be overridden to add the proper annotation and call {@link + * BaseTracingAspect#internalTrace(ProceedingJoinPoint)} + */ + public abstract Object trace(ProceedingJoinPoint pjp) throws Throwable; + + protected Object internalTrace(ProceedingJoinPoint pjp) throws Throwable { + if (skipPattern.matcher(pjp.getTarget().getClass().getName()).matches()) { + return pjp.proceed(); + } + + // operation name is method name + Span span = tracer.buildSpan(getOperationName(pjp)) + .withTag(Tags.COMPONENT.getKey(), getComponent(pjp)) + .withTag(ExtensionTags.CLASS_TAG.getKey(), pjp.getTarget().getClass().getSimpleName()) + .withTag(ExtensionTags.METHOD_TAG.getKey(), pjp.getSignature().getName()) + .start(); + + try { + try (Scope scope = tracer.activateSpan(span)) { + decoratePreProceed(pjp, span); + Object result = pjp.proceed(); + decoratePostProceed(pjp, span, result); + return result; + } + } catch (Exception ex) { + decorateOnError(pjp, span, ex); + throw ex; + } finally { + span.finish(); + } + } + + protected void decoratePreProceed(ProceedingJoinPoint pjp, Span span) { + for (MethodInterceptorSpanDecorator spanDecorator : decorators) { + try { + spanDecorator.onPreProceed(pjp, span); + } catch (RuntimeException exDecorator) { + log.error("Exception during decorating span", exDecorator); + } + } + } + + protected void decoratePostProceed(ProceedingJoinPoint pjp, Span span, Object result) { + for (MethodInterceptorSpanDecorator spanDecorator : decorators) { + try { + spanDecorator.onPostProceed(pjp, result, span); + } catch (RuntimeException exDecorator) { + log.error("Exception during decorating span", exDecorator); + } + } + } + + protected void decorateOnError(ProceedingJoinPoint pjp, Span span, Exception ex) { + for (MethodInterceptorSpanDecorator spanDecorator : decorators) { + spanDecorator.onError(pjp, ex, span); + } + } + + protected String getOperationName(ProceedingJoinPoint pjp) { + return ((MethodSignature) pjp.getSignature()).getMethod().getName(); + } + + protected String getComponent(ProceedingJoinPoint pjp) { + return annotation.getSimpleName().toLowerCase(); + } + + protected boolean shouldTrace(ProceedingJoinPoint pjp) { + return true; + } + + protected Tracer getTracer() { + return this.tracer; + } + +} diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/MethodInterceptorSpanDecorator.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/MethodInterceptorSpanDecorator.java new file mode 100644 index 00000000..c30cf012 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/MethodInterceptorSpanDecorator.java @@ -0,0 +1,77 @@ +/** + * Copyright 2017-2018 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. + */ +package io.opentracing.contrib.spring.cloud.aop; + +import io.opentracing.Span; +import io.opentracing.contrib.spring.cloud.ExtensionTags; +import io.opentracing.contrib.spring.cloud.SpanUtils; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.reflect.MethodSignature; + +public interface MethodInterceptorSpanDecorator { + + /** + * Decorate span before invocation is done, e.g. before + * {@link ProceedingJoinPoint#proceed()} + * is called + * + * @param ProceedingJoinPoint pjp + * @param Object result + * @param span span + */ + void onPreProceed(ProceedingJoinPoint pjp, Span span); + + /** + * Decorate span after invocation is done, e.g. after + * {@link ProceedingJoinPoint#proceed()} + * is called + * + * @param ProceedingJoinPoint pjp + * @param Object result + * @param span span + */ + void onPostProceed(ProceedingJoinPoint pjp, Object result, Span span); + + /** + * Decorate span when exception is thrown during the invocation, e.g. during + * {@link ProceedingJoinPoint#proceed()} + * is processing. + * + * @param ProceedingJoinPoint pjp + * @param ex exception + * @param span span + */ + void onError(ProceedingJoinPoint pjp, Exception ex, Span span); + + /** + * This decorator adds set of standard tags to the span. + */ + class StandardTags implements MethodInterceptorSpanDecorator { + + @Override + public void onPreProceed(ProceedingJoinPoint pjp, Span span) { + ExtensionTags.CLASS_TAG.set(span, pjp.getTarget().getClass().getSimpleName()); + ExtensionTags.METHOD_TAG.set(span, ((MethodSignature) pjp.getSignature()).getName()); + } + + @Override + public void onPostProceed(ProceedingJoinPoint pjp, Object result, Span span) { + } + + @Override + public void onError(ProceedingJoinPoint pjp, Exception ex, Span span) { + SpanUtils.captureException(span, ex); + } + } +} diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledAspect.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledAspect.java index ca98502e..98982e86 100644 --- a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledAspect.java +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledAspect.java @@ -18,49 +18,30 @@ import io.opentracing.Tracer; import io.opentracing.contrib.spring.cloud.ExtensionTags; import io.opentracing.contrib.spring.cloud.SpanUtils; +import io.opentracing.contrib.spring.cloud.aop.BaseTracingAspect; +import io.opentracing.contrib.spring.cloud.aop.MethodInterceptorSpanDecorator; import io.opentracing.tag.Tags; +import java.util.List; import java.util.regex.Pattern; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; +import org.springframework.scheduling.annotation.Scheduled; /** * @author Pavol Loffay */ @Aspect -public class ScheduledAspect { - - static final String COMPONENT_NAME = "scheduled"; +public class ScheduledAspect extends BaseTracingAspect { private Tracer tracer; - private Pattern skipPattern; - public ScheduledAspect(Tracer tracer, ScheduledTracingProperties scheduledTracingProperties) { - this.tracer = tracer; - this.skipPattern = Pattern.compile(scheduledTracingProperties.getSkipPattern()); + public ScheduledAspect(Tracer tracer, ScheduledTracingProperties scheduledTracingProperties, List decorators) { + super(tracer, decorators, Scheduled.class, Pattern.compile(scheduledTracingProperties.getSkipPattern())); } @Around("execution (@org.springframework.scheduling.annotation.Scheduled * *.*(..))") - public Object traceBackgroundThread(final ProceedingJoinPoint pjp) throws Throwable { - if (skipPattern.matcher(pjp.getTarget().getClass().getName()).matches()) { - return pjp.proceed(); - } - - // operation name is method name - Span span = tracer.buildSpan(pjp.getSignature().getName()) - .withTag(Tags.COMPONENT.getKey(), COMPONENT_NAME) - .withTag(ExtensionTags.CLASS_TAG.getKey(), pjp.getTarget().getClass().getSimpleName()) - .withTag(ExtensionTags.METHOD_TAG.getKey(), pjp.getSignature().getName()) - .start(); - try { - try (Scope scope = tracer.activateSpan(span)) { - return pjp.proceed(); - } - } catch (Exception ex) { - SpanUtils.captureException(span, ex); - throw ex; - } finally { - span.finish(); - } + public Object trace(final ProceedingJoinPoint pjp) throws Throwable { + return this.internalTrace(pjp); } } diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledAutoConfiguration.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledAutoConfiguration.java index 05281cc7..62a81b48 100644 --- a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledAutoConfiguration.java +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledAutoConfiguration.java @@ -15,13 +15,19 @@ import io.opentracing.Tracer; +import io.opentracing.contrib.spring.cloud.aop.MethodInterceptorSpanDecorator; import io.opentracing.contrib.spring.tracer.configuration.TracerAutoConfiguration; +import java.util.ArrayList; +import java.util.List; +import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.AnnotationAwareOrderComparator; +import org.springframework.util.CollectionUtils; /** * @author Pavol Loffay @@ -33,8 +39,24 @@ @EnableConfigurationProperties(ScheduledTracingProperties.class) public class ScheduledAutoConfiguration { + private final ObjectProvider> methodInterceptorSpanDecorators; + + public ScheduledAutoConfiguration(ObjectProvider> methodInterceptorSpanDecorators) { + this.methodInterceptorSpanDecorators = methodInterceptorSpanDecorators; + } + @Bean public ScheduledAspect scheduledAspect(Tracer tracer, ScheduledTracingProperties scheduledTracingProperties) { - return new ScheduledAspect(tracer, scheduledTracingProperties); + List spanDecorators = new ArrayList<>(); + spanDecorators.add(new MethodInterceptorSpanDecorator.StandardTags()); + + List providedDecorators = this.methodInterceptorSpanDecorators.getIfAvailable(); + if (!CollectionUtils.isEmpty(providedDecorators)) { + providedDecorators = new ArrayList<>(providedDecorators); + AnnotationAwareOrderComparator.sort(providedDecorators); + spanDecorators.addAll(providedDecorators); + } + + return new ScheduledAspect(tracer, scheduledTracingProperties, spanDecorators); } } diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedAspect.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedAspect.java new file mode 100644 index 00000000..cac7f5b9 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedAspect.java @@ -0,0 +1,59 @@ +/** + * Copyright 2017-2018 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. + */ +package io.opentracing.contrib.spring.cloud.traced; + +import io.opentracing.Tracer; +import io.opentracing.contrib.spring.cloud.aop.BaseTracingAspect; +import io.opentracing.contrib.spring.cloud.aop.MethodInterceptorSpanDecorator; +import io.opentracing.contrib.spring.cloud.aop.Traced; +import java.util.List; +import java.util.regex.Pattern; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.core.annotation.AnnotationUtils; + +@Aspect +public class TracedAspect extends BaseTracingAspect { + + public TracedAspect(Tracer tracer, TracedTracingProperties tracedTracingProperties, List decorators) { + super(tracer, decorators, Traced.class, Pattern.compile(tracedTracingProperties.getSkipPattern())); + } + + private Traced findAnnotation(ProceedingJoinPoint pjp) { + return AnnotationUtils + .findAnnotation(((MethodSignature) pjp.getSignature()).getMethod(), Traced.class); + } + + @Override + @Around("execution (@io.opentracing.contrib.spring.cloud.aop.Traced * *.*(..))") + public Object trace(ProceedingJoinPoint pjp) throws Throwable { + return super.internalTrace(pjp); + } + + @Override + protected String getComponent(ProceedingJoinPoint pjp) { + return findAnnotation(pjp).component(); + } + + @Override + protected String getOperationName(ProceedingJoinPoint pjp) { + String operationName = findAnnotation(pjp).operationName(); + if (operationName == null || "".equals(operationName)) { + operationName = super.getOperationName(pjp); + } + return operationName; + } +} diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedAutoConfiguration.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedAutoConfiguration.java new file mode 100644 index 00000000..f932b0a0 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedAutoConfiguration.java @@ -0,0 +1,67 @@ +/** + * Copyright 2017-2018 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. + */ +package io.opentracing.contrib.spring.cloud.traced; + +import io.opentracing.Tracer; +import io.opentracing.contrib.spring.cloud.aop.MethodInterceptorSpanDecorator; +import io.opentracing.contrib.spring.tracer.configuration.TracerAutoConfiguration; +import java.util.ArrayList; +import java.util.List; +import org.aspectj.lang.ProceedingJoinPoint; +import org.springframework.beans.factory.ObjectProvider; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.AnnotationAwareOrderComparator; +import org.springframework.util.CollectionUtils; + +@Configuration +@ConditionalOnBean(Tracer.class) +@AutoConfigureAfter(TracerAutoConfiguration.class) +@ConditionalOnProperty(name = "opentracing.spring.cloud.traced.enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnWebApplication +@ConditionalOnClass({ProceedingJoinPoint.class}) +@EnableConfigurationProperties(TracedTracingProperties.class) +public class TracedAutoConfiguration { + + private final ObjectProvider> methodInterceptorSpanDecorators; + + public TracedAutoConfiguration(ObjectProvider> methodInterceptorSpanDecorators) { + this.methodInterceptorSpanDecorators = methodInterceptorSpanDecorators; + } + + @Bean + @ConditionalOnMissingBean + public TracedAspect tracedAspect(Tracer tracer, TracedTracingProperties tracedTracingProperties) { + List spanDecorators = new ArrayList<>(); + spanDecorators.add(new MethodInterceptorSpanDecorator.StandardTags()); + + List decorators = this.methodInterceptorSpanDecorators + .getIfAvailable(); + if (!CollectionUtils.isEmpty(decorators)) { + decorators = new ArrayList<>(decorators); + AnnotationAwareOrderComparator.sort(decorators); + spanDecorators.addAll(decorators); + } + + return new TracedAspect(tracer, tracedTracingProperties, spanDecorators); + } + +} diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedTracingProperties.java b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedTracingProperties.java new file mode 100644 index 00000000..7e77e480 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedTracingProperties.java @@ -0,0 +1,49 @@ +/** + * Copyright 2017-2018 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. + */ +package io.opentracing.contrib.spring.cloud.traced; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * @author Pavol Loffay + */ +@ConfigurationProperties("opentracing.spring.cloud.traced") +public class TracedTracingProperties { + + /** + * Enable tracing for {@link io.opentracing.contrib.spring.cloud.aop.Traced} + */ + private boolean enabled = true; + + /** + * Regex of fully qualified class name annotated with {@link io.opentracing.contrib.spring.cloud.aop.Traced} + */ + private String skipPattern = ""; + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public String getSkipPattern() { + return skipPattern; + } + + public void setSkipPattern(String skipPattern) { + this.skipPattern = skipPattern; + } +} diff --git a/instrument-starters/opentracing-spring-cloud-core/src/main/resources/META-INF/spring.factories b/instrument-starters/opentracing-spring-cloud-core/src/main/resources/META-INF/spring.factories index 412f05ef..40123753 100644 --- a/instrument-starters/opentracing-spring-cloud-core/src/main/resources/META-INF/spring.factories +++ b/instrument-starters/opentracing-spring-cloud-core/src/main/resources/META-INF/spring.factories @@ -2,7 +2,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ io.opentracing.contrib.spring.cloud.async.CustomAsyncConfigurerAutoConfiguration,\ io.opentracing.contrib.spring.cloud.async.DefaultAsyncAutoConfiguration,\ io.opentracing.contrib.spring.cloud.scheduled.ScheduledAutoConfiguration,\ -io.opentracing.contrib.spring.cloud.log.LoggingAutoConfiguration +io.opentracing.contrib.spring.cloud.log.LoggingAutoConfiguration,\ +io.opentracing.contrib.spring.cloud.traced.TracedAutoConfiguration # Environment Post Processor org.springframework.boot.env.EnvironmentPostProcessor=\ diff --git a/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/aop/BaseTracingAspectTest.java b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/aop/BaseTracingAspectTest.java new file mode 100644 index 00000000..c195b223 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/aop/BaseTracingAspectTest.java @@ -0,0 +1,139 @@ +/** + * Copyright 2017-2018 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. + */ +package io.opentracing.contrib.spring.cloud.aop; + +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.same; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import io.opentracing.Span; +import io.opentracing.Tracer; +import io.opentracing.mock.MockTracer; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.reflect.MethodSignature; +import org.assertj.core.api.ThrowableAssert; +import org.assertj.core.api.WithAssertions; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Matchers; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.stereotype.Component; + +@RunWith(MockitoJUnitRunner.class) +public class BaseTracingAspectTest implements WithAssertions { + + private MockTracer tracer = new MockTracer(); + private List decorators = new ArrayList(); + @Mock + private MethodInterceptorSpanDecorator decorator; + @Mock + private ProceedingJoinPoint pjp; + @Mock + private MethodSignature methodSignature; + + private TestTracingAspect aspect; + + private Method method; + @Mock + private Object result; + + @Before + public void init() throws Throwable { + method = Object.class.getMethod("toString", (Class[]) null); + aspect = new TestTracingAspect(tracer, decorators, Component.class); + decorators.add(decorator); + when(pjp.getSignature()).thenReturn(methodSignature); + when(methodSignature.getMethod()).thenReturn(method); + when(pjp.proceed()).thenReturn(result); + when(pjp.getTarget()).thenReturn(Object.class); + } + + @Test + public void givenDecorators_whenMethodIsIntercepted_thenPreProceedShouldBeCalled() + throws Throwable { + aspect.trace(pjp); + + verify(decorator).onPreProceed(same(pjp), Matchers.any()); + } + + @Test + public void givenDecorators_whenMethodIsIntercepted_thenPostProceedShouldBeCalled() + throws Throwable { + Object result = aspect.trace(pjp); + + verify(decorator).onPostProceed(same(pjp), same(result), Matchers.any()); + } + + @Test + public void givenNoExceptionOnProceed_whenMethodIsIntercepted_thenOnErrorShouldNotBeCalled() + throws Throwable { + aspect.trace(pjp); + + verify(decorator, never()) + .onError(any(ProceedingJoinPoint.class), any(Exception.class), any(Span.class)); + } + + @Test + public void givenExceptionOnProceed_whenMethodIsIntercepted_thenExceptionShouldBeRethrowed() + throws Throwable { + RuntimeException e = new RuntimeException(); + when(pjp.proceed()).thenThrow(e); + assertThatThrownBy(new ThrowableAssert.ThrowingCallable() { + @Override + public void call() throws Throwable { + aspect.trace(pjp); + } + }).isSameAs(e); + } + + @Test + public void givenExceptionOnProceed_whenMethodIsIntercepted_thenOnErrorShouldBeCalled() + throws Throwable { + RuntimeException e = new RuntimeException(); + when(pjp.proceed()).thenThrow(e); + + assertThatThrownBy(new ThrowableAssert.ThrowingCallable() { + @Override + public void call() throws Throwable { + aspect.trace(pjp); + } + }).isSameAs(e); + + verify(decorator).onError(same(pjp), same(e), Matchers.any()); + } + + public static class TestTracingAspect extends BaseTracingAspect { + + public TestTracingAspect(Tracer tracer, List decorators, + Class annotation) { + super(tracer, decorators, annotation, Pattern.compile("")); + } + + @Override + public Object trace(ProceedingJoinPoint pjp) throws Throwable { + return super.internalTrace(pjp); + } + + } + +} diff --git a/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledTest.java b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledTest.java index 3f17fdff..411e86f0 100644 --- a/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledTest.java +++ b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledTest.java @@ -102,7 +102,7 @@ public void testScheduled() throws InterruptedException { assertEquals("scheduledFoo", scheduledSpan.operationName()); assertEquals(3, scheduledSpan.tags().size()); assertEquals(0, scheduledSpan.logEntries().size()); - assertEquals(ScheduledAspect.COMPONENT_NAME, scheduledSpan.tags().get(Tags.COMPONENT.getKey())); + assertEquals("scheduled", scheduledSpan.tags().get(Tags.COMPONENT.getKey())); assertEquals(ScheduledComponent.class.getSimpleName(), scheduledSpan.tags().get(ExtensionTags.CLASS_TAG.getKey())); assertEquals("scheduledFoo", scheduledSpan.tags().get(ExtensionTags.METHOD_TAG.getKey())); diff --git a/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/traced/TracedAspectTest.java b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/traced/TracedAspectTest.java new file mode 100644 index 00000000..08c551c3 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/traced/TracedAspectTest.java @@ -0,0 +1,108 @@ +/** + * Copyright 2017-2018 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. + */ +package io.opentracing.contrib.spring.cloud.traced; + +import static org.mockito.Mockito.when; + +import io.opentracing.Span; +import io.opentracing.Tracer; +import io.opentracing.contrib.spring.cloud.aop.MethodInterceptorSpanDecorator; +import io.opentracing.contrib.spring.cloud.aop.Traced; +import java.util.List; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.reflect.MethodSignature; +import org.assertj.core.api.WithAssertions; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +@RunWith(MockitoJUnitRunner.class) +public class TracedAspectTest implements WithAssertions { + + @Mock + private Span span; + @Mock + private Tracer tracer; + @Mock + private List decorators; + @Mock + private ProceedingJoinPoint pjp; + @Mock + private MethodSignature signature; + @Mock + private TracedTracingProperties tracedTracingProperties; + + private TracedAspect aspect; + + @Before + public void init() { + when(pjp.getSignature()).thenReturn(signature); + when(tracedTracingProperties.getSkipPattern()).thenReturn(""); + aspect = new TracedAspect(tracer, tracedTracingProperties, decorators); + } + + @Test + public void givenCustomOperation_whenGettingOperationName_thenOperationNameShouldBeOverriden() + throws Throwable { + when(signature.getMethod()).thenReturn(TracedClass.class.getMethod("tracedOperation")); + + assertThat(aspect.getOperationName(pjp)).isEqualTo("customOps"); + } + + @Test + public void givenEmptyOperation_whenGettingOperationName_thenOperationNameShouldBeMethodName() + throws Throwable { + when(signature.getMethod()).thenReturn(TracedClass.class.getMethod("traced")); + + assertThat(aspect.getOperationName(pjp)).isEqualTo("traced"); + } + + + @Test + public void givenCustomComponent_whenGettingComponent_thenComponentNameShouldBeOverriden() + throws Throwable { + when(signature.getMethod()).thenReturn(TracedClass.class.getMethod("tracedComponent")); + + assertThat(aspect.getComponent(pjp)).isEqualTo("custom"); + } + + @Test + public void givenDefaultComponent_whenGettingComponent_thenComponentNameShouldBeOverriden() + throws Throwable { + when(signature.getMethod()).thenReturn(TracedClass.class.getMethod("traced")); + + assertThat(aspect.getComponent(pjp)).isEqualTo("traced"); + } + + public static class TracedClass { + + @Traced + public void traced() { + + } + + @Traced(operationName = "customOps") + public void tracedOperation() { + + } + + @Traced(component = "custom") + public void tracedComponent() { + + } + } + +} diff --git a/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/traced/TracedAutoConfigurationTest.java b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/traced/TracedAutoConfigurationTest.java new file mode 100644 index 00000000..cfe33087 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/traced/TracedAutoConfigurationTest.java @@ -0,0 +1,144 @@ +/** + * Copyright 2017-2018 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. + */ +package io.opentracing.contrib.spring.cloud.traced; + +import io.opentracing.Tracer; +import io.opentracing.contrib.spring.cloud.MockTracingConfiguration; +import io.opentracing.contrib.spring.cloud.aop.Traced; +import io.opentracing.mock.MockTracer; +import io.opentracing.tag.Tags; +import org.assertj.core.api.WithAssertions; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@RunWith(SpringJUnit4ClassRunner.class) +public class TracedAutoConfigurationTest implements WithAssertions { + + @Autowired + private TracedClass tracedClass; + @Autowired + private IgnoredTracedClass ignoredTracedClass; + @Autowired + private MockTracer tracer; + + @Before() + public void setup() { + tracer.buildSpan("test").start(); + } + + @After() + public void tearDown() { + tracer.reset(); + } + + @Test + public void givenIgnoredClass_whenMethodInvocked_thenNoSpanIsGenerated() { + ignoredTracedClass.ignoredTraced(); + assertThat(tracer.finishedSpans()).isEmpty(); + } + + @Test + public void givenActiveTracer_whenITrace_thenTraceIsGenerated() { + tracedClass.traced(); + assertThat(tracer.finishedSpans()).hasSize(1); + assertThat(tracer.finishedSpans().get(0).operationName()).isEqualTo("traced"); + assertThat(tracer.finishedSpans().get(0).tags().get(Tags.COMPONENT.getKey())) + .isEqualTo("traced"); + } + + @Test + public void givenActiveTracer_whenITraceWithCustomComponent_thenTraceIsGenerated() { + tracedClass.tracedComponent(); + assertThat(tracer.finishedSpans()).hasSize(1); + assertThat(tracer.finishedSpans().get(0).operationName()).isEqualTo("tracedComponent"); + assertThat(tracer.finishedSpans().get(0).tags().get(Tags.COMPONENT.getKey())) + .isEqualTo("custom"); + } + + @Test + public void givenActiveTracer_whenITraceWithCustomOperation_thenTraceIsGenerated() { + tracedClass.tracedOperation(); + assertThat(tracer.finishedSpans()).hasSize(1); + assertThat(tracer.finishedSpans().get(0).operationName()).isEqualTo("customOps"); + assertThat(tracer.finishedSpans().get(0).tags().get(Tags.COMPONENT.getKey())) + .isEqualTo("traced"); + } + + @Test + public void givenActiveTracer_whenITraceWhitChild_thenTraceIsGenerated() { + tracedClass.child("someChildSpan"); + assertThat(tracer.finishedSpans()).hasSize(2); + assertThat(tracer.finishedSpans().get(1).operationName()).isEqualTo("child"); + assertThat(tracer.finishedSpans().get(1).tags().get(Tags.COMPONENT.getKey())) + .isEqualTo("traced"); + assertThat(tracer.finishedSpans().get(0).operationName()).isEqualTo("someChildSpan"); + assertThat(tracer.finishedSpans().get(0).tags()).isEmpty(); + } + + @SpringBootApplication + @Import(MockTracingConfiguration.class) + public static class TestConfig { + + @Bean + public TracedClass tracedClass() { + return new TracedClass(); + } + + @Bean + public IgnoredTracedClass ignoredTracedClass() { + return new IgnoredTracedClass(); + } + } + + public static class TracedClass { + @Autowired + private Tracer tracer; + + @Traced + public void traced() { + + } + + @Traced + public void child(String spanName) { + tracer.buildSpan(spanName).start().finish(); + } + + @Traced(operationName = "customOps") + public void tracedOperation() { + + } + + @Traced(component = "custom") + public void tracedComponent() { + + } + } + public static class IgnoredTracedClass { + @Traced + public void ignoredTraced() { + + } + + } +} diff --git a/instrument-starters/opentracing-spring-cloud-core/src/test/resources/application.yml b/instrument-starters/opentracing-spring-cloud-core/src/test/resources/application.yml new file mode 100644 index 00000000..8f242836 --- /dev/null +++ b/instrument-starters/opentracing-spring-cloud-core/src/test/resources/application.yml @@ -0,0 +1,2 @@ +opentracing.spring.cloud.traced: + skipPattern: .*IgnoredTracedClass diff --git a/pom.xml b/pom.xml index 3026a85b..fa5250f9 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,8 @@ 0.5.10-SNAPSHOT opentracing-spring-cloud-starter - /instrument-starters/opentracing-spring-cloud-core + instrument-starters/opentracing-spring-cloud-core + instrument-starters/opentracing-spring-cloud-aop instrument-starters/opentracing-spring-cloud-jdbc-starter instrument-starters/opentracing-spring-cloud-jms-starter instrument-starters/opentracing-spring-cloud-kafka-starter @@ -97,7 +98,7 @@ 2.2.0 1.3.1 1.7.25 - + 3.9.0 1.1-rev-1 @@ -116,6 +117,11 @@ + + ${project.groupId} + opentracing-spring-cloud-aop + ${project.version} + ${project.groupId} opentracing-spring-cloud-core @@ -288,6 +294,11 @@ pom import + + org.assertj + assertj-core + ${version.assertj} + From 8a865d560bf42b4bce839ba9a0977aecff3a4073 Mon Sep 17 00:00:00 2001 From: Michael Stummvoll Date: Fri, 1 Oct 2021 08:48:14 +0200 Subject: [PATCH 59/60] Remove support for LoadBalancerFeignClient (#324) LoadBalancerFeignClient was removed in spring-cloud-openfeign, so this code might raise errors when used with newer spring versions --- .../feign/FeignContextBeanPostProcessor.java | 7 ++--- .../feign/FeignTracingAutoConfiguration.java | 4 +-- .../spring/cloud/feign/TraceFeignContext.java | 6 ++-- .../cloud/feign/TracedFeignBeanFactory.java | 29 ++----------------- 4 files changed, 8 insertions(+), 38 deletions(-) diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/FeignContextBeanPostProcessor.java b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/FeignContextBeanPostProcessor.java index b97b90a0..88c3f95a 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/FeignContextBeanPostProcessor.java +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/FeignContextBeanPostProcessor.java @@ -27,20 +27,17 @@ public class FeignContextBeanPostProcessor implements BeanPostProcessor { private Tracer tracer; - private BeanFactory beanFactory; private List spanDecorators; - FeignContextBeanPostProcessor(Tracer tracer, BeanFactory beanFactory, - List spanDecorators) { + FeignContextBeanPostProcessor(Tracer tracer, List spanDecorators) { this.tracer = tracer; - this.beanFactory = beanFactory; this.spanDecorators = spanDecorators; } @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof FeignContext && !(bean instanceof TraceFeignContext)) { - return new TraceFeignContext(tracer, (FeignContext) bean, beanFactory, spanDecorators); + return new TraceFeignContext(tracer, (FeignContext) bean, spanDecorators); } return bean; } diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/FeignTracingAutoConfiguration.java b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/FeignTracingAutoConfiguration.java index bbfd832d..7a85c086 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/FeignTracingAutoConfiguration.java +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/FeignTracingAutoConfiguration.java @@ -58,8 +58,8 @@ public class FeignTracingAutoConfiguration { @Bean @ConditionalOnClass(name = "org.springframework.cloud.openfeign.FeignContext") - FeignContextBeanPostProcessor feignContextBeanPostProcessor(BeanFactory beanFactory) { - return new FeignContextBeanPostProcessor(tracer, beanFactory, spanDecorators); + FeignContextBeanPostProcessor feignContextBeanPostProcessor() { + return new FeignContextBeanPostProcessor(tracer, spanDecorators); } @Configuration diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TraceFeignContext.java b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TraceFeignContext.java index c61e9f7b..9adfb9e8 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TraceFeignContext.java +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TraceFeignContext.java @@ -19,7 +19,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.beans.factory.BeanFactory; import org.springframework.cloud.openfeign.FeignContext; /** @@ -30,10 +29,9 @@ class TraceFeignContext extends FeignContext { private final FeignContext delegate; private final TracedFeignBeanFactory tracedFeignBeanFactory; - TraceFeignContext(Tracer tracer, FeignContext delegate, BeanFactory beanFactory, - List spanDecorators) { + TraceFeignContext(Tracer tracer, FeignContext delegate, List spanDecorators) { this.delegate = delegate; - this.tracedFeignBeanFactory = new TracedFeignBeanFactory(tracer, beanFactory, spanDecorators); + this.tracedFeignBeanFactory = new TracedFeignBeanFactory(tracer, spanDecorators); } @SuppressWarnings("unchecked") diff --git a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TracedFeignBeanFactory.java b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TracedFeignBeanFactory.java index b4c38e29..c66cea57 100644 --- a/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TracedFeignBeanFactory.java +++ b/instrument-starters/opentracing-spring-cloud-feign-starter/src/main/java/io/opentracing/contrib/spring/cloud/feign/TracedFeignBeanFactory.java @@ -18,36 +18,24 @@ import feign.opentracing.TracingClient; import io.opentracing.Tracer; import java.util.List; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.cloud.netflix.ribbon.SpringClientFactory; -import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory; -import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient; import org.springframework.context.annotation.Lazy; class TracedFeignBeanFactory { private final Tracer tracer; - private final BeanFactory beanFactory; private final List spanDecorators; - public TracedFeignBeanFactory(Tracer tracer, BeanFactory beanFactory, @Lazy List spanDecorators) { + public TracedFeignBeanFactory(Tracer tracer, @Lazy List spanDecorators) { this.tracer = tracer; - this.beanFactory = beanFactory; this.spanDecorators = spanDecorators; } public Object from(Object bean) { - if (bean instanceof TracingClient || bean instanceof LoadBalancedTracedFeign) { + if (bean instanceof TracingClient) { return bean; } if (bean instanceof Client) { - if (bean instanceof LoadBalancerFeignClient) { - return new LoadBalancedTracedFeign( - buildTracingClient(((LoadBalancerFeignClient) bean).getDelegate(), tracer), - beanFactory.getBean(CachingSpringLoadBalancerFactory.class), - beanFactory.getBean(SpringClientFactory.class)); - } return buildTracingClient((Client) bean, tracer); } @@ -60,17 +48,4 @@ private TracingClient buildTracingClient(Client delegate, Tracer tracer) { .withFeignSpanDecorators(spanDecorators) .build(); } - - /** - * Needed for cast in {@link org.springframework.cloud.openfeign.FeignClientFactoryBean} - */ - static class LoadBalancedTracedFeign extends LoadBalancerFeignClient { - - public LoadBalancedTracedFeign(Client delegate, - CachingSpringLoadBalancerFactory lbClientFactory, - SpringClientFactory clientFactory) { - super(delegate, lbClientFactory, clientFactory); - } - } - } From c4e02cc3fec07a47a856a63e2e4274c69a72fea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A0=95=EC=9D=8C?= <48552765+jeongum@users.noreply.github.com> Date: Sat, 15 Mar 2025 10:57:49 +0900 Subject: [PATCH 60/60] Upgrade opentracing-spring-redis to 0.1.16 (#339) Co-authored-by: lyra --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa5250f9..813b42c2 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ 3.0.0 0.2.11 0.1.4 - 0.1.14 + 0.1.16 0.4.0 0.2.0 0.1.3