Skip to content

Commit 8fdf26b

Browse files
Fixed Groovy ambiguity. Tweaked
1 parent ad15665 commit 8fdf26b

File tree

16 files changed

+24
-24
lines changed

16 files changed

+24
-24
lines changed

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class BaseDecoratorTest extends DDSpecification {
8080
decorator.beforeFinish(span)
8181

8282
then:
83-
(0..1) * span.localRootSpan
83+
(0..1) * span.getLocalRootSpan()
8484
0 * _
8585
}
8686

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ServerDecoratorTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ServerDecoratorTest extends BaseDecoratorTest {
3939
newDecorator().beforeFinish(span)
4040

4141
then:
42-
(0..1) * span.localRootSpan
42+
(0..1) * span.getLocalRootSpan()
4343
}
4444

4545
@Override

dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/ValidatingRequestContextDecorator.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class ValidatingRequestContextDecorator implements RequestContext {
2424
this.traceSegment = new PreconditionCheckTraceSegment(
2525
segment, {
2626
->
27-
if (useStrictTraceWrites && spiedAgentSpan.localRootSpan.durationNano != 0) {
27+
if (useStrictTraceWrites && spiedAgentSpan.getLocalRootSpan().durationNano != 0) {
2828
throw new AssertionError("Interaction with TraceSegment after root span has already finished: $spiedAgentSpan")
2929
}
3030
}

dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2536,7 +2536,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
25362536
if (!context.requestBodySupplier.is(supplier)) {
25372537
throw new RuntimeException("Expected same instance: ${context.requestBodySupplier} and $supplier")
25382538
}
2539-
activeSpan().localRootSpan.setTag('request.body', supplier.get() as String)
2539+
activeSpan().getLocalRootSpan().setTag('request.body', supplier.get() as String)
25402540
if (context.bodyEndBlock) {
25412541
new RbaFlow(
25422542
new Flow.Action.RequestBlockingAction(413, BlockingContentType.JSON)

dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ abstract class PubSubTest extends VersionedNamingTestBase {
171171
assertTraces(shadowGrpcSpans() ? 2 : 3, [
172172
compare : { List<DDSpan> o1, List<DDSpan> o2 ->
173173
// trace will never be empty
174-
o1[0].localRootSpan.getTag(Tags.SPAN_KIND) <=> o2[0].localRootSpan.getTag(Tags.SPAN_KIND)
174+
o1[0].getLocalRootSpan().getTag(Tags.SPAN_KIND) <=> o2[0].getLocalRootSpan().getTag(Tags.SPAN_KIND)
175175
},
176176
] as Comparator) {
177177
trace(shadowGrpcSpans() ? 2 : 3) {

dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
7575

7676
int rootSpanTrace(List<DDSpan> trace) {
7777
assert !trace.isEmpty()
78-
def rootSpan = trace.get(0).localRootSpan
78+
def rootSpan = trace.get(0).getLocalRootSpan()
7979
switch (rootSpan.operationName.toString()) {
8080
case "parent":
8181
return 3

dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientTestBase.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
8585

8686
int rootSpanTrace(List<DDSpan> trace) {
8787
assert !trace.isEmpty()
88-
def rootSpan = trace.get(0).localRootSpan
88+
def rootSpan = trace.get(0).getLocalRootSpan()
8989
switch (rootSpan.operationName.toString()) {
9090
case "parent":
9191
return 3

dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
9898

9999
int rootSpanTrace(List<DDSpan> trace) {
100100
assert !trace.isEmpty()
101-
def rootSpan = trace.get(0).localRootSpan
101+
def rootSpan = trace.get(0).getLocalRootSpan()
102102
switch (rootSpan.operationName.toString()) {
103103
case "parent":
104104
return 3

dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class OpenTelemetryTest extends InstrumentationSpecification {
5050

5151
expect:
5252
result instanceof MutableSpan
53-
(result as MutableSpan).localRootSpan == result.delegate
53+
(result as MutableSpan).getLocalRootSpan() == result.delegate
5454
tracer.currentSpan == null
5555

5656
when:
@@ -108,7 +108,7 @@ class OpenTelemetryTest extends InstrumentationSpecification {
108108

109109
expect:
110110
result instanceof MutableSpan
111-
(result as MutableSpan).localRootSpan == result.delegate
111+
(result as MutableSpan).getLocalRootSpan() == result.delegate
112112
(result as MutableSpan).isError() == (exception != null)
113113
tracer.currentSpan == null
114114

@@ -150,7 +150,7 @@ class OpenTelemetryTest extends InstrumentationSpecification {
150150

151151
expect:
152152
result instanceof MutableSpan
153-
(result as MutableSpan).localRootSpan == result.delegate
153+
(result as MutableSpan).getLocalRootSpan() == result.delegate
154154
tracer.currentSpan == null
155155

156156
when:

dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/OpenTracing31Test.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class OpenTracing31Test extends InstrumentationSpecification {
6464

6565
expect:
6666
result instanceof MutableSpan
67-
(result as MutableSpan).localRootSpan.delegate == result.delegate
67+
(result as MutableSpan).getLocalRootSpan().delegate == result.delegate
6868
(result as MutableSpan).isError() == (exception != null)
6969
tracer.activeSpan() == null
7070
result.context().baggageItems().isEmpty()

0 commit comments

Comments
 (0)