tests

Author: jonatan-ivanov

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfigurationTests.java

@@ -17,7 +17,9 @@
 package org.springframework.boot.actuate.autoconfigure.tracing;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Stream;
 
 import brave.Span;
@@ -31,6 +33,7 @@
 import brave.propagation.CurrentTraceContext.ScopeDecorator;
 import brave.propagation.Propagation;
 import brave.propagation.Propagation.Factory;
+import brave.propagation.TraceContext;
 import brave.sampler.Sampler;
 import io.micrometer.tracing.brave.bridge.BraveBaggageManager;
 import io.micrometer.tracing.brave.bridge.BraveSpanCustomizer;
@@ -152,6 +155,31 @@ void shouldSupplyB3PropagationFactoryViaProperty() {
 		});
 	}
 
+	@Test
+	void shouldUseB3SingleWithParentWhenPropagationTypeIsB3() {
+		this.contextRunner
+			.withPropertyValues("management.tracing.propagation.type=B3", "management.tracing.sampling.probability=1.0")
+			.run((context) -> {
+				Propagation<String> propagation = context.getBean(Factory.class).get();
+				Tracer tracer = context.getBean(Tracing.class).tracer();
+				Span child;
+				Span parent = tracer.nextSpan().name("parent");
+				try (Tracer.SpanInScope ignored = tracer.withSpanInScope(parent.start())) {
+					child = tracer.nextSpan().name("child");
+					child.start().finish();
+				}
+				finally {
+					parent.finish();
+				}
+
+				Map<String, String> map = new HashMap<>();
+				TraceContext childContext = child.context();
+				propagation.injector(this::injectToMap).inject(childContext, map);
+				assertThat(map).containsExactly(Map.entry("b3", "%s-%s-1-%s".formatted(childContext.traceIdString(),
+						childContext.spanIdString(), childContext.parentIdString())));
+			});
+	}
+
 	@Test
 	void shouldNotSupplyCorrelationScopeDecoratorIfBaggageDisabled() {
 		this.contextRunner.withPropertyValues("management.tracing.baggage.enabled=false")
@@ -313,6 +341,10 @@ void compositeSpanHandlerUsesFilterPredicateAndReportersInOrder() {
 		});
 	}
 
+	private void injectToMap(Map<String, String> map, String key, String value) {
+		map.put(key, value);
+	}
+
 	private List<Factory> getInjectors(Factory factory) {
 		assertThat(factory).as("factory").isNotNull();
 		if (factory instanceof CompositePropagationFactory compositePropagationFactory) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactoryTests.java

@@ -21,17 +21,13 @@
 import java.util.List;
 import java.util.Map;
 
-import brave.Span;
-import brave.Tracing;
 import brave.internal.propagation.StringPropagationAdapter;
 import brave.propagation.Propagation;
 import brave.propagation.TraceContext;
 import brave.propagation.TraceContextOrSamplingFlags;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
@@ -71,9 +67,6 @@ void requires128BitTraceId() {
 	@Nested
 	static class CompostePropagationTests {
 
-		private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(CompositePropagationFactory.class));
-
 		@Test
 		void keys() {
 			CompositePropagationFactory factory = new CompositePropagationFactory(List.of(field("a")),
@@ -93,23 +86,6 @@ void inject() {
 			assertThat(request).containsOnly(entry("a", "a-value"), entry("b", "b-value"));
 		}
 
-		@Test
-		void thisIsATest() {
-			this.contextRunner
-					.withPropertyValues("management.tracing.propagation.type=B3",
-							"management.tracing.brave.span-joining-supported=true")
-					.run((context) -> {
-						CompositePropagationFactory factory = new CompositePropagationFactory(List.of(field("a"), field("b")),
-								List.of(field("c")));
-						Propagation<String> propagation = factory.get();
-						Tracing tracing = context.getBean(Tracing.class);
-						Span parentSpan = tracing.tracer().nextSpan();
-						Span childSpan = tracing.tracer().joinSpan(parentSpan.context());
-						Map<String, String> request = new HashMap<>();
-						propagation.injector(new CompositePropagationFactoryTests.MapSetter()).inject(parentSpan.context(), request);
-					});
-		}
-
 		@Test
 		void extractorWhenDelegateExtractsReturnsExtraction() {
 			CompositePropagationFactory factory = new CompositePropagationFactory(Collections.emptyList(),