Skip to content

Commit 28afc21

Browse files
marcingrzejszczakmarcingrzejszczak
committed
Polish
1 parent dc1e749 commit 28afc21

File tree

26 files changed

+148
-86
lines changed
  • benchmarks
  • docs
  • pom.xml
  • spring-cloud-sleuth-otel-autoconfigure
  • spring-cloud-sleuth-otel-dependencies
  • spring-cloud-sleuth-otel
  • tests
    • common
    • otel
      • pom.xml
      • spring-cloud-sleuth-instrumentation-annotation-tests
      • spring-cloud-sleuth-instrumentation-async-tests
      • spring-cloud-sleuth-instrumentation-baggage-tests
      • spring-cloud-sleuth-instrumentation-circuitbreaker-tests
      • spring-cloud-sleuth-instrumentation-feign-tests
      • spring-cloud-sleuth-instrumentation-gateway-tests
      • spring-cloud-sleuth-instrumentation-messaging-tests
      • spring-cloud-sleuth-instrumentation-mvc-tests
      • spring-cloud-sleuth-instrumentation-quartz-tests
      • spring-cloud-sleuth-instrumentation-reactor-tests
      • spring-cloud-sleuth-instrumentation-rxjava-tests
      • spring-cloud-sleuth-instrumentation-scheduling-tests
      • spring-cloud-sleuth-instrumentation-webflux-tests
      • spring-cloud-sleuth-zipkin-tests
    • pom.xml

26 files changed

+148
-86
lines changed

‎benchmarks/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<name>Benchmarks</name>
2323
<description>Benchmarks (JMH)</description>
2424
<groupId>org.springframework.cloud</groupId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>1.0.0-SNAPSHOT</version>
2626
<artifactId>otel-benchmarks</artifactId>
2727

2828
<parent>
@@ -84,7 +84,7 @@
8484
</dependency>
8585
<dependency>
8686
<groupId>${project.groupId}</groupId>
87-
<artifactId>spring-cloud-sleuth-otel</artifactId>
87+
<artifactId>spring-cloud-sleuth-otel-autoconfigure</artifactId>
8888
</dependency>
8989
<dependency>
9090
<groupId>org.springframework.boot</groupId>

‎docs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.springframework.cloud</groupId>
2323
<artifactId>spring-cloud-sleuth-otel-parent</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>1.0.0-SNAPSHOT</version>
2525
<relativePath>..</relativePath>
2626
</parent>
2727
<artifactId>spring-cloud-sleuth-otel-docs</artifactId>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ Add Spring Cloud Sleuth to the classpath of a Spring Boot application (together
2727
<type>pom</type>
2828
<scope>import</scope>
2929
</dependency>
30+
<dependency>
31+
<groupId>org.springframework.cloud</groupId>
32+
<artifactId>spring-cloud-sleuth-otel-dependencies</artifactId>
33+
<!-- Provide the version of the Spring Cloud Sleuth OpenTelemetry project -->
34+
<version>${spring-cloud-sleuth-otel.version}</version>
35+
<scope>import</scope>
36+
<type>pom</type>
37+
</dependency>
3038
</dependencies>
3139
</dependencyManagement>
3240

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

Lines changed: 96 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,32 @@ If you want to add a "`how-to`", send us a {github-code}[pull request].
1616
[[how-to-set-up-sleuth-with-otel]]
1717
== How to Set Up Sleuth with OpenTelemetry?
1818

19-
Add the Sleuth starter, exlcude Brave and add OpenTelemetry dependency to the classpath.
19+
Add the Sleuth starter, exclude Brave and add OpenTelemetry dependency to the classpath.
2020

2121
====
2222
[source,xml,indent=0,subs="verbatim,attributes",role="primary"]
2323
.Maven
2424
----
2525
<dependencyManagement>
26-
<dependencies>
27-
<dependency>
28-
<groupId>org.springframework.cloud</groupId>
29-
<artifactId>spring-cloud-dependencies</artifactId>
30-
<version>${release.train-version}</version>
31-
<type>pom</type>
32-
<scope>import</scope>
33-
</dependency>
34-
</dependencies>
35-
</dependencyManagement>
26+
<dependencies>
27+
<dependency>
28+
<groupId>org.springframework.cloud</groupId>
29+
<artifactId>spring-cloud-dependencies</artifactId>
30+
<!-- Provide the latest stable Spring Cloud release train version (e.g. 2020.0.0) -->
31+
<version>${release.train.version}</version>
32+
<type>pom</type>
33+
<scope>import</scope>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.springframework.cloud</groupId>
37+
<artifactId>spring-cloud-sleuth-otel-dependencies</artifactId>
38+
<!-- Provide the version of the Spring Cloud Sleuth OpenTelemetry project -->
39+
<version>${spring-cloud-sleuth-otel.version}</version>
40+
<scope>import</scope>
41+
<type>pom</type>
42+
</dependency>
43+
</dependencies>
44+
</dependencyManagement>
3645
3746
<dependency>
3847
<groupId>org.springframework.cloud</groupId>
@@ -77,16 +86,25 @@ Add the Sleuth starter, exclude Brave, add OTel and Zipkin to the classpath.
7786
.Maven
7887
----
7988
<dependencyManagement>
80-
<dependencies>
81-
<dependency>
82-
<groupId>org.springframework.cloud</groupId>
83-
<artifactId>spring-cloud-dependencies</artifactId>
84-
<version>${release.train-version}</version>
85-
<type>pom</type>
86-
<scope>import</scope>
87-
</dependency>
88-
</dependencies>
89-
</dependencyManagement>
89+
<dependencies>
90+
<dependency>
91+
<groupId>org.springframework.cloud</groupId>
92+
<artifactId>spring-cloud-dependencies</artifactId>
93+
<!-- Provide the latest stable Spring Cloud release train version (e.g. 2020.0.0) -->
94+
<version>${release.train.version}</version>
95+
<type>pom</type>
96+
<scope>import</scope>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.springframework.cloud</groupId>
100+
<artifactId>spring-cloud-sleuth-otel-dependencies</artifactId>
101+
<!-- Provide the version of the Spring Cloud Sleuth OpenTelemetry project -->
102+
<version>${spring-cloud-sleuth-otel.version}</version>
103+
<scope>import</scope>
104+
<type>pom</type>
105+
</dependency>
106+
</dependencies>
107+
</dependencyManagement>
90108
91109
<dependency>
92110
<groupId>org.springframework.cloud</groupId>
@@ -139,16 +157,25 @@ If using Kafka, you must add the Kafka dependency.
139157
.Maven
140158
----
141159
<dependencyManagement>
142-
<dependencies>
143-
<dependency>
144-
<groupId>org.springframework.cloud</groupId>
145-
<artifactId>spring-cloud-dependencies</artifactId>
146-
<version>${release.train-version}</version>
147-
<type>pom</type>
148-
<scope>import</scope>
149-
</dependency>
150-
</dependencies>
151-
</dependencyManagement>
160+
<dependencies>
161+
<dependency>
162+
<groupId>org.springframework.cloud</groupId>
163+
<artifactId>spring-cloud-dependencies</artifactId>
164+
<!-- Provide the latest stable Spring Cloud release train version (e.g. 2020.0.0) -->
165+
<version>${release.train.version}</version>
166+
<type>pom</type>
167+
<scope>import</scope>
168+
</dependency>
169+
<dependency>
170+
<groupId>org.springframework.cloud</groupId>
171+
<artifactId>spring-cloud-sleuth-otel-dependencies</artifactId>
172+
<!-- Provide the version of the Spring Cloud Sleuth OpenTelemetry project -->
173+
<version>${spring-cloud-sleuth-otel.version}</version>
174+
<scope>import</scope>
175+
<type>pom</type>
176+
</dependency>
177+
</dependencies>
178+
</dependencyManagement>
152179
153180
<dependency>
154181
<groupId>org.springframework.cloud</groupId>
@@ -207,16 +234,25 @@ If you want Sleuth over RabbitMQ, add the `spring-cloud-sleuth-otel` (exclude `s
207234
.Maven
208235
----
209236
<dependencyManagement>
210-
<dependencies>
211-
<dependency>
212-
<groupId>org.springframework.cloud</groupId>
213-
<artifactId>spring-cloud-dependencies</artifactId>
214-
<version>${release.train-version}</version>
215-
<type>pom</type>
216-
<scope>import</scope>
217-
</dependency>
218-
</dependencies>
219-
</dependencyManagement>
237+
<dependencies>
238+
<dependency>
239+
<groupId>org.springframework.cloud</groupId>
240+
<artifactId>spring-cloud-dependencies</artifactId>
241+
<!-- Provide the latest stable Spring Cloud release train version (e.g. 2020.0.0) -->
242+
<version>${release.train.version}</version>
243+
<type>pom</type>
244+
<scope>import</scope>
245+
</dependency>
246+
<dependency>
247+
<groupId>org.springframework.cloud</groupId>
248+
<artifactId>spring-cloud-sleuth-otel-dependencies</artifactId>
249+
<!-- Provide the version of the Spring Cloud Sleuth OpenTelemetry project -->
250+
<version>${spring-cloud-sleuth-otel.version}</version>
251+
<scope>import</scope>
252+
<type>pom</type>
253+
</dependency>
254+
</dependencies>
255+
</dependencyManagement>
220256
221257
<dependency>
222258
<groupId>org.springframework.cloud</groupId>
@@ -256,16 +292,25 @@ If you want Sleuth over RabbitMQ, add the `spring-cloud-sleuth-otel` (exclude `s
256292
.Maven
257293
----
258294
<dependencyManagement>
259-
<dependencies>
260-
<dependency>
261-
<groupId>org.springframework.cloud</groupId>
262-
<artifactId>spring-cloud-dependencies</artifactId>
263-
<version>${release.train-version}</version>
264-
<type>pom</type>
265-
<scope>import</scope>
266-
</dependency>
267-
</dependencies>
268-
</dependencyManagement>
295+
<dependencies>
296+
<dependency>
297+
<groupId>org.springframework.cloud</groupId>
298+
<artifactId>spring-cloud-dependencies</artifactId>
299+
<!-- Provide the latest stable Spring Cloud release train version (e.g. 2020.0.0) -->
300+
<version>${release.train.version}</version>
301+
<type>pom</type>
302+
<scope>import</scope>
303+
</dependency>
304+
<dependency>
305+
<groupId>org.springframework.cloud</groupId>
306+
<artifactId>spring-cloud-sleuth-otel-dependencies</artifactId>
307+
<!-- Provide the version of the Spring Cloud Sleuth OpenTelemetry project -->
308+
<version>${spring-cloud-sleuth-otel.version}</version>
309+
<scope>import</scope>
310+
<type>pom</type>
311+
</dependency>
312+
</dependencies>
313+
</dependencyManagement>
269314
270315
<dependency>
271316
<groupId>org.springframework.cloud</groupId>

‎docs/src/main/asciidoc/sagan-boot.adoc‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,25 @@ Maven
44

55
```xml
66
<dependencyManagement>
7-
<dependencies>
8-
<dependency>
9-
<groupId>org.springframework.cloud</groupId>
10-
<artifactId>spring-cloud-dependencies</artifactId>
11-
<version>${release.train.version}</version>
12-
<type>pom</type>
13-
<scope>import</scope>
14-
</dependency>
15-
</dependencies>
16-
</dependencyManagement>
7+
<dependencies>
8+
<dependency>
9+
<groupId>org.springframework.cloud</groupId>
10+
<artifactId>spring-cloud-dependencies</artifactId>
11+
<!-- Provide the latest stable Spring Cloud release train version (e.g. 2020.0.0) -->
12+
<version>${release.train.version}</version>
13+
<type>pom</type>
14+
<scope>import</scope>
15+
</dependency>
16+
<dependency>
17+
<groupId>org.springframework.cloud</groupId>
18+
<artifactId>spring-cloud-sleuth-otel-dependencies</artifactId>
19+
<!-- Provide the version of the Spring Cloud Sleuth OpenTelemetry project -->
20+
<version>${spring-cloud-sleuth-otel.version}</version>
21+
<scope>import</scope>
22+
<type>pom</type>
23+
</dependency>
24+
</dependencies>
25+
</dependencyManagement>
1726
<dependencies>
1827
<dependency>
1928
<groupId>org.springframework.cloud</groupId>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<modelVersion>4.0.0</modelVersion>
2222

2323
<artifactId>spring-cloud-sleuth-otel-parent</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>1.0.0-SNAPSHOT</version>
2525
<packaging>pom</packaging>
2626
<name>Spring Cloud Sleuth OTel</name>
2727
<description>Spring Cloud Sleuth OTel</description>
@@ -172,7 +172,7 @@
172172
<dependency>
173173
<groupId>org.springframework.cloud</groupId>
174174
<artifactId>spring-cloud-sleuth-dependencies</artifactId>
175-
<version>${project.version}</version>
175+
<version>${spring-cloud-sleuth.version}</version>
176176
<type>pom</type>
177177
<scope>import</scope>
178178
</dependency>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>org.springframework.cloud</groupId>
3030
<artifactId>spring-cloud-sleuth-otel-parent</artifactId>
31-
<version>3.0.0-SNAPSHOT</version>
31+
<version>1.0.0-SNAPSHOT</version>
3232
<relativePath>..</relativePath>
3333
</parent>
3434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<relativePath/>
2727
</parent>
2828
<artifactId>spring-cloud-sleuth-otel-dependencies</artifactId>
29-
<version>3.0.0-SNAPSHOT</version>
29+
<version>1.0.0-SNAPSHOT</version>
3030
<packaging>pom</packaging>
3131
<name>spring-cloud-sleuth-otel-dependencies</name>
3232
<description>Spring Cloud Sleuth OTel Dependencies</description>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>org.springframework.cloud</groupId>
3030
<artifactId>spring-cloud-sleuth-otel-parent</artifactId>
31-
<version>3.0.0-SNAPSHOT</version>
31+
<version>1.0.0-SNAPSHOT</version>
3232
<relativePath>..</relativePath>
3333
</parent>
3434

‎tests/common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<parent>
3131
<groupId>org.springframework.cloud</groupId>
3232
<artifactId>spring-cloud-sleuth-otel-tests-parent</artifactId>
33-
<version>3.0.0-SNAPSHOT</version>
33+
<version>1.0.0-SNAPSHOT</version>
3434
<relativePath>..</relativePath>
3535
</parent>
3636

0 commit comments

Comments
 (0)