Merge branch 'main' into feat/logback-spring-boot

Author: adinauer

.editorconfig

@@ -2,19 +2,18 @@ root = true
 
 [*]
 indent_style = space
+indent_size = 2
 trim_trailing_whitespace = true
 insert_final_newline = true
+max_line_length = 140
+ij_java_names_count_to_use_import_on_demand = 9999
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
 
 [*.md]
 trim_trailing_whitespace = false
 
 [*.java]
-indent_size = 2
 charset = utf-8
 
 [*.{kt,kts}]
-indent_size = 4
 charset = utf-8
-
-[*.xml]
-indent_size = 2

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Reformat codebase with Ktfmt and more accurate spotless configuration: #4499
+8b8369f06cbc5a9738de7810b1df5863b3ac6bcb

.github/workflows/agp-matrix.yml

@@ -93,3 +93,10 @@ jobs:
           reporter: java-junit
           output-to: step-summary
           fail-on-error: false
+
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: build/outputs/androidTest-results/**/*.xml

.github/workflows/format-code.yml

@@ -19,7 +19,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 

.github/workflows/integration-tests-ui.yml

@@ -72,3 +72,10 @@ jobs:
           fi
         if: env.SAUCE_USERNAME != null
 
+
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./artifacts/*.xml

CHANGELOG.md

@@ -2,9 +2,51 @@
 
 ## Unreleased
 
+### Features
+
+- Add chipset to device context ([#4512](https://github.com/getsentry/sentry-java/pull/4512))
+
 ### Fixes
 
 - No longer send out empty log envelopes ([#4497](https://github.com/getsentry/sentry-java/pull/4497))
+- Session Replay: Expand fix for crash on devices to all Unisoc/Spreadtrum chipsets ([#4510](https://github.com/getsentry/sentry-java/pull/4510))
+- Log parameter objects are now turned into `String` via `toString` ([#4515](https://github.com/getsentry/sentry-java/pull/4515))
+  - One of the two `SentryLogEventAttributeValue` constructors did not convert the value previously.
+- Logs are now flushed on shutdown ([#4503](https://github.com/getsentry/sentry-java/pull/4503))
+
+### Features
+
+- Send Logback logs to Sentry as logs ([#4502](https://github.com/getsentry/sentry-java/pull/4502))
+  - You need to enable the logs feature and can also set the `minimumLevel` for log events:
+    ```xml
+    <appender name="sentry" class="io.sentry.logback.SentryAppender">
+      <options>
+        <!-- NOTE: Replace the test DSN below with YOUR OWN DSN to see the events from this app in your Sentry project/dashboard -->
+        <dsn>https://502f25099c204a2fbf4cb16edc5975d1@o447951.ingest.sentry.io/5428563</dsn>
+        <logs>
+          <enabled>true</enabled>
+        </logs>
+      </options>
+      <!-- Demonstrates how to modify the minimum values -->
+      <!-- Default for Events is ERROR -->
+      <minimumEventLevel>WARN</minimumEventLevel>
+      <!-- Default for Breadcrumbs is INFO -->
+      <minimumBreadcrumbLevel>DEBUG</minimumBreadcrumbLevel>
+      <!-- Default for Log Events is INFO -->
+      <minimumLevel>INFO</minimumLevel>
+    </appender>
+    ```
+  - If you manually initialize Sentry, you may also enable logs on `Sentry.init`:
+    ```java
+    Sentry.init(options -> {
+      ...
+      options.getLogs().setEnabled(true);
+    });
+    ```
+  - Enabling via `sentry.properties` is also possible:
+    ```properties
+    logs.enabled=true
+    ```
 
 ### Dependencies
 

build-logic/build.gradle.kts

@@ -1,7 +1,11 @@
 plugins {
-    `kotlin-dsl`
+  `kotlin-dsl`
 }
 
 repositories {
-    gradlePluginPortal()
+  gradlePluginPortal()
+}
+
+dependencies {
+  implementation(libs.spotlessLib)
 }

build-logic/settings.gradle.kts

@@ -1 +1,9 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
 rootProject.name = "build-logic"

build-logic/src/main/kotlin/io.sentry.spotless.gradle.kts

@@ -0,0 +1,25 @@
+import com.diffplug.spotless.LineEnding
+
+plugins {
+    id("com.diffplug.spotless")
+}
+
+spotless {
+    lineEndings = LineEnding.UNIX
+    java {
+        target("src/*/java/**/*.java")
+        removeUnusedImports()
+        googleJavaFormat()
+        targetExclude("src/**/java/io/sentry/vendor/**")
+    }
+    kotlin {
+        target("src/*/kotlin/**/*.kt", "src/*/java/**/*.kt")
+        ktfmt().googleStyle()
+        targetExclude("src/test/java/io/sentry/apollo4/generated/**", "src/test/java/io/sentry/apollo3/adapter/**")
+    }
+    kotlinGradle {
+        target("*.gradle.kts")
+        ktfmt().googleStyle()
+    }
+}
+

build.gradle.kts

@@ -1,4 +1,3 @@
-import com.diffplug.spotless.LineEnding
 import com.vanniktech.maven.publish.JavaLibrary
 import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
@@ -10,7 +9,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     `java-library`
-    alias(libs.plugins.spotless)
+    alias(libs.plugins.spotless) apply false
     jacoco
     alias(libs.plugins.detekt)
     `maven-publish`
@@ -105,6 +104,8 @@ allprojects {
 }
 
 subprojects {
+    apply { plugin("io.sentry.spotless") }
+
     val jacocoAndroidModules = listOf(
         "sentry-android-core",
         "sentry-android-fragment",
@@ -225,26 +226,6 @@ subprojects {
     }
 }
 
-spotless {
-    lineEndings = LineEnding.UNIX
-    java {
-        target("**/*.java")
-        removeUnusedImports()
-        googleJavaFormat()
-        targetExclude("**/generated/**", "**/vendor/**", "**/sentry-native/**")
-    }
-    kotlin {
-        target("**/*.kt")
-        ktlint()
-        targetExclude("**/sentry-native/**", "**/build/**")
-    }
-    kotlinGradle {
-        target("**/*.kts")
-        ktlint()
-        targetExclude("**/sentry-native/**")
-    }
-}
-
 tasks.register("buildForCodeQL") {
     subprojects
         .filter {