Skip to content

DRAFT Groovy -> Java #10251

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

Draft
jpbempel wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

DRAFT Groovy -> Java #10251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
055b415
DRAFT Groovy -> Java
jpbempel Dec 19, 2025
2cd6a7b
LLM helps
jpbempel Dec 19, 2025
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
25 changes: 23 additions & 2 deletions ...tion-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,17 @@ abstract class InstrumentationSpecification extends DDSpecification implements A
options = "datadog.trace.agent.test.asserts.ListWriterAssert")
@DelegatesTo(value = ListWriterAssert, strategy = Closure.DELEGATE_FIRST)
final Closure spec) {
ListWriterAssert.assertTraces(TEST_WRITER, size, ignoreAdditionalTraces, spec)
// Ensure Groovy closure resolves methods (e.g., trace(), sortSpansByStart()) against ListWriterAssert
ListWriterAssert.assertTraces(
TEST_WRITER,
size,
ignoreAdditionalTraces,
{ ListWriterAssert asserter ->
spec.delegate = asserter
spec.resolveStrategy = Closure.DELEGATE_FIRST
spec.call(asserter)
} as java.util.function.Consumer<ListWriterAssert>
)
}

protected static final Comparator<List<DDSpan>> SORT_TRACES_BY_ID = ListWriterAssert.SORT_TRACES_BY_ID
Expand All @@ -591,7 +601,18 @@ abstract class InstrumentationSpecification extends DDSpecification implements A
options = "datadog.trace.agent.test.asserts.ListWriterAssert")
@DelegatesTo(value = ListWriterAssert, strategy = Closure.DELEGATE_FIRST)
final Closure spec) {
ListWriterAssert.assertTraces(TEST_WRITER, size, false, traceSorter, spec)
// Ensure Groovy closure resolves methods against ListWriterAssert when a custom sorter is provided
ListWriterAssert.assertTraces(
TEST_WRITER,
size,
false,
traceSorter,
{ ListWriterAssert asserter ->
spec.delegate = asserter
spec.resolveStrategy = Closure.DELEGATE_FIRST
spec.call(asserter)
} as java.util.function.Consumer<ListWriterAssert>
)
}

void blockUntilChildSpansFinished(final int numberOfSpans) {
Expand Down
1 change: 0 additions & 1 deletion ...d-2.10/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import java.util.concurrent.locks.ReentrantLock
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE
import static datadog.trace.instrumentation.spymemcached.MemcacheClientDecorator.*
import static datadog.trace.instrumentation.spymemcached.MemcacheClientDecorator.COMPONENT_NAME
import static net.spy.memcached.ConnectionFactoryBuilder.Protocol.BINARY

abstract class SpymemcachedTest extends VersionedNamingTestBase {
Expand Down
58 changes: 0 additions & 58 deletions dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/LinksAssert.groovy
View file
Open in desktop

This file was deleted.

172 changes: 0 additions & 172 deletions ...va-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/ListWriterAssert.groovy
View file
Open in desktop

This file was deleted.

Loading