Skip to content

[reference] reactor-core-3.1 async blind regeneration for #11927 #11940

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
jordan-wong wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

[reference] reactor-core-3.1 async blind regeneration for #11927 #11940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbf3d6b
eval: blind regeneration of reactor-core-3.1 against PR #11927 draft …
jordan-wong Jul 14, 2026
cf8b287
style(reactor-core-3.1): apply spotless formatting
jordan-wong Jul 14, 2026
cb53d97
fix(reactor-core-3.1): remove duplicate ReactorAsyncResultExtension
jordan-wong Jul 14, 2026
3f485e6
fix(reactor-core-3.1): drop Schedulers.elastic() from scheduler test
jordan-wong Jul 14, 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
17 changes: 0 additions & 17 deletions dd-java-agent/instrumentation/reactor-core-3.1/NOTICE.txt
View file
Open in desktop

This file was deleted.

20 changes: 4 additions & 16 deletions dd-java-agent/instrumentation/reactor-core-3.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

muzzle {
pass {
group = "io.projectreactor"
Expand All @@ -9,24 +8,13 @@ muzzle {

apply from: "$rootDir/gradle/java.gradle"

addTestSuite('latestDepTest')
addTestSuiteForDir('latestDepTest', 'test')

dependencies {
compileOnly group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.0'
compileOnly group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'


testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:reactive-streams-1.0')
testImplementation project(path: ':dd-java-agent:agent-otel:otel-bootstrap', configuration: 'shadow')
testImplementation project(':dd-java-agent:instrumentation:opentelemetry:opentelemetry-1.4')
testImplementation project(':dd-java-agent:instrumentation:opentelemetry:opentelemetry-annotations-1.20')

@mcculls mcculls Jul 15, 2026

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.

these are for various annotation driven tests

testImplementation project (':dd-java-agent:instrumentation:opentracing:opentracing-0.32')

testImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
testImplementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: '1.28.0'
testImplementation group: 'io.opentracing', name: 'opentracing-util', version: '0.32.0'

latestDepTestImplementation group: 'io.projectreactor', name: 'reactor-core', version: '+'
// Looks like later versions on reactor need this dependency for some reason even though it is marked as optional.
latestDepTestImplementation group: 'io.micrometer', name: 'micrometer-core', version: '1.+'
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
latestDepTestImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.+'
}
141 changes: 0 additions & 141 deletions dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile
View file
Open in desktop

This file was deleted.

Loading