Skip to content

Commit 2a84a67

Browse files
Bumping versions before the 1.0.0-M8 release
1 parent e9d3a1a commit 2a84a67

File tree

26 files changed

+39
-37
lines changed
  • benchmarks
  • docs
  • spring-cloud-sleuth-otel-autoconfigure
  • spring-cloud-sleuth-otel-dependencies
  • spring-cloud-sleuth-otel
  • tests
    • common
    • otel
      • 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-multiple-tracers-otel-tests
      • spring-cloud-sleuth-zipkin-tests

26 files changed

+39
-37
lines changed

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ Go to root project's `pom.xml` and update the properties to point to proper depe
415415
$ otelVersion="1.0.0-M8" && ./mvnw versions:set -DnewVersion="${otelVersion}" -DgenerateBackupPoms=false && pushd spring-cloud-sleuth-otel-dependencies && ../mvnw versions:set -DnewVersion="${otelVersion}" -DgenerateBackupPoms=false && popd && pushd benchmarks && ../mvnw versions:set -DnewVersion="${otelVersion}" -DgenerateBackupPoms=false && popd
416416
```
417417

418-
IMPORTANT: Notice that we have to update the `otel-dependencies` and `benchmarks` modules manually.
418+
IMPORTANT: Notice that we have to update some modules manually.
419419

420420
=== Build the project
421421

benchmarks/pom.xml

Lines changed: 1 addition & 1 deletion
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>1.0.0-SNAPSHOT</version>
25+
<version>1.0.0-M8</version>
2626
<artifactId>otel-benchmarks</artifactId>
2727

2828
<parent>

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>1.0.0-SNAPSHOT</version>
24+
<version>1.0.0-M8</version>
2525
<relativePath>..</relativePath>
2626
</parent>
2727
<artifactId>spring-cloud-sleuth-otel-docs</artifactId>

docs/src/main/asciidoc/_configprops.adoc

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
|===
22
|Name | Default | Description
33

4-
|spring.sleuth.otel.config.instrumentation-name | | Instrumentation name to be used to find a Tracer.
4+
|spring.sleuth.otel.config.instrumentation-name | `org.springframework.cloud.spring-cloud-sleuth` | Instrumentation name to be used to find a Tracer.
55
|spring.sleuth.otel.config.instrumentation-version | | Instrumentation version to be used to find a Tracer.
6-
|spring.sleuth.otel.config.max-attrs | | Returns the global default max number of attributes per {@link Span}.
7-
|spring.sleuth.otel.config.max-event-attrs | | Returns the global default max number of attributes per event.
8-
|spring.sleuth.otel.config.max-events | | Returns the global default max number of events per {@link Span}.
9-
|spring.sleuth.otel.config.max-link-attrs | | Returns the global default max number of attributes per link.
10-
|spring.sleuth.otel.config.max-links | | Returns the global default max number of link entries per {@link Span}.
11-
|spring.sleuth.otel.config.trace-id-ratio-based | | Sets the global default {@code Sampler} value.
6+
|spring.sleuth.otel.config.max-attrs | `0` | Returns the global default max number of attributes per {@link Span}.
7+
|spring.sleuth.otel.config.max-event-attrs | `0` | Returns the global default max number of attributes per event.
8+
|spring.sleuth.otel.config.max-events | `0` | Returns the global default max number of events per {@link Span}.
9+
|spring.sleuth.otel.config.max-link-attrs | `0` | Returns the global default max number of attributes per link.
10+
|spring.sleuth.otel.config.max-links | `0` | Returns the global default max number of link entries per {@link Span}.
11+
|spring.sleuth.otel.config.trace-id-ratio-based | `0.1` | Sets the global default {@code Sampler} value.
1212
|spring.sleuth.otel.exporter.jaeger.endpoint | | Sets the Jaeger endpoint to connect to.
1313
|spring.sleuth.otel.exporter.jaeger.timeout | | Timeout in millis.
1414
|spring.sleuth.otel.exporter.otlp.endpoint | | Sets the OTLP endpoint to connect to.
1515
|spring.sleuth.otel.exporter.otlp.headers | | Map of headers to be added.
1616
|spring.sleuth.otel.exporter.otlp.timeout | | Timeout in millis.
17-
|spring.sleuth.otel.exporter.sleuth-span-filter.enabled | | Enables Sleuth span filter.
18-
|spring.sleuth.otel.log.exporter.enabled | | Enable log exporter for OTel.
19-
|spring.sleuth.otel.log.slf4j.enabled | | Enable slf4j support for OTel.
17+
|spring.sleuth.otel.exporter.sleuth-span-filter.enabled | `true` | Enables Sleuth span filter.
18+
|spring.sleuth.otel.log.exporter.enabled | `false` | Enable log exporter for OTel.
19+
|spring.sleuth.otel.log.slf4j.enabled | `false` | Enable slf4j support for OTel.
20+
|spring.sleuth.otel.multiple-tracer-configs-detector-enabled | `true` | Enable detection of autoconfiguration for multiple tracers (i.e.: Brave and OTel); only one of them should be used.
2021
|spring.sleuth.otel.processor.batch.exporter-timeout | | Exporter timeout in millis.
2122
|spring.sleuth.otel.processor.batch.max-export-batch-size | | Max export batch size.
2223
|spring.sleuth.otel.processor.batch.max-queue-size | | Max queue size.
2324
|spring.sleuth.otel.processor.batch.schedule-delay | | Schedule delay in millis.
24-
|spring.sleuth.otel.propagation.sleuth-baggage.enabled | | Enables default B3 Sleuth Baggage propagation. This will be automatically turned on when B3 propagation type gets picked.
25-
|spring.sleuth.otel.resource.enabled | | Enables default {@link Resource} implementations.
25+
|spring.sleuth.otel.propagation.composite-text-map-propagator.enabled | `true` | Enable a composite text map propagator that can combine multiple propagation types into a single text map propagator.
26+
|spring.sleuth.otel.propagation.sleuth-baggage.enabled | `true` | Enable propagating baggage in a Sleuth compatible way (baggage key & value pair means e.g. a key & value HTTP pair).
27+
|spring.sleuth.otel.resource.enabled | `true` | Enables default {@link Resource} implementations.
2628
|spring.zipkin.activemq.message-max-bytes | `100000` | Maximum number of bytes for a given message with spans sent to Zipkin over ActiveMQ.
2729
|spring.zipkin.activemq.queue | `zipkin` | Name of the ActiveMQ queue where spans should be sent to Zipkin.
2830
|spring.zipkin.kafka.topic | `zipkin` | Name of the Kafka topic where spans should be sent to Zipkin.

pom.xml

Lines changed: 1 addition & 1 deletion
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>1.0.0-SNAPSHOT</version>
24+
<version>1.0.0-M8</version>
2525
<packaging>pom</packaging>
2626
<name>Spring Cloud Sleuth OTel</name>
2727
<description>Spring Cloud Sleuth OTel</description>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>org.springframework.cloud</groupId>
3333
<artifactId>spring-cloud-sleuth-otel-parent</artifactId>
34-
<version>1.0.0-SNAPSHOT</version>
34+
<version>1.0.0-M8</version>
3535
<relativePath>..</relativePath>
3636
</parent>
3737

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>1.0.0-SNAPSHOT</version>
29+
<version>1.0.0-M8</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>1.0.0-SNAPSHOT</version>
31+
<version>1.0.0-M8</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>1.0.0-SNAPSHOT</version>
33+
<version>1.0.0-M8</version>
3434
<relativePath>..</relativePath>
3535
</parent>
3636

tests/otel/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>1.0.0-SNAPSHOT</version>
33+
<version>1.0.0-M8</version>
3434
<relativePath>..</relativePath>
3535
</parent>
3636

0 commit comments

Comments
 (0)