Merge ba9af62 into cfc5405

getsentry · Sep 30, 2024 · 24c454d · 24c454d
2 parents cfc5405 + ba9af62
commit 24c454d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/sentry-spring-boot-jakarta/api/sentry-spring-boot-jakarta.api b/sentry-spring-boot-jakarta/api/sentry-spring-boot-jakarta.api
@@ -18,6 +18,12 @@ public class io/sentry/spring/boot/jakarta/SentryLogbackAppenderAutoConfiguratio
 	public fun sentryLogbackInitializer (Lio/sentry/spring/boot/jakarta/SentryProperties;)Lio/sentry/spring/boot/jakarta/SentryLogbackInitializer;
 }
 
+public class io/sentry/spring/boot/jakarta/SentryLogbackInitializer : org/springframework/context/event/GenericApplicationListener {
+	public fun <init> (Lio/sentry/spring/boot/jakarta/SentryProperties;)V
+	public fun onApplicationEvent (Lorg/springframework/context/ApplicationEvent;)V
+	public fun supportsEventType (Lorg/springframework/core/ResolvableType;)Z
+}
+
 public class io/sentry/spring/boot/jakarta/SentryProperties : io/sentry/SentryOptions {
 	public fun <init> ()V
 	public fun getExceptionResolverOrder ()I

diff --git a/sentry-spring-boot/api/sentry-spring-boot.api b/sentry-spring-boot/api/sentry-spring-boot.api
@@ -18,6 +18,12 @@ public class io/sentry/spring/boot/SentryLogbackAppenderAutoConfiguration {
 	public fun sentryLogbackInitializer (Lio/sentry/spring/boot/SentryProperties;)Lio/sentry/spring/boot/SentryLogbackInitializer;
 }
 
+public class io/sentry/spring/boot/SentryLogbackInitializer : org/springframework/context/event/GenericApplicationListener {
+	public fun <init> (Lio/sentry/spring/boot/SentryProperties;)V
+	public fun onApplicationEvent (Lorg/springframework/context/ApplicationEvent;)V
+	public fun supportsEventType (Lorg/springframework/core/ResolvableType;)Z
+}
+
 public class io/sentry/spring/boot/SentryProperties : io/sentry/SentryOptions {
 	public fun <init> ()V
 	public fun getExceptionResolverOrder ()I

diff --git a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/SentrySpringFilter.java b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/SentrySpringFilter.java
@@ -134,12 +134,17 @@ private boolean qualifiesForCaching(
     return maxRequestBodySize != RequestSize.NONE
         && contentLength != -1
         && contentType != null
-        && MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_JSON)
+        && shouldCacheMimeType(contentType)
         && ((maxRequestBodySize == SMALL && contentLength < 1000)
             || (maxRequestBodySize == MEDIUM && contentLength < 10000)
             || maxRequestBodySize == ALWAYS);
   }
 
+  private static boolean shouldCacheMimeType(String contentType) {
+    return MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_JSON)
+        || MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_FORM_URLENCODED);
+  }
+
   static final class RequestBodyExtractingEventProcessor implements EventProcessor {
     private final @NotNull RequestPayloadExtractor requestPayloadExtractor =
         new RequestPayloadExtractor();

diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentrySpringFilter.java b/sentry-spring/src/main/java/io/sentry/spring/SentrySpringFilter.java
@@ -134,12 +134,17 @@ private boolean qualifiesForCaching(
     return maxRequestBodySize != RequestSize.NONE
         && contentLength != -1
         && contentType != null
-        && MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_JSON)
+        && shouldCacheMimeType(contentType)
         && ((maxRequestBodySize == SMALL && contentLength < 1000)
             || (maxRequestBodySize == MEDIUM && contentLength < 10000)
             || maxRequestBodySize == ALWAYS);
   }
 
+  private static boolean shouldCacheMimeType(String contentType) {
+    return MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_JSON)
+        || MimeType.valueOf(contentType).isCompatibleWith(MediaType.APPLICATION_FORM_URLENCODED);
+  }
+
   static final class RequestBodyExtractingEventProcessor implements EventProcessor {
     private final @NotNull RequestPayloadExtractor requestPayloadExtractor =
         new RequestPayloadExtractor();