Skip to content

fix(core): Fix/otel compat #6119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aseemxs wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix(core): Fix/otel compat #6119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83dc9f6
refactor(otel): use compatibility helpers instead of duplicating enti…
aseemxs Nov 20, 2025
b356a38
fix: remove unused NonInjectable import
aseemxs Nov 20, 2025
8337d9d
refactor(otel): use Apache HttpClient for cross-version compatibility
aseemxs Nov 20, 2025
86f632c
refactor(otel): use HttpRequests for proxy and user agent support
aseemxs Nov 20, 2025
7f6e248
Optimize telemetry export by writing directly to output stream
aseemxs Dec 1, 2025
80e2171
perf(otel): write telemetry directly to HTTP stream
aseemxs Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
171 changes: 0 additions & 171 deletions ...community/src-253+/software/aws/toolkits/jetbrains/services/telemetry/otel/OTelService.kt
View file
Open in desktop

This file was deleted.

12 changes: 7 additions & 5 deletions ...ns/services/telemetry/otel/OTelService.kt → ...ns/services/telemetry/otel/OTelService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
import com.intellij.openapi.components.service
import com.intellij.openapi.diagnostic.thisLogger
import com.intellij.openapi.util.SystemInfoRt
import com.intellij.platform.util.http.ContentType
import com.intellij.platform.util.http.httpPost
import com.intellij.serviceContainer.NonInjectable
import com.intellij.util.io.HttpRequests
import io.opentelemetry.api.common.AttributeKey
import io.opentelemetry.api.common.Attributes
import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator
Expand All @@ -34,10 +33,11 @@
import software.amazon.awssdk.http.SdkHttpRequest
import software.amazon.awssdk.http.apache.ApacheHttpClient
import software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner
import software.aws.toolkits.jetbrains.core.AwsClientManager
import java.io.ByteArrayOutputStream
import java.net.ConnectException

private class BasicOtlpSpanProcessor(

Check warning on line 40 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OTelService.kt

View workflow job for this annotation

GitHub Actions / qodana

Unused symbol 

Class "BasicOtlpSpanProcessor" is never used
private val coroutineScope: CoroutineScope,
private val traceUrl: String = "http://127.0.0.1:4318/v1/traces",
) : SpanProcessor {
Expand All @@ -51,13 +51,15 @@
try {
val item = TraceRequestMarshaler.create(listOf(data))

httpPost(traceUrl, contentLength = item.binarySerializedSize.toLong(), contentType = ContentType.XProtobuf) {
item.writeBinaryTo(this)
}
HttpRequests.post(traceUrl, "application/x-protobuf")
.userAgent(AwsClientManager.getUserAgent())
.connect { request ->
item.writeBinaryTo(request.connection.outputStream)
}
} catch (e: CancellationException) {
throw e
} catch (e: ConnectException) {
thisLogger().warn("Cannot export (url=$traceUrl): ${e.message}")

Check notice on line 62 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OTelService.kt

View workflow job for this annotation

GitHub Actions / qodana

Non-distinguishable logging calls 

Similar log messages
} catch (e: Throwable) {
thisLogger().error("Cannot export (url=$traceUrl)", e)
}
Expand All @@ -65,7 +67,7 @@
}
}

private class SigV4OtlpSpanProcessor(

Check warning on line 70 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OTelService.kt

View workflow job for this annotation

GitHub Actions / qodana

Unused symbol 

Class "SigV4OtlpSpanProcessor" is never used
private val coroutineScope: CoroutineScope,
private val traceUrl: String,
private val creds: AwsCredentialsProvider,
Expand Down Expand Up @@ -111,7 +113,7 @@
} catch (e: CancellationException) {
throw e
} catch (e: ConnectException) {
thisLogger().warn("Cannot export (url=$traceUrl): ${e.message}")

Check notice on line 116 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OTelService.kt

View workflow job for this annotation

GitHub Actions / qodana

Non-distinguishable logging calls 

Similar log messages
} catch (e: Throwable) {
thisLogger().error("Cannot export (url=$traceUrl)", e)
}
Expand All @@ -119,7 +121,7 @@
}
}

private object StdoutSpanProcessor : SpanProcessor {

Check warning on line 124 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OTelService.kt

View workflow job for this annotation

GitHub Actions / qodana

Unused symbol 

Object "StdoutSpanProcessor" is never used
override fun onStart(parentContext: Context, span: ReadWriteSpan) {}
override fun isStartRequired() = false
override fun isEndRequired() = true
Expand Down
Loading