Merge branch 'main' into feat/openfeature-integration

Author: adinauer

CHANGELOG.md

@@ -7,6 +7,10 @@
 - Implement OpenFeature Integration that tracks Feature Flag evaluations ([#4910](https://github.com/getsentry/sentry-java/pull/4910))
   - To make use of it, add the `sentry-openfeature` dependency and register the the hook using: `openFeatureApiInstance.addHooks(new SentryOpenFeatureHook());`
 
+### Improvements
+
+- Do not send manual log origin ([#4897](https://github.com/getsentry/sentry-java/pull/4897))
+
 ## 8.26.0
 
 ### Features

gradle/libs.versions.toml

@@ -4,6 +4,7 @@ androidxLifecycle = "2.2.0"
 androidxNavigation = "2.4.2"
 androidxTestCore = "1.7.0"
 androidxCompose = "1.6.3"
+asyncProfiler = "4.2"
 composeCompiler = "1.5.14"
 coroutines = "1.6.1"
 espresso = "3.7.0"
@@ -94,6 +95,8 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-compose
 androidx-sqlite = { module = "androidx.sqlite:sqlite", version = "2.5.2" }
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.2.1" }
 androidx-browser = { module = "androidx.browser:browser", version = "1.8.0" }
+async-profiler = { module = "tools.profiler:async-profiler", version.ref = "asyncProfiler" }
+async-profiler-jfr-converter = { module = "tools.profiler:jfr-converter", version.ref = "asyncProfiler" }
 coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" }
 commons-compress = {module = "org.apache.commons:commons-compress", version = "1.25.0"}
 context-propagation = { module = "io.micrometer:context-propagation", version = "1.1.0" }

sentry-async-profiler/build.gradle.kts

@@ -20,8 +20,8 @@ kotlin { explicitApi() }
 dependencies {
   api(projects.sentry)
 
-  implementation("tools.profiler:async-profiler:4.2")
-  implementation("tools.profiler:jfr-converter:4.2")
+  implementation(libs.async.profiler)
+  implementation(libs.async.profiler.jfr.converter)
 
   compileOnly(libs.jetbrains.annotations)
   compileOnly(libs.nopen.annotations)

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

@@ -163,9 +163,11 @@ private void captureLog(
       final @NotNull SpanId spanId,
       final @Nullable Object... args) {
     final @NotNull HashMap<String, SentryLogEventAttributeValue> attributes = new HashMap<>();
-    attributes.put(
-        "sentry.origin",
-        new SentryLogEventAttributeValue(SentryAttributeType.STRING, params.getOrigin()));
+    final @NotNull String origin = params.getOrigin();
+    if (!"manual".equalsIgnoreCase(origin)) {
+      attributes.put(
+          "sentry.origin", new SentryLogEventAttributeValue(SentryAttributeType.STRING, origin));
+    }
 
     final @Nullable SentryAttributes incomingAttributes = params.getAttributes();
 

sentry/src/test/java/io/sentry/ScopesTest.kt

@@ -2585,6 +2585,43 @@ class ScopesTest {
       )
   }
 
+  @Test
+  fun `log with manual origin does not have origin attribute`() {
+    val (sut, mockClient) = getEnabledScopes { it.logs.isEnabled = true }
+
+    sut.logger().log(SentryLogLevel.WARN, "log message")
+
+    verify(mockClient)
+      .captureLog(
+        check {
+          assertEquals("log message", it.body)
+          assertNull(it.attributes!!.get("sentry.origin"))
+        },
+        anyOrNull(),
+      )
+  }
+
+  @Test
+  fun `log with non manual origin does have origin attribute`() {
+    val (sut, mockClient) = getEnabledScopes { it.logs.isEnabled = true }
+
+    sut
+      .logger()
+      .log(SentryLogLevel.WARN, SentryLogParameters().also { it.origin = "other" }, "log message")
+
+    verify(mockClient)
+      .captureLog(
+        check {
+          assertEquals("log message", it.body)
+          assertEquals(
+            "other",
+            (it.attributes!!.get("sentry.origin") as? SentryLogEventAttributeValue)?.value,
+          )
+        },
+        anyOrNull(),
+      )
+  }
+
   @Test
   fun `creating log with format string works`() {
     val (sut, mockClient) =