Move SentrySpanClientHttpRequestInterceptor to Spring module. (#1181)

Fixes #1178.

Author: maciejwalkowiak

CHANGELOG.md

@@ -4,8 +4,9 @@
 * Enhancement: Pass request to CustomSamplingContext in Spring integration (#1172)
 * Ref: Set SpanContext on SentryTransaction to avoid potential NPE (#1173)
 * Fix: Free Local Refs manually due to Android local ref. count limits
-* Fix: Bring back support for setting transaction name without ongoing transaction (#1183)
+* Enhancement: Move `SentrySpanClientHttpRequestInterceptor` to Spring module (#1181)
 * Enhancement: Add overload for `transaction/span.finish(SpanStatus)` (#1182)
+* Fix: Bring back support for setting transaction name without ongoing transaction (#1183)
 * Enhancement: Simplify registering traces sample callback in Spring integration (#1184)
 
 # 4.0.0-alpha.3

sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentrySpanRestTemplateCustomizer.java

@@ -2,6 +2,7 @@
 
 import com.jakewharton.nopen.annotation.Open;
 import io.sentry.IHub;
+import io.sentry.spring.tracing.SentrySpanClientHttpRequestInterceptor;
 import java.util.ArrayList;
 import java.util.List;
 import org.jetbrains.annotations.NotNull;

sentry-spring/api/sentry-spring.api

@@ -76,6 +76,12 @@ public class io/sentry/spring/tracing/SentrySpanAdvice : org/aopalliance/interce
 	public fun invoke (Lorg/aopalliance/intercept/MethodInvocation;)Ljava/lang/Object;
 }
 
+public class io/sentry/spring/tracing/SentrySpanClientHttpRequestInterceptor : org/springframework/http/client/ClientHttpRequestInterceptor {
+	public fun <init> (Lio/sentry/IHub;)V
+	public fun createUriTemplateHandler (Lorg/springframework/web/util/UriTemplateHandler;)Lorg/springframework/web/util/UriTemplateHandler;
+	public fun intercept (Lorg/springframework/http/HttpRequest;[BLorg/springframework/http/client/ClientHttpRequestExecution;)Lorg/springframework/http/client/ClientHttpResponse;
+}
+
 public class io/sentry/spring/tracing/SentryTracingFilter : org/springframework/web/filter/OncePerRequestFilter {
 	public fun <init> (Lio/sentry/IHub;Lio/sentry/SentryOptions;Lio/sentry/spring/SentryRequestResolver;)V
 	protected fun doFilterInternal (Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V

sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentrySpanClientHttpRequestInterceptor.java renamed to sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanClientHttpRequestInterceptor.java

@@ -1,4 +1,4 @@
-package io.sentry.spring.boot;
+package io.sentry.spring.tracing;
 
 import com.jakewharton.nopen.annotation.Open;
 import io.sentry.IHub;
@@ -21,7 +21,7 @@
 import org.springframework.web.util.UriTemplateHandler;
 
 @Open
-class SentrySpanClientHttpRequestInterceptor implements ClientHttpRequestInterceptor {
+public class SentrySpanClientHttpRequestInterceptor implements ClientHttpRequestInterceptor {
   private static final @NotNull ThreadLocal<Deque<String>> urlTemplate =
       new UrlTemplateThreadLocal();
   private final @NotNull IHub hub;
@@ -60,7 +60,8 @@ public SentrySpanClientHttpRequestInterceptor(final @NotNull IHub hub) {
     }
   }
 
-  UriTemplateHandler createUriTemplateHandler(final @NotNull UriTemplateHandler delegate) {
+  public @NotNull UriTemplateHandler createUriTemplateHandler(
+      final @NotNull UriTemplateHandler delegate) {
     return new UriTemplateHandler() {
 
       @Override