Skip to content

Commit 299154c

Browse files
xiepuhuanxiepuhuan
authored andcommitted
1. Add comment for baggage test
2. Assert response status 3. Specify the key used by baggage
1 parent 7a9b214 commit 299154c

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class JavaagentTestArgumentsProvider(
9494
"-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.grpc.internal.ManagedChannelImplBuilder=INFO",
9595
"-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.perfmark.PerfMark=INFO",
9696
"-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.grpc.Context=INFO",
97-
"-Dotel.java.experimental.span-attributes.copy-from-baggage.include=*"
97+
"-Dotel.java.experimental.span-attributes.copy-from-baggage.include=test-baggage-key-1,test-baggage-key-2"
9898
)
9999
}
100100

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/LibraryTestRunner.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
package io.opentelemetry.instrumentation.testing;
77

8+
import static java.util.Arrays.asList;
9+
810
import io.opentelemetry.api.GlobalOpenTelemetry;
911
import io.opentelemetry.api.OpenTelemetry;
1012
import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator;
@@ -76,7 +78,11 @@ public final class LibraryTestRunner extends InstrumentationTestRunner {
7678
.addSpanProcessor(new FlushTrackingSpanProcessor())
7779
.addSpanProcessor(SimpleSpanProcessor.create(LoggingSpanExporter.create()))
7880
.addSpanProcessor(SimpleSpanProcessor.create(testSpanExporter))
79-
.addSpanProcessor(BaggageSpanProcessor.allowAllBaggageKeys())
81+
.addSpanProcessor(
82+
new BaggageSpanProcessor(
83+
baggageKey ->
84+
asList("test-baggage-key-1", "test-baggage-key-2")
85+
.contains(baggageKey)))
8086
.build())
8187
.setMeterProvider(SdkMeterProvider.builder().registerMetricReader(metricReader).build())
8288
.setLoggerProvider(

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,9 +549,13 @@ void extractSingleBaggage() {
549549
AggregatedHttpRequest request =
550550
AggregatedHttpRequest.of(
551551
request(SUCCESS, method).headers().toBuilder()
552+
// adding baggage header in w3c baggage format
552553
.set("baggage", "test-baggage-key-1=test-baggage-value-1")
553554
.build());
554-
client.execute(request).aggregate().join();
555+
AggregatedHttpResponse response = client.execute(request).aggregate().join();
556+
557+
assertThat(response.status().code()).isEqualTo(SUCCESS.getStatus());
558+
assertThat(response.contentUtf8()).isEqualTo(SUCCESS.getBody());
555559

556560
testing.waitAndAssertTraces(
557561
trace ->
@@ -570,10 +574,14 @@ void extractMultiBaggage() {
570574
AggregatedHttpRequest request =
571575
AggregatedHttpRequest.of(
572576
request(SUCCESS, method).headers().toBuilder()
577+
// adding baggage header in w3c baggage format
573578
.add("baggage", "test-baggage-key-1=test-baggage-value-1")
574579
.add("baggage", "test-baggage-key-2=test-baggage-value-2")
575580
.build());
576-
client.execute(request).aggregate().join();
581+
AggregatedHttpResponse response = client.execute(request).aggregate().join();
582+
583+
assertThat(response.status().code()).isEqualTo(SUCCESS.getStatus());
584+
assertThat(response.contentUtf8()).isEqualTo(SUCCESS.getBody());
577585

578586
testing.waitAndAssertTraces(
579587
trace ->

0 commit comments

Comments
 (0)