Skip to content

Commit

Permalink
Rename opentracing-spring-web-autoconfigure to *-starter
Browse files Browse the repository at this point in the history
Fixes: #75
  • Loading branch information
geoand authored Jun 14, 2018
1 parent d9c66d5 commit 12d666a
Show file tree
Hide file tree
Showing 19 changed files with 20 additions and 24 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ If you are using Spring Boot the easiest way how to configure OpenTracing instru
```xml
<dependency>
<groupId>io.opentracing.contrib</groupId>
<artifactId>opentracing-spring-web-autoconfigure</artifactId>
<artifactId>opentracing-spring-web-starter</artifactId>
</dependency>

```
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<version>0.3.3-SNAPSHOT</version>
</parent>

<artifactId>opentracing-spring-web-autoconfigure</artifactId>
<artifactId>opentracing-spring-web-starter</artifactId>

<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.opentracing.contrib.spring.web.autoconfig;
package io.opentracing.contrib.spring.web.starter;

import io.opentracing.Tracer;
import io.opentracing.contrib.spring.tracer.configuration.TracerAutoConfiguration;
import io.opentracing.contrib.spring.web.client.RestTemplateSpanDecorator;
import io.opentracing.contrib.spring.web.client.TracingAsyncRestTemplateInterceptor;
import io.opentracing.contrib.spring.web.autoconfig.client.TracingRestTemplateCustomizer;
import io.opentracing.contrib.spring.web.starter.client.TracingRestTemplateCustomizer;
import io.opentracing.contrib.spring.web.client.TracingRestTemplateInterceptor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.opentracing.contrib.spring.web.autoconfig;
package io.opentracing.contrib.spring.web.starter;

import java.util.Arrays;
import java.util.Collections;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.opentracing.contrib.spring.web.autoconfig;
package io.opentracing.contrib.spring.web.starter;

import org.springframework.boot.context.properties.ConfigurationProperties;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.opentracing.contrib.spring.web.autoconfig;
package io.opentracing.contrib.spring.web.starter;

import java.util.*;
import java.util.regex.Pattern;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.opentracing.contrib.spring.web.autoconfig.client;
package io.opentracing.contrib.spring.web.starter.client;

import io.opentracing.Tracer;
import io.opentracing.contrib.spring.web.client.RestTemplateSpanDecorator;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
io.opentracing.contrib.spring.web.starter.ServerTracingAutoConfiguration,\
io.opentracing.contrib.spring.web.starter.RestTemplateTracingAutoConfiguration
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package io.opentracing.contrib.spring.web.autoconfig;
package io.opentracing.contrib.spring.web.starter;

import io.opentracing.contrib.spring.web.client.RestTemplateSpanDecorator;
import io.opentracing.mock.MockTracer;
import io.opentracing.tag.Tags;
import io.opentracing.util.ThreadLocalScopeManager;
import org.awaitility.Awaitility;
import org.hamcrest.core.IsEqual;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.opentracing.contrib.spring.web.autoconfig;
package io.opentracing.contrib.spring.web.starter;

import java.lang.reflect.Field;
import org.junit.BeforeClass;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.opentracing.contrib.spring.web.autoconfig;
package io.opentracing.contrib.spring.web.starter;

import io.opentracing.Span;
import io.opentracing.contrib.spring.web.client.RestTemplateSpanDecorator;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.opentracing.contrib.spring.web.autoconfig;
package io.opentracing.contrib.spring.web.starter;

import io.opentracing.contrib.spring.web.client.TracingRestTemplateInterceptor;
import io.opentracing.mock.MockTracer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.opentracing.contrib.spring.web.autoconfig;
package io.opentracing.contrib.spring.web.starter;

import io.opentracing.mock.MockTracer;
import io.opentracing.tag.Tags;
import io.opentracing.util.ThreadLocalScopeManager;
import org.assertj.core.api.Assertions;
import org.junit.Before;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.opentracing.contrib.spring.web.autoconfig;
package io.opentracing.contrib.spring.web.starter;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package io.opentracing.contrib.spring.web.autoconfig;
package io.opentracing.contrib.spring.web.starter;

import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

import io.opentracing.contrib.web.servlet.filter.ServletFilterSpanDecorator;
import org.awaitility.Awaitility;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.opentracing.contrib.spring.web.autoconfig;
package io.opentracing.contrib.spring.web.starter;

import io.opentracing.mock.MockSpan;
import io.opentracing.mock.MockTracer;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

<modules>
<module>opentracing-spring-web</module>
<module>opentracing-spring-web-autoconfigure</module>
<module>opentracing-spring-web-starter</module>
<module>opentracing-spring-web-itest</module>
</modules>

Expand Down

0 comments on commit 12d666a

Please sign in to comment.