Skip to content

Commit d971371

Browse files
randomandersonrandomanderson
committed
fix tests
1 parent d7b6bc9 commit d971371

5 files changed

Lines changed: 40 additions & 55 deletions

File tree

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

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,15 @@ class OpenTelemetryTest extends InstrumentationSpecification {
3939
.setAttribute("number", 1)
4040
.setAttribute("boolean", true)
4141
}
42+
43+
when:
4244
def result = builder.startSpan()
4345
if (tagSpan) {
4446
result.setAttribute(DDTags.RESOURCE_NAME, "other resource")
4547
result.setAttribute("string", "b")
4648
result.setAttribute("number", 2)
4749
result.setAttribute("boolean", false)
4850
}
49-
50-
expect:
51-
GlobalTracer.get().getLocalRootSpan() == result.delegate
52-
tracer.currentSpan == null
53-
54-
when:
5551
result.end()
5652

5753
then:
@@ -96,23 +92,19 @@ class OpenTelemetryTest extends InstrumentationSpecification {
9692
def "test span exception"() {
9793
setup:
9894
def builder = tracer.spanBuilder("some name")
95+
96+
when:
9997
def result = builder.startSpan()
10098
result.setStatus(Status.UNKNOWN)
10199
result.setAttribute(DDTags.ERROR_MSG, (String) exception.message)
102100
result.setAttribute(DDTags.ERROR_TYPE, (String) exception.class.name)
103101
final StringWriter errorString = new StringWriter()
104102
exception.printStackTrace(new PrintWriter(errorString))
105103
result.setAttribute(DDTags.ERROR_STACK, errorString.toString())
106-
107-
expect:
108-
GlobalTracer.get().getLocalRootSpan() == result.delegate
109-
GlobalTracer.get().toMutableSpan(result).isError() == (exception != null)
110-
tracer.currentSpan == null
111-
112-
when:
113104
result.end()
114105

115106
then:
107+
GlobalTracer.get().toMutableSpan(result).isError() == (exception != null)
116108
assertTraces(1) {
117109
trace(1) {
118110
span {
@@ -143,13 +135,9 @@ class OpenTelemetryTest extends InstrumentationSpecification {
143135
def ctx = new ExtractedContext(DDTraceId.ONE, linkId, SAMPLER_DROP, null, PropagationTags.factory().empty(), NONE)
144136
builder.addLink(tracer.converter.toSpanContext(ctx))
145137
}
146-
def result = builder.startSpan()
147-
148-
expect:
149-
GlobalTracer.get().localRootSpan == result.delegate
150-
tracer.currentSpan == null
151138

152139
when:
140+
def result = builder.startSpan()
153141
result.end()
154142

155143
then:

‎dd-smoke-tests/dynamic-config/src/main/java/datadog/smoketest/dynamicconfig/ServiceMappingApplication.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package datadog.smoketest.dynamicconfig;
22

33
import datadog.trace.api.DDTags;
4-
import datadog.trace.api.interceptor.MutableSpan;
54
import io.opentracing.Span;
65
import io.opentracing.Tracer;
76
import io.opentracing.util.GlobalTracer;
@@ -21,7 +20,9 @@ public static void main(String[] args) throws InterruptedException {
2120
while (System.nanoTime() - startTime < TIMEOUT_IN_NANOS) {
2221
Span span = tracer.buildSpan("someOperation").start();
2322
span.setTag(DDTags.SERVICE_NAME, ORIGINAL_SERVICE_NAME);
24-
String serviceName = ((MutableSpan) span).getServiceName();
23+
24+
String serviceName =
25+
datadog.trace.api.GlobalTracer.get().toMutableSpan(span).getServiceName();
2526

2627
if (serviceName.equals(MAPPED_SERVICE_NAME)) {
2728
System.out.println("Service mapping updated to dynamic value");

‎dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentApiTest.groovy‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class DDAgentApiTest extends DDCoreSpecification {
7676
agent.close()
7777

7878
where:
79-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
79+
agentVersion << ["v0.4/traces", "v0.5/traces"]
8080
}
8181

8282
def "response body propagated in case of non-200 response"() {
@@ -109,27 +109,27 @@ class DDAgentApiTest extends DDCoreSpecification {
109109
put("v0.4/traces") {
110110
response.status(404).send()
111111
}
112-
113-
put("v0.3/traces") {
112+
put("v0.5/traces") {
114113
response.status(404).send()
115114
}
116115
}
117116
}
118117
def client = createAgentApi(agent.address.toString())[1]
119-
Payload payload = prepareTraces("v0.3/traces", [])
118+
Payload payload = prepareTraces("v0.5/traces", [])
120119
expect:
121120
def clientResponse = client.sendSerializedTraces(payload)
122121
!clientResponse.success()
123122
clientResponse.status().present
124123
clientResponse.status().asInt == 404
125-
agent.getLastRequest().path == "/v0.3/traces"
124+
agent.getLastRequest().path == "/v0.4/traces"
126125

127126
cleanup:
128127
agent.close()
129128
}
130129

131130
def "content is sent as MSGPACK"() {
132131
setup:
132+
def agentVersion = "v0.4/traces"
133133
def agent = httpServer {
134134
handlers {
135135
put(agentVersion) {
@@ -210,7 +210,6 @@ class DDAgentApiTest extends DDCoreSpecification {
210210
it.@durationNano = 10
211211
}
212212
}
213-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.4/traces"]
214213
}
215214

216215
def "Api ResponseListeners see 200 responses"() {
@@ -248,39 +247,39 @@ class DDAgentApiTest extends DDCoreSpecification {
248247
agent.close()
249248

250249
where:
251-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
250+
agentVersion << ["v0.4/traces", "v0.5/traces"]
252251
}
253252

254-
def "Api Downgrades to v3 if v0.4 not available"() {
253+
def "Api Downgrades to v0.4 if v0.5 not available"() {
255254
setup:
256255
def v3Agent = httpServer {
257256
handlers {
258-
put("v0.3/traces") {
257+
put("v0.4/traces") {
259258
def status = request.contentLength > 0 ? 200 : 500
260259
response.status(status).send()
261260
}
262261
}
263262
}
264263
def client = createAgentApi(v3Agent.address.toString())[1]
265-
def payload = prepareTraces("v0.4/traces", [])
264+
def payload = prepareTraces("v0.5/traces", [])
266265
expect:
267266
client.sendSerializedTraces(payload).success()
268-
v3Agent.getLastRequest().path == "/v0.3/traces"
267+
v3Agent.getLastRequest().path == "/v0.4/traces"
269268

270269
cleanup:
271270
v3Agent.close()
272271
}
273272

274-
def "Api Downgrades to v3 if timeout exceeded (#delayTrace, #badPort)"() {
273+
def "Api Downgrades to v0.4 if timeout exceeded (#delayTrace, #badPort)"() {
275274
// This test is unfortunately only exercising the read timeout, not the connect timeout.
276275
setup:
277276
def agent = httpServer {
278277
handlers {
279-
put("v0.3/traces") {
278+
put("v0.4/traces") {
280279
def status = request.contentLength > 0 ? 200 : 500
281280
response.status(status).send()
282281
}
283-
put("v0.4/traces") {
282+
put("v0.5/traces") {
284283
Thread.sleep(delayTrace)
285284
def status = request.contentLength > 0 ? 200 : 500
286285
response.status(status).send()
@@ -289,7 +288,7 @@ class DDAgentApiTest extends DDCoreSpecification {
289288
}
290289
def port = badPort ? 999 : agent.address.port
291290
def client = createAgentApi("http://" + agent.address.host + ":" + port)[1]
292-
def payload = prepareTraces("v0.4/traces", [])
291+
def payload = prepareTraces("v0.5/traces", [])
293292
def result = client.sendSerializedTraces(payload)
294293

295294
expect:
@@ -303,10 +302,10 @@ class DDAgentApiTest extends DDCoreSpecification {
303302

304303
where:
305304
endpointVersion | delayTrace | badPort
306-
"v0.4" | 0 | false
307-
"v0.3" | 0 | true
308-
"v0.4" | 500 | false
309-
"v0.3" | 30000 | false
305+
"v0.5" | 0 | false
306+
"v0.4" | 0 | true
307+
"v0.5" | 500 | false
308+
"v0.4" | 30000 | false
310309
}
311310

312311
def "verify content length"() {

‎dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterCombinedTest.groovy‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
8787
writer.close()
8888

8989
where:
90-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
90+
agentVersion << ["v0.4/traces", "v0.5/traces"]
9191
}
9292

9393
def "test happy path"() {
@@ -118,7 +118,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
118118
writer.close()
119119

120120
where:
121-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
121+
agentVersion << ["v0.4/traces", "v0.5/traces"]
122122
}
123123

124124
def "test flood of traces"() {
@@ -152,7 +152,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
152152
where:
153153
bufferSize = 1024
154154
traceCount = 100 // Shouldn't trigger payload, but bigger than the disruptor size.
155-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
155+
agentVersion << ["v0.4/traces", "v0.5/traces"]
156156
}
157157

158158
def "test flush by time"() {
@@ -191,7 +191,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
191191
writer.close()
192192

193193
where:
194-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
194+
agentVersion << ["v0.4/traces", "v0.5/traces"]
195195
}
196196

197197
@Timeout(30)
@@ -234,7 +234,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
234234

235235
where:
236236
minimalTrace = createMinimalTrace()
237-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
237+
agentVersion << ["v0.4/traces", "v0.5/traces"]
238238
}
239239

240240
def "check that there are no interactions after close"() {
@@ -267,7 +267,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
267267
writer.close()
268268

269269
where:
270-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
270+
agentVersion << ["v0.4/traces", "v0.5/traces"]
271271
}
272272

273273
def createMinimalContext() {
@@ -355,7 +355,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
355355
agent.close()
356356

357357
where:
358-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
358+
agentVersion << ["v0.4/traces", "v0.5/traces"]
359359
}
360360

361361
def "monitor agent returns error"() {
@@ -414,7 +414,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
414414
agent.close()
415415

416416
where:
417-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
417+
agentVersion << ["v0.4/traces", "v0.5/traces"]
418418
}
419419

420420
def "unreachable agent test"() {
@@ -461,7 +461,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
461461
1 * healthMetrics.onShutdown(true)
462462

463463
where:
464-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
464+
agentVersion << ["v0.4/traces", "v0.5/traces"]
465465
}
466466

467467
@Flaky("If execution is too slow, the http client timeout may trigger")
@@ -575,7 +575,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
575575
where:
576576
bufferSize = 16
577577
minimalTrace = createMinimalTrace()
578-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
578+
agentVersion << ["v0.4/traces", "v0.5/traces"]
579579
}
580580

581581
def "multi threaded"() {
@@ -646,7 +646,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
646646
agent.close()
647647

648648
where:
649-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
649+
agentVersion << ["v0.4/traces", "v0.5/traces"]
650650
}
651651

652652
def "statsd success"() {
@@ -697,7 +697,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
697697
writer.close()
698698

699699
where:
700-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
700+
agentVersion << ["v0.4/traces", "v0.5/traces"]
701701
}
702702

703703
def "statsd comm failure"() {
@@ -736,7 +736,7 @@ class DDAgentWriterCombinedTest extends DDCoreSpecification {
736736
healthMetrics.close()
737737

738738
where:
739-
agentVersion << ["v0.3/traces", "v0.4/traces", "v0.5/traces"]
739+
agentVersion << ["v0.4/traces", "v0.5/traces"]
740740
}
741741

742742
static int calculateSize(List<DDSpan> trace, Mapper<List<DDSpan>> mapper) {

‎dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanTest.groovy‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,6 @@ class DDSpanTest extends DDCoreSpecification {
306306
expect:
307307
root.localRootSpan == root
308308
child.localRootSpan == root
309-
// Checking for backward compatibility method names
310-
root.rootSpan == root
311-
child.rootSpan == root
312309

313310
cleanup:
314311
child.finish()

0 commit comments

Comments
 (0)