fix(deps): update opentelemetry.instrumentation.alpha to v2.13.0-alpha (#826)

* fix(deps): update opentelemetry.instrumentation.alpha to v2.13.0-alpha

* update sdk in demo app and fix events api usage

* fix tests

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jason Plumb <[email protected]>

Author: renovate[bot]

core/src/test/java/io/opentelemetry/android/OpenTelemetryRumBuilderTest.java

@@ -47,9 +47,7 @@
 import io.opentelemetry.android.internal.session.SessionIdTimeoutHandler;
 import io.opentelemetry.android.session.SessionManager;
 import io.opentelemetry.api.common.Attributes;
-import io.opentelemetry.api.common.KeyValue;
-import io.opentelemetry.api.common.Value;
-import io.opentelemetry.api.incubator.events.EventLogger;
+import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder;
 import io.opentelemetry.api.logs.Logger;
 import io.opentelemetry.api.logs.Severity;
 import io.opentelemetry.api.metrics.LongCounter;
@@ -62,9 +60,9 @@
 import io.opentelemetry.contrib.disk.buffering.SpanToDiskExporter;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
+import io.opentelemetry.sdk.logs.data.internal.ExtendedLogRecordData;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
 import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor;
-import io.opentelemetry.sdk.logs.internal.SdkEventLoggerProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
@@ -186,28 +184,32 @@ public void shouldBuildLogRecordProvider() {
                                                 SimpleLogRecordProcessor.create(logsExporter)))
                         .build();
 
-        OpenTelemetrySdk sdk = (OpenTelemetrySdk) openTelemetryRum.getOpenTelemetry();
-        EventLogger eventLogger =
-                SdkEventLoggerProvider.create(sdk.getSdkLoggerProvider())
-                        .get("otel.initialization.events");
+        Logger logger =
+                openTelemetryRum
+                        .getOpenTelemetry()
+                        .getLogsBridge()
+                        .loggerBuilder("otel.initialization.events")
+                        .build();
+        ExtendedLogRecordBuilder eventLogger = (ExtendedLogRecordBuilder) logger.logRecordBuilder();
         Attributes attrs = Attributes.of(stringKey("mega"), "hit");
-        eventLogger.builder("test.event").put("body.field", "foo").setAttributes(attrs).emit();
+        eventLogger
+                .setEventName("test.event")
+                .setAllAttributes(attrs)
+                .setAttribute(stringKey("body.field"), "foo")
+                .emit();
 
         List<LogRecordData> logs = logsExporter.getFinishedLogRecordItems();
         assertThat(logs).hasSize(1);
         assertThat(logs.get(0))
                 .hasAttributesSatisfyingExactly(
                         equalTo(SESSION_ID, openTelemetryRum.getRumSessionId()),
-                        equalTo(stringKey("event.name"), "test.event"),
                         equalTo(SCREEN_NAME_KEY, CUR_SCREEN_NAME),
-                        equalTo(stringKey("mega"), "hit"))
+                        equalTo(stringKey("mega"), "hit"),
+                        equalTo(stringKey("body.field"), "foo"))
                 .hasResource(resource);
-
-        Value<?> bodyValue = logs.get(0).getBodyValue();
-        List<KeyValue> payload = (List<KeyValue>) bodyValue.getValue();
-        assertThat(payload).hasSize(1);
-        KeyValue expected = KeyValue.of("body.field", Value.of("foo"));
-        assertThat(payload.get(0)).isEqualTo(expected);
+        // TODO: verify event name inline above when the assertions framework can handle it
+        ExtendedLogRecordData log0 = (ExtendedLogRecordData) logs.get(0);
+        assertThat(log0.getEventName()).isEqualTo("test.event");
     }
 
     @Test

demo-app/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-opentelemetry = "1.46.0"
-opentelemetry-alpha = "1.46.0-alpha"
+opentelemetry = "1.47.0"
+opentelemetry-alpha = "1.47.0-alpha"
 junit = "5.11.4"
 spotless = "7.0.2"
 kotlin = "2.1.10"

demo-app/src/main/java/io/opentelemetry/android/demo/OtelDemoApplication.kt

@@ -15,14 +15,14 @@ import io.opentelemetry.android.features.diskbuffering.DiskBufferingConfig
 import io.opentelemetry.android.instrumentation.sessions.SessionInstrumentation
 import io.opentelemetry.api.common.AttributeKey.stringKey
 import io.opentelemetry.api.common.Attributes
-import io.opentelemetry.api.incubator.events.EventBuilder
+import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder
+import io.opentelemetry.api.logs.LogRecordBuilder
 import io.opentelemetry.api.metrics.LongCounter
 import io.opentelemetry.api.trace.Tracer
 import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter
 import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter
 import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporter
 import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter
-import io.opentelemetry.sdk.logs.internal.SdkEventLoggerProvider
 
 const val TAG = "otel.demo"
 
@@ -95,11 +95,10 @@ class OtelDemoApplication : Application() {
             return rum?.openTelemetry?.meterProvider?.get("demo.app")?.counterBuilder(name)?.build()
         }
 
-        fun eventBuilder(scopeName: String, eventName: String): EventBuilder {
-            val loggerProvider = rum?.openTelemetry?.logsBridge
-            val eventLogger =
-                SdkEventLoggerProvider.create(loggerProvider).get(scopeName)
-            return eventLogger.builder(eventName)
+        fun eventBuilder(scopeName: String, eventName: String): LogRecordBuilder {
+            val logger = rum?.openTelemetry?.logsBridge?.loggerBuilder(scopeName)?.build()
+            var builder: ExtendedLogRecordBuilder = logger?.logRecordBuilder() as ExtendedLogRecordBuilder
+            return builder.setEventName(eventName)
         }
     }
 }

demo-app/src/main/java/io/opentelemetry/android/demo/shop/ui/AstronomyShopActivity.kt

@@ -20,19 +20,21 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import io.opentelemetry.android.demo.OtelDemoApplication
 import io.opentelemetry.android.demo.shop.clients.ProductCatalogClient
-import io.opentelemetry.android.demo.theme.DemoAppTheme
 import io.opentelemetry.android.demo.shop.ui.cart.CartScreen
-import io.opentelemetry.android.demo.shop.ui.products.ProductDetails
-import io.opentelemetry.android.demo.shop.ui.products.ProductList
 import io.opentelemetry.android.demo.shop.ui.cart.CartViewModel
-import androidx.lifecycle.viewmodel.compose.viewModel
-import io.opentelemetry.android.demo.OtelDemoApplication
 import io.opentelemetry.android.demo.shop.ui.cart.CheckoutConfirmationScreen
 import io.opentelemetry.android.demo.shop.ui.cart.CheckoutInfoViewModel
 import io.opentelemetry.android.demo.shop.ui.cart.InfoScreen
+import io.opentelemetry.android.demo.shop.ui.products.ProductDetails
+import io.opentelemetry.android.demo.shop.ui.products.ProductList
+import io.opentelemetry.android.demo.theme.DemoAppTheme
+import io.opentelemetry.api.common.AttributeKey.doubleKey
+import io.opentelemetry.api.common.AttributeKey.stringKey
 
 class AstronomyShopActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -140,8 +142,8 @@ private fun generateOrderPlacedEvent(
 ) {
     val eventBuilder = OtelDemoApplication.eventBuilder("otel.demo.app", "order.placed")
     eventBuilder
-        .put("order.total.value", cartViewModel.getTotalPrice())
-        .put("buyer.state", checkoutInfoViewModel.shippingInfo.state)
+        .setAttribute(doubleKey("order.total.value"), cartViewModel.getTotalPrice())
+        .setAttribute(stringKey("buyer.state"), checkoutInfoViewModel.shippingInfo.state)
         .emit()
 }
 

demo-app/src/main/java/io/opentelemetry/android/demo/shop/ui/Navigation.kt

@@ -13,6 +13,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import androidx.compose.material3.*
 import io.opentelemetry.android.demo.OtelDemoApplication
+import io.opentelemetry.api.common.AttributeKey.stringKey
 
 
 sealed class BottomNavItem(val route: String, val icon: ImageVector, val label: String) {
@@ -100,7 +101,7 @@ class InstrumentedAstronomyShopNavController(
     private fun generateNavigationEvent(eventName: String, payload: Map<String, String>) {
         val eventBuilder = OtelDemoApplication.eventBuilder("otel.demo.app.navigation", eventName)
         payload.forEach { (key, value) ->
-            eventBuilder.put(key, value)
+            eventBuilder.setAttribute(stringKey(key), value)
         }
         eventBuilder.emit()
     }

demo-app/src/main/java/io/opentelemetry/android/demo/shop/ui/cart/Cart.kt

@@ -4,18 +4,19 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import java.util.Locale
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import io.opentelemetry.android.demo.shop.ui.products.ProductCard
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
 import io.opentelemetry.android.demo.OtelDemoApplication
 import io.opentelemetry.android.demo.shop.clients.ProductCatalogClient
 import io.opentelemetry.android.demo.shop.clients.RecommendationService
+import io.opentelemetry.android.demo.shop.ui.products.ProductCard
 import io.opentelemetry.android.demo.shop.ui.products.RecommendedSection
+import io.opentelemetry.api.common.AttributeKey.doubleKey
+import java.util.Locale
 
 @Composable
 fun CartScreen(
@@ -99,6 +100,6 @@ private fun clearCart(cartViewModel: CartViewModel) {
 
 private fun generateEmptiedCartEvent(cartViewModel: CartViewModel) {
     val eventBuilder = OtelDemoApplication.eventBuilder("otel.demo.app", "cart.emptied")
-    eventBuilder.put("cart.total.value", cartViewModel.getTotalPrice())
+    eventBuilder.setAttribute(doubleKey("cart.total.value"), cartViewModel.getTotalPrice())
         .emit()
 }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-opentelemetry-instrumentation-alpha = "2.12.0-alpha"
+opentelemetry-instrumentation-alpha = "2.13.0-alpha"
 #opentelemetry-instrumentation = "2.9.0" // alpha bom includes non-alpha bom
 opentelemetry-semconv = "1.30.0-rc.1"
 opentelemetry-semconv-alpha = "1.30.0-alpha-rc.1"

instrumentation/sessions/src/main/kotlin/io/opentelemetry/android/instrumentation/sessions/SessionIdEventSender.kt

@@ -9,7 +9,7 @@ import io.opentelemetry.android.common.RumConstants.Events.EVENT_SESSION_END
 import io.opentelemetry.android.common.RumConstants.Events.EVENT_SESSION_START
 import io.opentelemetry.android.session.Session
 import io.opentelemetry.android.session.SessionObserver
-import io.opentelemetry.api.incubator.events.EventLogger
+import io.opentelemetry.api.incubator.logs.ExtendedLogger
 import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes.SESSION_ID
 import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes.SESSION_PREVIOUS_ID
 
@@ -18,19 +18,20 @@ import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes.SESSION_P
  * specified in the OpenTelemetry semantic conventions.
  */
 internal class SessionIdEventSender(
-    private val eventLogger: EventLogger,
+    private val eventLogger: ExtendedLogger,
 ) : SessionObserver {
     override fun onSessionStarted(
         newSession: Session,
         previousSession: Session,
     ) {
         val eventBuilder =
             eventLogger
-                .builder(EVENT_SESSION_START)
-                .put(SESSION_ID, newSession.getId())
+                .logRecordBuilder()
+                .setEventName(EVENT_SESSION_START)
+                .setAttribute(SESSION_ID, newSession.getId())
         val previousSessionId = previousSession.getId()
         if (previousSessionId.isNotEmpty()) {
-            eventBuilder.put(SESSION_PREVIOUS_ID, previousSessionId)
+            eventBuilder.setAttribute(SESSION_PREVIOUS_ID, previousSessionId)
         }
         eventBuilder.emit()
     }
@@ -40,8 +41,9 @@ internal class SessionIdEventSender(
             return
         }
         eventLogger
-            .builder(EVENT_SESSION_END)
-            .put(SESSION_ID, session.getId())
+            .logRecordBuilder()
+            .setEventName(EVENT_SESSION_END)
+            .setAttribute(SESSION_ID, session.getId())
             .emit()
     }
 }

instrumentation/sessions/src/main/kotlin/io/opentelemetry/android/instrumentation/sessions/SessionInstrumentation.kt

@@ -5,18 +5,16 @@
 
 package io.opentelemetry.android.instrumentation.sessions
 
-import io.opentelemetry.android.OpenTelemetryRum
 import io.opentelemetry.android.instrumentation.AndroidInstrumentation
 import io.opentelemetry.android.instrumentation.InstallationContext
-import io.opentelemetry.sdk.logs.internal.SdkEventLoggerProvider
+import io.opentelemetry.api.incubator.logs.ExtendedLogger
 
 class SessionInstrumentation : AndroidInstrumentation {
     override fun install(ctx: InstallationContext) {
-        val eventLogger =
-            SdkEventLoggerProvider
-                .create(ctx.openTelemetry.logsBridge)
-                .get(OpenTelemetryRum::class.java.simpleName)
-
+        val eventLogger: ExtendedLogger =
+            ctx.openTelemetry.logsBridge
+                .loggerBuilder("otel.session")
+                .build() as ExtendedLogger
         ctx.sessionManager.addObserver(SessionIdEventSender(eventLogger))
     }
 }

instrumentation/startup/src/main/java/io/opentelemetry/android/instrumentation/startup/SdkInitializationEvents.kt

@@ -13,7 +13,7 @@ import io.opentelemetry.api.OpenTelemetry
 import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.common.Value
-import io.opentelemetry.sdk.logs.internal.SdkEventLoggerProvider
+import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder
 import io.opentelemetry.sdk.trace.export.SpanExporter
 import java.time.Instant
 import java.util.function.Supplier
@@ -60,29 +60,22 @@ class SdkInitializationEvents(
 
     internal fun finish(openTelemetry: OpenTelemetry) {
         val loggerProvider = openTelemetry.logsBridge
-        val eventLogger =
-            SdkEventLoggerProvider.create(loggerProvider).get("otel.initialization.events")
+        val logger = loggerProvider.loggerBuilder("otel.initialization.events").build()
         events.forEach { event: Event ->
-            val eventBuilder =
-                eventLogger
-                    .builder(event.name)
-                    .setTimestamp(event.timestamp)
-                    .setAttributes(event.attributes)
-            if (event.body != null) {
-                // TODO: Config is technically correct because config is the only startup event
-                // with a body, but this is ultimately clunky/fragile.
-                eventBuilder.put("config", event.body)
-            }
+            val eventBuilder: ExtendedLogRecordBuilder = logger.logRecordBuilder() as ExtendedLogRecordBuilder
+            eventBuilder
+                .setEventName(event.name)
+                .setTimestamp(event.timestamp)
+            event.attributes?.let { eventBuilder.setAllAttributes(it) }
             eventBuilder.emit()
         }
     }
 
     private fun addEvent(
         name: String,
         attr: Attributes? = null,
-        body: Value<*>? = null,
     ) {
-        events.add(Event(clock.get(), name, attr, body))
+        events.add(Event(clock.get(), name, attr))
     }
 
     private data class Event(