Skip to content

Commit 656e779

Browse files
fix: replace sender-okhttp with sender-grpc-managed-channel for Strimzi compatibility (#3268) (#3309)
cherry-pick: #3268 d63afdf Co-authored-by: rafaelsoutto <rafasoutto40@gmail.com>
1 parent a1eda2e commit 656e779

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,12 @@ allprojects {
179179
libs.nettyHandler,
180180
libs.nettyTransportNativeEpoll,
181181
// be explicit about the reload4j version instead of relying on the transitive versions
182-
libs.reload4j
182+
libs.reload4j,
183+
// AutoMQ inject start
184+
// pin OTel sender versions to prevent version conflicts with Strimzi thirdparty-libs
185+
libs.opentelemetryExporterSenderJdk,
186+
libs.opentelemetryExporterSenderGrpcManagedChannel
187+
// AutoMQ inject end
183188
)
184189
// AutoMQ inject start
185190
// swagger is only used for doc generation and still depends on jackson-yaml compatible with SnakeYAML 1.x.
@@ -2379,6 +2384,7 @@ project(':automq-metrics') {
23792384
api libs.opentelemetryExporterLogging
23802385
api libs.opentelemetryExporterProm
23812386
api libs.opentelemetryExporterOTLP
2387+
api libs.opentelemetryExporterSenderJdk
23822388
api libs.opentelemetryJmx
23832389

23842390
// Logging dependencies

gradle/dependencies.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ versions += [
188188
guava:"32.0.1-jre",
189189
hdrHistogram:"2.1.12",
190190
nettyTcnativeBoringSsl: "2.0.69.Final",
191+
grpc: "1.65.0",
191192
avro: "1.11.4",
192193
confluentSchema: "7.8.0",
193194
iceberg: "1.6.1",
@@ -325,6 +326,9 @@ libs += [
325326
opentelemetryExporterLogging: "io.opentelemetry:opentelemetry-exporter-logging:$versions.opentelemetrySDK",
326327
opentelemetryExporterProm: "io.opentelemetry:opentelemetry-exporter-prometheus:$versions.opentelemetrySDKAlpha",
327328
opentelemetryExporterOTLP: "io.opentelemetry:opentelemetry-exporter-otlp:$versions.opentelemetrySDK",
329+
opentelemetryExporterSenderJdk: "io.opentelemetry:opentelemetry-exporter-sender-jdk:$versions.opentelemetrySDK",
330+
opentelemetryExporterSenderGrpcManagedChannel: "io.opentelemetry:opentelemetry-exporter-sender-grpc-managed-channel:$versions.opentelemetrySDK",
331+
grpcNettyShaded: "io.grpc:grpc-netty-shaded:$versions.grpc",
328332
opentelemetryJmx: "io.opentelemetry.instrumentation:opentelemetry-jmx-metrics:$versions.opentelemetryInstrument",
329333
bucket4j: "com.bucket4j:bucket4j-core:$versions.bucket4j",
330334
jna: "net.java.dev.jna:jna:$versions.jna",

0 commit comments

Comments
 (0)