Merge branch 'main' into dependabot/github_actions/gradle/actions-4.4.1

Author: runningcode

.github/workflows/agp-matrix.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        agp: [ '8.7.0','8.8.0','8.9.0-beta01' ]
+        agp: [ '8.7.0','8.8.0','8.9.0' ]
         integrations: [ true, false ]
 
     name: AGP Matrix Release - AGP ${{ matrix.agp }} - Integrations ${{ matrix.integrations }}

.github/workflows/format-code.yml

@@ -18,18 +18,13 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
-      - name: Cache Gradle packages
-        uses: actions/cache@v4
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
         with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
-      - name: Make format
-        run: make format
+      - name: Format with spotlessApply
+        run: ./gradlew spotlessApply
 
       # actions/checkout fetches only a single commit in a detached HEAD state. Therefore
       # we need to pass the current branch, otherwise we can't commit the changes.

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- No longer send out empty log envelopes ([#4497](https://github.com/getsentry/sentry-java/pull/4497))
+
 ## 8.14.0
 
 ### Fixes

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all clean compile javadocs dryRelease update stop checkFormat format api assembleBenchmarkTestRelease assembleUiTestRelease assembleUiTestCriticalRelease createCoverageReports runUiTestCritical check preMerge publish
+.PHONY: all clean compile javadocs dryRelease update checkFormat api assembleBenchmarkTestRelease assembleUiTestRelease assembleUiTestCriticalRelease createCoverageReports runUiTestCritical check preMerge publish
 
 all: stop clean javadocs compile createCoverageReports
 assembleBenchmarks: assembleBenchmarkTestRelease
@@ -26,19 +26,10 @@ dryRelease:
 update:
 	./gradlew dependencyUpdates -Drevision=release
 
-# We stop gradle at the end to make sure the cache folders
-# don't contain any lock files and are free to be cached.
-stop:
-	./gradlew --stop
-
 # Spotless check's code
 checkFormat:
 	./gradlew spotlessJavaCheck spotlessKotlinCheck
 
-# Spotless format's code
-format:
-	./gradlew spotlessApply
-
 # Binary compatibility validator
 api:
 	./gradlew apiDump

build.gradle.kts

@@ -93,12 +93,10 @@ allprojects {
                 TestLogEvent.PASSED,
                 TestLogEvent.FAILED
             )
-            maxParallelForks = 1
 
             // Cap JVM args per test
             minHeapSize = "256m"
             maxHeapSize = "2g"
-            dependsOn("cleanTest")
         }
         withType<JavaCompile>().configureEach {
             options.compilerArgs.addAll(arrayOf("-Xlint:all", "-Werror", "-Xlint:-classfile", "-Xlint:-processing", "-Xlint:-try"))

gradle.properties

@@ -7,9 +7,6 @@ org.gradle.configuration-cache=true
 
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 
-# Daemons workers
-org.gradle.workers.max=2
-
 # AndroidX required by AGP >= 3.6.x
 android.useAndroidX=true
 

sentry/src/main/java/io/sentry/logger/LoggerBatchProcessor.java

@@ -101,7 +101,9 @@ private void flushBatch() {
       }
     } while (!queue.isEmpty() && logEvents.size() < MAX_BATCH_SIZE);
 
-    client.captureBatchedLogEvents(new SentryLogEvents(logEvents));
+    if (!logEvents.isEmpty()) {
+      client.captureBatchedLogEvents(new SentryLogEvents(logEvents));
+    }
   }
 
   private class BatchRunnable implements Runnable {