fix stack overflow and tests

open-telemetry · Dec 5, 2024 · cc7fd0d · cc7fd0d
1 parent fe54ff2
commit cc7fd0d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/core/src/main/java/io/opentelemetry/android/session/SessionManager.kt b/core/src/main/java/io/opentelemetry/android/session/SessionManager.kt
@@ -50,11 +50,12 @@ internal class SessionManager(
         // observers need to be called after bumping the timer because it may
         // create a new span
         if (newSession != session) {
+            val oldSession = session
+            session = newSession
             observers.forEach {
-                it.onSessionEnded(session)
-                it.onSessionStarted(newSession, session)
+                it.onSessionEnded(oldSession)
+                it.onSessionStarted(session, oldSession)
             }
-            session = newSession
         }
         return session.getId()
     }

diff --git a/core/src/test/java/io/opentelemetry/android/OpenTelemetryRumBuilderTest.java b/core/src/test/java/io/opentelemetry/android/OpenTelemetryRumBuilderTest.java
@@ -175,7 +175,9 @@ public void shouldBuildLogRecordProvider() {
         List<LogRecordData> logs = logsExporter.getFinishedLogRecordItems();
         assertThat(logs).hasSize(2);
         assertThat(logs.get(0))
-                .hasAttributesSatisfyingExactly(equalTo(stringKey("event.name"), "session.start"));
+                .hasAttributesSatisfyingExactly(
+                        equalTo(SESSION_ID, openTelemetryRum.getRumSessionId()),
+                        equalTo(stringKey("event.name"), "session.start"));
         assertThat(logs.get(1))
                 .hasAttributesSatisfyingExactly(
                         equalTo(SESSION_ID, openTelemetryRum.getRumSessionId()),
@@ -323,7 +325,9 @@ public void setLogRecordExporterCustomizer() {
         assertThat(logs).hasSize(2);
         Iterator<LogRecordData> iter = logs.iterator();
         assertThat(iter.next())
-                .hasAttributesSatisfyingExactly(equalTo(stringKey("event.name"), "session.start"));
+                .hasAttributesSatisfyingExactly(
+                        equalTo(SESSION_ID, rum.getRumSessionId()),
+                        equalTo(stringKey("event.name"), "session.start"));
         assertThat(iter.next())
                 .hasBody("foo")
                 .hasAttributesSatisfyingExactly(