open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add test for setting service/resource name via tag.

This commit is contained in:
Tyler Benson 2017-10-13 15:52:44 +02:00
parent aac945747b
commit 4ab32b0b95
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-trace/src/test/groovy/com/datadoghq/trace/SpanFactory.groovy
View File

@ -14,7 +14,7 @@ class SpanFactory {
"fakeType", "fakeType",
Collections.emptyMap(), Collections.emptyMap(),
null, null,
null) new DDTracer())
return new DDSpan(timestampMicro, context) return new DDSpan(timestampMicro, context)
} }

25
dd-trace/src/test/groovy/com/datadoghq/trace/writer/DDApiTest.groovy
View File

@ -1,6 +1,5 @@
package com.datadoghq.trace.writer package com.datadoghq.trace.writer
import com.datadoghq.trace.DDTags
import com.datadoghq.trace.Service import com.datadoghq.trace.Service
import com.datadoghq.trace.SpanFactory import com.datadoghq.trace.SpanFactory
import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.core.type.TypeReference
@ -85,28 +84,28 @@ class DDApiTest extends Specification {
// Populate thread info dynamically as it is different when run via gradle vs idea. // Populate thread info dynamically as it is different when run via gradle vs idea.
where: where:
traces | expectedRequestBody traces | expectedRequestBody
[] | [] [] | []
[SpanFactory.newSpanOf(1L)] | [new TreeMap<>([ [SpanFactory.newSpanOf(1L).setTag("service.name", "my-service")] | [new TreeMap<>([
"duration" : 0, "duration" : 0,
"error" : 0, "error" : 0,
"meta" : [(DDTags.THREAD_NAME): Thread.currentThread().getName(), (DDTags.THREAD_ID): "${Thread.currentThread().id}"], "meta" : ["thread.name": Thread.currentThread().getName(), "thread.id": "${Thread.currentThread().id}"],
"name" : "fakeOperation", "name" : "fakeOperation",
"parent_id": 0, "parent_id": 0,
"resource" : "fakeResource", "resource" : "fakeResource",
"service" : "fakeService", "service" : "my-service",
"span_id" : 1, "span_id" : 1,
"start" : 1000, "start" : 1000,
"trace_id" : 1, "trace_id" : 1,
"type" : "fakeType" "type" : "fakeType"
])] ])]
[SpanFactory.newSpanOf(100L)] | [new TreeMap<>([ [SpanFactory.newSpanOf(100L).setTag("resource.name", "my-resource")] | [new TreeMap<>([
"duration" : 0, "duration" : 0,
"error" : 0, "error" : 0,
"meta" : [(DDTags.THREAD_NAME): Thread.currentThread().getName(), (DDTags.THREAD_ID): "${Thread.currentThread().id}"], "meta" : ["thread.name": Thread.currentThread().getName(), "thread.id": "${Thread.currentThread().id}"],
"name" : "fakeOperation", "name" : "fakeOperation",
"parent_id": 0, "parent_id": 0,
"resource" : "fakeResource", "resource" : "my-resource",
"service" : "fakeService", "service" : "fakeService",
"span_id" : 1, "span_id" : 1,
"start" : 100000, "start" : 100000,
@ -184,10 +183,10 @@ class DDApiTest extends Specification {
// Populate thread info dynamically as it is different when run via gradle vs idea. // Populate thread info dynamically as it is different when run via gradle vs idea.
where: where:
services | expectedRequestBody services | expectedRequestBody
[:] | [:] [:] | [:]
["my-service-name": new Service("my-service-name", "app-name", Service.AppType.CUSTOM)] | ["my-service-name": new TreeMap<>([ ["my-service-name": new Service("my-service-name", "my-app-name", Service.AppType.CUSTOM)] | ["my-service-name": new TreeMap<>([
"app" : "app-name", "app" : "my-app-name",
"app_type": "custom"]) "app_type": "custom"])
] ]
} }