Skip to content

Commit dc1e749

Browse files
marcingrzejszczakmarcingrzejszczak
committed
Fixed deps
1 parent 303d10f commit dc1e749

File tree

40 files changed

+137
-487
lines changed

40 files changed

+137
-487
lines changed

‎README.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Add Spring Cloud Sleuth to the classpath of a Spring Boot application (together
5757
<!-- This dependency adds OTel support -->
5858
<dependency>
5959
<groupId>org.springframework.cloud</groupId>
60-
<artifactId>spring-cloud-sleuth-otel</artifactId>
60+
<artifactId>spring-cloud-sleuth-otel-autoconfigure</artifactId>
6161
</dependency>
6262
</dependencies>
6363
----

‎docs/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
<artifactId>spring-cloud-sleuth-otel-docs</artifactId>
2828
<packaging>jar</packaging>
2929
<name>Spring Cloud Sleuth OTel Docs</name>
30-
<description>Spring Sleuth Docs</description>
30+
<description>Spring Sleuth OTel Docs</description>
3131
<properties>
32-
<docs.main>spring-cloud-sleuth</docs.main>
32+
<docs.main>spring-cloud-sleuth-otel</docs.main>
3333
<main.basedir>${basedir}/..</main.basedir>
3434
<configprops.inclusionPattern>spring.sleuth.otel*|spring.zipkin.*</configprops.inclusionPattern>
3535
<upload-docs-zip.phase>deploy</upload-docs-zip.phase>

‎docs/src/main/asciidoc/README.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Add Spring Cloud Sleuth to the classpath of a Spring Boot application (together
5050
<!-- This dependency adds OTel support -->
5151
<dependency>
5252
<groupId>org.springframework.cloud</groupId>
53-
<artifactId>spring-cloud-sleuth-otel</artifactId>
53+
<artifactId>spring-cloud-sleuth-otel-autoconfigure</artifactId>
5454
</dependency>
5555
</dependencies>
5656
----

‎docs/src/main/asciidoc/getting-started.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ To add the necessary dependencies, edit your `pom.xml` and add the `spring-boot-
124124
<!-- Add OpenTelemetry tracer -->
125125
<dependency>
126126
<groupId>org.springframework.cloud</groupId>
127-
<artifactId>spring-cloud-sleuth-otel</artifactId>
127+
<artifactId>spring-cloud-sleuth-otel-autoconfigure</artifactId>
128128
</dependency>
129129
</dependencies>
130130
----

‎docs/src/main/asciidoc/howto.adoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Add the Sleuth starter, exlcude Brave and add OpenTelemetry dependency to the cl
4646
</dependency>
4747
<dependency>
4848
<groupId>org.springframework.cloud</groupId>
49-
<artifactId>spring-cloud-sleuth-otel</artifactId>
49+
<artifactId>spring-cloud-sleuth-otel-autoconfigure</artifactId>
5050
</dependency>
5151
----
5252
@@ -100,7 +100,7 @@ Add the Sleuth starter, exclude Brave, add OTel and Zipkin to the classpath.
100100
</dependency>
101101
<dependency>
102102
<groupId>org.springframework.cloud</groupId>
103-
<artifactId>spring-cloud-sleuth-otel</artifactId>
103+
<artifactId>spring-cloud-sleuth-otel-autoconfigure</artifactId>
104104
</dependency>
105105
<dependency>
106106
<groupId>org.springframework.cloud</groupId>
@@ -162,7 +162,7 @@ If using Kafka, you must add the Kafka dependency.
162162
</dependency>
163163
<dependency>
164164
<groupId>org.springframework.cloud</groupId>
165-
<artifactId>spring-cloud-sleuth-otel</artifactId>
165+
<artifactId>spring-cloud-sleuth-otel-autoconfigure</artifactId>
166166
</dependency>
167167
<dependency>
168168
<groupId>org.springframework.cloud</groupId>
@@ -279,7 +279,7 @@ If you want Sleuth over RabbitMQ, add the `spring-cloud-sleuth-otel` (exclude `s
279279
</dependency>
280280
<dependency>
281281
<groupId>org.springframework.cloud</groupId>
282-
<artifactId>spring-cloud-sleuth-otel</artifactId>
282+
<artifactId>spring-cloud-sleuth-otel-autoconfigure</artifactId>
283283
</dependency>
284284
<dependency>
285285
<groupId>org.springframework.cloud</groupId>

‎docs/src/main/asciidoc/spring-cloud-sleuth.adoc‎ renamed to ‎docs/src/main/asciidoc/spring-cloud-sleuth-otel.adoc‎

File renamed without changes.

‎docs/src/main/asciidoc/spring-cloud-sleuth.htmlsingleadoc‎ renamed to ‎docs/src/main/asciidoc/spring-cloud-sleuth-otel.htmlsingleadoc‎

File renamed without changes.

‎docs/src/main/asciidoc/spring-cloud-sleuth.pdfadoc‎ renamed to ‎docs/src/main/asciidoc/spring-cloud-sleuth-otel.pdfadoc‎

File renamed without changes.

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<artifactId>spring-cloud-sleuth-otel-parent</artifactId>
2424
<version>3.0.0-SNAPSHOT</version>
2525
<packaging>pom</packaging>
26-
<name>Spring Cloud Sleuth OTel OTel</name>
27-
<description>Spring Cloud Sleuth OTel OTel</description>
26+
<name>Spring Cloud Sleuth OTel</name>
27+
<description>Spring Cloud Sleuth OTel</description>
2828

2929
<parent>
3030
<groupId>org.springframework.cloud</groupId>

‎spring-cloud-sleuth-otel-autoconfigure/pom.xml‎

Lines changed: 0 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -42,119 +42,11 @@
4242
<groupId>org.springframework.cloud</groupId>
4343
<artifactId>spring-cloud-sleuth-instrumentation</artifactId>
4444
</dependency>
45-
<dependency>
46-
<groupId>org.springframework.boot</groupId>
47-
<artifactId>spring-boot-starter-web</artifactId>
48-
<optional>true</optional>
49-
</dependency>
50-
<dependency>
51-
<groupId>io.micrometer</groupId>
52-
<artifactId>micrometer-core</artifactId>
53-
<optional>true</optional>
54-
</dependency>
55-
<dependency>
56-
<groupId>io.projectreactor</groupId>
57-
<artifactId>reactor-core</artifactId>
58-
<optional>true</optional>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.reactivestreams</groupId>
62-
<artifactId>reactive-streams</artifactId>
63-
<optional>true</optional>
64-
</dependency>
6545
<dependency>
6646
<groupId>org.springframework.boot</groupId>
6747
<artifactId>spring-boot-configuration-processor</artifactId>
6848
<optional>true</optional>
6949
</dependency>
70-
<dependency>
71-
<groupId>org.springframework.boot</groupId>
72-
<artifactId>spring-boot-starter-actuator</artifactId>
73-
<optional>true</optional>
74-
</dependency>
75-
<dependency>
76-
<groupId>org.springframework.integration</groupId>
77-
<artifactId>spring-integration-core</artifactId>
78-
<optional>true</optional>
79-
</dependency>
80-
<dependency>
81-
<groupId>org.springframework.cloud</groupId>
82-
<artifactId>spring-cloud-function-context</artifactId>
83-
<optional>true</optional>
84-
</dependency>
85-
<dependency>
86-
<groupId>org.springframework.boot</groupId>
87-
<artifactId>spring-boot-starter-websocket</artifactId>
88-
<optional>true</optional>
89-
</dependency>
90-
<dependency>
91-
<groupId>org.springframework.cloud</groupId>
92-
<artifactId>spring-cloud-stream</artifactId>
93-
<optional>true</optional>
94-
</dependency>
95-
<dependency>
96-
<groupId>org.springframework.cloud</groupId>
97-
<artifactId>spring-cloud-commons</artifactId>
98-
</dependency>
99-
<dependency>
100-
<groupId>org.springframework</groupId>
101-
<artifactId>spring-context</artifactId>
102-
</dependency>
103-
<dependency>
104-
<groupId>org.springframework.cloud</groupId>
105-
<artifactId>spring-cloud-context</artifactId>
106-
<optional>true</optional>
107-
</dependency>
108-
<dependency>
109-
<groupId>io.reactivex</groupId>
110-
<artifactId>rxjava</artifactId>
111-
<optional>true</optional>
112-
</dependency>
113-
<dependency>
114-
<groupId>io.github.openfeign</groupId>
115-
<artifactId>feign-okhttp</artifactId>
116-
<optional>true</optional>
117-
</dependency>
118-
<dependency>
119-
<groupId>org.springframework.cloud</groupId>
120-
<artifactId>spring-cloud-starter-openfeign</artifactId>
121-
<optional>true</optional>
122-
</dependency>
123-
<dependency>
124-
<groupId>org.springframework.cloud</groupId>
125-
<artifactId>spring-cloud-starter-loadbalancer</artifactId>
126-
<optional>true</optional>
127-
</dependency>
128-
<dependency>
129-
<groupId>org.springframework.cloud</groupId>
130-
<artifactId>spring-cloud-starter-gateway</artifactId>
131-
<optional>true</optional>
132-
</dependency>
133-
<dependency>
134-
<groupId>org.aspectj</groupId>
135-
<artifactId>aspectjrt</artifactId>
136-
</dependency>
137-
<!-- For Instrumentation of Quartz -->
138-
<dependency>
139-
<groupId>org.springframework.boot</groupId>
140-
<artifactId>spring-boot-starter-quartz</artifactId>
141-
<optional>true</optional>
142-
</dependency>
143-
<dependency>
144-
<groupId>org.springframework.boot</groupId>
145-
<artifactId>spring-boot-autoconfigure-processor</artifactId>
146-
<optional>true</optional>
147-
</dependency>
148-
<dependency>
149-
<groupId>org.springframework.security.oauth</groupId>
150-
<artifactId>spring-security-oauth2</artifactId>
151-
<optional>true</optional>
152-
</dependency>
153-
<dependency>
154-
<groupId>org.springframework.security.oauth.boot</groupId>
155-
<artifactId>spring-security-oauth2-autoconfigure</artifactId>
156-
<optional>true</optional>
157-
</dependency>
15850

15951
<dependency>
16052
<groupId>javax.jms</groupId>
@@ -182,12 +74,6 @@
18274
</exclusions>
18375
<optional>true</optional>
18476
</dependency>
185-
<!-- Instrumentation of Lettuce -->
186-
<dependency>
187-
<groupId>io.lettuce</groupId>
188-
<artifactId>lettuce-core</artifactId>
189-
<optional>true</optional>
190-
</dependency>
19177
<dependency>
19278
<groupId>org.springframework.kafka</groupId>
19379
<artifactId>spring-kafka</artifactId>
@@ -203,27 +89,18 @@
20389
<artifactId>spring-rabbit</artifactId>
20490
<optional>true</optional>
20591
</dependency>
206-
<dependency>
207-
<groupId>org.springframework.boot</groupId>
208-
<artifactId>spring-boot-starter-data-mongodb</artifactId>
209-
<optional>true</optional>
210-
</dependency>
21192

212-
<!-- Otel -->
21393
<dependency>
21494
<groupId>org.springframework.cloud</groupId>
21595
<artifactId>spring-cloud-sleuth-otel</artifactId>
216-
<optional>true</optional>
21796
</dependency>
21897
<dependency>
21998
<groupId>io.opentelemetry</groupId>
22099
<artifactId>opentelemetry-api</artifactId>
221-
<optional>true</optional>
222100
</dependency>
223101
<dependency>
224102
<groupId>io.opentelemetry</groupId>
225103
<artifactId>opentelemetry-sdk-common</artifactId>
226-
<optional>true</optional>
227104
<exclusions>
228105
<exclusion>
229106
<groupId>io.opentelemetry</groupId>
@@ -234,7 +111,6 @@
234111
<dependency>
235112
<groupId>io.opentelemetry</groupId>
236113
<artifactId>opentelemetry-sdk-tracing</artifactId>
237-
<optional>true</optional>
238114
<exclusions>
239115
<exclusion>
240116
<groupId>io.opentelemetry</groupId>
@@ -245,7 +121,6 @@
245121
<dependency>
246122
<groupId>io.opentelemetry.instrumentation</groupId>
247123
<artifactId>opentelemetry-instrumentation-api</artifactId>
248-
<optional>true</optional>
249124
<exclusions>
250125
<exclusion>
251126
<groupId>io.opentelemetry</groupId>
@@ -271,7 +146,6 @@
271146
<dependency>
272147
<groupId>io.opentelemetry</groupId>
273148
<artifactId>opentelemetry-extension-trace-propagators</artifactId>
274-
<optional>true</optional>
275149
<exclusions>
276150
<exclusion>
277151
<groupId>io.opentelemetry</groupId>
@@ -312,11 +186,6 @@
312186
<artifactId>zipkin-reporter</artifactId>
313187
<optional>true</optional>
314188
</dependency>
315-
<dependency>
316-
<groupId>io.zipkin.reporter2</groupId>
317-
<artifactId>zipkin-reporter-brave</artifactId>
318-
<optional>true</optional>
319-
</dependency>
320189
<dependency>
321190
<groupId>io.zipkin.reporter2</groupId>
322191
<artifactId>zipkin-sender-kafka</artifactId>
@@ -369,12 +238,6 @@
369238
<scope>test</scope>
370239
</dependency>
371240

372-
<!-- Brave -->
373-
<dependency>
374-
<groupId>io.zipkin.brave</groupId>
375-
<artifactId>brave-instrumentation-http-tests</artifactId>
376-
<scope>test</scope>
377-
</dependency>
378241
<dependency>
379242
<groupId>com.squareup.okhttp3</groupId>
380243
<artifactId>mockwebserver</artifactId>

0 commit comments

Comments
 (0)