fix e2e test assertions; handle null data map

Author: adinauer

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -41,7 +41,7 @@ class PersonSystemTest {
           transaction,
           op = "spanCreatedThroughOtelApi",
           featureFlag = FeatureFlag("flag.evaluation.my-feature-flag", true),
-        )
+        ) &&
       testHelper.doesTransactionHaveSpanWith(transaction, op = "spanCreatedThroughSentryApi")
     }
 

sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -41,7 +41,7 @@ class PersonSystemTest {
           transaction,
           op = "spanCreatedThroughOtelApi",
           featureFlag = FeatureFlag("flag.evaluation.my-feature-flag", true),
-        )
+        ) &&
       testHelper.doesTransactionHaveSpanWith(transaction, op = "spanCreatedThroughSentryApi")
     }
 

sentry-samples/sentry-samples-spring-boot-opentelemetry/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -41,7 +41,7 @@ class PersonSystemTest {
           transaction,
           op = "spanCreatedThroughOtelApi",
           featureFlag = FeatureFlag("flag.evaluation.my-feature-flag", true),
-        )
+        ) &&
       testHelper.doesTransactionHaveSpanWith(transaction, op = "spanCreatedThroughSentryApi")
     }
 

sentry/src/main/java/io/sentry/protocol/SentrySpan.java

@@ -77,9 +77,12 @@ public SentrySpan(final @NotNull Span span, final @Nullable Map<String, Object>
     final @NotNull IFeatureFlagBuffer featureFlagBuffer =
         span.getSpanContext().getFeatureFlagBuffer();
     final @Nullable FeatureFlags featureFlags = featureFlagBuffer.getFeatureFlags();
-    if (featureFlags != null && data != null) {
+    if (featureFlags != null) {
+      if (this.data == null) {
+        this.data = new HashMap<>();
+      }
       for (FeatureFlag featureFlag : featureFlags.getValues()) {
-        data.put(FeatureFlag.DATA_PREFIX + featureFlag.getFlag(), featureFlag.getResult());
+        this.data.put(FeatureFlag.DATA_PREFIX + featureFlag.getFlag(), featureFlag.getResult());
       }
     }
   }