Emit OTel spans to toolkit telemetry service (#5046)

rli · web-flow · commit bb851ecc1b51 · 2024-11-06T11:54:12.000-08:00
This PR transforms OTel spans to the format expected by the current telemetry service
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OTelService.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OTelService.kt
@@ -132,7 +132,7 @@ private object StdoutSpanProcessor : SpanProcessor {
 @Service
 class OTelService @NonInjectable internal constructor(spanProcessors: List<SpanProcessor>) : Disposable {
     @Suppress("unused")
-    constructor() : this(listOf(StdoutSpanProcessor))
+    constructor() : this(listOf(ToolkitTelemetryOTelSpanProcessor()))
 
     private val sdkDelegate = lazy {
         OpenTelemetrySdk.builder()
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OtelBase.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OtelBase.kt
@@ -33,7 +33,7 @@ import com.intellij.platform.diagnostic.telemetry.helpers.use as ijUse
 import com.intellij.platform.diagnostic.telemetry.helpers.useWithScope as ijUseWithScope
 
 val AWS_PRODUCT_CONTEXT_KEY = ContextKey.named<AWSProduct>("pluginDescriptor")
-internal val PLUGIN_ATTRIBUTE_KEY = AttributeKey.stringKey("plugin")
+internal val PLUGIN_NAME_ATTRIBUTE_KEY = AttributeKey.stringKey("pluginName")
 
 class DefaultSpan(context: Context?, delegate: Span) : BaseSpan<DefaultSpan>(context, delegate)
 
@@ -175,7 +175,7 @@ abstract class AbstractSpanBuilder<
         requireNotNull(parent)
 
         parent.get(AWS_PRODUCT_CONTEXT_KEY)?.toString()?.let {
-            setAttribute(PLUGIN_ATTRIBUTE_KEY, it)
+            setAttribute(PLUGIN_NAME_ATTRIBUTE_KEY, it)
         } ?: run {
             LOG.warn { "Reached setAttribute with null AWS_PRODUCT_CONTEXT_KEY, but should not be possible" }
         }
@@ -193,7 +193,7 @@ abstract class AbstractBaseSpan<SpanType : AbstractBaseSpan<SpanType>>(internal
     protected open val requiredFields: Collection<String> = emptySet()
     private var passive: Boolean = false
     private var unit: MetricUnit = MetricUnit.NONE
-    private var value: Double = 0.0
+    private var value: Double = 1.0
 
     /**
      * Same as [com.intellij.platform.diagnostic.telemetry.helpers.use] except downcasts to specific subclass of [BaseSpan]
@@ -210,12 +210,19 @@ abstract class AbstractBaseSpan<SpanType : AbstractBaseSpan<SpanType>>(internal
         return this as SpanType
     }
 
+    override fun recordException(exception: Throwable): SpanType {
+        delegate.recordException(exception)
+        return this as SpanType
+    }
+
     override fun end() {
+        finalize()
         validateRequiredAttributes()
         delegate.end()
     }
 
     override fun end(timestamp: Long, unit: TimeUnit) {
+        finalize()
         validateRequiredAttributes()
         delegate.end()
     }
@@ -235,6 +242,12 @@ abstract class AbstractBaseSpan<SpanType : AbstractBaseSpan<SpanType>>(internal
         return this as SpanType
     }
 
+    private fun finalize() {
+        setAttribute("passive", passive)
+        setAttribute("unit", unit.toString())
+        setAttribute("value", value)
+    }
+
     private fun validateRequiredAttributes() {
         val missingFields = requiredFields.filter { delegate.getAttribute(AttributeKey.stringKey(it)) == null }
         val message = { "${delegate.name} is missing required fields: ${missingFields.joinToString(", ")}" }
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/ToolkitTelemetryOTelSpanProcessor.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/ToolkitTelemetryOTelSpanProcessor.kt
@@ -0,0 +1,72 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.telemetry.otel
+
+import io.opentelemetry.context.Context
+import io.opentelemetry.sdk.trace.ReadWriteSpan
+import io.opentelemetry.sdk.trace.ReadableSpan
+import io.opentelemetry.sdk.trace.SpanProcessor
+import software.amazon.awssdk.services.toolkittelemetry.model.AWSProduct
+import software.amazon.awssdk.services.toolkittelemetry.model.MetricUnit
+import software.aws.toolkits.core.utils.tryOrNull
+import software.aws.toolkits.jetbrains.AwsPlugin
+import software.aws.toolkits.jetbrains.AwsToolkit
+import software.aws.toolkits.jetbrains.services.telemetry.MetricEventMetadata
+import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
+import java.time.Instant
+import kotlin.time.Duration.Companion.nanoseconds
+
+class ToolkitTelemetryOTelSpanProcessor : SpanProcessor {
+    override fun isStartRequired() = false
+    override fun isEndRequired() = true
+
+    override fun onStart(parentContext: Context, span: ReadWriteSpan) {}
+
+    override fun onEnd(span: ReadableSpan) {
+        val data = span.toSpanData()
+        val product = data.attributes.get(PLUGIN_NAME_ATTRIBUTE_KEY)?.let { AWSProduct.fromValue(it) } ?: AWSProduct.AWS_TOOLKIT_FOR_JET_BRAINS
+        val version = tryOrNull {
+            when (product) {
+                AWSProduct.AWS_TOOLKIT_FOR_JET_BRAINS -> AwsToolkit.PLUGINS_INFO[AwsPlugin.TOOLKIT]?.version
+                AWSProduct.AMAZON_Q_FOR_JET_BRAINS -> AwsToolkit.PLUGINS_INFO[AwsPlugin.Q]?.version
+                else -> null
+            }
+        } ?: "unknown"
+
+        TelemetryService.getInstance().record(
+            MetricEventMetadata(
+                awsProduct = product,
+                awsVersion = version,
+            )
+        ) {
+            createTime(Instant.ofEpochSecond(0L, data.startEpochNanos))
+
+            datum(data.name) {
+                val attributes = data.attributes.asMap().entries.associate { it.key.key to it.value }.toMutableMap()
+                // goes on root of payload
+                attributes.remove(PLUGIN_NAME_ATTRIBUTE_KEY.key)
+
+                // special handling attributes
+                passive(attributes.remove("passive") as Boolean)
+                unit(MetricUnit.fromValue(attributes.remove("unit") as String))
+                value(attributes.remove("value") as Double)
+
+                // everything else
+                attributes.forEach { t, u ->
+                    metadata(t, u.toString())
+                }
+
+                // auto-duration
+                if (attributes["duration"] == null && data.endEpochNanos != 0L) {
+                    metadata("duration", (data.endEpochNanos - data.startEpochNanos).nanoseconds.inWholeMilliseconds.toString())
+                }
+
+                // the reason why we used opentelemetry
+                metadata("traceId", data.traceId)
+                metadata("metricId", data.spanId)
+                metadata("parentId", data.parentSpanId)
+            }
+        }
+    }
+}
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/otel/OtelBaseTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/otel/OtelBaseTest.kt
@@ -72,7 +72,7 @@ class OtelBaseTest {
 
             assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
             assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)
-            assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))
+            assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))
         }
     }
 
@@ -88,7 +88,7 @@ class OtelBaseTest {
 
             assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
             assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)
-            assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))
+            assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))
         }
     }
 
@@ -104,8 +104,8 @@ class OtelBaseTest {
 
             assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
             assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)
-            assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
-            assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))
+            assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
+            assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))
         }
     }
 
@@ -122,8 +122,8 @@ class OtelBaseTest {
 
             assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
             assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)
-            assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isNotEqualTo(child.getAttribute(PLUGIN_ATTRIBUTE_KEY))
-            assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
+            assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isNotEqualTo(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))
+            assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
         }
     }
 
@@ -141,8 +141,8 @@ class OtelBaseTest {
 
             assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
             assertThat(child.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
-            assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
-            assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isNotEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))
+            assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
+            assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isNotEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))
         }
     }
 
@@ -160,8 +160,8 @@ class OtelBaseTest {
 
             assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
             assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)
-            assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
-            assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))
+            assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
+            assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))
         }
     }
 
@@ -181,8 +181,8 @@ class OtelBaseTest {
 
             assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
             assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)
-            assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
-            assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))
+            assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
+            assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))
         }
     }
 
@@ -198,8 +198,8 @@ class OtelBaseTest {
 
             assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
             assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)
-            assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
-            assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))
+            assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
+            assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))
         }
     }
 
@@ -215,8 +215,8 @@ class OtelBaseTest {
 
             assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
             assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)
-            assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
-            assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))
+            assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
+            assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))
         }
     }
 
@@ -234,8 +234,8 @@ class OtelBaseTest {
 
             assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
             assertThat(child.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
-            assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
-            assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isNotEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))
+            assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
+            assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isNotEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))
         }
     }
 
@@ -253,8 +253,8 @@ class OtelBaseTest {
 
             assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
             assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)
-            assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
-            assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))
+            assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
+            assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))
         }
     }
 
@@ -285,8 +285,8 @@ class OtelBaseTest {
 
             assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())
             assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)
-            assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
-            assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))
+            assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")
+            assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))
         }
     }
 
@@ -339,7 +339,8 @@ class OtelExtension : AfterEachCallback, AfterAllCallback {
                     assert(openSpans.isEmpty()) { "Not all open spans were closed: ${openSpans.joinToString(", ")}" }
                     return CompletableResultCode.ofSuccess()
                 }
-            }
+            },
+            ToolkitTelemetryOTelSpanProcessor()
         )
     )
 
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/otel/ToolkitTelemetryOTelSpanProcessorTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/otel/ToolkitTelemetryOTelSpanProcessorTest.kt

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class OtelBaseTest {`
`72`	`72`
`73`	`73`	`assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`74`	`74`	`assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)`
`75`		`- assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))`
	`75`	`+ assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`@@ -88,7 +88,7 @@ class OtelBaseTest {`
`88`	`88`
`89`	`89`	`assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`90`	`90`	`assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)`
`91`		`- assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))`
	`91`	`+ assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
`@@ -104,8 +104,8 @@ class OtelBaseTest {`
`104`	`104`
`105`	`105`	`assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`106`	`106`	`assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)`
`107`		`- assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
`108`		`- assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))`
	`107`	`+ assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
	`108`	`+ assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
`@@ -122,8 +122,8 @@ class OtelBaseTest {`
`122`	`122`
`123`	`123`	`assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`124`	`124`	`assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)`
`125`		`- assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isNotEqualTo(child.getAttribute(PLUGIN_ATTRIBUTE_KEY))`
`126`		`- assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
	`125`	`+ assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isNotEqualTo(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))`
	`126`	`+ assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
`@@ -141,8 +141,8 @@ class OtelBaseTest {`
`141`	`141`
`142`	`142`	`assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`143`	`143`	`assertThat(child.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`144`		`- assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
`145`		`- assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isNotEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))`
	`144`	`+ assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
	`145`	`+ assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isNotEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
`@@ -160,8 +160,8 @@ class OtelBaseTest {`
`160`	`160`
`161`	`161`	`assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`162`	`162`	`assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)`
`163`		`- assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
`164`		`- assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))`
	`163`	`+ assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
	`164`	`+ assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`@@ -181,8 +181,8 @@ class OtelBaseTest {`
`181`	`181`
`182`	`182`	`assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`183`	`183`	`assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)`
`184`		`- assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
`185`		`- assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))`
	`184`	`+ assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
	`185`	`+ assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`@@ -198,8 +198,8 @@ class OtelBaseTest {`
`198`	`198`
`199`	`199`	`assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`200`	`200`	`assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)`
`201`		`- assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
`202`		`- assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))`
	`201`	`+ assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
	`202`	`+ assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
`@@ -215,8 +215,8 @@ class OtelBaseTest {`
`215`	`215`
`216`	`216`	`assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`217`	`217`	`assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)`
`218`		`- assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
`219`		`- assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))`
	`218`	`+ assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
	`219`	`+ assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
`@@ -234,8 +234,8 @@ class OtelBaseTest {`
`234`	`234`
`235`	`235`	`assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`236`	`236`	`assertThat(child.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`237`		`- assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
`238`		`- assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isNotEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))`
	`237`	`+ assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
	`238`	`+ assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isNotEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))`
`239`	`239`	`}`
`240`	`240`	`}`
`241`	`241`
`@@ -253,8 +253,8 @@ class OtelBaseTest {`
`253`	`253`
`254`	`254`	`assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`255`	`255`	`assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)`
`256`		`- assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
`257`		`- assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))`
	`256`	`+ assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
	`257`	`+ assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`
`@@ -285,8 +285,8 @@ class OtelBaseTest {`
`285`	`285`
`286`	`286`	`assertThat(parent.parentSpanContext.traceId).isEqualTo(TraceId.getInvalid())`
`287`	`287`	`assertThat(child.parentSpanContext.traceId).isEqualTo(parent.spanContext.traceId)`
`288`		`- assertThat(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
`289`		`- assertThat(child.getAttribute(PLUGIN_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_ATTRIBUTE_KEY))`
	`288`	`+ assertThat(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo("Amazon Q For VS Code")`
	`289`	`+ assertThat(child.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY)).isEqualTo(parent.getAttribute(PLUGIN_NAME_ATTRIBUTE_KEY))`
`290`	`290`	`}`
`291`	`291`	`}`
`292`	`292`
`@@ -339,7 +339,8 @@ class OtelExtension : AfterEachCallback, AfterAllCallback {`
`339`	`339`	`assert(openSpans.isEmpty()) { "Not all open spans were closed: ${openSpans.joinToString(", ")}" }`
`340`	`340`	`return CompletableResultCode.ofSuccess()`
`341`	`341`	`}`
`342`		`- }`
	`342`	`+ },`
	`343`	`+ ToolkitTelemetryOTelSpanProcessor()`
`343`	`344`	`)`
`344`	`345`	`)`
`345`	`346`