Skip to content

Fix method-level scope diagnostic opt-outs in Spock #12707

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

Merged
amarziali merged 1 commit into from
Oct 1, 2026
Merged

Fix method-level scope diagnostic opt-outs in Spock #12707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions ...ting/src/main/java/datadog/trace/agent/test/scopediag/ScopeDiagnosticsSpockExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.spockframework.runtime.extension.IAnnotationDrivenExtension;
import org.spockframework.runtime.extension.IMethodInterceptor;
import org.spockframework.runtime.model.FeatureInfo;
import org.spockframework.runtime.model.MethodInfo;
import org.spockframework.runtime.model.SpecInfo;

Expand Down Expand Up @@ -36,4 +37,9 @@ public void visitSpecAnnotation(TrackScopeContinuations annotation, SpecInfo spe
}
}
}

@Override
public void visitFeatureAnnotation(TrackScopeContinuations annotation, FeatureInfo feature) {
// Override Spock's default rejection of feature annotations so discovery succeeds.
}
}
6 changes: 6 additions & 0 deletions ...rc/test/groovy/datadog/trace/agent/test/scopediag/ScopeDiagnosticsSpockFixtureTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ class ScopeDiagnosticsSpockFixtureTest extends InstrumentationSpecification {
true
}

@TrackScopeContinuations(enabled = false, reason = "synthetic fixture testing method-level opt-out")
def "runs with diagnostics disabled for this feature"() {
expect:
ScopeDiagnostics.recordingWindow() == null
}

def "restarts recording after aborted suite setup"() {
given:
scopeDiagnosticsSuiteSetupPending = true
Expand Down
Loading