Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 3 additions & 7 deletions android-agent/api/android-agent.api
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
public abstract interface annotation class io/opentelemetry/android/Incubating : java/lang/annotation/Annotation {
}

public final class io/opentelemetry/android/agent/OpenTelemetryRumInitializer {
public static final field INSTANCE Lio/opentelemetry/android/agent/OpenTelemetryRumInitializer;
public static final fun initialize (Landroid/app/Application;Ljava/lang/String;Ljava/util/Map;Lio/opentelemetry/android/agent/connectivity/EndpointConnectivity;Lio/opentelemetry/android/agent/connectivity/EndpointConnectivity;Lio/opentelemetry/android/agent/connectivity/EndpointConnectivity;Lio/opentelemetry/android/config/OtelRumConfig;Lio/opentelemetry/android/agent/session/SessionConfig;Lkotlin/jvm/functions/Function1;)Lio/opentelemetry/android/OpenTelemetryRum;
Expand Down Expand Up @@ -65,15 +68,8 @@ public final class io/opentelemetry/android/agent/session/SessionConfig {
public static final field Companion Lio/opentelemetry/android/agent/session/SessionConfig$Companion;
public synthetic fun <init> (JJILkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (JJLkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1-UwyO8pc ()J
public final fun component2-UwyO8pc ()J
public final fun copy-QTBD994 (JJ)Lio/opentelemetry/android/agent/session/SessionConfig;
public static synthetic fun copy-QTBD994$default (Lio/opentelemetry/android/agent/session/SessionConfig;JJILjava/lang/Object;)Lio/opentelemetry/android/agent/session/SessionConfig;
public fun equals (Ljava/lang/Object;)Z
public final fun getBackgroundInactivityTimeout-UwyO8pc ()J
public final fun getMaxLifetime-UwyO8pc ()J
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
public static final fun withDefaults ()Lio/opentelemetry/android/agent/session/SessionConfig;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.android

/**
* Marks an API as incubating. Incubating APIs can be subject to breaking change without warning
* between versions, and require an opt-in annotation to prevent compiler warnings.
*
* This annotation is intended for use on opentelemetry-android's API only and should not be used
* by library consumers on their own code.
*/
@RequiresOptIn(level = RequiresOptIn.Level.WARNING)
@Retention(AnnotationRetention.BINARY)
@Target(
AnnotationTarget.CLASS,
AnnotationTarget.FUNCTION,
AnnotationTarget.PROPERTY,
AnnotationTarget.TYPEALIAS,
)
annotation class Incubating
Comment thread
breedx-splk marked this conversation as resolved.
Comment thread
LikeTheSalad marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package io.opentelemetry.android.agent

import android.app.Application
import io.opentelemetry.android.Incubating
import io.opentelemetry.android.OpenTelemetryRum
import io.opentelemetry.android.OpenTelemetryRumBuilder
import io.opentelemetry.android.agent.connectivity.EndpointConnectivity
Expand Down Expand Up @@ -35,6 +36,7 @@ import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter
import kotlin.time.Duration
import kotlin.time.toJavaDuration

@OptIn(Incubating::class)
object OpenTelemetryRumInitializer {
/**
* Opinionated [OpenTelemetryRum] initialization.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@

package io.opentelemetry.android.agent.session

import io.opentelemetry.android.Incubating
import kotlin.time.Duration
import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.minutes

data class SessionConfig(
@Incubating
class SessionConfig(
val backgroundInactivityTimeout: Duration = 15.minutes,
val maxLifetime: Duration = 4.hours,
) {
Expand Down