Skip to content
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

Jump to bottom

Mark span default as non-private #830

Merged
merged 6 commits into from
May 15, 2024
Merged

Mark span default as non-private #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f26e0d1
mark spans as non-private
nelsitoPuglisi May 9, 2024
a725904
fix test
nelsitoPuglisi May 9, 2024
f4a2b9d
span default is public
nelsitoPuglisi May 10, 2024
8ad414c
span default is public
nelsitoPuglisi May 10, 2024
8149574
fix tests
nelsitoPuglisi May 14, 2024
549b0d5
children span default is public
nelsitoPuglisi May 15, 2024
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
1 change: 0 additions & 1 deletion ...dk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/V2SessionApiTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ internal class V2SessionApiTest {
val networkStatusSpan = snapshots.single { it.name == "emb-network-status" }
assertEquals(startTime, networkStatusSpan.startTimeNanos.nanosToMillis())
assertEquals("sys.network_status", networkStatusSpan.attributes["emb.type"])
assertEquals("true", networkStatusSpan.attributes["emb.private"])

// validate session span
val sessionSpan = snapshots.single { it.name == "emb-session" }
Expand Down
1 change: 0 additions & 1 deletion ...roid-sdk/src/main/java/io/embrace/android/embracesdk/capture/crumbs/RnActionDataSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ internal open class RnActionDataSource(
startTimeMs = startTime,
endTimeMs = endTime,
type = schemaType.telemetryType,
private = false,
attributes = schemaType.attributes()
)
}
Expand Down
4 changes: 2 additions & 2 deletions ...ace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/SpanService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ internal interface SpanService : Initializable {
parent: EmbraceSpan? = null,
type: TelemetryType = EmbType.Performance.Default,
internal: Boolean = true,
private: Boolean = internal,
private: Boolean = false,
): PersistableEmbraceSpan?

/**
Expand All @@ -33,7 +33,7 @@ internal interface SpanService : Initializable {
startTimeMs: Long? = null,
type: TelemetryType = EmbType.Performance.Default,
internal: Boolean = true,
private: Boolean = internal
private: Boolean = false
): PersistableEmbraceSpan? {
createSpan(
name = name,
Expand Down
8 changes: 4 additions & 4 deletions ...oid-sdk/src/test/java/io/embrace/android/embracesdk/internal/spans/SpanServiceImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ internal class SpanServiceImplTest {
assertEquals(SpanId.getInvalid(), parentSpanId)
assertIsTypePerformance()
assertIsKeySpan()
assertIsPrivateSpan()
assertNotPrivateSpan()
}
}

Expand Down Expand Up @@ -140,7 +140,7 @@ internal class SpanServiceImplTest {
assertEquals(childSpan.spanId, spanId)
assertEquals(childSpan.traceId, traceId)
assertNotKeySpan()
assertIsPrivateSpan()
assertNotPrivateSpan()
}

with(currentSpans[1]) {
Expand All @@ -149,7 +149,7 @@ internal class SpanServiceImplTest {
assertEquals(parentSpan.spanId, spanId)
assertEquals(parentSpan.traceId, traceId)
assertIsKeySpan()
assertIsPrivateSpan()
assertNotPrivateSpan()
}
}

Expand Down Expand Up @@ -208,7 +208,7 @@ internal class SpanServiceImplTest {
assertEquals("emb-child-span", name)
assertEquals(childStartTimeMs, startTimeNanos.nanosToMillis())
assertEquals(childSpanEndTimeMs, endTimeNanos.nanosToMillis())
assertIsPrivateSpan()
assertNotPrivateSpan()
assertNotKeySpan()
assertIsType(EmbType.Ux.View)
}
Expand Down