Skip to content

fix(fix): 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
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix(fix): Fix/otel compat #6119

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
31e85d0
Add 2025.3 version support for artifact generation
aseemxs Nov 14, 2025
bf1a830
Merge remote-tracking branch 'origin/main'
aseemxs Nov 20, 2025
1ead856
refactor(otel): use compatibility helpers instead of duplicating enti…
aseemxs Nov 20, 2025
543169d
fix: remove unused NonInjectable import
aseemxs Nov 20, 2025
c6b8e05
refactor(otel): use Apache HttpClient for cross-version compatibility
aseemxs Nov 20, 2025
a8ebd09
refactor(otel): use HttpRequests for proxy and user agent support
aseemxs Nov 20, 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.

18 changes: 14 additions & 4 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,8 +9,6 @@
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 io.opentelemetry.api.common.AttributeKey
import io.opentelemetry.api.common.Attributes
Expand All @@ -27,6 +25,9 @@
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
import org.apache.http.client.methods.HttpPost
import org.apache.http.entity.ByteArrayEntity
import org.apache.http.impl.client.HttpClients
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider
import software.amazon.awssdk.http.ContentStreamProvider
import software.amazon.awssdk.http.HttpExecuteRequest
Expand All @@ -37,7 +38,7 @@
import java.io.ByteArrayOutputStream
import java.net.ConnectException

private class BasicOtlpSpanProcessor(

Check warning on line 41 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 @@ -50,14 +51,23 @@
coroutineScope.launch {
try {
val item = TraceRequestMarshaler.create(listOf(data))
val baos = ByteArrayOutputStream()
item.writeBinaryTo(baos)

httpPost(traceUrl, contentLength = item.binarySerializedSize.toLong(), contentType = ContentType.XProtobuf) {
item.writeBinaryTo(this)
HttpClients.createDefault().use { client ->
Copy link
Contributor

@rli rli Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does not respect IDE proxy settings nor uses our custom user agent. see HttpUtils/HttpRequests

val request = HttpPost(traceUrl).apply {
entity = ByteArrayEntity(baos.toByteArray()).apply {
setContentType("application/x-protobuf")
}
}
client.execute(request).use {
// Response consumed and closed
}
}
} catch (e: CancellationException) {
throw e
} catch (e: ConnectException) {
thisLogger().warn("Cannot export (url=$traceUrl): ${e.message}")

Check notice 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

Non-distinguishable logging calls 

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

private class SigV4OtlpSpanProcessor(

Check warning on line 78 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 +121,7 @@
} catch (e: CancellationException) {
throw e
} catch (e: ConnectException) {
thisLogger().warn("Cannot export (url=$traceUrl): ${e.message}")

Check notice 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

Non-distinguishable logging calls 

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

private object StdoutSpanProcessor : SpanProcessor {

Check warning on line 132 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