@@ -156,7 +156,7 @@ private final class TraceInstrumentation(
156156 private val openTelemetry : OpenTelemetry = {
157157 val resource =
158158 Resource .getDefault.merge(
159- Resource .create(Attributes .of(ResourceAttributes .SERVICE_NAME , tracePrefix + " : " + componentName)))
159+ Resource .create(Attributes .of(ResourceAttributes .SERVICE_NAME , s " $tracePrefix ( $ componentName) " )))
160160 val sdkTracerProvider = SdkTracerProvider
161161 .builder()
162162 .addSpanProcessor(
@@ -194,15 +194,15 @@ private final class TraceInstrumentation(
194194
195195 val span = openTelemetry
196196 .getTracer(" java-sdk" )
197- .spanBuilder(s """ ${ command.entityId} """ )
197+ .spanBuilder(command.name )
198198 .setParent(context)
199199 .setSpanKind(SpanKind .SERVER )
200200 .startSpan()
201201 Some (
202202 span
203- .setAttribute(" service.name" , s """ ${service.serviceName}. ${command.entityId}""" )
204203 .setAttribute(" component.type" , service.componentType)
205- .setAttribute(" entity.id" , command.entityId))
204+ .setAttribute(" component.type_id" , service.serviceName)
205+ .setAttribute(" component.id" , command.entityId))
206206 } else {
207207 if (logger.isTraceEnabled) logger.trace(" No `traceparent` found for command [{}]." , command)
208208 None
@@ -220,15 +220,14 @@ private final class TraceInstrumentation(
220220 .extract(OtelContext .current(), metadata, otelGetter.asInstanceOf [TextMapGetter [Object ]])
221221
222222 val span = getTracer()
223- .spanBuilder(s """ ${ command.name} """ )
223+ .spanBuilder(command.name)
224224 .setParent(context)
225225 .setSpanKind(SpanKind .SERVER )
226226 .startSpan()
227227 Some (
228228 span
229- .setAttribute(" service.name" , s """ ${service.serviceName}""" )
230- .setAttribute(" component.type" , service.componentType)
231- .setAttribute(s " ${service.componentType}" , command.name))
229+ .setAttribute(" service.name" , service.serviceName)
230+ .setAttribute(" component.type" , service.componentType))
232231 } else {
233232 if (logger.isTraceEnabled) logger.trace(" No `traceparent` found for command [{}]." , command)
234233 None
0 commit comments