Merge branch 'main' into rz/fix/external-files-dir-optin

romtsn · romtsn · commit b0508a0232cb · 2025-12-16T22:56:58.000+01:00
diff --git a/.github/workflows/agp-matrix.yml b/.github/workflows/agp-matrix.yml
@@ -94,7 +94,7 @@ jobs:
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: test-results-AGP${{ matrix.agp }}-Integrations${{ matrix.integrations }}
           path: |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -53,7 +53,7 @@ jobs:
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: test-results-build
           path: |
diff --git a/.github/workflows/integration-tests-ui-critical.yml b/.github/workflows/integration-tests-ui-critical.yml
@@ -44,7 +44,7 @@ jobs:
         run: make assembleUiTestCriticalRelease
 
       - name: Upload APK artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: ${{env.APK_ARTIFACT_NAME}}
           path: "${{env.BASE_PATH}}/${{env.BUILD_PATH}}/${{env.APK_NAME}}"
@@ -110,7 +110,7 @@ jobs:
           script: echo "Generated AVD snapshot for caching."
 
       - name: Download APK artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: ${{env.APK_ARTIFACT_NAME}}
 
@@ -137,7 +137,7 @@ jobs:
 
       - name: Upload Maestro test results
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: maestro-logs
           path: "${{env.BASE_PATH}}/maestro-logs"
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -32,7 +32,7 @@ jobs:
         run: make publish
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ github.sha }}
           if-no-files-found: error
diff --git a/.github/workflows/spring-boot-2-matrix.yml b/.github/workflows/spring-boot-2-matrix.yml
@@ -150,7 +150,7 @@ jobs:
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: test-results-springboot-2-${{ matrix.springboot-version }}
           path: |
diff --git a/.github/workflows/spring-boot-3-matrix.yml b/.github/workflows/spring-boot-3-matrix.yml
@@ -150,7 +150,7 @@ jobs:
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: test-results-springboot-3-${{ matrix.springboot-version }}
           path: |
diff --git a/.github/workflows/spring-boot-4-matrix.yml b/.github/workflows/spring-boot-4-matrix.yml
@@ -151,7 +151,7 @@ jobs:
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: test-results-springboot-4-${{ matrix.springboot-version }}
           path: |
diff --git a/.github/workflows/system-tests-backend.yml b/.github/workflows/system-tests-backend.yml
@@ -147,7 +147,7 @@ jobs:
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: test-results-${{ matrix.sample }}-${{ matrix.agent }}-${{ matrix.agent-auto-init }}-system-test
           path: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,17 @@
 
 ## Unreleased
 
+### Improvements
+
+- Discard envelopes on `4xx` and `5xx` response ([#4950](https://github.com/getsentry/sentry-java/pull/4950))
+  - This aims to not overwhelm Sentry after an outage or load shedding (including HTTP 429) where too many events are sent at once
+
+
+## 8.29.0
+
 ### Fixes
 
+- Support serialization of primitive arrays (boolean[], byte[], short[], char[], int[], long[], float[], double[]) ([#4968](https://github.com/getsentry/sentry-java/pull/4968))
 - Session Replay: Improve network body parsing and truncation handling ([#4958](https://github.com/getsentry/sentry-java/pull/4958))
 
 ### Internal
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 android.useAndroidX=true
 
 # Release information
-versionName=8.28.0
+versionName=8.29.0
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android
diff --git a/sentry/src/main/java/io/sentry/JsonObjectSerializer.java b/sentry/src/main/java/io/sentry/JsonObjectSerializer.java
@@ -6,11 +6,13 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Currency;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
@@ -53,6 +55,54 @@ public void serialize(
       ((JsonSerializable) object).serialize(writer, logger);
     } else if (object instanceof Collection) {
       serializeCollection(writer, logger, (Collection<?>) object);
+    } else if (object instanceof boolean[]) {
+      final List<Boolean> bools = new ArrayList<>(((boolean[]) object).length);
+      for (boolean b : ((boolean[]) object)) {
+        bools.add(b);
+      }
+      serializeCollection(writer, logger, bools);
+    } else if (object instanceof byte[]) {
+      final List<Byte> bytes = new ArrayList<>(((byte[]) object).length);
+      for (byte b : ((byte[]) object)) {
+        bytes.add(b);
+      }
+      serializeCollection(writer, logger, bytes);
+    } else if (object instanceof short[]) {
+      final List<Short> shorts = new ArrayList<>(((short[]) object).length);
+      for (short s : ((short[]) object)) {
+        shorts.add(s);
+      }
+      serializeCollection(writer, logger, shorts);
+    } else if (object instanceof char[]) {
+      final List<Character> chars = new ArrayList<>(((char[]) object).length);
+      for (char s : ((char[]) object)) {
+        chars.add(s);
+      }
+      serializeCollection(writer, logger, chars);
+    } else if (object instanceof int[]) {
+      final List<Integer> ints = new ArrayList<>(((int[]) object).length);
+      for (int i : ((int[]) object)) {
+        ints.add(i);
+      }
+      serializeCollection(writer, logger, ints);
+    } else if (object instanceof long[]) {
+      final List<Long> longs = new ArrayList<>(((long[]) object).length);
+      for (long l : ((long[]) object)) {
+        longs.add(l);
+      }
+      serializeCollection(writer, logger, longs);
+    } else if (object instanceof float[]) {
+      final List<Float> floats = new ArrayList<>(((float[]) object).length);
+      for (float f : ((float[]) object)) {
+        floats.add(f);
+      }
+      serializeCollection(writer, logger, floats);
+    } else if (object instanceof double[]) {
+      final List<Double> doubles = new ArrayList<>(((double[]) object).length);
+      for (double d : ((double[]) object)) {
+        doubles.add(d);
+      }
+      serializeCollection(writer, logger, doubles);
     } else if (object.getClass().isArray()) {
       serializeCollection(writer, logger, Arrays.asList((Object[]) object));
     } else if (object instanceof Map) {
diff --git a/sentry/src/main/java/io/sentry/transport/AsyncHttpTransport.java b/sentry/src/main/java/io/sentry/transport/AsyncHttpTransport.java
@@ -309,18 +309,13 @@ public void run() {
 
             options.getLogger().log(SentryLevel.ERROR, message);
 
-            // ignore e.g. 429 as we're not the ones actively dropping
-            if (result.getResponseCode() >= 400 && result.getResponseCode() != 429) {
-              if (!cached) {
-                HintUtils.runIfDoesNotHaveType(
-                    hint,
-                    Retryable.class,
-                    (hint) -> {
-                      options
-                          .getClientReportRecorder()
-                          .recordLostEnvelope(
-                              DiscardReason.NETWORK_ERROR, envelopeWithClientReport);
-                    });
+            if (result.getResponseCode() >= 400) {
+              envelopeCache.discard(envelope);
+              // ignore e.g. 429 as we're not the ones actively dropping
+              if (result.getResponseCode() != 429) {
+                options
+                    .getClientReportRecorder()
+                    .recordLostEnvelope(DiscardReason.NETWORK_ERROR, envelopeWithClientReport);
               }
             }
 
diff --git a/sentry/src/test/java/io/sentry/JsonObjectSerializerTest.kt b/sentry/src/test/java/io/sentry/JsonObjectSerializerTest.kt
@@ -101,6 +101,79 @@ internal class JsonObjectSerializerTest {
     verify(fixture.writer).endArray()
   }
 
+  @Suppress("RemoveRedundantCallsOfConversionMethods")
+  @Test
+  fun `serializing primitive int array`() {
+    fixture.getSUT().serialize(fixture.writer, fixture.logger, intArrayOf(1, 2))
+    verify(fixture.writer).beginArray()
+    verify(fixture.writer).value(1.toInt())
+    verify(fixture.writer).value(2.toInt())
+    verify(fixture.writer).endArray()
+  }
+
+  @Test
+  fun `serializing primitive boolean array`() {
+    fixture.getSUT().serialize(fixture.writer, fixture.logger, booleanArrayOf(true, false))
+    verify(fixture.writer).beginArray()
+    verify(fixture.writer).value(true)
+    verify(fixture.writer).value(false)
+    verify(fixture.writer).endArray()
+  }
+
+  @Test
+  fun `serializing primitive byte array`() {
+    fixture.getSUT().serialize(fixture.writer, fixture.logger, byteArrayOf(1, 2))
+    verify(fixture.writer).beginArray()
+    verify(fixture.writer).value(1.toByte())
+    verify(fixture.writer).value(2.toByte())
+    verify(fixture.writer).endArray()
+  }
+
+  @Test
+  fun `serializing primitive short array`() {
+    fixture.getSUT().serialize(fixture.writer, fixture.logger, shortArrayOf(1, 2))
+    verify(fixture.writer).beginArray()
+    verify(fixture.writer).value(1.toShort())
+    verify(fixture.writer).value(2.toShort())
+    verify(fixture.writer).endArray()
+  }
+
+  @Test
+  fun `serializing primitive char array`() {
+    fixture.getSUT().serialize(fixture.writer, fixture.logger, charArrayOf('a', 'b'))
+    verify(fixture.writer).beginArray()
+    verify(fixture.writer).value("a")
+    verify(fixture.writer).value("b")
+    verify(fixture.writer).endArray()
+  }
+
+  @Test
+  fun `serializing primitive long array`() {
+    fixture.getSUT().serialize(fixture.writer, fixture.logger, longArrayOf(1L, 2L))
+    verify(fixture.writer).beginArray()
+    verify(fixture.writer).value(1L as Number)
+    verify(fixture.writer).value(2L as Number)
+    verify(fixture.writer).endArray()
+  }
+
+  @Test
+  fun `serializing primitive float array`() {
+    fixture.getSUT().serialize(fixture.writer, fixture.logger, floatArrayOf(1.5f, 2.5f))
+    verify(fixture.writer).beginArray()
+    verify(fixture.writer).value(1.5f as Number)
+    verify(fixture.writer).value(2.5f as Number)
+    verify(fixture.writer).endArray()
+  }
+
+  @Test
+  fun `serializing primitive double array`() {
+    fixture.getSUT().serialize(fixture.writer, fixture.logger, doubleArrayOf(1.5, 2.5))
+    verify(fixture.writer).beginArray()
+    verify(fixture.writer).value(1.5 as Number)
+    verify(fixture.writer).value(2.5 as Number)
+    verify(fixture.writer).endArray()
+  }
+
   @Test
   fun `serialize map`() {
     fixture
diff --git a/sentry/src/test/java/io/sentry/transport/AsyncHttpTransportClientReportTest.kt b/sentry/src/test/java/io/sentry/transport/AsyncHttpTransportClientReportTest.kt
diff --git a/sentry/src/test/java/io/sentry/transport/AsyncHttpTransportTest.kt b/sentry/src/test/java/io/sentry/transport/AsyncHttpTransportTest.kt
