Merge branch 'feat/otel' into feat/otel-span-processor

Author: adinauer

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches

.github/workflows/codeql-analysis.yml

@@ -30,7 +30,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -40,12 +40,12 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f # pin@v2
+        uses: github/codeql-action/init@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # pin@v2
         with:
           languages: ${{ matrix.language }}
 
       - run: |
           ./gradlew assemble
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f # pin@v2
+        uses: github/codeql-action/analyze@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # pin@v2

.github/workflows/format-code.yml

@@ -17,7 +17,7 @@ jobs:
           java-version: '17'
 
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches

.github/workflows/generate-javadocs.yml

@@ -17,7 +17,7 @@ jobs:
           java-version: '17'
 
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches

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

@@ -91,4 +91,4 @@ jobs:
           config: sentry-android-integration-tests/metrics-test.yml
           sauce-user: ${{ secrets.SAUCE_USERNAME }}
           sauce-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-        if: env.SAUCE_USERNAME != null      
+        if: env.SAUCE_USERNAME != null

.sauce/sentry-uitest-android-benchmark-lite.yml

@@ -20,7 +20,7 @@ suites:
 
   - name: "Android 11 (api 30)"
     devices:
-      - id: Google_Pixel_2_real_us # Google Pixel 2 - api 30 (11)
+      - id: OnePlus_Nord_N200_5G_real_us # OnePlus Nord N200 5G - api 30 (11)
 
 artifacts:
   download:

.sauce/sentry-uitest-android-benchmark.yml

@@ -28,7 +28,7 @@ suites:
     devices:
       - id: OnePlus_9_Pro_real_us # OnePlus 9 Pro - api 30 (11) - high end
       - id: Google_Pixel_4_real_us # Google Pixel 4 - api 30 (11) - mid end
-      - id: Google_Pixel_2_real_us # Google Pixel 2 - api 30 (11) - low end
+      - id: OnePlus_Nord_N200_5G_real_us # OnePlus Nord N200 5G - api 30 (11) - low end
 
   - name: "Android 10 (api 29)"
     devices:

CHANGELOG.md

@@ -2,8 +2,13 @@
 
 ## Unreleased
 
+### Fixes
+
+- Fix `Gpu.vendorId` should be a String ([#2343](https://github.com/getsentry/sentry-java/pull/2343))
+
 ### Features
 
+- Update Spring Boot Jakarta to Spring Boot 3.0.0-RC2 ([#2347](https://github.com/getsentry/sentry-java/pull/2347))
 - Add support for Opentelemetry ([#2344](https://github.com/getsentry/sentry-java/pull/2344))
 
 ## 6.7.0

buildSrc/src/main/java/Config.kt

@@ -5,7 +5,7 @@ object Config {
     val kotlinStdLib = "stdlib-jdk8"
 
     val springBootVersion = "2.7.4"
-    val springBoot3Version = "3.0.0-M5"
+    val springBoot3Version = "3.0.0-RC2"
     val kotlinCompatibleLanguageVersion = "1.4"
 
     val composeVersion = "1.1.1"
@@ -144,18 +144,16 @@ object Config {
     }
 
     object TestLibs {
-        private val androidxTestVersion = "1.4.0"
-
-        // todo This beta version is needed to run ui tests on Android 13.
-        //  It will be replaced by androidxTestVersion when 1.5.0 will be out.
-        private val androidxTestVersionBeta = "1.5.0-beta01"
-        private val espressoVersion = "3.4.0"
+        // todo These rc versions are needed to run ui tests on Android 13.
+        //  They will be replaced by stable version when 1.5.0/3.5.0 will be out.
+        private val androidxTestVersion = "1.5.0-rc01"
+        private val espressoVersion = "3.5.0-rc01"
 
         val androidJUnitRunner = "androidx.test.runner.AndroidJUnitRunner"
         val kotlinTestJunit = "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
-        val androidxCore = "androidx.test:core:$androidxTestVersionBeta"
+        val androidxCore = "androidx.test:core:$androidxTestVersion"
         val androidxRunner = "androidx.test:runner:$androidxTestVersion"
-        val androidxTestCoreKtx = "androidx.test:core-ktx:$androidxTestVersionBeta"
+        val androidxTestCoreKtx = "androidx.test:core-ktx:$androidxTestVersion"
         val androidxTestRules = "androidx.test:rules:$androidxTestVersion"
         val espressoCore = "androidx.test.espresso:espresso-core:$espressoVersion"
         val espressoIdlingResource = "androidx.test.espresso:espresso-idling-resource:$espressoVersion"

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.parallel=true
 android.useAndroidX=true
 
 # Release information
-versionName=6.7.0-alpha.1
+versionName=6.7.0
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android