Skip to content

Commit 0354de2

Browse files
nikita-tkachenko-datadognikita-tkachenko-datadog
authored
Fix JUnit 5 Cucumber instrumentation for version 7.28.1 (#9474)
1 parent fa788ac commit 0354de2

File tree

2 files changed

+37
-23
lines changed

2 files changed

+37
-23
lines changed

‎dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/gradle.lockfile‎

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,16 @@ com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latest
1212
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1313
com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
1414
com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
15-
com.fasterxml.jackson.core:jackson-annotations:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
16-
com.fasterxml.jackson.core:jackson-core:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
17-
com.fasterxml.jackson.core:jackson-databind:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
18-
com.fasterxml.jackson:jackson-bom:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
15+
com.ethlo.time:itu:1.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
16+
com.fasterxml.jackson.core:jackson-annotations:2.16.0=testCompileClasspath,testRuntimeClasspath
17+
com.fasterxml.jackson.core:jackson-annotations:2.18.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
18+
com.fasterxml.jackson.core:jackson-core:2.16.0=testCompileClasspath,testRuntimeClasspath
19+
com.fasterxml.jackson.core:jackson-core:2.18.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
20+
com.fasterxml.jackson.core:jackson-databind:2.16.0=testCompileClasspath,testRuntimeClasspath
21+
com.fasterxml.jackson.core:jackson-databind:2.18.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
22+
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
23+
com.fasterxml.jackson:jackson-bom:2.16.0=testCompileClasspath,testRuntimeClasspath
24+
com.fasterxml.jackson:jackson-bom:2.18.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
1925
com.github.javaparser:javaparser-core:3.25.6=codenarc,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2026
com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
2127
com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
@@ -42,6 +48,7 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno
4248
com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor
4349
com.google.re2j:re2j:1.7=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
4450
com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
51+
com.networknt:json-schema-validator:1.5.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
4552
com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4653
com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4754
com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -55,31 +62,33 @@ de.thetaphi:forbiddenapis:3.8=compileClasspath
5562
info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath
5663
io.cucumber:ci-environment:10.0.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
5764
io.cucumber:cucumber-core:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
58-
io.cucumber:cucumber-core:7.23.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
65+
io.cucumber:cucumber-core:7.28.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
5966
io.cucumber:cucumber-expressions:18.0.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6067
io.cucumber:cucumber-expressions:8.3.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
61-
io.cucumber:cucumber-gherkin-messages:7.23.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
68+
io.cucumber:cucumber-gherkin-messages:7.28.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6269
io.cucumber:cucumber-gherkin-vintage:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
6370
io.cucumber:cucumber-gherkin:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
64-
io.cucumber:cucumber-gherkin:7.23.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
71+
io.cucumber:cucumber-gherkin:7.28.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6572
io.cucumber:cucumber-java:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
66-
io.cucumber:cucumber-java:7.23.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
73+
io.cucumber:cucumber-java:7.28.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
74+
io.cucumber:cucumber-json-formatter:0.1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6775
io.cucumber:cucumber-junit-platform-engine:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
68-
io.cucumber:cucumber-junit-platform-engine:7.23.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
76+
io.cucumber:cucumber-junit-platform-engine:7.28.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6977
io.cucumber:cucumber-plugin:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
70-
io.cucumber:cucumber-plugin:7.23.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
78+
io.cucumber:cucumber-plugin:7.28.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7179
io.cucumber:datatable:3.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
72-
io.cucumber:datatable:7.23.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
80+
io.cucumber:datatable:7.28.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7381
io.cucumber:docstring:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
74-
io.cucumber:docstring:7.23.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
75-
io.cucumber:gherkin:32.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
76-
io.cucumber:html-formatter:21.10.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
77-
io.cucumber:junit-xml-formatter:0.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
78-
io.cucumber:messages:27.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
79-
io.cucumber:query:13.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
82+
io.cucumber:docstring:7.28.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
83+
io.cucumber:gherkin:34.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
84+
io.cucumber:html-formatter:21.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
85+
io.cucumber:junit-xml-formatter:0.8.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
86+
io.cucumber:messages:28.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
87+
io.cucumber:pretty-formatter:2.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
88+
io.cucumber:query:13.6.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8089
io.cucumber:tag-expressions:2.0.4=compileClasspath,testCompileClasspath,testRuntimeClasspath
8190
io.cucumber:tag-expressions:6.1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
82-
io.cucumber:testng-xml-formatter:0.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
91+
io.cucumber:testng-xml-formatter:0.5.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8392
io.sqreen:libsqreen:15.0.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
8493
javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8594
jaxen:jaxen:1.2.0=spotbugs
@@ -184,8 +193,6 @@ org.junit.platform:junit-platform-suite:1.12.0=testCompileClasspath,testRuntimeC
184193
org.junit.platform:junit-platform-suite:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
185194
org.junit:junit-bom:5.12.0=testCompileClasspath,testRuntimeClasspath
186195
org.junit:junit-bom:5.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
187-
org.junit:junit-bom:5.6.0=compileClasspath
188-
org.junit:junit-bom:5.9.1=spotbugs
189196
org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
190197
org.msgpack:msgpack-core:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
191198
org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -209,9 +216,10 @@ org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRunti
209216
org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
210217
org.slf4j:log4j-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
211218
org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath
212-
org.slf4j:slf4j-api:1.7.32=latestDepTestCompileClasspath,testCompileClasspath
213-
org.slf4j:slf4j-api:1.7.36=latestDepTestRuntimeClasspath,testRuntimeClasspath
219+
org.slf4j:slf4j-api:1.7.32=testCompileClasspath
220+
org.slf4j:slf4j-api:1.7.36=testRuntimeClasspath
214221
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
222+
org.slf4j:slf4j-api:2.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
215223
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
216224
org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
217225
org.spockframework:spock-core:2.3-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -220,5 +228,6 @@ org.testng:testng:7.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
220228
org.webjars:jquery:3.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
221229
org.xmlresolver:xmlresolver:4.4.3=spotbugs
222230
org.xmlunit:xmlunit-core:2.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
231+
org.yaml:snakeyaml:2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
223232
xml-apis:xml-apis:1.4.01=spotbugs
224233
empty=spotbugsPlugins

‎dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,12 @@ public String hierarchyMarkerType() {
5454
public ElementMatcher<TypeDescription> hierarchyMatcher() {
5555
return extendsClass(named("io.cucumber.junit.platform.engine.NodeDescriptor"))
5656
// legacy Cucumber versions
57-
.or(extendsClass(named("io.cucumber.junit.platform.engine.PickleDescriptor")));
57+
.or(extendsClass(named("io.cucumber.junit.platform.engine.PickleDescriptor")))
58+
// Cucumber 7.24+
59+
.or(
60+
extendsClass(
61+
named(
62+
"io.cucumber.junit.platform.engine.CucumberTestDescriptor$PickleDescriptor")));
5863
}
5964

6065
@Override

0 commit comments

Comments
 (0)