Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

W3CPropagation allows not having baggage #72

Merged
merged 1 commit into from
Sep 23, 2022
Merged

W3CPropagation allows not having baggage #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions ...tracing-bridge-brave/src/main/java/io/micrometer/tracing/brave/bridge/W3CPropagation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@

package io.micrometer.tracing.brave.bridge;

import brave.baggage.BaggageField;
import brave.baggage.BaggagePropagation;
import brave.internal.baggage.BaggageFields;
import brave.internal.propagation.StringPropagationAdapter;
import brave.propagation.Propagation;
import brave.propagation.TraceContext;
import brave.propagation.TraceContextOrSamplingFlags;
import io.micrometer.common.lang.Nullable;
import io.micrometer.common.util.StringUtils;
import io.micrometer.common.util.internal.logging.InternalLogger;
import io.micrometer.common.util.internal.logging.InternalLoggerFactory;
Expand Down Expand Up @@ -96,15 +95,30 @@ public class W3CPropagation extends Propagation.Factory implements Propagation<S

private static final String VERSION_00 = "00";

@Nullable
private final W3CBaggagePropagator baggagePropagator;

@Nullable
private final BraveBaggageManager braveBaggageManager;

/**
* Creates an instance of {@link W3CPropagation} with baggage support.
* @param braveBaggageManager Brave baggage manager
* @param localFields local fields to be registered as baggage
*/
public W3CPropagation(BraveBaggageManager braveBaggageManager, List<String> localFields) {
this.baggagePropagator = new W3CBaggagePropagator(braveBaggageManager, localFields);
this.braveBaggageManager = braveBaggageManager;
}

/**
* Creates an instance of {@link W3CPropagation} without baggage support.
*/
public W3CPropagation() {
this.baggagePropagator = null;
this.braveBaggageManager = null;
}

private static boolean isTraceIdValid(CharSequence traceId) {
return (traceId.length() == TRACE_ID_HEX_SIZE) && !INVALID_TRACE_ID.contentEquals(traceId)
&& EncodingUtils.isValidBase16String(traceId);
Expand Down Expand Up @@ -190,12 +204,14 @@ public <R> TraceContext.Injector<R> injector(Setter<R, String> setter) {
copyTraceFlagsHexTo(chars, TRACE_OPTION_OFFSET, context);
setter.put(carrier, TRACE_PARENT, new String(chars, 0, TRACEPARENT_HEADER_SIZE));
addTraceState(setter, context, carrier);
this.baggagePropagator.injector(setter).inject(context, carrier);
if (this.baggagePropagator != null) {
this.baggagePropagator.injector(setter).inject(context, carrier);
}
};
}

private <R> void addTraceState(Setter<R, String> setter, TraceContext context, R carrier) {
if (carrier != null) {
if (carrier != null && this.braveBaggageManager != null) {
BaggageInScope baggage = this.braveBaggageManager.getBaggage(BraveTraceContext.fromBrave(context),
TRACE_STATE);
if (baggage == null) {
Expand Down Expand Up @@ -240,7 +256,11 @@ public <R> TraceContext.Extractor<R> extractor(Getter<R, String> getter) {
return withBaggage(TraceContextOrSamplingFlags.EMPTY, carrier, getter);
}
String traceStateHeader = getter.get(carrier, TRACE_STATE);
return withBaggage(context(contextFromParentHeader, traceStateHeader), carrier, getter);
TraceContextOrSamplingFlags context = context(contextFromParentHeader, traceStateHeader);
if (this.baggagePropagator == null || this.braveBaggageManager == null) {
return context;
}
return withBaggage(context, carrier, getter);
};
}

Expand Down Expand Up @@ -294,8 +314,6 @@ class W3CBaggagePropagator {

private static final String TRACE_STATE = "tracestate";

private static final BaggageField TRACE_STATE_BAGGAGE = BaggageField.create(TRACE_STATE);

private static final String FIELD = "baggage";

private static final List<String> FIELDS = singletonList(FIELD);
Expand All @@ -309,15 +327,6 @@ class W3CBaggagePropagator {
this.localFields = localFields;
}

private BaggagePropagation.FactoryBuilder factory() {
return BaggagePropagation.newFactoryBuilder(new Propagation.Factory() {
@Override
public <K> Propagation<K> create(Propagation.KeyFactory<K> keyFactory) {
return null;
}
});
}

public List<String> keys() {
return FIELDS;
}
Expand Down
Loading