Skip to content

Commit 952a80e

Browse files
committed
Migrate dd-trace-core groovy files to java part 9
we migrate 20 tests from the propagation package: - TagKeyTest - TagValueTest - B3HttpExtractorTest - B3HttpInjectorPaddedTest - B3HttpInjectorTest - DatadogHttpExtractorTest - DatadogHttpInjectorTest - DatadogPropagationTagsTest - HaystackHttpExtractorTest - HaystackHttpInjectorTest - HttpExtractorTest - HttpInjectorB3PaddingTest - HttpInjectorTest - NoneHttpExtractorTest - TracingPropagatorTest - W3CHttpExtractorTest - W3CHttpInjectorTest - W3CPropagationTagsTest - XRayHttpExtractorTest - XRayHttpInjectorTest
1 parent 0ae18bb commit 952a80e

47 files changed

Lines changed: 4833 additions & 4519 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ class B3HttpCodec {
2929
private static final String B3_SPAN_ID = "b3.spanid";
3030
static final String TRACE_ID_KEY = "X-B3-TraceId";
3131
static final String SPAN_ID_KEY = "X-B3-SpanId";
32-
private static final String SAMPLING_PRIORITY_KEY = "X-B3-Sampled";
32+
static final String SAMPLING_PRIORITY_KEY = "X-B3-Sampled";
3333
// See https://github.com/openzipkin/b3-propagation#single-header for b3 header documentation
34-
private static final String B3_KEY = "b3";
34+
static final String B3_KEY = "b3";
3535
private static final String SAMPLING_PRIORITY_ACCEPT = String.valueOf(1);
3636
private static final String SAMPLING_PRIORITY_DROP = String.valueOf(0);
3737

dd-trace-core/src/main/java/datadog/trace/core/propagation/HaystackHttpCodec.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ class HaystackHttpCodec {
2929
private static final Logger log = LoggerFactory.getLogger(HaystackHttpCodec.class);
3030

3131
// https://github.com/ExpediaDotCom/haystack-client-java/blob/master/core/src/main/java/com/expedia/www/haystack/client/propagation/DefaultKeyConvention.java
32-
private static final String OT_BAGGAGE_PREFIX = "Baggage-";
33-
private static final String TRACE_ID_KEY = "Trace-ID";
34-
private static final String SPAN_ID_KEY = "Span-ID";
32+
static final String OT_BAGGAGE_PREFIX = "Baggage-";
33+
static final String TRACE_ID_KEY = "Trace-ID";
34+
static final String SPAN_ID_KEY = "Span-ID";
3535
private static final String PARENT_ID_KEY = "Parent-ID";
3636

37-
private static final String DD_TRACE_ID_BAGGAGE_KEY = OT_BAGGAGE_PREFIX + "Datadog-Trace-Id";
38-
private static final String DD_SPAN_ID_BAGGAGE_KEY = OT_BAGGAGE_PREFIX + "Datadog-Span-Id";
39-
private static final String DD_PARENT_ID_BAGGAGE_KEY = OT_BAGGAGE_PREFIX + "Datadog-Parent-Id";
37+
static final String DD_TRACE_ID_BAGGAGE_KEY = OT_BAGGAGE_PREFIX + "Datadog-Trace-Id";
38+
static final String DD_SPAN_ID_BAGGAGE_KEY = OT_BAGGAGE_PREFIX + "Datadog-Span-Id";
39+
static final String DD_PARENT_ID_BAGGAGE_KEY = OT_BAGGAGE_PREFIX + "Datadog-Parent-Id";
4040

41-
private static final String HAYSTACK_TRACE_ID_BAGGAGE_KEY = "Haystack-Trace-ID";
42-
private static final String HAYSTACK_SPAN_ID_BAGGAGE_KEY = "Haystack-Span-ID";
41+
static final String HAYSTACK_TRACE_ID_BAGGAGE_KEY = "Haystack-Trace-ID";
42+
static final String HAYSTACK_SPAN_ID_BAGGAGE_KEY = "Haystack-Span-ID";
4343
private static final String HAYSTACK_PARENT_ID_BAGGAGE_KEY = "Haystack-Parent-ID";
4444

4545
// public static final long DATADOG = new BigInteger("Datadog!".getBytes()).longValue();

0 commit comments

Comments
 (0)