Skip to content

Remove Groovy from internal-api modules - #13152

Open
AlexeyKuznetsov-DD wants to merge 4 commits into
masterfrom
alexeyk/internal-api-remove-groovy
Open

AlexeyKuznetsov-DD wants to merge 4 commits into
masterfrom
alexeyk/internal-api-remove-groovy

Conversation

@AlexeyKuznetsov-DD

@AlexeyKuznetsov-DD AlexeyKuznetsov-DD commented Nov 1, 2026 •

Copy link
Copy Markdown
Contributor

What Does This Do

Drops the groovy plugin, Spock and CodeNarc from the internal-api module convention (internal-api, internal-api-9, metrics-api, remote-config-api), now that their tests are all Java/JUnit 5.

Motivation

Part of the Groovy-to-Java test migration: migrated modules shouldn't pay for Groovy compilation, Spock on the test classpath, or CodeNarc.

Additional Notes

  • Builds on the merged Attach modifiable-config agent alongside JaCoCo #13150, which attaches the config agent explicitly now that Spock no longer supplies it.
  • dd-trace-java.conventions.java is the Java-only default. Modules that still need Groovy use dd-trace-java.conventions.java-groovy, preserving their existing behavior. The shared JUnit/Mockito/TableTest dependencies moved to gradle/java_test_deps.gradle, which both conventions use.
  • CodeNarc is now applied only when the groovy plugin is present, the same way Spotless already handles Groovy.
  • ThreadUtils.runConcurrently loses its groovy.lang.Closure overload. Groovy callers' closure literals coerce to ThrowingRunnable (checked with the Groovy ThreadUtilsTest and the pekko and quarkus test compiles). Checked exceptions now propagate unwrapped.
  • Lockfile changes: Groovy, Spock, JUnit 4 and Hamcrest drop off the test classpaths, and objenesis goes from 3.3 (pinned by Spock) to 3.2 (from Mockito 4.4.0).

Contributor Checklist

🤖 Generated with Claude Code

@AlexeyKuznetsov-DD AlexeyKuznetsov-DD added comp: testing Testing comp: core Tracer core tag: no release notes Changes to exclude from release notes type: refactoring tag: ai generated Largely based on code generated by an AI or LLM labels Nov 1, 2026
@datadog-official

This comment has been minimized.

@dd-octo-sts

dd-octo-sts Bot commented Nov 1, 2026 •

Copy link
Copy Markdown
Contributor

🟢 Java Benchmark SLOs — All performance SLOs passed

Suite Status
Startup 🟢 pass

SLO thresholds are defined here based on automatically generated metrics. A warning is raised when results are within 5% of the threshold.

PR vs. master results
Scenario Candidate master Δ (95% CI of mean)
startup:insecure-bank:iast:Agent 14.83 s 14.63 s [+0.6%; +2.2%] (maybe worse)
startup:insecure-bank:tracing:Agent 13.63 s 13.72 s [-1.6%; +0.3%] (no difference)
startup:petclinic:appsec:Agent 17.12 s 17.04 s [-0.4%; +1.4%] (no difference)
startup:petclinic:iast:Agent 16.89 s 17.05 s [-1.8%; -0.1%] (maybe better)
startup:petclinic:profiling:Agent 16.71 s 16.58 s [-0.2%; +1.8%] (no difference)
startup:petclinic:sca:Agent 17.07 s 16.90 s [+0.1%; +1.9%] (maybe worse)
startup:petclinic:tracing:Agent 16.12 s 16.31 s [-2.0%; -0.3%] (maybe better)

Commit: 14f88ce1 · CI Pipeline · Benchmarking Platform UI


Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion.

Base automatically changed from alexeyk/modifiable-config-with-jacoco to master November 2, 2026 19:41
AlexeyKuznetsov-DD and others added 2 commits November 2, 2026 15:07
All internal-api tests are now Java/JUnit 5, so the internal-api module
convention no longer applies the groovy plugin, Spock or CodeNarc. A
temporary java-only convention backs migrated modules while the rest keep
the Groovy-based one.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@AlexeyKuznetsov-DD
AlexeyKuznetsov-DD force-pushed the alexeyk/internal-api-remove-groovy branch from 93db133 to 973fb78 Compare November 2, 2026 20:09
@AlexeyKuznetsov-DD AlexeyKuznetsov-DD self-assigned this Nov 2, 2026
@AlexeyKuznetsov-DD
AlexeyKuznetsov-DD marked this pull request as ready for review November 2, 2026 20:14
@AlexeyKuznetsov-DD
AlexeyKuznetsov-DD requested review from a team as code owners November 2, 2026 20:14
@AlexeyKuznetsov-DD
AlexeyKuznetsov-DD requested review from PerfectSlayer and mhlidd and removed request for a team November 2, 2026 20:14
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 2, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-02T20:17:58.018319Z 973fb78 Draft marked ready
🔒 Security Review ✅ Completed 2026-11-02T20:18:11.841764Z 973fb78 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@datadog-official datadog-official Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bits Code Review: PASS

More details

Static review found no actionable regression in convention consumers, dependency changes, or ThreadUtils callers. Build and test execution remains unverified.

Was this helpful? React 👍 or 👎

Open Bits AI session

🤖 Bits Code Review · Commit 973fb78

@PerfectSlayer PerfectSlayer left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the follow up changes

@bric3 bric3 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is nice, but the plugin composition looks wrong to me.

There shouldn't be a dd-trace-java.conventions.java-groovy, the primitives separations looks, so it

I tend to think module conventions should look like this.

plugins {
  id("dd-trace-java.conventions.java")
  id("dd-trace-java.conventions.testing.groovy")
}

Or at worst, like

plugins {
  id("dd-trace-java.conventions.java")
}

apply(from = rootDir.resolve("gradle/groovy_test_deps.gradle"))

Comment thread gradle/java_deps.gradle Resolved
@AlexeyKuznetsov-DD
AlexeyKuznetsov-DD requested review from a team as code owners November 4, 2026 02:28
@AlexeyKuznetsov-DD
AlexeyKuznetsov-DD requested review from claponcet, dromanol and jordan-wong and removed request for a team November 4, 2026 02:28

@datadog-official datadog-official Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bits Code Review: PASS

More details

Existing Groovy consumers retain explicit Groovy/Spock support through the convention split. Static review found no actionable regression; build and test execution remains unverified.

Was this helpful? React 👍 or 👎

Open Bits AI session

🤖 Bits Code Review · Commit 14f88ce

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp: core Tracer core comp: testing Testing tag: ai generated Largely based on code generated by an AI or LLM tag: no release notes Changes to exclude from release notes type: refactoring

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants