From 0200081007c6f64decdfb15340fe2dd7eccdff30 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 14 Dec 2020 01:16:33 -0800 Subject: [PATCH] Use new SemanticAttribute constants (#1896) * Use new SemanticAttribute constants * Spotless --- .../tooling/AddThreadDetailsSpanProcessor.java | 10 +++------- .../tooling/AddThreadDetailsSpanProcessorTest.groovy | 5 +++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessor.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessor.java index 2f34a396b4..251e0b78b5 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessor.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessor.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.tooling; -import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.api.trace.attributes.SemanticAttributes; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.trace.ReadWriteSpan; @@ -14,15 +14,11 @@ import io.opentelemetry.sdk.trace.SpanProcessor; public class AddThreadDetailsSpanProcessor implements SpanProcessor { - // TODO(anuraaga): Restore these in SemanticAttributes - static final AttributeKey THREAD_ID = AttributeKey.longKey("thread.id"); - static final AttributeKey THREAD_NAME = AttributeKey.stringKey("thread.name"); - @Override public void onStart(Context context, ReadWriteSpan span) { Thread currentThread = Thread.currentThread(); - span.setAttribute(THREAD_ID, currentThread.getId()); - span.setAttribute(THREAD_NAME, currentThread.getName()); + span.setAttribute(SemanticAttributes.THREAD_ID, currentThread.getId()); + span.setAttribute(SemanticAttributes.THREAD_NAME, currentThread.getName()); } @Override diff --git a/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy index 19bfa6ef97..ce321a7a49 100644 --- a/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy +++ b/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy @@ -5,6 +5,7 @@ package io.opentelemetry.javaagent.tooling +import io.opentelemetry.api.trace.attributes.SemanticAttributes import io.opentelemetry.context.Context import io.opentelemetry.sdk.trace.ReadWriteSpan import spock.lang.Specification @@ -28,7 +29,7 @@ class AddThreadDetailsSpanProcessorTest extends Specification { processor.onStart(Context.root(), span) then: - 1 * span.setAttribute(AddThreadDetailsSpanProcessor.THREAD_ID, currentThreadId) - 1 * span.setAttribute(AddThreadDetailsSpanProcessor.THREAD_NAME, currentThreadName) + 1 * span.setAttribute(SemanticAttributes.THREAD_ID, currentThreadId) + 1 * span.setAttribute(SemanticAttributes.THREAD_NAME, currentThreadName) } }