Skip to content

Commit 2c87c91

Browse files
committed
Factorize tests and add gradle lock
1 parent 94550e3 commit 2c87c91

File tree

6 files changed

+204
-348
lines changed

6 files changed

+204
-348
lines changed

dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ dependencies {
2222
testImplementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: openTelemetryVersion
2323
latest1xDepTestImplementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: '1+'
2424
latestDepTestImplementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: '+'
25+
latestDepTestImplementation sourceSets.test.output
2526
}

dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile

Lines changed: 169 additions & 0 deletions
Large diffs are not rendered by default.

dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/latestDepTest/groovy/SpanAttributeAnnotationTest.groovy

Lines changed: 0 additions & 44 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import annotatedsample.latest.TracedMethods
2+
import datadog.trace.bootstrap.instrumentation.api.Tags
3+
4+
import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
5+
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
6+
7+
class WithSpanAnnotationLatestDepTest extends WithSpanAnnotationTest {
8+
9+
def "test WithSpan annotated method inheritContext=false"() {
10+
setup:
11+
runUnderTrace("parent") {
12+
TracedMethods.sayHelloWithInANewTrace()
13+
}
14+
expect:
15+
assertTraces(2) {
16+
trace(1) {
17+
basicSpan(it, "parent")
18+
}
19+
trace(1) {
20+
span {
21+
resourceName "TracedMethods.sayHelloWithInANewTrace"
22+
operationName "TracedMethods.sayHelloWithInANewTrace"
23+
parent()
24+
errored false
25+
tags {
26+
defaultTags()
27+
"$Tags.COMPONENT" "opentelemetry"
28+
}
29+
}
30+
}
31+
}
32+
}
33+
}

dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/latestDepTest/groovy/WithSpanAnnotationTest.groovy

Lines changed: 0 additions & 303 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package annotatedsample;
1+
package annotatedsample.latest;
22

33
import static datadog.trace.api.DDTags.SERVICE_NAME;
44
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;

0 commit comments

Comments
 (0)