Skip to content

Commit 598b7ac

Browse files
committed
Sync otel versions and fix build failure
1 parent 47dab2b commit 598b7ac

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
1111
import com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryItemExporter;
1212
import io.opentelemetry.api.logs.LoggerProvider;
13-
import io.opentelemetry.internal.shaded.jctools.queues.MpscArrayQueue;
13+
import io.opentelemetry.internal.shaded.jctools.queues.atomic.MpscAtomicArrayQueue;
1414
import io.opentelemetry.javaagent.bootstrap.CallDepth;
1515
import io.opentelemetry.sdk.common.CompletableResultCode;
1616
import io.opentelemetry.sdk.internal.DaemonThreadFactory;
@@ -56,7 +56,7 @@ public static BatchItemProcessorBuilder builder(TelemetryItemExporter exporter)
5656
long exporterTimeoutNanos,
5757
int maxPendingExports,
5858
String queueName) {
59-
MpscArrayQueue<TelemetryItem> queue = new MpscArrayQueue<>(maxQueueSize);
59+
MpscAtomicArrayQueue<TelemetryItem> queue = new MpscAtomicArrayQueue<>(maxQueueSize);
6060
this.worker =
6161
new Worker(
6262
exporter,

dependencyManagement/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ data class DependencySet(val group: String, val version: String, val modules: Li
77
val dependencyVersions = hashMapOf<String, String>()
88
rootProject.extra["versions"] = dependencyVersions
99

10-
val otelSdkVersion = "1.53.0"
10+
val otelSdkVersion = "1.55.0"
1111
val otelInstrumentationAlphaVersion = "2.21.0-alpha"
12-
val otelInstrumentationVersion = "2.19.0"
13-
val otelContribVersion = "1.48.0"
12+
val otelInstrumentationVersion = "2.21.0"
13+
val otelContribVersion = "1.51.0"
1414

1515
rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion
1616
rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion

0 commit comments

Comments
 (0)