Skip to content

Commit 51f9b65

Browse files
marcingrzejszczakmarcingrzejszczak
committed
Merge branch '1.0.x' into main
2 parents 6943903 + 9598e09 commit 51f9b65

File tree

4 files changed

+49
-16
lines changed

4 files changed

+49
-16
lines changed

‎README.adoc‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -434,20 +434,19 @@ $ ./mvnw clean install -Pcentral
434434
=== Upload the artifacts
435435

436436
```bash
437-
$ ./mvnw deploy -Pmilestone
437+
$ ./mvnw deploy -Pmilestone -DskipTests
438438
```
439439

440440
or
441441

442442
```bash
443-
$ ./mvnw deploy -Pcentral
443+
$ ./mvnw deploy -Pcentral -DskipTests
444444
```
445445

446446
=== Commit and tag
447447

448448
```bash
449-
$ ./mvnw versions:commit
450-
$ otelVersion="1.0.0-M8" && ./mvnw versions:set-scm-tag -DnewTag="${otelVersion}"
449+
$ otelVersion="1.0.0-M8" && git commit -am "Bumped versions for the ${otelVersion} release" && git tag "v${otelVersion}"
451450
```
452451

453452
=== Generate and update the docs
@@ -461,12 +460,12 @@ $ temporaryDir="/tmp/sleuth-otel" && rm -rf "${temporaryDir}" && mkdir -p "${te
461460
=== Go back to snapshots
462461

463462
```bash
464-
$ otelVersion="1.0.0-SNAPSHOT" && ./mvnw versions:set -DnewVersion="${otelVersion}" -DgenerateBackupPoms=false && pushd spring-cloud-sleuth-otel-dependencies && ../mvnw versions:set -DnewVersion="${otelVersion}" -DgenerateBackupPoms=false && popd
463+
$ otelVersion="1.0.0-SNAPSHOT" && ./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
465464
```
466465

467466
=== Commit and push tags
468467

469468
```bash
470-
$ ./mvnw versions:commit
469+
$ git commit -am "Going back to snapshots after the release"
471470
$ git push origin --tags
472471
```

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,19 @@ $ ./mvnw clean install -Pcentral
2727
=== Upload the artifacts
2828

2929
```bash
30-
$ ./mvnw deploy -Pmilestone
30+
$ ./mvnw deploy -Pmilestone -DskipTests
3131
```
3232

3333
or
3434

3535
```bash
36-
$ ./mvnw deploy -Pcentral
36+
$ ./mvnw deploy -Pcentral -DskipTests
3737
```
3838

3939
=== Commit and tag
4040

4141
```bash
42-
$ ./mvnw versions:commit
43-
$ otelVersion="1.0.0-M8" && ./mvnw versions:set-scm-tag -DnewTag="${otelVersion}"
42+
$ otelVersion="1.0.0-M8" && git commit -am "Bumped versions for the ${otelVersion} release" && git tag "v${otelVersion}"
4443
```
4544

4645
=== Generate and update the docs
@@ -54,12 +53,12 @@ $ temporaryDir="/tmp/sleuth-otel" && rm -rf "${temporaryDir}" && mkdir -p "${te
5453
=== Go back to snapshots
5554

5655
```bash
57-
$ otelVersion="1.0.0-SNAPSHOT" && ./mvnw versions:set -DnewVersion="${otelVersion}" -DgenerateBackupPoms=false && pushd spring-cloud-sleuth-otel-dependencies && ../mvnw versions:set -DnewVersion="${otelVersion}" -DgenerateBackupPoms=false && popd
56+
$ otelVersion="1.0.0-SNAPSHOT" && ./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
5857
```
5958

6059
=== Commit and push tags
6160

6261
```bash
63-
$ ./mvnw versions:commit
62+
$ git commit -am "Going back to snapshots after the release"
6463
$ git push origin --tags
6564
```

‎spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/propagation/CompositeTextMapPropagator.java‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,19 @@ public class CompositeTextMapPropagator implements TextMapPropagator {
5757

5858
public CompositeTextMapPropagator(BeanFactory beanFactory, List<PropagationType> types) {
5959
this.types = types;
60-
if (isOnClasspath("io.opentelemetry.extension.trace.propagation.AwsXRayPropagator")) {
60+
if (isOnClasspath(awsClass())) {
6161
this.mapping.put(PropagationType.AWS, beanFactory.getBeanProvider(AwsXrayPropagator.class)
6262
.getIfAvailable(AwsXrayPropagator::getInstance));
6363
}
64-
if (isOnClasspath("io.opentelemetry.extension.trace.propagation.B3Propagator")) {
64+
if (isOnClasspath(b3Class())) {
6565
this.mapping.put(PropagationType.B3, beanFactory.getBeanProvider(B3Propagator.class)
6666
.getIfAvailable(B3Propagator::injectingSingleHeader));
6767
}
68-
if (isOnClasspath("io.opentelemetry.extension.trace.propagation.JaegerPropagator")) {
68+
if (isOnClasspath(jaegerClass())) {
6969
this.mapping.put(PropagationType.JAEGER,
7070
beanFactory.getBeanProvider(JaegerPropagator.class).getIfAvailable(JaegerPropagator::getInstance));
7171
}
72-
if (isOnClasspath("io.opentelemetry.extension.trace.propagation.OtTracerPropagator")) {
72+
if (isOnClasspath(otClass())) {
7373
this.mapping.put(PropagationType.OT_TRACER, beanFactory.getBeanProvider(OtTracePropagator.class)
7474
.getIfAvailable(OtTracePropagator::getInstance));
7575
}
@@ -81,6 +81,22 @@ public CompositeTextMapPropagator(BeanFactory beanFactory, List<PropagationType>
8181
}
8282
}
8383

84+
String otClass() {
85+
return "io.opentelemetry.extension.trace.propagation.OtTracePropagator";
86+
}
87+
88+
String jaegerClass() {
89+
return "io.opentelemetry.extension.trace.propagation.JaegerPropagator";
90+
}
91+
92+
String b3Class() {
93+
return "io.opentelemetry.extension.trace.propagation.B3Propagator";
94+
}
95+
96+
String awsClass() {
97+
return "io.opentelemetry.extension.aws.AwsXrayPropagator";
98+
}
99+
84100
private boolean isOnClasspath(String clazz) {
85101
return ClassUtils.isPresent(clazz, null);
86102
}

‎spring-cloud-sleuth-otel/src/test/java/org/springframework/cloud/sleuth/otel/propagation/CompositeTextMapPropagatorTest.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,16 @@
2323
import io.opentelemetry.api.baggage.Baggage;
2424
import io.opentelemetry.context.Context;
2525
import io.opentelemetry.context.propagation.TextMapGetter;
26+
import io.opentelemetry.extension.aws.AwsXrayPropagator;
27+
import io.opentelemetry.extension.trace.propagation.B3Propagator;
28+
import io.opentelemetry.extension.trace.propagation.JaegerPropagator;
29+
import io.opentelemetry.extension.trace.propagation.OtTracePropagator;
30+
import org.assertj.core.api.SoftAssertions;
2631
import org.junit.jupiter.api.Test;
2732
import org.mockito.Mockito;
2833

2934
import org.springframework.beans.factory.BeanFactory;
35+
import org.springframework.beans.factory.support.StaticListableBeanFactory;
3036

3137
import static org.assertj.core.api.Assertions.assertThat;
3238
import static org.mockito.Mockito.mock;
@@ -48,6 +54,19 @@ void extract_onlyBaggage() {
4854
assertThat(Baggage.fromContext(result)).isEqualTo(Baggage.builder().put("key", "value").build());
4955
}
5056

57+
@Test
58+
void should_map_propagaotr_string_class_names_to_actual_classes() {
59+
CompositeTextMapPropagator propagator = new CompositeTextMapPropagator(new StaticListableBeanFactory(),
60+
Collections.emptyList());
61+
62+
SoftAssertions softly = new SoftAssertions();
63+
softly.assertThat(propagator.awsClass()).isEqualTo(AwsXrayPropagator.class.getName());
64+
softly.assertThat(propagator.b3Class()).isEqualTo(B3Propagator.class.getName());
65+
softly.assertThat(propagator.jaegerClass()).isEqualTo(JaegerPropagator.class.getName());
66+
softly.assertThat(propagator.otClass()).isEqualTo(OtTracePropagator.class.getName());
67+
softly.assertAll();
68+
}
69+
5170
private static class MapGetter implements TextMapGetter<Map<String, String>> {
5271

5372
@Override

0 commit comments

Comments
 (0)