Merge branch 'main' into markushi/feat/anr-profiling

Author: markushi

CHANGELOG.md

@@ -2,14 +2,16 @@
 
 ## Unreleased
 
-### Features
+### Improvements
 
+- Do not send manual log origin ([#4897](https://github.com/getsentry/sentry-java/pull/4897))
 - Add ANR profiling integration ([#4899](https://github.com/getsentry/sentry-java/pull/4899))
   - Captures main thread profile when ANR is detected
   - Identifies culprit code causing application hangs
   - Profiles are attached to ANR error events for better diagnostics
   - Enable via `options.setEnableAnrProfiling(true)` or Android manifest: `<meta-data android:name="io.sentry.anr.enable-profiling" android:value="true" />`
 
+
 ## 8.26.0
 
 ### Features

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) =