Skip to content

Commit dcf2809

Browse files
committed
add baggage before it can be exported
1 parent 2b8de4b commit dcf2809

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

baggage-processor/src/main/java/io/opentelemetry/contrib/baggage/processor/BaggageProcessorCustomizer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private static void addSpanProcessor(
3737
return;
3838
}
3939

40-
sdkTracerProviderBuilder.addSpanProcessor(createBaggageSpanProcessor(keys));
40+
sdkTracerProviderBuilder.addSpanProcessorFirst(createBaggageSpanProcessor(keys));
4141
}
4242

4343
static BaggageSpanProcessor createBaggageSpanProcessor(List<String> keys) {
@@ -56,7 +56,7 @@ private static void addLogRecordProcessor(
5656
return;
5757
}
5858

59-
sdkLoggerProviderBuilder.addLogRecordProcessor(createBaggageLogRecordProcessor(keys));
59+
sdkLoggerProviderBuilder.addLogRecordProcessorFirst(createBaggageLogRecordProcessor(keys));
6060
}
6161

6262
static BaggageLogRecordProcessor createBaggageLogRecordProcessor(List<String> keys) {

baggage-processor/src/test/java/io/opentelemetry/contrib/baggage/processor/BaggageProcessorCustomizerTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,15 @@ class BaggageProcessorCustomizerTest {
4848
private static final String MEMORY_EXPORTER = "memory";
4949

5050
@Test
51-
void test_customizer() {
51+
void test_empty_customizer() {
5252
assertCustomizer(
5353
Collections.emptyMap(),
5454
span -> assertThat(span).hasTotalAttributeCount(0),
5555
logRecord -> assertThat(logRecord).hasTotalAttributeCount(0));
56+
}
57+
58+
@Test
59+
void test_customizer() {
5660
Map<String, String> properties = new HashMap<>();
5761
properties.put("otel.java.experimental.span-attributes.copy-from-baggage.include", "key");
5862
properties.put("otel.java.experimental.log-attributes.copy-from-baggage.include", "key");
@@ -117,7 +121,7 @@ private static OpenTelemetrySdk getOpenTelemetrySdk(
117121
new ComponentLoader() {
118122
@Override
119123
public <T> List<T> load(Class<T> spiClass) {
120-
if (spiClass == ConfigurableSpanExporterProvider.class) {
124+
if (spiClass.equals(ConfigurableSpanExporterProvider.class)) {
121125
return Collections.singletonList(
122126
spiClass.cast(
123127
new ConfigurableSpanExporterProvider() {
@@ -132,7 +136,7 @@ public String getName() {
132136
return MEMORY_EXPORTER;
133137
}
134138
}));
135-
} else if (spiClass == ConfigurableLogRecordExporterProvider.class) {
139+
} else if (spiClass.equals(ConfigurableLogRecordExporterProvider.class)) {
136140
return Collections.singletonList(
137141
spiClass.cast(
138142
new ConfigurableLogRecordExporterProvider() {

0 commit comments

Comments
 (0)