Skip to content

Commit 1d216ba

Browse files
jpbempeldevflow.devflow-routing-intake
andauthored
Migrate dd-trace-core groovy files to java part 5 (#11217)
Migrate dd-trace-core groovy files to java part 5 we migrate 4 tests: - DDSpanContextTest - DDSpanSerializationTest - DDSpanTest - KnuthSamplingRateTest # Conflicts: # dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextTest.groovy # dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanTest.groovy # dd-trace-core/src/test/groovy/datadog/trace/core/KnuthSamplingRateTest.groovy address comments address comments resolve conflicts Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>
1 parent 39c42b2 commit 1d216ba

14 files changed

Lines changed: 1887 additions & 1669 deletions

File tree

.claude/skills/migrate-groovy-to-java/SKILL.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ When converting Groovy code to Java code, make sure that:
3030
- Do not mark local variables `final`
3131
- Ensure variables are human-readable; avoid single-letter names and pre-define variables that are referenced multiple times
3232
- When translating Spock `Mock(...)` usage, use `libs.bundles.mockito` instead of writing manual recording/stub implementations
33+
- Keep inline comments
34+
- Migrate the named Spock clauses if they exist as inline comments in the Java unit test
3335

3436
TableTest usage
3537
Import: `import org.tabletest.junit.TableTest;`

dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_5.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,16 @@ public String endpoint() {
125125
return "v0.5";
126126
}
127127

128+
// Visible for tests
129+
Map<Object, Integer> getEncoding() {
130+
return encoding;
131+
}
132+
133+
// Visible for tests
134+
GrowableBuffer getDictionary() {
135+
return dictionary;
136+
}
137+
128138
private static class DictionaryMapper implements Mapper<Object> {
129139

130140
@Override

dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,11 @@ void setLongRunningTrackedState(int state) {
233233
LONG_RUNNING_STATE.set(this, state);
234234
}
235235

236+
// @VisibleForTesting
237+
int getPendingReferenceCount() {
238+
return pendingReferenceCount;
239+
}
240+
236241
boolean empty() {
237242
return 0 >= COMPLETED_SPAN_COUNT.get(this) + PENDING_REFERENCE_COUNT.get(this);
238243
}

0 commit comments

Comments
 (0)