build

Author: rli

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OTelService.kt

@@ -6,15 +6,19 @@ package software.aws.toolkits.jetbrains.services.telemetry.otel
 
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.thisLogger
-import com.intellij.platform.diagnostic.telemetry.impl.OpenTelemetryConfigurator
+import com.intellij.openapi.util.SystemInfoRt
 import com.intellij.platform.util.http.ContentType
 import com.intellij.platform.util.http.httpPost
+import io.opentelemetry.api.common.AttributeKey
+import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator
 import io.opentelemetry.context.Context
 import io.opentelemetry.context.propagation.ContextPropagators
 import io.opentelemetry.exporter.internal.otlp.traces.TraceRequestMarshaler
 import io.opentelemetry.sdk.OpenTelemetrySdk
+import io.opentelemetry.sdk.resources.Resource
 import io.opentelemetry.sdk.trace.ReadWriteSpan
 import io.opentelemetry.sdk.trace.ReadableSpan
 import io.opentelemetry.sdk.trace.SdkTracerProvider
@@ -127,25 +131,33 @@ private object StdoutSpanProcessor : SpanProcessor {
 @Service
 class OTelService : Disposable {
     private val sdkDelegate = lazy {
-        val configurator = OpenTelemetryConfigurator(
-            sdkBuilder = OpenTelemetrySdk.builder(),
-        )
-
-        configurator.getConfiguredSdkBuilder()
+        OpenTelemetrySdk.builder()
             .setTracerProvider(
                 SdkTracerProvider.builder()
                     .addSpanProcessor(StdoutSpanProcessor)
-                    .setResource(configurator.resource)
+                    .setResource(
+                        Resource.create(
+                            Attributes.builder()
+                                .put(AttributeKey.stringKey("os.type"), SystemInfoRt.OS_NAME)
+                                .put(AttributeKey.stringKey("os.version"), SystemInfoRt.OS_VERSION)
+                                .put(AttributeKey.stringKey("host.arch"), System.getProperty("os.arch"))
+                                .build()
+                        )
+                    )
                     .build()
             )
             .setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
             .build()
     }
-    val sdk: OpenTelemetrySdk by sdkDelegate
+    internal val sdk: OpenTelemetrySdk by sdkDelegate
 
     override fun dispose() {
         if (sdkDelegate.isInitialized()) {
             sdk.close()
         }
     }
+
+    companion object {
+        fun getSdk() = service<OTelService>().sdk
+    }
 }

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OtelBase.kt

@@ -3,7 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.telemetry.otel
 
-import com.intellij.platform.diagnostic.telemetry.helpers.useWithoutActiveScope
+import com.intellij.platform.diagnostic.telemetry.helpers.use as ijUse
 import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.trace.Span
@@ -17,7 +17,6 @@ import software.amazon.awssdk.services.toolkittelemetry.model.AWSProduct
 import software.aws.toolkits.jetbrains.services.telemetry.PluginResolver
 import java.time.Instant
 import java.util.concurrent.TimeUnit
-import kotlin.use
 
 val AWS_PRODUCT_CONTEXT_KEY = ContextKey.named<AWSProduct>("pluginDescriptor")
 private val PLUGIN_ATTRIBUTE_KEY = AttributeKey.stringKey("plugin")
@@ -33,10 +32,8 @@ abstract class AbstractSpanBuilder<Builder : AbstractSpanBuilder<Builder, Span>,
      * @inheritdoc
      */
     inline fun<T> use(operation: (Span) -> T): T =
-        startSpan().useWithoutActiveScope { span ->
-            (span as Span).makeCurrent().use {
-                operation(span)
-            }
+        startSpan().ijUse { span ->
+            operation(span as Span)
         }
 
     protected var parent: Context? = null
@@ -124,9 +121,10 @@ abstract class AbstractSpanBuilder<Builder : AbstractSpanBuilder<Builder, Span>,
 
         val contextValue = parent.get(AWS_PRODUCT_CONTEXT_KEY)
         if (contextValue == null) {
-            val s = Span.fromContextOrNull(parent)
+            // FIX_WHEN_MIN_IS_243: Kotlin compiler can't figure out difference between class/type parameter until 2.x
+            val s = io.opentelemetry.api.trace.Span.fromContextOrNull(parent)
             if (s is AbstractBaseSpan) {
-                setParent(s.context.with(Span.fromContext(parent)))
+                setParent(s.context.with(io.opentelemetry.api.trace.Span.fromContext(parent)))
             } else {
                 setParent(parent.with(AWS_PRODUCT_CONTEXT_KEY, resolvePluginName()))
             }
@@ -144,6 +142,16 @@ abstract class AbstractSpanBuilder<Builder : AbstractSpanBuilder<Builder, Span>,
 }
 
 abstract class AbstractBaseSpan(internal val context: Context, private val delegate: Span) : Span by delegate {
+    /**
+     * Same as [com.intellij.platform.diagnostic.telemetry.helpers.use] except downcasts to specific subclass of [BaseSpan]
+     *
+     * @inheritdoc
+     */
+    inline fun<T> use(operation: (Span) -> T): T =
+        ijUse { span ->
+            operation(span as Span)
+        }
+
     fun metadata(key: String, value: String) = setAttribute(key, value)
 
     override fun makeCurrent(): Scope =

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/sso/SsoCredentialProviderTest.kt

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.core.credentials.sso
 
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.testFramework.ApplicationRule
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
@@ -95,6 +96,13 @@ class SsoCredentialProviderTest {
         verify(ssoAccessTokenProvider).invalidate()
     }
 
+    @Test
+    fun aaaaa() {
+        ApplicationManager.getApplication().executeOnPooledThread {
+            println(Thread.currentThread().getContextClassLoader())
+        }.get()
+    }
+
     private fun createSsoResponse(expirationTime: Instant) {
         ssoClient.stub {
             on(