Skip to content

Commit 719dfa2

Browse files
committed
fix OtelSentrySpanProcessorTest, rename superSampled to isSuperSampled
1 parent 24304f6 commit 719dfa2

2 files changed

Lines changed: 4 additions & 33 deletions

File tree

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSpanContext.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ public void setOperation(@NotNull String operation) {
116116

117117
@Override
118118
public @Nullable Boolean getSampled() {
119-
Boolean superSampled = super.getSampled();
120-
if (superSampled != null) {
121-
return superSampled;
119+
Boolean isSuperSampled = super.getSampled();
120+
if (isSuperSampled != null) {
121+
return isSuperSampled;
122122
}
123123
final @Nullable ReadWriteSpan otelSpan = span.get();
124124
if (otelSpan != null) {

sentry-opentelemetry/sentry-opentelemetry-core/src/test/kotlin/OtelSentrySpanProcessorTest.kt

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class OtelSentrySpanProcessorTest {
5252

5353
val options = SentryOptions().also {
5454
it.dsn = "https://key@sentry.io/proj"
55-
it.ignoredSpanOrigins = SpanUtils.ignoredSpanOriginsForOpenTelemetry()
55+
it.ignoredSpanOrigins = SpanUtils.ignoredSpanOriginsForOpenTelemetry(false)
5656
it.spanFactory = OtelSpanFactory()
5757
it.sampleRate = 1.0
5858
it.tracesSampleRate = 1.0
@@ -292,35 +292,6 @@ class OtelSentrySpanProcessorTest {
292292
thenSpanIsFinished(otelSpan)
293293
}
294294

295-
// TODO [POTEL]
296-
@Test
297-
@Ignore
298-
fun `links error to OTEL transaction`() {
299-
fixture.setup()
300-
val extractedContext = whenExtractingHeaders()
301-
302-
extractedContext.makeCurrent().use { _ ->
303-
val otelSpan = givenSpanBuilder().startSpan()
304-
thenSentrySpanIsCreated(otelSpan, isContinued = true)
305-
306-
otelSpan.makeCurrent().use { _ ->
307-
val processedEvent = OpenTelemetryLinkErrorEventProcessor(fixture.scopes).process(
308-
SentryEvent(),
309-
Hint()
310-
)
311-
val traceContext = processedEvent!!.contexts.trace!!
312-
313-
assertEquals(SENTRY_TRACE_ID, traceContext.traceId.toString())
314-
assertEquals(otelSpan.spanContext.spanId, traceContext.spanId.toString())
315-
assertEquals("cedf5b7571cb4972", traceContext.parentSpanId.toString())
316-
assertEquals("spanContextOp", traceContext.operation)
317-
}
318-
319-
otelSpan.end()
320-
// thenTransactionIsFinished()
321-
}
322-
}
323-
324295
private fun givenSpanBuilder(spanKind: SpanKind = SpanKind.SERVER, parentSpan: Span? = null): SpanBuilder {
325296
val spanName = if (parentSpan == null) "testspan" else "childspan"
326297
val spanBuilder = fixture.tracer

0 commit comments

Comments
 (0)