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

Merge pull request #153 from DataDog/tyler/fix-tags 

Null tags are intended for “deletion”
This commit is contained in:
Tyler Benson 2017-11-10 17:08:06 -05:00 committed by GitHub
parent 01e7134419 9e53841429
commit 96c39d1c25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dd-trace/src/main/java/com/datadoghq/trace/DDSpanContext.java
View File

@ -181,6 +181,7 @@ public class DDSpanContext implements io.opentracing.SpanContext {
*/
public synchronized void setTag(final String tag, final Object value) {
if (value == null) {
tags.remove(tag);
return;
}

14
dd-trace/src/test/groovy/com/datadoghq/trace/DDSpanContextTest.groovy
View File

@ -4,22 +4,26 @@ import spock.lang.Specification
class DDSpanContextTest extends Specification {
def "null values for tags are ignored"() {
def "null values for tags delete existing tags"() {
setup:
def context = SpanFactory.newSpanOf(0).context
context.setTag("some.tag", "asdf")
context.setTag(name, null)
context.setErrorFlag(true)
def thread = Thread.currentThread()
expect:
context.getTags() == [(DDTags.THREAD_NAME): thread.name, (DDTags.THREAD_ID): thread.id]
context.getTags() == tags
context.serviceName == "fakeService"
context.resourceName == "fakeResource"
context.spanType == "fakeType"
context.toString() == "Span [ t_id=1, s_id=1, p_id=0] trace=fakeService/fakeOperation/fakeResource *errored* tags={thread.id=$thread.id, thread.name=$thread.name}"
context.toString() == "Span [ t_id=1, s_id=1, p_id=0] trace=fakeService/fakeOperation/fakeResource *errored* tags={${extra}thread.id=${Thread.currentThread().id}, thread.name=${Thread.currentThread().name}}"
where:
name << [DDTags.SERVICE_NAME, DDTags.RESOURCE_NAME, DDTags.SPAN_TYPE, "some.tag"]
name | extra | tags
DDTags.SERVICE_NAME | "some.tag=asdf, " | ["some.tag": "asdf", (DDTags.THREAD_NAME): Thread.currentThread().name, (DDTags.THREAD_ID): Thread.currentThread().id]
DDTags.RESOURCE_NAME | "some.tag=asdf, " | ["some.tag": "asdf", (DDTags.THREAD_NAME): Thread.currentThread().name, (DDTags.THREAD_ID): Thread.currentThread().id]
DDTags.SPAN_TYPE | "some.tag=asdf, " | ["some.tag": "asdf", (DDTags.THREAD_NAME): Thread.currentThread().name, (DDTags.THREAD_ID): Thread.currentThread().id]
"some.tag" | "" | [(DDTags.THREAD_NAME): Thread.currentThread().name, (DDTags.THREAD_ID): Thread.currentThread().id]
}
def "special tags set certain values"() {