Merge branch 'main' into antonis/3859-newCaptureFeedbackAPI-hint

# Conflicts:
#	CHANGELOG.md
#	samples/react-native-macos/src/components/UserFeedbackModal.tsx
#	samples/react-native/src/components/UserFeedbackModal.tsx

Author: antonis

CHANGELOG.md

@@ -38,11 +38,16 @@
 ### Fixes
 
 - Return `lastEventId` export from `@sentry/core` ([#4315](https://github.com/getsentry/sentry-react-native/pull/4315))
+- Navigation Span should have no parent by default ([#4326](https://github.com/getsentry/sentry-react-native/pull/4326))
+
 ### Dependencies
 
 - Bump CLI from v2.38.2 to v2.39.1 ([#4305](https://github.com/getsentry/sentry-react-native/pull/4305), [#4316](https://github.com/getsentry/sentry-react-native/pull/4316))
   - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2391)
   - [diff](https://github.com/getsentry/sentry-cli/compare/2.38.2...2.39.1)
+- Bump Android SDK from v7.18.0 to v7.18.1 ([#4329](https://github.com/getsentry/sentry-react-native/pull/4329))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7181)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.18.0...7.18.1)
 
 ## 6.4.0-beta.1
 

packages/core/android/build.gradle

@@ -54,5 +54,5 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:7.18.0'
+    api 'io.sentry:sentry-android:7.18.1'
 }

packages/core/package.json

@@ -81,7 +81,7 @@
     "@sentry-internal/eslint-config-sdk": "8.40.0",
     "@sentry-internal/eslint-plugin-sdk": "8.40.0",
     "@sentry-internal/typescript": "8.40.0",
-    "@sentry/wizard": "3.34.4",
+    "@sentry/wizard": "3.36.0",
     "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.3",
     "@types/node": "^20.9.3",

packages/core/src/js/tracing/span.ts

@@ -57,6 +57,7 @@ export const startIdleNavigationSpan = (
   }
 
   const activeSpan = getActiveSpan();
+  clearActiveSpanFromScope(getCurrentScope());
   if (activeSpan && isRootSpan(activeSpan) && isSentryInteractionSpan(activeSpan)) {
     logger.log(
       `[startIdleNavigationSpan] Canceling ${
@@ -128,9 +129,9 @@ export function isSentryInteractionSpan(span: Span): boolean {
   return [SPAN_ORIGIN_AUTO_INTERACTION, SPAN_ORIGIN_MANUAL_INTERACTION].includes(spanToJSON(span).origin);
 }
 
-const SCOPE_SPAN_FIELD = '_sentrySpan';
+export const SCOPE_SPAN_FIELD = '_sentrySpan';
 
-type ScopeWithMaybeSpan = Scope & {
+export type ScopeWithMaybeSpan = Scope & {
   [SCOPE_SPAN_FIELD]?: Span;
 };
 

packages/core/test/tracing/idleNavigationSpan.test.ts

@@ -1,7 +1,9 @@
-import { getActiveSpan, spanToJSON } from '@sentry/core';
+import { getActiveSpan, getCurrentScope, spanToJSON, startSpanManual } from '@sentry/core';
+import type { Span } from '@sentry/types';
 import type { AppState, AppStateStatus } from 'react-native';
 
-import { startIdleNavigationSpan } from '../../src/js/tracing/span';
+import type { ScopeWithMaybeSpan } from '../../src/js/tracing/span';
+import { SCOPE_SPAN_FIELD, startIdleNavigationSpan } from '../../src/js/tracing/span';
 import { NATIVE } from '../../src/js/wrapper';
 import { setupTestClient } from '../mocks/client';
 
@@ -79,4 +81,62 @@ describe('startIdleNavigationSpan', () => {
 
     expect(spanToJSON(transaction!).timestamp).toBeDefined();
   });
+
+  describe('Start a new active root span (without parent)', () => {
+    it('Starts a new span when there is no active span', () => {
+      const span = startIdleNavigationSpan({
+        name: 'test',
+      });
+
+      expect(span).toBe(getActiveSpan());
+    });
+
+    it('Starts a new span when current active navigation span not ended', () => {
+      startIdleNavigationSpan({
+        name: 'test',
+      });
+
+      const secondSpan = startIdleNavigationSpan({
+        name: 'test',
+      });
+
+      expect(secondSpan).toBe(getActiveSpan());
+      expect(spanToJSON(secondSpan!).parent_span_id).toBeUndefined();
+    });
+
+    it('Starts a new span when current active navigation span is ended', () => {
+      const firstSpan = startIdleNavigationSpan({
+        name: 'test',
+      });
+
+      firstSpan.end();
+
+      const secondSpan = startIdleNavigationSpan({
+        name: 'test',
+      });
+
+      expect(secondSpan).toBe(getActiveSpan());
+      expect(spanToJSON(secondSpan!).parent_span_id).toBeUndefined();
+    });
+
+    it('Starts a new span when current active span is not a navigation span', () => {
+      const span = startSpanManual(
+        {
+          name: 'test',
+        },
+        (span: Span) => span,
+      );
+      setActiveSpanOnScope(getCurrentScope(), span);
+
+      const newSpan = startIdleNavigationSpan({
+        name: 'test',
+      });
+      expect(newSpan).toBe(getActiveSpan());
+      expect(spanToJSON(newSpan!).parent_span_id).toBeUndefined();
+    });
+  });
 });
+
+export function setActiveSpanOnScope(scope: ScopeWithMaybeSpan, span: Span): void {
+  scope[SCOPE_SPAN_FIELD] = span;
+}

yarn.lock

@@ -8342,7 +8342,7 @@ __metadata:
     "@sentry/react": 8.40.0
     "@sentry/types": 8.40.0
     "@sentry/utils": 8.40.0
-    "@sentry/wizard": 3.34.4
+    "@sentry/wizard": 3.36.0
     "@testing-library/react-native": ^12.7.2
     "@types/jest": ^29.5.3
     "@types/node": ^20.9.3
@@ -8435,9 +8435,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/wizard@npm:3.34.4":
-  version: 3.34.4
-  resolution: "@sentry/wizard@npm:3.34.4"
+"@sentry/wizard@npm:3.36.0":
+  version: 3.36.0
+  resolution: "@sentry/wizard@npm:3.36.0"
   dependencies:
     "@clack/core": ^0.3.4
     "@clack/prompts": 0.7.0
@@ -8459,7 +8459,7 @@ __metadata:
     yargs: ^16.2.0
   bin:
     sentry-wizard: dist/bin.js
-  checksum: 95bd53a1f351f31a20159168e944ef70ea2a4c0c7090c1ececb7e9ff576e376d62d1bdfddbb1ec7a7edf87ac5baba156aa6e46f15615b7b43f2baab399fac98e
+  checksum: 39c4e8066ea96f6e128c270cf00ebeb7d9992f9228edbe5ca290efab8b1b4817e54191860a53e917df5428d133b97cec6395ea3ee857e5156c0ed47832f51758
   languageName: node
   linkType: hard