From a8fd0eacd2fb30495e7bb5653261ccb80bc4ac5b Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Fri, 22 Jan 2021 09:48:06 +0100 Subject: [PATCH] Remove `IHub#getSpanContext` from public API. --- sentry/api/sentry.api | 4 +--- sentry/src/main/java/io/sentry/Hub.java | 6 +++--- sentry/src/main/java/io/sentry/HubAdapter.java | 5 ----- sentry/src/main/java/io/sentry/IHub.java | 11 ----------- sentry/src/main/java/io/sentry/NoOpHub.java | 5 ----- sentry/src/test/java/io/sentry/HubTest.kt | 4 ++-- sentry/src/test/java/io/sentry/NoOpHubTest.kt | 5 ----- 7 files changed, 6 insertions(+), 34 deletions(-) diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api index 89a87f360a4..a55bce99b91 100644 --- a/sentry/api/sentry.api +++ b/sentry/api/sentry.api @@ -118,7 +118,6 @@ public final class io/sentry/Hub : io/sentry/IHub { public fun getLastEventId ()Lio/sentry/protocol/SentryId; public fun getOptions ()Lio/sentry/SentryOptions; public fun getSpan ()Lio/sentry/ISpan; - public fun getSpanContext (Ljava/lang/Throwable;)Lio/sentry/SpanContext; public fun isEnabled ()Z public fun popScope ()V public fun pushScope ()V @@ -158,7 +157,6 @@ public final class io/sentry/HubAdapter : io/sentry/IHub { public fun getLastEventId ()Lio/sentry/protocol/SentryId; public fun getOptions ()Lio/sentry/SentryOptions; public fun getSpan ()Lio/sentry/ISpan; - public fun getSpanContext (Ljava/lang/Throwable;)Lio/sentry/SpanContext; public fun isEnabled ()Z public fun popScope ()V public fun pushScope ()V @@ -213,7 +211,6 @@ public abstract interface class io/sentry/IHub { public abstract fun getLastEventId ()Lio/sentry/protocol/SentryId; public abstract fun getOptions ()Lio/sentry/SentryOptions; public abstract fun getSpan ()Lio/sentry/ISpan; - public abstract fun getSpanContext (Ljava/lang/Throwable;)Lio/sentry/SpanContext; public abstract fun isEnabled ()Z public abstract fun popScope ()V public abstract fun pushScope ()V @@ -515,6 +512,7 @@ public final class io/sentry/Sentry { public static fun init (Lio/sentry/Sentry$OptionsConfiguration;)V public static fun init (Lio/sentry/Sentry$OptionsConfiguration;Z)V public static fun init (Lio/sentry/SentryOptions;)V + public static fun init (Ljava/lang/String;)V public static fun isEnabled ()Z public static fun popScope ()V public static fun pushScope ()V diff --git a/sentry/src/main/java/io/sentry/Hub.java b/sentry/src/main/java/io/sentry/Hub.java index e8ba3f1fb25..5ac706aedbc 100644 --- a/sentry/src/main/java/io/sentry/Hub.java +++ b/sentry/src/main/java/io/sentry/Hub.java @@ -171,7 +171,7 @@ public SentryId captureEnvelope( private void assignTraceContext(final @NotNull SentryEvent event) { if (event.getThrowable() != null) { final ISpan span = throwableToSpan.get(event.getThrowable()); - if (span != null && span.getSpanContext() != null) { + if (span != null) { if (event.getContexts().getTrace() == null) { event.getContexts().setTrace(span.getSpanContext()); } @@ -627,8 +627,8 @@ public void setSpanContext(final @NotNull Throwable throwable, final @NotNull IS this.throwableToSpan.put(throwable, span); } - @Override - public @Nullable SpanContext getSpanContext(final @NotNull Throwable throwable) { + @Nullable + SpanContext getSpanContext(final @NotNull Throwable throwable) { Objects.requireNonNull(throwable, "throwable is required"); final ISpan span = this.throwableToSpan.get(throwable); if (span != null) { diff --git a/sentry/src/main/java/io/sentry/HubAdapter.java b/sentry/src/main/java/io/sentry/HubAdapter.java index bcf6a29059d..9e8a3a49f53 100644 --- a/sentry/src/main/java/io/sentry/HubAdapter.java +++ b/sentry/src/main/java/io/sentry/HubAdapter.java @@ -185,11 +185,6 @@ public void setSpanContext(final @NotNull Throwable t, final @NotNull ISpan sc) Sentry.getCurrentHub().setSpanContext(t, sc); } - @Override - public @Nullable SpanContext getSpanContext(final @NotNull Throwable ex) { - return Sentry.getCurrentHub().getSpanContext(ex); - } - @Override public @Nullable ISpan getSpan() { return Sentry.getCurrentHub().getSpan(); diff --git a/sentry/src/main/java/io/sentry/IHub.java b/sentry/src/main/java/io/sentry/IHub.java index 6d3f6733786..9f26ad1e718 100644 --- a/sentry/src/main/java/io/sentry/IHub.java +++ b/sentry/src/main/java/io/sentry/IHub.java @@ -343,17 +343,6 @@ ITransaction startTransaction( @ApiStatus.Internal void setSpanContext(@NotNull Throwable throwable, @NotNull ISpan span); - /** - * Gets the span context for the span that was active while the throwable given by parameter was - * thrown. - * - * @param throwable - the throwable - * @return span context or {@code null} if no corresponding span context found. - */ - @ApiStatus.Internal - @Nullable - SpanContext getSpanContext(Throwable throwable); - /** * Gets the current active transaction or span. * diff --git a/sentry/src/main/java/io/sentry/NoOpHub.java b/sentry/src/main/java/io/sentry/NoOpHub.java index 06452450e95..46576b81d9b 100644 --- a/sentry/src/main/java/io/sentry/NoOpHub.java +++ b/sentry/src/main/java/io/sentry/NoOpHub.java @@ -137,11 +137,6 @@ public SentryId captureTransaction( public void setSpanContext( final @NotNull Throwable throwable, final @NotNull ISpan spanContext) {} - @Override - public @Nullable SpanContext getSpanContext(final @NotNull Throwable throwable) { - return null; - } - @Override public @Nullable ISpan getSpan() { return null; diff --git a/sentry/src/test/java/io/sentry/HubTest.kt b/sentry/src/test/java/io/sentry/HubTest.kt index 0c2c71fd371..3d9e8c4f43c 100644 --- a/sentry/src/test/java/io/sentry/HubTest.kt +++ b/sentry/src/test/java/io/sentry/HubTest.kt @@ -1144,7 +1144,7 @@ class HubTest { //region setSpanContext @Test fun `associates span context with throwable`() { - val hub = generateHub() + val hub = generateHub() as Hub val transaction = hub.startTransaction("aTransaction") val span = transaction.startChild("op") val exception = RuntimeException() @@ -1154,7 +1154,7 @@ class HubTest { @Test fun `returns null when no span context associated with throwable`() { - val hub = generateHub() + val hub = generateHub() as Hub assertNull(hub.getSpanContext(RuntimeException())) } // endregion diff --git a/sentry/src/test/java/io/sentry/NoOpHubTest.kt b/sentry/src/test/java/io/sentry/NoOpHubTest.kt index 452c5c119a4..8b34e00d76d 100644 --- a/sentry/src/test/java/io/sentry/NoOpHubTest.kt +++ b/sentry/src/test/java/io/sentry/NoOpHubTest.kt @@ -84,11 +84,6 @@ class NoOpHubTest { assertNull(sut.span) } - @Test - fun `getSpanContext returns null`() { - assertNull(sut.getSpanContext(RuntimeException())) - } - @Test fun `setSpanContext doesnt throw`() = sut.setSpanContext(RuntimeException(), mock()) }