Skip to content

Clean up AI generated code #11606

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

Open
PerfectSlayer wants to merge 14 commits into
base: master
Choose a base branch
from
+646 −646
Open

Clean up AI generated code #11606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4ea1e66
fix(core): Manually cleaning up AI code
PerfectSlayer Jun 8, 2026
b7d8bc9
WIP
PerfectSlayer Jun 8, 2026
239d46b
fix(core): Manually cleaning up AI code
PerfectSlayer Jun 8, 2026
040a3b5
fix(core): Manually cleaning up AI code
PerfectSlayer Jun 8, 2026
6f81a79
fix(core): Manually cleaning up AI code
PerfectSlayer Jun 9, 2026
ee63c38
fix(core): Manually cleaning up AI code
PerfectSlayer Jun 9, 2026
bde771f
fix(core): Manually cleaning up AI code
PerfectSlayer Jun 9, 2026
5af4233
fix(core): Manually cleaning up AI code
PerfectSlayer Jun 9, 2026
cff11a9
fix(core): Manually cleaning up AI code
PerfectSlayer Jun 9, 2026
26dcc39
fix(core): Manually cleaning up AI code
PerfectSlayer Jun 9, 2026
a16e16b
fix(core): Manually cleaning up AI code
PerfectSlayer Jun 9, 2026
b2ddc4a
fix(core): Manually cleaning up AI code
PerfectSlayer Jun 9, 2026
b44c07c
feat(junit): Create class constant type converter
PerfectSlayer Jun 9, 2026
bdd7b2c
fix(core): Manually cleaning up AI code
PerfectSlayer Jun 9, 2026
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
4 changes: 2 additions & 2 deletions dd-trace-core/src/main/java/datadog/trace/core/propagation/opg/OrgGuardEnforcer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ private ExtractedContext strip(
ctx.getTraceId(),
ctx.getSpanId(),
PrioritySampling.UNSET,
/* origin */ null,
null,
ctx.getEndToEndStartTime(),
ctx.getBaggage(),
ctx.getTags(),
/* httpHeaders */ null,
null,
stripped,
ctx.getTraceConfig(),
ctx.getPropagationStyle());
Expand Down
3 changes: 2 additions & 1 deletion dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/W3CPTagsCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import datadog.logging.RatelimitedLogger;
import datadog.trace.api.ProductTraceSource;
import datadog.trace.api.internal.VisibleForTesting;
import datadog.trace.api.sampling.PrioritySampling;
import datadog.trace.core.propagation.PropagationTags;
import datadog.trace.core.propagation.ptags.PTagsFactory.PTags;
Expand All @@ -26,7 +27,7 @@ public class W3CPTagsCodec extends PTagsCodec {
private static final char KEY_VALUE_SEPARATOR = ':';
private static final int MIN_ALLOWED_CHAR = 32;
private static final int MAX_ALLOWED_CHAR = 126;
private static final int MAX_MEMBER_COUNT = 32;
@VisibleForTesting public static final int MAX_MEMBER_COUNT = 32;

@Override
PropagationTags fromHeaderValue(PTagsFactory tagsFactory, String value) {
Expand Down
32 changes: 16 additions & 16 deletions dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ void teardown() {
}

@TableTest({
"scenario | traceIdHex | spanIdHex | samplingPriority | expectedSamplingPriority ",
"no priority | '1' | '2' | | PrioritySampling.UNSET ",
"sampler keep | '2' | '3' | 1 | PrioritySampling.SAMPLER_KEEP",
"sampler drop | '3' | '4' | 0 | PrioritySampling.SAMPLER_DROP",
"uint64 max drop | 'ffffffffffffffff' | 'fffffffffffffffe' | 0 | PrioritySampling.SAMPLER_DROP",
"uint64 max-1 keep | 'fffffffffffffffe' | 'ffffffffffffffff' | 1 | PrioritySampling.SAMPLER_KEEP"
"scenario | traceIdHex | spanIdHex | samplingPriority | expectedSamplingPriority",
"no priority | '1' | '2' | | UNSET ",
"sampler keep | '2' | '3' | 1 | SAMPLER_KEEP ",
"sampler drop | '3' | '4' | 0 | SAMPLER_DROP ",
"uint64 max drop | 'ffffffffffffffff' | 'fffffffffffffffe' | 0 | SAMPLER_DROP ",
"uint64 max-1 keep | 'fffffffffffffffe' | 'ffffffffffffffff' | 1 | SAMPLER_KEEP "
})
void extractHttpHeaders(
String traceIdHex,
Expand All @@ -95,11 +95,11 @@ void extractHttpHeaders(
}

@TableTest({
"scenario | b3 | expectedTraceIdHex | expectedSpanId | expectedSamplingPriority ",
"b3 takes precedence | '2-3-0' | '2' | 3 | PrioritySampling.SAMPLER_DROP",
"b3 without priority | '2-3' | '2' | 3 | PrioritySampling.UNSET ",
"invalid b3 falls back | '0' | '1' | 2 | PrioritySampling.SAMPLER_KEEP",
"absent b3 falls back | | '1' | 2 | PrioritySampling.SAMPLER_KEEP"
"scenario | b3 | expectedTraceIdHex | expectedSpanId | expectedSamplingPriority",
"b3 takes precedence | '2-3-0' | '2' | 3 | SAMPLER_DROP ",
"b3 without priority | '2-3' | '2' | 3 | UNSET ",
"invalid b3 falls back | '0' | '1' | 2 | SAMPLER_KEEP ",
"absent b3 falls back | | '1' | 2 | SAMPLER_KEEP "
})
void extractHttpHeadersWithB3HeaderAtTheBeginning(
String b3,
Expand Down Expand Up @@ -127,11 +127,11 @@ void extractHttpHeadersWithB3HeaderAtTheBeginning(
}

@TableTest({
"scenario | b3 | expectedTraceIdHex | expectedSpanId | expectedSamplingPriority ",
"b3 takes precedence | '2-3-0' | '2' | 3 | PrioritySampling.SAMPLER_DROP",
"b3 without priority | '2-3' | '2' | 3 | PrioritySampling.UNSET ",
"invalid b3 falls back | '0' | '1' | 2 | PrioritySampling.SAMPLER_KEEP",
"absent b3 falls back | | '1' | 2 | PrioritySampling.SAMPLER_KEEP"
"scenario | b3 | expectedTraceIdHex | expectedSpanId | expectedSamplingPriority",
"b3 takes precedence | '2-3-0' | '2' | 3 | SAMPLER_DROP ",
"b3 without priority | '2-3' | '2' | 3 | UNSET ",
"invalid b3 falls back | '0' | '1' | 2 | SAMPLER_KEEP ",
"absent b3 falls back | | '1' | 2 | SAMPLER_KEEP "
})
void extractHttpHeadersWithB3HeaderAtTheEnd(
String b3,
Expand Down
16 changes: 8 additions & 8 deletions dd-trace-core/src/test/java/datadog/trace/core/propagation/B3HttpInjectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ void tearDown() {
}

@TableTest({
"scenario | traceId | spanId | samplingPriority | expectedSamplingPriority ",
"unset | 1 | 2 | PrioritySampling.UNSET | ",
"sampler keep | 2 | 3 | PrioritySampling.SAMPLER_KEEP | PrioritySampling.SAMPLER_KEEP",
"sampler drop | 4 | 5 | PrioritySampling.SAMPLER_DROP | PrioritySampling.SAMPLER_DROP",
"user keep | 5 | 6 | PrioritySampling.USER_KEEP | PrioritySampling.SAMPLER_KEEP",
"user drop | 6 | 7 | PrioritySampling.USER_DROP | PrioritySampling.SAMPLER_DROP",
"uint64 max unset | -1 | -2 | PrioritySampling.UNSET | ",
"uint64 max-1 keep | -2 | -1 | PrioritySampling.SAMPLER_KEEP | PrioritySampling.SAMPLER_KEEP"
"scenario | traceId | spanId | samplingPriority | expectedSamplingPriority",
"unset | 1 | 2 | UNSET | ",
"sampler keep | 2 | 3 | SAMPLER_KEEP | SAMPLER_KEEP ",
"sampler drop | 4 | 5 | SAMPLER_DROP | SAMPLER_DROP ",
"user keep | 5 | 6 | USER_KEEP | SAMPLER_KEEP ",
"user drop | 6 | 7 | USER_DROP | SAMPLER_DROP ",
"uint64 max unset | -1 | -2 | UNSET | ",
"uint64 max-1 keep | -2 | -1 | SAMPLER_KEEP | SAMPLER_KEEP "
})
void injectHttpHeaders(
long traceId,
Expand Down
9 changes: 5 additions & 4 deletions dd-trace-core/src/test/java/datadog/trace/core/propagation/ControllableSampler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package datadog.trace.core.propagation;

import datadog.trace.api.sampling.PrioritySampling;
import datadog.trace.api.sampling.SamplingMechanism;
import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_KEEP;
import static datadog.trace.api.sampling.SamplingMechanism.DEFAULT;

import datadog.trace.common.sampling.PrioritySampler;
import datadog.trace.common.sampling.Sampler;
import datadog.trace.core.CoreSpan;

public class ControllableSampler implements Sampler, PrioritySampler {
protected int nextSamplingPriority = PrioritySampling.SAMPLER_KEEP;
protected int nextSamplingPriority = SAMPLER_KEEP;

@Override
public <T extends CoreSpan<T>> void setSamplingPriority(T span) {
span.setSamplingPriority(nextSamplingPriority, SamplingMechanism.DEFAULT);
span.setSamplingPriority(nextSamplingPriority, DEFAULT);
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ void teardown() {
}

@TableTest({
"scenario | traceId | spanId | samplingPriority | origin ",
"unset no origin | '1' | '2' | PrioritySampling.UNSET | ",
"keep with origin | '2' | '3' | PrioritySampling.SAMPLER_KEEP | 'saipan'",
"uint64 max unset | 'TRACE_ID_MAX' | 'TRACE_ID_MAX-1' | PrioritySampling.UNSET | 'saipan'",
"uint64 max-1 keep | 'TRACE_ID_MAX-1' | 'TRACE_ID_MAX' | PrioritySampling.SAMPLER_KEEP | 'saipan'"
"scenario | traceId | spanId | samplingPriority | origin ",
"unset no origin | '1' | '2' | UNSET | ",
"keep with origin | '2' | '3' | SAMPLER_KEEP | 'saipan'",
"uint64 max unset | 'TRACE_ID_MAX' | 'TRACE_ID_MAX-1' | UNSET | 'saipan'",
"uint64 max-1 keep | 'TRACE_ID_MAX-1' | 'TRACE_ID_MAX' | SAMPLER_KEEP | 'saipan'"
})
void extractHttpHeaders(
@ConvertWith(TraceIdConverter.class) String traceId,
Expand Down
10 changes: 5 additions & 5 deletions dd-trace-core/src/test/java/datadog/trace/core/propagation/DatadogHttpInjectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ void tearDown() {
}

@TableTest({
"scenario | traceId | spanId | samplingPriority | origin ",
"unset no origin | '1' | '2' | PrioritySampling.UNSET | ",
"keep with origin | '1' | '2' | PrioritySampling.SAMPLER_KEEP | 'saipan'",
"uint64 max unset | 'TRACE_ID_MAX' | 'TRACE_ID_MAX-1' | PrioritySampling.UNSET | 'saipan'",
"uint64 max-1 keep | 'TRACE_ID_MAX-1' | 'TRACE_ID_MAX' | PrioritySampling.SAMPLER_KEEP | "
"scenario | traceId | spanId | samplingPriority | origin ",
"unset no origin | '1' | '2' | UNSET | ",
"keep with origin | '1' | '2' | SAMPLER_KEEP | 'saipan'",
"uint64 max unset | 'TRACE_ID_MAX' | 'TRACE_ID_MAX-1' | UNSET | 'saipan'",
"uint64 max-1 keep | 'TRACE_ID_MAX-1' | 'TRACE_ID_MAX' | SAMPLER_KEEP | "
})
void injectHttpHeaders(
@ConvertWith(TraceIdConverter.class) String traceId,
Expand Down
Loading
Loading