Merge 71a1fa0 into d872fbc

buenaflor · web-flow · commit d9d541cd866c · 2025-11-25T16:30:57.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@
 - Avoid forking `rootScopes` for Reactor if current thread has `NoOpScopes` ([#4793](https://github.com/getsentry/sentry-java/pull/4793))
   - This reduces the SDKs overhead by avoiding unnecessary scope forks
 
+### Internal
+
+- Support `span` envelope item type ([#4935](https://github.com/getsentry/sentry-java/pull/4935))
+
 ## 8.27.1
 
 ### Fixes
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
@@ -3137,6 +3137,7 @@ public final class io/sentry/SentryItemType : java/lang/Enum, io/sentry/JsonSeri
 	public static final field ReplayRecording Lio/sentry/SentryItemType;
 	public static final field ReplayVideo Lio/sentry/SentryItemType;
 	public static final field Session Lio/sentry/SentryItemType;
+	public static final field Span Lio/sentry/SentryItemType;
 	public static final field Transaction Lio/sentry/SentryItemType;
 	public static final field Unknown Lio/sentry/SentryItemType;
 	public static final field UserFeedback Lio/sentry/SentryItemType;
diff --git a/sentry/src/main/java/io/sentry/SentryItemType.java b/sentry/src/main/java/io/sentry/SentryItemType.java
@@ -23,6 +23,7 @@ public enum SentryItemType implements JsonSerializable {
   CheckIn("check_in"),
   Feedback("feedback"),
   Log("log"),
+  Span("span"),
   Unknown("__unknown__"); // DataCategory.Unknown
 
   private final String itemType;
diff --git a/sentry/src/test/java/io/sentry/protocol/SentryItemTypeSerializationTest.kt b/sentry/src/test/java/io/sentry/protocol/SentryItemTypeSerializationTest.kt
@@ -32,6 +32,7 @@ class SentryItemTypeSerializationTest {
     assertEquals(serialize(SentryItemType.ReplayVideo), json("replay_video"))
     assertEquals(serialize(SentryItemType.CheckIn), json("check_in"))
     assertEquals(serialize(SentryItemType.Feedback), json("feedback"))
+    assertEquals(serialize(SentryItemType.Span), json("span"))
   }
 
   @Test
@@ -49,6 +50,7 @@ class SentryItemTypeSerializationTest {
     assertEquals(deserialize(json("replay_video")), SentryItemType.ReplayVideo)
     assertEquals(deserialize(json("check_in")), SentryItemType.CheckIn)
     assertEquals(deserialize(json("feedback")), SentryItemType.Feedback)
+    assertEquals(deserialize(json("span")), SentryItemType.Span)
   }
 
   private fun json(type: String): String = "{\"type\":\"${type}\"}"

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ class SentryItemTypeSerializationTest {`
`32`	`32`	`assertEquals(serialize(SentryItemType.ReplayVideo), json("replay_video"))`
`33`	`33`	`assertEquals(serialize(SentryItemType.CheckIn), json("check_in"))`
`34`	`34`	`assertEquals(serialize(SentryItemType.Feedback), json("feedback"))`
	`35`	`+ assertEquals(serialize(SentryItemType.Span), json("span"))`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`@Test`
`@@ -49,6 +50,7 @@ class SentryItemTypeSerializationTest {`
`49`	`50`	`assertEquals(deserialize(json("replay_video")), SentryItemType.ReplayVideo)`
`50`	`51`	`assertEquals(deserialize(json("check_in")), SentryItemType.CheckIn)`
`51`	`52`	`assertEquals(deserialize(json("feedback")), SentryItemType.Feedback)`
	`53`	`+ assertEquals(deserialize(json("span")), SentryItemType.Span)`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`private fun json(type: String): String = "{\"type\":\"${type}\"}"`