lint

Author: rli

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

@@ -130,7 +130,7 @@ private object StdoutSpanProcessor : SpanProcessor {
 }
 
 @Service
-class OTelService @NonInjectable internal constructor(spanProcessors: List<SpanProcessor>): Disposable {
+class OTelService @NonInjectable internal constructor(spanProcessors: List<SpanProcessor>) : Disposable {
     @Suppress("unused")
     constructor() : this(listOf(StdoutSpanProcessor))
 

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

@@ -3,8 +3,6 @@
 
 package software.aws.toolkits.jetbrains.services.telemetry.otel
 
-import com.intellij.platform.diagnostic.telemetry.helpers.use as ijUse
-import com.intellij.platform.diagnostic.telemetry.helpers.useWithScope as ijUseWithScope
 import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.trace.Span
@@ -23,6 +21,8 @@ import java.time.Instant
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
+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")
@@ -49,7 +49,7 @@ abstract class AbstractSpanBuilder<Builder : AbstractSpanBuilder<Builder, Span>,
      */
     suspend inline fun<T> useWithScope(
         context: CoroutineContext = EmptyCoroutineContext,
-        crossinline operation: suspend CoroutineScope.(Span) -> T
+        crossinline operation: suspend CoroutineScope.(Span) -> T,
     ): T =
         ijUseWithScope(context) { span ->
             operation(span as Span)

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/otel/OtelBaseTest.kt

@@ -144,7 +144,7 @@ class OtelBaseTest {
     }
 
     @Test
-    fun `context override propagates from parent to child when only child is coroutine`()  {
+    fun `context override propagates from parent to child when only child is coroutine`() {
         spanBuilder("tracer", "parentSpan").setParent(Context.current().with(AWS_PRODUCT_CONTEXT_KEY, AWSProduct.AMAZON_Q_FOR_VS_CODE)).use {
             runTest {
                 spanBuilder("anotherTracer", "childSpan").useWithScope {
@@ -199,7 +199,7 @@ class OtelBaseTest {
     }
 
     @Test
-    fun `context override does not propagate from parent to child coroutines if context is not preserved`()  {
+    fun `context override does not propagate from parent to child coroutines if context is not preserved`() {
         spanBuilder("tracer", "parentSpan").setParent(Context.current().with(AWS_PRODUCT_CONTEXT_KEY, AWSProduct.AMAZON_Q_FOR_VS_CODE)).use {
             runBlocking(getCoroutineBgContext()) {
                 spanBuilder("anotherTracer", "childSpan").use {}
@@ -218,7 +218,7 @@ class OtelBaseTest {
     }
 
     @Test
-    fun `context override propagates from parent to child coroutines with manual coroutine context propagation`()  {
+    fun `context override propagates from parent to child coroutines with manual coroutine context propagation`() {
         spanBuilder("tracer", "parentSpan").setParent(Context.current().with(AWS_PRODUCT_CONTEXT_KEY, AWSProduct.AMAZON_Q_FOR_VS_CODE)).use {
             runBlocking(getCoroutineBgContext() + Context.current().asContextElement()) {
                 spanBuilder("anotherTracer", "childSpan").use {}
@@ -277,32 +277,34 @@ class OtelExtension : AfterEachCallback, AfterAllCallback {
     val completedSpans
         get() = _completedSpans.reversed().toList()
 
-    val sdk = OTelService(listOf(
-        // should probably be a service loader
-        object : SpanProcessor {
-            override fun isStartRequired() = true
-            override fun isEndRequired() = true
+    val sdk = OTelService(
+        listOf(
+            // should probably be a service loader
+            object : SpanProcessor {
+                override fun isStartRequired() = true
+                override fun isEndRequired() = true
 
-            override fun onStart(parentContext: Context, span: ReadWriteSpan) {
-                openSpans.add(span)
-            }
+                override fun onStart(parentContext: Context, span: ReadWriteSpan) {
+                    openSpans.add(span)
+                }
 
-            override fun onEnd(span: ReadableSpan) {
-                println(span)
-                _completedSpans.add(span)
+                override fun onEnd(span: ReadableSpan) {
+                    println(span)
+                    _completedSpans.add(span)
 
-                if (!openSpans.contains(span)) {
-                    LOG.warn(RuntimeException("Span ended without corresponding start")) { span.toString() }
+                    if (!openSpans.contains(span)) {
+                        LOG.warn(RuntimeException("Span ended without corresponding start")) { span.toString() }
+                    }
+                    openSpans.remove(span)
                 }
-                openSpans.remove(span)
-            }
 
-            override fun forceFlush(): CompletableResultCode {
-                assert(openSpans.isEmpty()) { "Not all open spans were closed: ${openSpans.joinToString(", ")}" }
-                return CompletableResultCode.ofSuccess()
+                override fun forceFlush(): CompletableResultCode {
+                    assert(openSpans.isEmpty()) { "Not all open spans were closed: ${openSpans.joinToString(", ")}" }
+                    return CompletableResultCode.ofSuccess()
+                }
             }
-        }
-    ))
+        )
+    )
 
     override fun afterEach(context: ExtensionContext?) {
         reset()