From 96979e1e2730fb3613b56f627e0fa1d0a605a2f6 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 10 Dec 2020 11:18:12 +0100 Subject: [PATCH] Fixed broken compilation --- .../java/org/springframework/cloud/sleuth/TraceContext.java | 3 ++- .../cloud/sleuth/brave/bridge/BraveTraceContext.java | 5 ----- .../cloud/sleuth/otel/bridge/OtelTraceContext.java | 5 ----- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/spring-cloud-sleuth-api/src/main/java/org/springframework/cloud/sleuth/TraceContext.java b/spring-cloud-sleuth-api/src/main/java/org/springframework/cloud/sleuth/TraceContext.java index d34792f41..65157b0df 100644 --- a/spring-cloud-sleuth-api/src/main/java/org/springframework/cloud/sleuth/TraceContext.java +++ b/spring-cloud-sleuth-api/src/main/java/org/springframework/cloud/sleuth/TraceContext.java @@ -46,7 +46,8 @@ public interface TraceContext { String spanId(); /** - * @return {@code true} when sampled, {@code false} when not sampled and {@code null} when sampling decision should be deferred + * @return {@code true} when sampled, {@code false} when not sampled and {@code null} + * when sampling decision should be deferred */ Boolean sampled(); diff --git a/spring-cloud-sleuth-brave/src/main/java/org/springframework/cloud/sleuth/brave/bridge/BraveTraceContext.java b/spring-cloud-sleuth-brave/src/main/java/org/springframework/cloud/sleuth/brave/bridge/BraveTraceContext.java index a73f5f907..9684cef4a 100644 --- a/spring-cloud-sleuth-brave/src/main/java/org/springframework/cloud/sleuth/brave/bridge/BraveTraceContext.java +++ b/spring-cloud-sleuth-brave/src/main/java/org/springframework/cloud/sleuth/brave/bridge/BraveTraceContext.java @@ -61,11 +61,6 @@ class BraveTraceContext implements TraceContext { return this.traceContext != null ? this.traceContext.toString() : "null"; } - @Nullable - public Boolean sampled() { - return this.traceContext.sampled(); - } - static brave.propagation.TraceContext toBrave(TraceContext traceContext) { if (traceContext == null) { return null; diff --git a/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelTraceContext.java b/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelTraceContext.java index 1a6baa013..5eb998b5c 100644 --- a/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelTraceContext.java +++ b/spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelTraceContext.java @@ -109,11 +109,6 @@ class OtelTraceContext implements TraceContext { return this.delegate != null ? this.delegate.toString() : "null"; } - @Nullable - public Boolean sampled() { - return this.delegate.isSampled(); - } - Span span() { return this.span; }