-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #542 from embrace-io/span-population
Populate spans in new payload
- Loading branch information
Showing
6 changed files
with
76 additions
and
31 deletions.
There are no files selected for viewing
30 changes: 24 additions & 6 deletions
30
...n/java/io/embrace/android/embracesdk/capture/envelope/session/SessionPayloadSourceImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,38 @@ | ||
| package io.embrace.android.embracesdk.capture.envelope.session | ||
|
|
||
| import io.embrace.android.embracesdk.anr.ndk.NativeThreadSamplerService | ||
| import io.embrace.android.embracesdk.arch.schema.AppTerminationCause | ||
| import io.embrace.android.embracesdk.internal.payload.SessionPayload | ||
| import io.embrace.android.embracesdk.internal.payload.Span | ||
| import io.embrace.android.embracesdk.internal.payload.toNewPayload | ||
| import io.embrace.android.embracesdk.internal.spans.CurrentSessionSpan | ||
| import io.embrace.android.embracesdk.internal.spans.EmbraceSpanData | ||
| import io.embrace.android.embracesdk.internal.spans.SpanSink | ||
| import io.embrace.android.embracesdk.logging.InternalErrorService | ||
| import io.embrace.android.embracesdk.session.captureDataSafely | ||
| import io.embrace.android.embracesdk.session.orchestrator.SessionSnapshotType | ||
|
|
||
| internal class SessionPayloadSourceImpl( | ||
| private val internalErrorService: InternalErrorService, | ||
| private val nativeThreadSamplerService: NativeThreadSamplerService?, | ||
| private val spanSink: SpanSink, | ||
| private val currentSessionSpan: CurrentSessionSpan | ||
| ) : SessionPayloadSource { | ||
|
|
||
| override fun getSessionPayload(endType: SessionSnapshotType) = SessionPayload( | ||
| spans = null, | ||
| spanSnapshots = null, | ||
| internalError = captureDataSafely { internalErrorService.currentExceptionError?.toNewPayload() }, | ||
| sharedLibSymbolMapping = captureDataSafely { nativeThreadSamplerService?.getNativeSymbols() } | ||
| ) | ||
| override fun getSessionPayload(endType: SessionSnapshotType): SessionPayload { | ||
| return SessionPayload( | ||
| spans = retrieveSpanData(endType), | ||
| spanSnapshots = null, | ||
| internalError = captureDataSafely { internalErrorService.currentExceptionError?.toNewPayload() }, | ||
| sharedLibSymbolMapping = captureDataSafely { nativeThreadSamplerService?.getNativeSymbols() } | ||
| ) | ||
| } | ||
|
|
||
| private fun retrieveSpanData(endType: SessionSnapshotType): List<Span>? = captureDataSafely { | ||
| when (endType) { | ||
| SessionSnapshotType.NORMAL_END -> currentSessionSpan.endSession(null) | ||
| SessionSnapshotType.PERIODIC_CACHE -> spanSink.completedSpans() | ||
| SessionSnapshotType.JVM_CRASH -> currentSessionSpan.endSession(AppTerminationCause.Crash) | ||
| }.map(EmbraceSpanData::toNewPayload) | ||
| } | ||
| } |
23 changes: 11 additions & 12 deletions
23
...ce-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/payload/SpanMapper.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,31 @@ | ||
| package io.embrace.android.embracesdk.internal.payload | ||
|
|
||
| import io.opentelemetry.api.common.Attributes | ||
| import io.embrace.android.embracesdk.internal.spans.EmbraceSpanData | ||
| import io.embrace.android.embracesdk.spans.EmbraceSpanEvent | ||
| import io.opentelemetry.api.trace.StatusCode | ||
| import io.opentelemetry.sdk.trace.data.EventData | ||
| import io.opentelemetry.sdk.trace.data.SpanData | ||
|
|
||
| internal fun SpanData.toNewPayload() = Span( | ||
| internal fun EmbraceSpanData.toNewPayload() = Span( | ||
| traceId = traceId, | ||
| spanId = spanId, | ||
| parentSpanId = parentSpanId, | ||
| name = name, | ||
| startTimeUnixNano = startEpochNanos, | ||
| endTimeUnixNano = endEpochNanos, | ||
| status = when (status.statusCode) { | ||
| startTimeUnixNano = startTimeNanos, | ||
| endTimeUnixNano = endTimeNanos, | ||
| status = when (status) { | ||
| StatusCode.UNSET -> Span.Status.UNSET | ||
| StatusCode.OK -> Span.Status.OK | ||
| StatusCode.ERROR -> Span.Status.ERROR | ||
| else -> Span.Status.UNSET | ||
| }, | ||
| events = events.map(EventData::toNewPayload), | ||
| events = events.map(EmbraceSpanEvent::toNewPayload), | ||
| attributes = attributes.toNewPayload() | ||
| ) | ||
|
|
||
| internal fun EventData.toNewPayload() = SpanEvent( | ||
| internal fun EmbraceSpanEvent.toNewPayload() = SpanEvent( | ||
| name = name, | ||
| timeUnixNano = epochNanos, | ||
| timeUnixNano = timestampNanos, | ||
| attributes = attributes.toNewPayload() | ||
| ) | ||
|
|
||
| internal fun Attributes.toNewPayload(): List<Attribute> = | ||
| asMap().map { (key, value) -> Attribute(key.key, value.toString()) } | ||
| internal fun Map<String, String>.toNewPayload(): List<Attribute> = | ||
| map { (key, value) -> Attribute(key, value) } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 10 additions & 10 deletions
20
...ndroid-sdk/src/test/java/io/embrace/android/embracesdk/internal/payload/SpanMapperTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,41 @@ | ||
| package io.embrace.android.embracesdk.internal.payload | ||
|
|
||
| import io.embrace.android.embracesdk.fakes.FakeSpanData | ||
| import io.opentelemetry.sdk.trace.data.SpanData | ||
| import io.embrace.android.embracesdk.internal.spans.EmbraceSpanData | ||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Test | ||
|
|
||
| internal class SpanMapperTest { | ||
|
|
||
| @Test | ||
| fun toSpan() { | ||
| val input: SpanData = FakeSpanData() | ||
| val input = EmbraceSpanData(FakeSpanData()) | ||
| val output = input.toNewPayload() | ||
|
|
||
| assertEquals(input.traceId, output.traceId) | ||
| assertEquals(input.spanId, output.spanId) | ||
| assertEquals(input.parentSpanId, output.parentSpanId) | ||
| assertEquals(input.name, output.name) | ||
| assertEquals(input.startEpochNanos, output.startTimeUnixNano) | ||
| assertEquals(input.endEpochNanos, output.endTimeUnixNano) | ||
| assertEquals(input.status.statusCode.name, checkNotNull(output.status).name) | ||
| assertEquals(input.startTimeNanos, output.startTimeUnixNano) | ||
| assertEquals(input.endTimeNanos, output.endTimeUnixNano) | ||
| assertEquals(input.status.name, checkNotNull(output.status).name) | ||
|
|
||
| // validate event copied | ||
| val inputEvent = input.events.single() | ||
| val outputEvent = checkNotNull(output.events).single() | ||
| assertEquals(inputEvent.name, outputEvent.name) | ||
| assertEquals(inputEvent.epochNanos, outputEvent.timeUnixNano) | ||
| assertEquals(inputEvent.timestampNanos, outputEvent.timeUnixNano) | ||
|
|
||
| // test event attributes | ||
| val inputEventAttrs = checkNotNull(inputEvent.attributes?.asMap()) | ||
| val inputEventAttrs = checkNotNull(inputEvent.attributes) | ||
| val outputEventAttrs = checkNotNull(outputEvent.attributes?.single()) | ||
| assertEquals(inputEventAttrs.keys.single().key, outputEventAttrs.key) | ||
| assertEquals(inputEventAttrs.keys.single(), outputEventAttrs.key) | ||
| assertEquals(inputEventAttrs.values.single(), outputEventAttrs.data) | ||
|
|
||
| // test attributes | ||
| val inputAttrs = checkNotNull(input.attributes?.asMap()) | ||
| val inputAttrs = checkNotNull(input.attributes) | ||
| val outputAttrs = checkNotNull(output.attributes?.single()) | ||
| assertEquals(inputAttrs.keys.single().key, outputAttrs.key) | ||
| assertEquals(inputAttrs.keys.single(), outputAttrs.key) | ||
| assertEquals(inputAttrs.values.single(), outputAttrs.data) | ||
| } | ||
| } |