Skip to content

Unskip some CapturedSnapshot and ReferenceCreator tests #12084

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
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
Jul 27, 2026
+4 −16
Merged

Unskip some CapturedSnapshot and ReferenceCreator tests #12084

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
d548307
Unskip tests
sarahchen6 Jul 27, 2026
873e40a
Merge branch 'master' into sarahchen6/unskip-tests
sarahchen6 Jul 27, 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
8 changes: 0 additions & 8 deletions ...a-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,6 @@ public void sourceFileProbeGroovy() throws IOException, URISyntaxException {
}

@Test
@EnabledForJreRange(
max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released.
@DisabledIf(
value = "datadog.environment.JavaVirtualMachine#isJ9",
disabledReason = "Issue with J9 when compiling Kotlin code")
Expand Down Expand Up @@ -696,8 +694,6 @@ public void sourceFileProbeKotlin() throws IOException, URISyntaxException {
}

@Test
@EnabledForJreRange(
max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released.
@DisabledIf(
value = "datadog.environment.JavaVirtualMachine#isJ9",
disabledReason = "Issue with J9 when compiling Kotlin code")
Expand Down Expand Up @@ -725,8 +721,6 @@ public void suspendKotlin() throws IOException, URISyntaxException {
}

@Test
@EnabledForJreRange(
max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released.
@DisabledIf(
value = "datadog.environment.JavaVirtualMachine#isJ9",
disabledReason = "Issue with J9 when compiling Kotlin code")
Expand Down Expand Up @@ -760,8 +754,6 @@ public void suspendMethodKotlin() {
}

@Test
@EnabledForJreRange(
max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released.
@DisabledIf(
value = "datadog.environment.JavaVirtualMachine#isJ9",
disabledReason = "Issue with J9 when compiling Kotlin code")
Expand Down
3 changes: 0 additions & 3 deletions ...nt-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/ReferenceCreatorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package datadog.trace.agent.tooling.muzzle

import datadog.trace.test.util.DDSpecification
import spock.lang.Ignore

import static TestAdviceClasses.InstanceofAdvice
import static TestAdviceClasses.LdcAdvice
Expand Down Expand Up @@ -114,8 +113,6 @@ class ReferenceCreatorTest extends DDSpecification {
references.get('datadog.trace.agent.tooling.muzzle.TestAdviceClasses$MethodBodyAdvice$A') != null
}

// TODO: remove ignore when we drop java 7 support.
@Ignore
def "invokedynamic creates references"() {
Comment thread
sarahchen6 marked this conversation as resolved.
setup:
Map<String, Reference> references = ReferenceCreator.createReferencesFrom(TestAdviceClasses.InDyAdvice.name, this.class.classLoader)
Expand Down
9 changes: 4 additions & 5 deletions ...ent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestAdviceClasses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,10 @@ public static boolean instanceofMethod(final Object a) {
}
}

// Can't test this until java 7 is dropped.
public static class InDyAdvice {
// public static MethodBodyAdvice.HasMethod indyMethod(final MethodBodyAdvice.HasMethod a) {
// Runnable aStaticMethod = MethodBodyAdvice.B::aStaticMethod;
// return a::requiredMethod;
// }
public static MethodBodyAdvice.HasMethod indyMethod(final MethodBodyAdvice.HasMethod a) {
Runnable aStaticMethod = MethodBodyAdvice.B::aStaticMethod;
return a::requiredMethod;
}
}
}