Skip to content

Commit aaab229

Browse files
committed
Format code
1 parent fb8fd83 commit aaab229

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

sentry-opentelemetry/sentry-opentelemetry-otlp/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ dependencies {
1818
api(projects.sentry)
1919

2020
compileOnly(libs.otel)
21-
// compileOnly(libs.otel.semconv)
22-
// compileOnly(libs.otel.semconv.incubating)
21+
// compileOnly(libs.otel.semconv)
22+
// compileOnly(libs.otel.semconv.incubating)
2323

2424
compileOnly(libs.jetbrains.annotations)
2525
compileOnly(libs.nopen.annotations)
@@ -35,8 +35,8 @@ dependencies {
3535
testImplementation(libs.mockito.kotlin)
3636

3737
testImplementation(libs.otel)
38-
// testImplementation(libs.otel.semconv)
39-
// testImplementation(libs.otel.semconv.incubating)
38+
// testImplementation(libs.otel.semconv)
39+
// testImplementation(libs.otel.semconv.incubating)
4040
}
4141

4242
configure<SourceSetContainer> { test { java.srcDir("src/test/java") } }

sentry-opentelemetry/sentry-opentelemetry-otlp/src/main/java/io/sentry/opentelemetry/otlp/OpenTelemetryOtlpPropagator.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.sentry.SentryLevel;
1919
import io.sentry.SentryTraceHeader;
2020
import io.sentry.exception.InvalidSentryTraceHeaderException;
21-
2221
import java.util.Arrays;
2322
import java.util.Collection;
2423
import java.util.List;
@@ -31,7 +30,7 @@ public final class OpenTelemetryOtlpPropagator implements TextMapPropagator {
3130
Arrays.asList(SENTRY_TRACE_HEADER, BaggageHeader.BAGGAGE_HEADER);
3231

3332
public static final @NotNull ContextKey<Baggage> SENTRY_BAGGAGE_KEY =
34-
ContextKey.named("sentry.baggage");
33+
ContextKey.named("sentry.baggage");
3534
private final @NotNull IScopes scopes;
3635

3736
public OpenTelemetryOtlpPropagator() {
@@ -61,7 +60,14 @@ public <C> void inject(final Context context, final C carrier, final TextMapSett
6160
return;
6261
}
6362

64-
setter.set(carrier, SENTRY_TRACE_HEADER, otelSpanContext.getTraceId() + "-" + otelSpanContext.getSpanId() + "-" + (otelSpanContext.isSampled() ? "1" : "0"));
63+
setter.set(
64+
carrier,
65+
SENTRY_TRACE_HEADER,
66+
otelSpanContext.getTraceId()
67+
+ "-"
68+
+ otelSpanContext.getSpanId()
69+
+ "-"
70+
+ (otelSpanContext.isSampled() ? "1" : "0"));
6571

6672
final @Nullable Baggage baggage = context.get(SENTRY_BAGGAGE_KEY);
6773
if (baggage != null) {
@@ -72,8 +78,7 @@ public <C> void inject(final Context context, final C carrier, final TextMapSett
7278
@Override
7379
public <C> Context extract(
7480
final Context context, final C carrier, final TextMapGetter<C> getter) {
75-
final @Nullable String sentryTraceString =
76-
getter.get(carrier, SENTRY_TRACE_HEADER);
81+
final @Nullable String sentryTraceString = getter.get(carrier, SENTRY_TRACE_HEADER);
7782
if (sentryTraceString == null) {
7883
return context;
7984
}
@@ -95,9 +100,7 @@ public <C> Context extract(
95100
Span wrappedSpan = Span.wrap(otelSpanContext);
96101

97102
final @NotNull Context modifiedContext =
98-
context
99-
.with(wrappedSpan)
100-
.with(SENTRY_BAGGAGE_KEY, baggage);
103+
context.with(wrappedSpan).with(SENTRY_BAGGAGE_KEY, baggage);
101104

102105
scopes
103106
.getOptions()

0 commit comments

Comments
 (0)