Skip to content

Commit 75a3cf9

Browse files
fractalwrenchfractalwrench
authored
alter opentelemetry-kotlin usage for 0.3.0 (#3209)
1 parent 086bd68 commit 75a3cf9

48 files changed

Lines changed: 180 additions & 135 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎embrace-android-api/api/embrace-android-api.api‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@ public abstract interface class io/embrace/android/embracesdk/spans/EmbraceSpan
231231
public abstract fun addAttribute (Ljava/lang/String;Ljava/lang/String;)Z
232232
public abstract fun addEvent (Ljava/lang/String;Ljava/lang/Long;Ljava/util/Map;)Z
233233
public abstract fun addLink (Lio/embrace/android/embracesdk/spans/EmbraceSpan;Ljava/util/Map;)Z
234-
public abstract fun addLink (Lio/opentelemetry/kotlin/tracing/model/SpanContext;Ljava/util/Map;)Z
234+
public abstract fun addLink (Lio/opentelemetry/kotlin/tracing/SpanContext;Ljava/util/Map;)Z
235235
public abstract fun getAutoTerminationMode ()Lio/embrace/android/embracesdk/spans/AutoTerminationMode;
236236
public abstract fun getParent ()Lio/embrace/android/embracesdk/spans/EmbraceSpan;
237-
public abstract fun getSpanContext ()Lio/opentelemetry/kotlin/tracing/model/SpanContext;
237+
public abstract fun getSpanContext ()Lio/opentelemetry/kotlin/tracing/SpanContext;
238238
public abstract fun getSpanId ()Ljava/lang/String;
239239
public abstract fun getTraceId ()Ljava/lang/String;
240240
public abstract fun isRecording ()Z
@@ -248,7 +248,7 @@ public final class io/embrace/android/embracesdk/spans/EmbraceSpan$DefaultImpls
248248
public static synthetic fun addEvent$default (Lio/embrace/android/embracesdk/spans/EmbraceSpan;Ljava/lang/String;Ljava/lang/Long;Ljava/util/Map;ILjava/lang/Object;)Z
249249
public static fun addLink (Lio/embrace/android/embracesdk/spans/EmbraceSpan;Lio/embrace/android/embracesdk/spans/EmbraceSpan;Ljava/util/Map;)Z
250250
public static synthetic fun addLink$default (Lio/embrace/android/embracesdk/spans/EmbraceSpan;Lio/embrace/android/embracesdk/spans/EmbraceSpan;Ljava/util/Map;ILjava/lang/Object;)Z
251-
public static synthetic fun addLink$default (Lio/embrace/android/embracesdk/spans/EmbraceSpan;Lio/opentelemetry/kotlin/tracing/model/SpanContext;Ljava/util/Map;ILjava/lang/Object;)Z
251+
public static synthetic fun addLink$default (Lio/embrace/android/embracesdk/spans/EmbraceSpan;Lio/opentelemetry/kotlin/tracing/SpanContext;Ljava/util/Map;ILjava/lang/Object;)Z
252252
public static synthetic fun recordException$default (Lio/embrace/android/embracesdk/spans/EmbraceSpan;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)Z
253253
public static synthetic fun start$default (Lio/embrace/android/embracesdk/spans/EmbraceSpan;Ljava/lang/Long;ILjava/lang/Object;)Z
254254
public static synthetic fun stop$default (Lio/embrace/android/embracesdk/spans/EmbraceSpan;Lio/embrace/android/embracesdk/spans/ErrorCode;Ljava/lang/Long;ILjava/lang/Object;)Z

‎embrace-android-api/src/main/kotlin/io/embrace/android/embracesdk/spans/EmbraceSpan.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.embrace.android.embracesdk.spans
22

3-
import io.opentelemetry.kotlin.tracing.model.SpanContext
3+
import io.opentelemetry.kotlin.tracing.SpanContext
44

55
/**
66
* Represents a Span that can be started and stopped with the appropriate [ErrorCode] if applicable. This wraps the OpenTelemetry Span

‎embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/arch/destination/TelemetryDestinationImpl.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import io.embrace.android.embracesdk.spans.AutoTerminationMode
2424
import io.embrace.android.embracesdk.spans.EmbraceSpan
2525
import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
2626
import io.embrace.android.embracesdk.spans.ErrorCode
27-
import io.opentelemetry.kotlin.logging.model.SeverityNumber
27+
import io.opentelemetry.kotlin.logging.SeverityNumber
2828
import java.util.concurrent.TimeUnit
2929
import java.util.concurrent.atomic.AtomicInteger
3030

‎embrace-android-otel-fakes/src/main/kotlin/io/embrace/android/embracesdk/assertions/LinkAssertions.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import io.embrace.android.embracesdk.internal.arch.schema.LinkType
66
import io.embrace.android.embracesdk.internal.payload.Link
77
import io.embrace.android.embracesdk.internal.payload.Span
88
import io.opentelemetry.kotlin.semconv.SessionAttributes
9-
import io.opentelemetry.kotlin.tracing.model.SpanContext
9+
import io.opentelemetry.kotlin.tracing.SpanContext
1010
import org.junit.Assert.assertTrue
1111

1212
fun Link.validatePreviousSessionLink(

‎embrace-android-otel-fakes/src/main/kotlin/io/embrace/android/embracesdk/assertions/LogAssertions.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import io.embrace.android.embracesdk.internal.otel.sdk.findAttributeValue
99
import io.embrace.android.embracesdk.internal.payload.Log
1010
import io.embrace.android.embracesdk.internal.serialization.EmbraceSerializer
1111
import io.embrace.android.embracesdk.internal.serialization.truncatedStacktrace
12-
import io.opentelemetry.kotlin.logging.model.SeverityNumber
12+
import io.opentelemetry.kotlin.logging.SeverityNumber
1313
import io.opentelemetry.kotlin.semconv.ExceptionAttributes
1414
import io.opentelemetry.kotlin.semconv.LogAttributes
1515
import io.opentelemetry.kotlin.semconv.SessionAttributes

‎embrace-android-otel-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/FakeEmbraceSdkSpan.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import io.opentelemetry.kotlin.OpenTelemetry
2727
import io.opentelemetry.kotlin.context.Context
2828
import io.opentelemetry.kotlin.factory.toHexString
2929
import io.opentelemetry.kotlin.semconv.SessionAttributes
30-
import io.opentelemetry.kotlin.tracing.data.StatusData
31-
import io.opentelemetry.kotlin.tracing.model.Span
32-
import io.opentelemetry.kotlin.tracing.model.SpanContext
33-
import io.opentelemetry.kotlin.tracing.model.SpanKind
30+
import io.opentelemetry.kotlin.tracing.StatusData
31+
import io.opentelemetry.kotlin.tracing.Span
32+
import io.opentelemetry.kotlin.tracing.SpanContext
33+
import io.opentelemetry.kotlin.tracing.SpanKind
3434
import java.util.concurrent.ConcurrentLinkedQueue
3535
import kotlin.random.Random
3636

@@ -86,6 +86,7 @@ class FakeEmbraceSdkSpan(
8686
spanId = Random.nextBytes(8).toHexString(),
8787
traceFlags = openTelemetry.traceFlags.default,
8888
traceState = openTelemetry.traceState.default,
89+
isRemote = false,
8990
),
9091
startTimestamp = timestampMs.millisToNanos(),
9192
parent = parentContext.getEmbraceSpan(openTelemetry)?.spanContext

‎embrace-android-otel-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/FakeEventService.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import io.embrace.android.embracesdk.internal.utils.Provider
55
import io.opentelemetry.kotlin.attributes.AttributesMutator
66
import io.opentelemetry.kotlin.context.Context
77
import io.opentelemetry.kotlin.logging.Logger
8-
import io.opentelemetry.kotlin.logging.model.SeverityNumber
8+
import io.opentelemetry.kotlin.logging.SeverityNumber
99

1010
class FakeEventService : EventService {
1111
val eventData: MutableList<FakeEventData> = mutableListOf()

‎embrace-android-otel-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/FakeLogRecord.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.embrace.android.embracesdk.fakes
22

33
import io.opentelemetry.kotlin.context.Context
4-
import io.opentelemetry.kotlin.logging.model.SeverityNumber
4+
import io.opentelemetry.kotlin.logging.SeverityNumber
55

66
class FakeLogRecord(
77
val eventName: String?,

‎embrace-android-otel-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/FakeLogRecordProcessor.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class FakeLogRecordProcessor(
1515
log: ReadWriteLogRecord,
1616
context: Context,
1717
) {
18-
val body = log.body ?: ""
18+
val body = log.body?.toString() ?: ""
1919
processedLogBodies.add(body)
2020
onEmitAction(log)
2121
}

‎embrace-android-otel-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/FakeOpenTelemetryLogger.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package io.embrace.android.embracesdk.fakes
33
import io.opentelemetry.kotlin.attributes.AttributesMutator
44
import io.opentelemetry.kotlin.context.Context
55
import io.opentelemetry.kotlin.logging.Logger
6-
import io.opentelemetry.kotlin.logging.model.SeverityNumber
6+
import io.opentelemetry.kotlin.logging.SeverityNumber
77

88
class FakeOpenTelemetryLogger : Logger {
99

@@ -16,18 +16,19 @@ class FakeOpenTelemetryLogger : Logger {
1616
): Boolean = true
1717

1818
override fun emit(
19-
body: String?,
19+
body: Any?,
2020
eventName: String?,
2121
timestamp: Long?,
2222
observedTimestamp: Long?,
2323
context: Context?,
2424
severityNumber: SeverityNumber?,
2525
severityText: String?,
26+
exception: Throwable?,
2627
attributes: (AttributesMutator.() -> Unit)?,
2728
) {
2829
processTelemetry(
2930
eventName = eventName,
30-
body = body,
31+
body = body?.toString(),
3132
timestamp = timestamp,
3233
observedTimestamp = observedTimestamp,
3334
context = context,

0 commit comments

Comments
 (0)