Merge branch 'main' into lcian/feat/mdc-logs

Author: lcian

CHANGELOG.md

@@ -5,12 +5,15 @@
 ### Features
 
 - Attach MDC properties to logs as attributes ([#4786](https://github.com/getsentry/sentry-java/pull/4786))
-  - MDC properties set using supported logging frameworks (Logback, Log4j2, java.util.Logging) are now attached to structured logs as attributes
+  - MDC properties set using supported logging frameworks (Logback, Log4j2, java.util.Logging) are now attached to structured logs as attributes.
   - This means that you will be able to filter/aggregate logs in the product based on these properties.
-  - All properties are sent. To avoid sending certain properties, use the `beforeSendLog` hook. You can also set up [Advanced Data
-    Scrubbing rules](https://docs.sentry.io/security-legal-pii/scrubbing/advanced-datascrubbing/) to redact sensitive information.
+  - All properties are sent. To avoid sending certain properties, use the `beforeSendLog` hook. You can also set up [Advanced Data Scrubbing rules](https://docs.sentry.io/security-legal-pii/scrubbing/advanced-datascrubbing/) to redact sensitive information.
   - Note that keys containing spaces are not supported.
 
+### Fixes
+
+- Use logger from options for JVM profiler ([#4771](https://github.com/getsentry/sentry-java/pull/4771))
+
 ## 8.23.0
 
 ### Features

sentry-android-distribution/src/main/java/io/sentry/android/distribution/DistributionHttpClient.kt

@@ -22,7 +22,6 @@ internal class DistributionHttpClient(private val options: SentryOptions) {
 
   /** Parameters for checking updates. */
   data class UpdateCheckParams(
-    val mainBinaryIdentifier: String,
     val appId: String,
     val platform: String = "android",
     val versionCode: Long,
@@ -53,8 +52,7 @@ internal class DistributionHttpClient(private val options: SentryOptions) {
       append(
         "/api/0/projects/${URLEncoder.encode(orgSlug, "UTF-8")}/${URLEncoder.encode(projectSlug, "UTF-8")}/preprodartifacts/check-for-updates/"
       )
-      append("?main_binary_identifier=${URLEncoder.encode(params.mainBinaryIdentifier, "UTF-8")}")
-      append("&app_id=${URLEncoder.encode(params.appId, "UTF-8")}")
+      append("?app_id=${URLEncoder.encode(params.appId, "UTF-8")}")
       append("&platform=${URLEncoder.encode(params.platform, "UTF-8")}")
       append("&build_number=${URLEncoder.encode(params.versionCode.toString(), "UTF-8")}")
       append("&build_version=${URLEncoder.encode(params.versionName, "UTF-8")}")

sentry-android-distribution/src/main/java/io/sentry/android/distribution/DistributionIntegration.kt

@@ -133,7 +133,6 @@ public class DistributionIntegration(context: Context) : Integration, IDistribut
       val appId = context.applicationInfo.packageName
 
       DistributionHttpClient.UpdateCheckParams(
-        mainBinaryIdentifier = appId,
         appId = appId,
         platform = "android",
         versionCode = versionCode,

sentry-android-distribution/src/test/java/io/sentry/android/distribution/DistributionHttpClientTest.kt

@@ -34,7 +34,6 @@ class DistributionHttpClientTest {
   fun `test checkForUpdates with real API`() {
     val params =
       DistributionHttpClient.UpdateCheckParams(
-        mainBinaryIdentifier = "com.emergetools.hackernews",
         appId = "com.emergetools.hackernews",
         versionName = "1.0.0",
         versionCode = 5L,

sentry/src/main/java/io/sentry/Sentry.java

@@ -710,7 +710,7 @@ private static void initJvmContinuousProfiling(@NotNull SentryOptions options) {
 
         final IContinuousProfiler continuousProfiler =
             ProfilingServiceLoader.loadContinuousProfiler(
-                new SystemOutLogger(),
+                options.getLogger(),
                 profilingTracesDirPath,
                 options.getProfilingTracesHz(),
                 options.getExecutorService());