Skip to content

Commit 26573a6

Browse files
PerfectSlayerPerfectSlayer
authored
Improve JUnit Type Converter and clean up AI generated code (#11606)
fix(core): Manually cleaning up AI code WIP fix(core): Manually cleaning up AI code fix(core): Manually cleaning up AI code fix(core): Manually cleaning up AI code fix(core): Manually cleaning up AI code fix(core): Manually cleaning up AI code fix(core): Manually cleaning up AI code fix(core): Manually cleaning up AI code fix(core): Manually cleaning up AI code fix(core): Manually cleaning up AI code fix(core): Manually cleaning up AI code feat(junit): Create class constant type converter fix(core): Manually cleaning up AI code feat(junit): Improve argument converters feat(junit): Improve argument converters feat(junit): Improve argument converters feat(junit): Improve argument converters feat(junit): Improve argument converters feat(junit): Improve argument converters feat(junit): Improve argument converters feat(junit): Improve argument converters Co-authored-by: bruce.bujon <bruce.bujon@datadoghq.com>
1 parent 2f0f3d8 commit 26573a6

45 files changed

Lines changed: 1179 additions & 1147 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/opg/OrgGuardEnforcer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ private ExtractedContext strip(
113113
ctx.getTraceId(),
114114
ctx.getSpanId(),
115115
PrioritySampling.UNSET,
116-
/* origin */ null,
116+
null,
117117
ctx.getEndToEndStartTime(),
118118
ctx.getBaggage(),
119119
ctx.getTags(),
120-
/* httpHeaders */ null,
120+
null,
121121
stripped,
122122
ctx.getTraceConfig(),
123123
ctx.getPropagationStyle());

‎dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/W3CPTagsCodec.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import datadog.logging.RatelimitedLogger;
66
import datadog.trace.api.ProductTraceSource;
7+
import datadog.trace.api.internal.VisibleForTesting;
78
import datadog.trace.api.sampling.PrioritySampling;
89
import datadog.trace.core.propagation.PropagationTags;
910
import datadog.trace.core.propagation.ptags.PTagsFactory.PTags;
@@ -26,7 +27,7 @@ public class W3CPTagsCodec extends PTagsCodec {
2627
private static final char KEY_VALUE_SEPARATOR = ':';
2728
private static final int MIN_ALLOWED_CHAR = 32;
2829
private static final int MAX_ALLOWED_CHAR = 126;
29-
private static final int MAX_MEMBER_COUNT = 32;
30+
@VisibleForTesting public static final int MAX_MEMBER_COUNT = 32;
3031

3132
@Override
3233
PropagationTags fromHeaderValue(PTagsFactory tagsFactory, String value) {

‎dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import datadog.trace.core.CoreTracer;
1010
import datadog.trace.core.DDCoreJavaSpecification;
1111
import datadog.trace.core.DDSpan;
12-
import datadog.trace.junit.utils.tabletest.DDSpanTypesConverter;
12+
import datadog.trace.junit.utils.converter.DDSpanTypesConverter;
1313
import java.util.List;
1414
import java.util.concurrent.TimeUnit;
1515
import java.util.concurrent.TimeoutException;

‎dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpExtractorTest.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import datadog.trace.api.DynamicConfig;
2525
import datadog.trace.bootstrap.instrumentation.api.TagContext;
2626
import datadog.trace.junit.utils.config.WithConfig;
27-
import datadog.trace.junit.utils.tabletest.PrioritySamplingConverter;
27+
import datadog.trace.junit.utils.converter.PrioritySamplingConverter;
2828
import datadog.trace.test.util.DDJavaSpecification;
2929
import java.util.HashMap;
3030
import java.util.Map;
@@ -63,12 +63,12 @@ void teardown() {
6363
}
6464

6565
@TableTest({
66-
"scenario | traceIdHex | spanIdHex | samplingPriority | expectedSamplingPriority ",
67-
"no priority | '1' | '2' | | PrioritySampling.UNSET ",
68-
"sampler keep | '2' | '3' | 1 | PrioritySampling.SAMPLER_KEEP",
69-
"sampler drop | '3' | '4' | 0 | PrioritySampling.SAMPLER_DROP",
70-
"uint64 max drop | 'ffffffffffffffff' | 'fffffffffffffffe' | 0 | PrioritySampling.SAMPLER_DROP",
71-
"uint64 max-1 keep | 'fffffffffffffffe' | 'ffffffffffffffff' | 1 | PrioritySampling.SAMPLER_KEEP"
66+
"scenario | traceIdHex | spanIdHex | samplingPriority | expectedSamplingPriority",
67+
"no priority | '1' | '2' | | UNSET ",
68+
"sampler keep | '2' | '3' | 1 | SAMPLER_KEEP ",
69+
"sampler drop | '3' | '4' | 0 | SAMPLER_DROP ",
70+
"uint64 max drop | 'ffffffffffffffff' | 'fffffffffffffffe' | 0 | SAMPLER_DROP ",
71+
"uint64 max-1 keep | 'fffffffffffffffe' | 'ffffffffffffffff' | 1 | SAMPLER_KEEP "
7272
})
7373
void extractHttpHeaders(
7474
String traceIdHex,
@@ -95,11 +95,11 @@ void extractHttpHeaders(
9595
}
9696

9797
@TableTest({
98-
"scenario | b3 | expectedTraceIdHex | expectedSpanId | expectedSamplingPriority ",
99-
"b3 takes precedence | '2-3-0' | '2' | 3 | PrioritySampling.SAMPLER_DROP",
100-
"b3 without priority | '2-3' | '2' | 3 | PrioritySampling.UNSET ",
101-
"invalid b3 falls back | '0' | '1' | 2 | PrioritySampling.SAMPLER_KEEP",
102-
"absent b3 falls back | | '1' | 2 | PrioritySampling.SAMPLER_KEEP"
98+
"scenario | b3 | expectedTraceIdHex | expectedSpanId | expectedSamplingPriority",
99+
"b3 takes precedence | '2-3-0' | '2' | 3 | SAMPLER_DROP ",
100+
"b3 without priority | '2-3' | '2' | 3 | UNSET ",
101+
"invalid b3 falls back | '0' | '1' | 2 | SAMPLER_KEEP ",
102+
"absent b3 falls back | | '1' | 2 | SAMPLER_KEEP "
103103
})
104104
void extractHttpHeadersWithB3HeaderAtTheBeginning(
105105
String b3,
@@ -127,11 +127,11 @@ void extractHttpHeadersWithB3HeaderAtTheBeginning(
127127
}
128128

129129
@TableTest({
130-
"scenario | b3 | expectedTraceIdHex | expectedSpanId | expectedSamplingPriority ",
131-
"b3 takes precedence | '2-3-0' | '2' | 3 | PrioritySampling.SAMPLER_DROP",
132-
"b3 without priority | '2-3' | '2' | 3 | PrioritySampling.UNSET ",
133-
"invalid b3 falls back | '0' | '1' | 2 | PrioritySampling.SAMPLER_KEEP",
134-
"absent b3 falls back | | '1' | 2 | PrioritySampling.SAMPLER_KEEP"
130+
"scenario | b3 | expectedTraceIdHex | expectedSpanId | expectedSamplingPriority",
131+
"b3 takes precedence | '2-3-0' | '2' | 3 | SAMPLER_DROP ",
132+
"b3 without priority | '2-3' | '2' | 3 | UNSET ",
133+
"invalid b3 falls back | '0' | '1' | 2 | SAMPLER_KEEP ",
134+
"absent b3 falls back | | '1' | 2 | SAMPLER_KEEP "
135135
})
136136
void extractHttpHeadersWithB3HeaderAtTheEnd(
137137
String b3,

‎dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpInjectorTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import datadog.trace.core.CoreTracer;
2525
import datadog.trace.core.DDCoreJavaSpecification;
2626
import datadog.trace.core.DDSpanContext;
27-
import datadog.trace.junit.utils.tabletest.PrioritySamplingConverter;
27+
import datadog.trace.junit.utils.converter.PrioritySamplingConverter;
2828
import java.util.HashMap;
2929
import java.util.Map;
3030
import org.junit.jupiter.api.AfterEach;
@@ -62,14 +62,14 @@ void tearDown() {
6262
}
6363

6464
@TableTest({
65-
"scenario | traceId | spanId | samplingPriority | expectedSamplingPriority ",
66-
"unset | 1 | 2 | PrioritySampling.UNSET | ",
67-
"sampler keep | 2 | 3 | PrioritySampling.SAMPLER_KEEP | PrioritySampling.SAMPLER_KEEP",
68-
"sampler drop | 4 | 5 | PrioritySampling.SAMPLER_DROP | PrioritySampling.SAMPLER_DROP",
69-
"user keep | 5 | 6 | PrioritySampling.USER_KEEP | PrioritySampling.SAMPLER_KEEP",
70-
"user drop | 6 | 7 | PrioritySampling.USER_DROP | PrioritySampling.SAMPLER_DROP",
71-
"uint64 max unset | -1 | -2 | PrioritySampling.UNSET | ",
72-
"uint64 max-1 keep | -2 | -1 | PrioritySampling.SAMPLER_KEEP | PrioritySampling.SAMPLER_KEEP"
65+
"scenario | traceId | spanId | samplingPriority | expectedSamplingPriority",
66+
"unset | 1 | 2 | UNSET | ",
67+
"sampler keep | 2 | 3 | SAMPLER_KEEP | SAMPLER_KEEP ",
68+
"sampler drop | 4 | 5 | SAMPLER_DROP | SAMPLER_DROP ",
69+
"user keep | 5 | 6 | USER_KEEP | SAMPLER_KEEP ",
70+
"user drop | 6 | 7 | USER_DROP | SAMPLER_DROP ",
71+
"uint64 max unset | -1 | -2 | UNSET | ",
72+
"uint64 max-1 keep | -2 | -1 | SAMPLER_KEEP | SAMPLER_KEEP "
7373
})
7474
void injectHttpHeaders(
7575
long traceId,

‎dd-trace-core/src/test/java/datadog/trace/core/propagation/ControllableSampler.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package datadog.trace.core.propagation;
22

3-
import datadog.trace.api.sampling.PrioritySampling;
4-
import datadog.trace.api.sampling.SamplingMechanism;
3+
import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_KEEP;
4+
import static datadog.trace.api.sampling.SamplingMechanism.DEFAULT;
5+
56
import datadog.trace.common.sampling.PrioritySampler;
67
import datadog.trace.common.sampling.Sampler;
78
import datadog.trace.core.CoreSpan;
89

910
public class ControllableSampler implements Sampler, PrioritySampler {
10-
protected int nextSamplingPriority = PrioritySampling.SAMPLER_KEEP;
11+
protected int nextSamplingPriority = SAMPLER_KEEP;
1112

1213
@Override
1314
public <T extends CoreSpan<T>> void setSamplingPriority(T span) {
14-
span.setSamplingPriority(nextSamplingPriority, SamplingMechanism.DEFAULT);
15+
span.setSamplingPriority(nextSamplingPriority, DEFAULT);
1516
}
1617

1718
@Override

‎dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpExtractorTest.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import static datadog.trace.core.propagation.DatadogHttpCodec.SPAN_ID_KEY;
1515
import static datadog.trace.core.propagation.DatadogHttpCodec.TRACE_ID_KEY;
1616
import static datadog.trace.core.propagation.HttpCodecTestHelper.headers;
17-
import static datadog.trace.junit.utils.tabletest.TraceIdConverter.TRACE_ID_MAX_PLUS_1;
17+
import static datadog.trace.junit.utils.converter.TraceIdConverter.TRACE_ID_MAX_PLUS_1;
1818
import static java.util.Collections.singletonMap;
1919
import static org.junit.jupiter.api.Assertions.assertEquals;
2020
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -31,8 +31,8 @@
3131
import datadog.trace.api.internal.util.LongStringUtils;
3232
import datadog.trace.bootstrap.instrumentation.api.TagContext;
3333
import datadog.trace.junit.utils.config.WithConfig;
34-
import datadog.trace.junit.utils.tabletest.PrioritySamplingConverter;
35-
import datadog.trace.junit.utils.tabletest.TraceIdConverter;
34+
import datadog.trace.junit.utils.converter.PrioritySamplingConverter;
35+
import datadog.trace.junit.utils.converter.TraceIdConverter;
3636
import datadog.trace.test.util.DDJavaSpecification;
3737
import java.util.HashMap;
3838
import java.util.Map;
@@ -80,11 +80,11 @@ void teardown() {
8080
}
8181

8282
@TableTest({
83-
"scenario | traceId | spanId | samplingPriority | origin ",
84-
"unset no origin | '1' | '2' | PrioritySampling.UNSET | ",
85-
"keep with origin | '2' | '3' | PrioritySampling.SAMPLER_KEEP | 'saipan'",
86-
"uint64 max unset | 'TRACE_ID_MAX' | 'TRACE_ID_MAX-1' | PrioritySampling.UNSET | 'saipan'",
87-
"uint64 max-1 keep | 'TRACE_ID_MAX-1' | 'TRACE_ID_MAX' | PrioritySampling.SAMPLER_KEEP | 'saipan'"
83+
"scenario | traceId | spanId | samplingPriority | origin ",
84+
"unset no origin | '1' | '2' | UNSET | ",
85+
"keep with origin | '2' | '3' | SAMPLER_KEEP | 'saipan'",
86+
"uint64 max unset | 'MAX' | 'MAX-1' | UNSET | 'saipan'",
87+
"uint64 max-1 keep | 'MAX-1' | 'MAX' | SAMPLER_KEEP | 'saipan'"
8888
})
8989
void extractHttpHeaders(
9090
@ConvertWith(TraceIdConverter.class) String traceId,
@@ -362,15 +362,15 @@ void extractHttpHeadersWithOutOfRangeSpanId() {
362362
}
363363

364364
@TableTest({
365-
"scenario | traceId | spanId | expectExtraction",
366-
"negative traceId | '-1' | '1' | false ",
367-
"negative spanId | '1' | '-1' | false ",
368-
"zero traceId | '0' | '1' | false ",
369-
"zero spanId | '1' | '0' | true ",
370-
"uint64 max traceId | 'TRACE_ID_MAX' | '1' | true ",
371-
"out-of-range traceId | 'TRACE_ID_MAX+1' | '1' | false ",
372-
"uint64 max spanId | '1' | 'TRACE_ID_MAX' | true ",
373-
"out-of-range spanId | '1' | 'TRACE_ID_MAX+1' | false "
365+
"scenario | traceId | spanId | expectExtraction",
366+
"negative traceId | '-1' | '1' | false ",
367+
"negative spanId | '1' | '-1' | false ",
368+
"zero traceId | '0' | '1' | false ",
369+
"zero spanId | '1' | '0' | true ",
370+
"uint64 max traceId | 'MAX' | '1' | true ",
371+
"out-of-range traceId | 'MAX+1' | '1' | false ",
372+
"uint64 max spanId | '1' | 'MAX' | true ",
373+
"out-of-range spanId | '1' | 'MAX+1' | false "
374374
})
375375
void moreIdRangeValidation(
376376
@ConvertWith(TraceIdConverter.class) String traceId,
@@ -430,11 +430,11 @@ void extractHttpHeadersWithEndToEnd(String traceId, String spanId, long endToEnd
430430
}
431431

432432
@TableTest({
433-
"scenario | traceId | spanId | ctxCreated",
434-
"negative traceId | '-1' | '1' | false ",
435-
"negative spanId | '1' | '-1' | false ",
436-
"zero traceId | '0' | '1' | true ",
437-
"uint64 max-1 ids | 'TRACE_ID_MAX-1' | 'TRACE_ID_MAX-1' | true "
433+
"scenario | traceId | spanId | ctxCreated",
434+
"negative traceId | '-1' | '1' | false ",
435+
"negative spanId | '1' | '-1' | false ",
436+
"zero traceId | '0' | '1' | true ",
437+
"uint64 max-1 ids | 'MAX-1' | 'MAX-1' | true "
438438
})
439439
void baggageIsMappedOnContextCreation(
440440
@ConvertWith(TraceIdConverter.class) String traceId,

‎dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpInjectorTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import datadog.trace.core.CoreTracer;
2323
import datadog.trace.core.DDCoreJavaSpecification;
2424
import datadog.trace.core.DDSpanContext;
25-
import datadog.trace.junit.utils.tabletest.PrioritySamplingConverter;
26-
import datadog.trace.junit.utils.tabletest.TraceIdConverter;
25+
import datadog.trace.junit.utils.converter.PrioritySamplingConverter;
26+
import datadog.trace.junit.utils.converter.TraceIdConverter;
2727
import java.util.HashMap;
2828
import java.util.Map;
2929
import org.junit.jupiter.api.AfterEach;
@@ -51,11 +51,11 @@ void tearDown() {
5151
}
5252

5353
@TableTest({
54-
"scenario | traceId | spanId | samplingPriority | origin ",
55-
"unset no origin | '1' | '2' | PrioritySampling.UNSET | ",
56-
"keep with origin | '1' | '2' | PrioritySampling.SAMPLER_KEEP | 'saipan'",
57-
"uint64 max unset | 'TRACE_ID_MAX' | 'TRACE_ID_MAX-1' | PrioritySampling.UNSET | 'saipan'",
58-
"uint64 max-1 keep | 'TRACE_ID_MAX-1' | 'TRACE_ID_MAX' | PrioritySampling.SAMPLER_KEEP | "
54+
"scenario | traceId | spanId | samplingPriority | origin ",
55+
"unset no origin | '1' | '2' | UNSET | ",
56+
"keep with origin | '1' | '2' | SAMPLER_KEEP | 'saipan'",
57+
"uint64 max unset | 'MAX' | 'MAX-1' | UNSET | 'saipan'",
58+
"uint64 max-1 keep | 'MAX-1' | 'MAX' | SAMPLER_KEEP | "
5959
})
6060
void injectHttpHeaders(
6161
@ConvertWith(TraceIdConverter.class) String traceId,

0 commit comments

Comments
 (0)