From 61d9e299b6d004c4f61fc6dd7da36492e17b3790 Mon Sep 17 00:00:00 2001
From: Mohammed Naushad <mnaushad@catchpoint.com>
Date: Mon, 21 Apr 2025 21:24:08 +0530
Subject: [PATCH 1/2] Move Session Config up

---
 .../java/io/opentelemetry/android/OpenTelemetryRumBuilder.java  | 2 +-
 .../java/io/opentelemetry/android/config/OtelRumConfig.java     | 1 -
 .../main/java/io/opentelemetry/android/config}/SessionConfig.kt | 2 +-
 .../android/internal/session/SessionIdTimeoutHandler.kt         | 2 +-
 .../android/internal/session/SessionManagerImpl.kt              | 2 +-
 .../android/internal/session/SessionIdTimeoutHandlerTest.kt     | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename {session/src/main/kotlin/io/opentelemetry/android/session => core/src/main/java/io/opentelemetry/android/config}/SessionConfig.kt (91%)

diff --git a/core/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java b/core/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java
index 8a1f5413b..d2b397908 100644
--- a/core/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java
+++ b/core/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java
@@ -37,7 +37,7 @@
 import io.opentelemetry.android.internal.services.periodicwork.PeriodicWork;
 import io.opentelemetry.android.internal.session.SessionIdTimeoutHandler;
 import io.opentelemetry.android.internal.session.SessionManagerImpl;
-import io.opentelemetry.android.session.SessionConfig;
+import io.opentelemetry.android.config.SessionConfig;
 import io.opentelemetry.android.session.SessionManager;
 import io.opentelemetry.android.session.SessionProvider;
 import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator;
diff --git a/core/src/main/java/io/opentelemetry/android/config/OtelRumConfig.java b/core/src/main/java/io/opentelemetry/android/config/OtelRumConfig.java
index 750c4b6d9..e7ecf9d47 100644
--- a/core/src/main/java/io/opentelemetry/android/config/OtelRumConfig.java
+++ b/core/src/main/java/io/opentelemetry/android/config/OtelRumConfig.java
@@ -8,7 +8,6 @@
 import io.opentelemetry.android.ScreenAttributesSpanProcessor;
 import io.opentelemetry.android.features.diskbuffering.DiskBufferingConfig;
 import io.opentelemetry.android.internal.services.network.CurrentNetworkProvider;
-import io.opentelemetry.android.session.SessionConfig;
 import io.opentelemetry.api.common.Attributes;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/session/src/main/kotlin/io/opentelemetry/android/session/SessionConfig.kt b/core/src/main/java/io/opentelemetry/android/config/SessionConfig.kt
similarity index 91%
rename from session/src/main/kotlin/io/opentelemetry/android/session/SessionConfig.kt
rename to core/src/main/java/io/opentelemetry/android/config/SessionConfig.kt
index 263f3f8d6..e00763726 100644
--- a/session/src/main/kotlin/io/opentelemetry/android/session/SessionConfig.kt
+++ b/core/src/main/java/io/opentelemetry/android/config/SessionConfig.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.android.session
+package io.opentelemetry.android.config
 
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
diff --git a/core/src/main/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandler.kt b/core/src/main/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandler.kt
index b0e4c71af..ee002d06a 100644
--- a/core/src/main/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandler.kt
+++ b/core/src/main/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandler.kt
@@ -6,7 +6,7 @@
 package io.opentelemetry.android.internal.session
 
 import io.opentelemetry.android.internal.services.applifecycle.ApplicationStateListener
-import io.opentelemetry.android.session.SessionConfig
+import io.opentelemetry.android.config.SessionConfig
 import io.opentelemetry.sdk.common.Clock
 import kotlin.time.Duration
 
diff --git a/core/src/main/java/io/opentelemetry/android/internal/session/SessionManagerImpl.kt b/core/src/main/java/io/opentelemetry/android/internal/session/SessionManagerImpl.kt
index 68874c6d2..f2227c47d 100644
--- a/core/src/main/java/io/opentelemetry/android/internal/session/SessionManagerImpl.kt
+++ b/core/src/main/java/io/opentelemetry/android/internal/session/SessionManagerImpl.kt
@@ -6,7 +6,7 @@
 package io.opentelemetry.android.internal.session
 
 import io.opentelemetry.android.session.Session
-import io.opentelemetry.android.session.SessionConfig
+import io.opentelemetry.android.config.SessionConfig
 import io.opentelemetry.android.session.SessionIdGenerator
 import io.opentelemetry.android.session.SessionManager
 import io.opentelemetry.android.session.SessionObserver
diff --git a/core/src/test/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandlerTest.kt b/core/src/test/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandlerTest.kt
index 1598f3252..63dd59045 100644
--- a/core/src/test/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandlerTest.kt
+++ b/core/src/test/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandlerTest.kt
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.android.internal.session
 
-import io.opentelemetry.android.session.SessionConfig
+import io.opentelemetry.android.config.SessionConfig
 import io.opentelemetry.sdk.testing.time.TestClock
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue

From 44346784d4e832e82ab550e72e486d8605302ddd Mon Sep 17 00:00:00 2001
From: Mohammed Naushad <mnaushad@catchpoint.com>
Date: Mon, 21 Apr 2025 21:59:11 +0530
Subject: [PATCH 2/2] Ran Spotless

---
 .../java/io/opentelemetry/android/OpenTelemetryRumBuilder.java  | 2 +-
 .../android/internal/session/SessionIdTimeoutHandler.kt         | 2 +-
 .../android/internal/session/SessionManagerImpl.kt              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java b/core/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java
index d2b397908..6b162fb6d 100644
--- a/core/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java
+++ b/core/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java
@@ -14,6 +14,7 @@
 import androidx.annotation.VisibleForTesting;
 import io.opentelemetry.android.common.RumConstants;
 import io.opentelemetry.android.config.OtelRumConfig;
+import io.opentelemetry.android.config.SessionConfig;
 import io.opentelemetry.android.export.BufferDelegatingLogExporter;
 import io.opentelemetry.android.export.BufferDelegatingMetricExporter;
 import io.opentelemetry.android.export.BufferDelegatingSpanExporter;
@@ -37,7 +38,6 @@
 import io.opentelemetry.android.internal.services.periodicwork.PeriodicWork;
 import io.opentelemetry.android.internal.session.SessionIdTimeoutHandler;
 import io.opentelemetry.android.internal.session.SessionManagerImpl;
-import io.opentelemetry.android.config.SessionConfig;
 import io.opentelemetry.android.session.SessionManager;
 import io.opentelemetry.android.session.SessionProvider;
 import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator;
diff --git a/core/src/main/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandler.kt b/core/src/main/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandler.kt
index ee002d06a..23ffab639 100644
--- a/core/src/main/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandler.kt
+++ b/core/src/main/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandler.kt
@@ -5,8 +5,8 @@
 
 package io.opentelemetry.android.internal.session
 
-import io.opentelemetry.android.internal.services.applifecycle.ApplicationStateListener
 import io.opentelemetry.android.config.SessionConfig
+import io.opentelemetry.android.internal.services.applifecycle.ApplicationStateListener
 import io.opentelemetry.sdk.common.Clock
 import kotlin.time.Duration
 
diff --git a/core/src/main/java/io/opentelemetry/android/internal/session/SessionManagerImpl.kt b/core/src/main/java/io/opentelemetry/android/internal/session/SessionManagerImpl.kt
index f2227c47d..be880d603 100644
--- a/core/src/main/java/io/opentelemetry/android/internal/session/SessionManagerImpl.kt
+++ b/core/src/main/java/io/opentelemetry/android/internal/session/SessionManagerImpl.kt
@@ -5,8 +5,8 @@
 
 package io.opentelemetry.android.internal.session
 
-import io.opentelemetry.android.session.Session
 import io.opentelemetry.android.config.SessionConfig
+import io.opentelemetry.android.session.Session
 import io.opentelemetry.android.session.SessionIdGenerator
 import io.opentelemetry.android.session.SessionManager
 import io.opentelemetry.android.session.SessionObserver