File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed
main/java/datadog/trace/core
test/groovy/datadog/trace/core/datastreams Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -193,6 +193,7 @@ public static CoreTracerBuilder builder() {
193193
194194 /** A set of tags that are added to every span */
195195 private final TagMap defaultSpanTags ;
196+
196197 private final boolean defaultSpanTagsNeedsIntercept ;
197198
198199 /** number of spans in a pending trace before they get flushed */
@@ -1769,11 +1770,11 @@ private DDSpanContext buildSpanContext() {
17691770 boolean mergedTracerTagsNeedsIntercept = traceConfig .mergedTracerTagsNeedsIntercept ;
17701771
17711772 final int tagsSize =
1772- mergedTracerTags .size ()
1773- + (null == tagLedger ? 0 : tagLedger .estimateSize ())
1774- + (null == coreTags ? 0 : coreTags .size ())
1775- + (null == rootSpanTags ? 0 : rootSpanTags .size ())
1776- + (null == contextualTags ? 0 : contextualTags .size ());
1773+ mergedTracerTags .size ()
1774+ + (null == tagLedger ? 0 : tagLedger .estimateSize ())
1775+ + (null == coreTags ? 0 : coreTags .size ())
1776+ + (null == rootSpanTags ? 0 : rootSpanTags .size ())
1777+ + (null == contextualTags ? 0 : contextualTags .size ());
17771778
17781779 if (builderRequestContextDataAppSec != null ) {
17791780 requestContextDataAppSec = builderRequestContextDataAppSec ;
Original file line number Diff line number Diff line change @@ -520,7 +520,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification {
520520 timeSource.advance(MILLISECONDS.toNanos(50))
521521 context.setCheckpoint(fromTags(new LinkedHashMap<>([" type" : " internal" ])), pointConsumer)
522522 def encoded = context.encode()
523-
523+
524524 Map<String, String> carrier = [(PROPAGATION_KEY_BASE64): encoded, " someotherkey" : " someothervalue" ]
525525 def contextVisitor = new Base64MapContextVisitor()
526526 def propagator = dataStreams.propagator()
You can’t perform that action at this time.
0 commit comments