Skip to content

Commit da1246d

Browse files
Update opentelemetry.inst to v1.33.2 (#818)
* Update opentelemetry.inst to v1.33.2 * fix up instrumentation dep versions --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jason Plumb <[email protected]> Co-authored-by: jason plumb <[email protected]>
1 parent e95a409 commit da1246d

File tree

3 files changed

+11
-16
lines changed

3 files changed

+11
-16
lines changed

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
2-
opentelemetry-core = "1.36.0"
3-
opentelemetry-core-alpha = "1.36.0-alpha"
4-
opentelemetry-inst = "1.33.1"
2+
opentelemetry-core = "1.37.0"
3+
opentelemetry-core-alpha = "1.37.0-alpha"
4+
opentelemetry-inst = "1.33.2"
55
opentelemetry-inst-alpha = "1.33.2-alpha"
66
opentelemetry-android = "0.4.0-alpha"
77
mockito = "5.11.0"
@@ -13,7 +13,7 @@ opentelemetry-instrumentation-bom = { module = "io.opentelemetry.instrumentation
1313
opentelemetry-bom = { module = "io.opentelemetry:opentelemetry-bom", version.ref = "opentelemetry-core-alpha" }
1414
opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "opentelemetry-core" }
1515
opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api", version.ref = "opentelemetry-core" }
16-
opentelemetry-api-events = { module = "io.opentelemetry:opentelemetry-api-events", version.ref = "opentelemetry-core-alpha" }
16+
opentelemetry-api-incubator = { module = "io.opentelemetry:opentelemetry-api-incubator", version.ref = "opentelemetry-core-alpha" }
1717
opentelemetry-android = { module = "io.opentelemetry.android:instrumentation", version.ref = "opentelemetry-android" }
1818
opentelemetry-instrumenter-api = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api", version.ref = "opentelemetry-inst" }
1919
opentelemetry-instrumenter-api-semconv = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv", version.ref = "opentelemetry-inst-alpha" }

sample-app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ dependencies {
6767
implementation(libs.android.volley)
6868
implementation(libs.androidx.work)
6969
implementation(libs.opentelemetry.sdk)
70-
implementation(libs.opentelemetry.api.events)
70+
implementation(libs.opentelemetry.api.incubator)
7171
testImplementation(libs.bundles.junit)
7272
androidTestImplementation(libs.androidx.test.core)
7373
androidTestImplementation(libs.androidx.junit)

sample-app/src/main/java/com/splunk/android/sample/SecondFragment.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@
3131
import com.splunk.rum.SplunkRum;
3232
import io.opentelemetry.android.instrumentation.RumScreenName;
3333
import io.opentelemetry.api.common.Attributes;
34-
import io.opentelemetry.api.events.EventEmitter;
35-
import io.opentelemetry.api.events.EventEmitterProvider;
34+
import io.opentelemetry.api.incubator.events.EventLogger;
3635
import io.opentelemetry.api.trace.Span;
3736
import io.opentelemetry.api.trace.Tracer;
3837
import io.opentelemetry.context.Scope;
3938
import io.opentelemetry.sdk.OpenTelemetrySdk;
40-
import io.opentelemetry.sdk.logs.internal.SdkEventEmitterProvider;
39+
import io.opentelemetry.sdk.logs.internal.SdkEventLoggerProvider;
4140
import java.util.Random;
4241
import java.util.concurrent.Executors;
4342
import java.util.concurrent.ScheduledExecutorService;
@@ -221,14 +220,10 @@ private void createSpamSpan() {
221220
}
222221

223222
public static void emitEvent(SplunkRum splunkRum, String eventDomain, String eventName) {
224-
EventEmitterProvider eventEmitterProvider =
225-
SdkEventEmitterProvider.create(
223+
SdkEventLoggerProvider eventEmitterProvider =
224+
SdkEventLoggerProvider.create(
226225
((OpenTelemetrySdk) splunkRum.getOpenTelemetry()).getSdkLoggerProvider());
227-
EventEmitter eventEmitter =
228-
eventEmitterProvider
229-
.eventEmitterBuilder("test")
230-
.setEventDomain(eventDomain)
231-
.build();
232-
eventEmitter.emit(eventName, Attributes.empty());
226+
EventLogger eventLogger = eventEmitterProvider.eventLoggerBuilder("test").build();
227+
eventLogger.builder(eventName).emit();
233228
}
234229
}

0 commit comments

Comments
 (0)