Skip to content

Move Session Config up #959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
breedx-splk merged 2 commits into from
Apr 23, 2025
Merged

Move Session Config up #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61d9e29
Move Session Config up
mdnaushad1 Apr 21, 2025
4434678
Ran Spotless
mdnaushad1 Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.session.SessionConfig;
import io.opentelemetry.android.session.SessionManager;
import io.opentelemetry.android.session.SessionProvider;
import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator;
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/io/opentelemetry/android/config/OtelRumConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...elemetry/android/session/SessionConfig.kt → ...telemetry/android/config/SessionConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

package io.opentelemetry.android.internal.session

import io.opentelemetry.android.config.SessionConfig
import io.opentelemetry.android.internal.services.applifecycle.ApplicationStateListener
import io.opentelemetry.android.session.SessionConfig
import io.opentelemetry.sdk.common.Clock
import kotlin.time.Duration

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/opentelemetry/android/internal/session/SessionManagerImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

package io.opentelemetry.android.internal.session

import io.opentelemetry.android.config.SessionConfig
import io.opentelemetry.android.session.Session
import io.opentelemetry.android.session.SessionConfig
import io.opentelemetry.android.session.SessionIdGenerator
import io.opentelemetry.android.session.SessionManager
import io.opentelemetry.android.session.SessionObserver
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/io/opentelemetry/android/internal/session/SessionIdTimeoutHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down