Merge branch 'main' into jenn/touch-events

Author: marandaneto

CHANGELOG.md

@@ -5,6 +5,7 @@
 - feat: Touch events now track components with `sentry-label` prop, falls back to `accessibilityLabel` and then finally `displayName`. #2068
 - fix: Respect sentryOption.debug setting instead of #DEBUG build flag for outputting logs #2039
 - fix: Passing correct mutableOptions to iOS SDK (#2037)
+- Bump: Bump @sentry/javascript dependencies to 6.17.9 #2082
 
 ## 3.2.14-beta.1
 

package.json

@@ -40,20 +40,20 @@
     "react-native": ">=0.56.0"
   },
   "dependencies": {
-    "@sentry/browser": "6.12.0",
+    "@sentry/browser": "6.17.9",
     "@sentry/cli": "^1.72.0",
-    "@sentry/core": "6.12.0",
-    "@sentry/hub": "6.12.0",
-    "@sentry/integrations": "6.12.0",
-    "@sentry/react": "6.12.0",
-    "@sentry/tracing": "6.12.0",
-    "@sentry/types": "6.12.0",
-    "@sentry/utils": "6.12.0",
+    "@sentry/core": "6.17.9",
+    "@sentry/hub": "6.17.9",
+    "@sentry/integrations": "6.17.9",
+    "@sentry/react": "6.17.9",
+    "@sentry/tracing": "6.17.9",
+    "@sentry/types": "6.17.9",
+    "@sentry/utils": "6.17.9",
     "@sentry/wizard": "^1.2.17"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "6.12.0",
-    "@sentry-internal/eslint-plugin-sdk": "6.12.0",
+    "@sentry-internal/eslint-config-sdk": "6.17.9",
+    "@sentry-internal/eslint-plugin-sdk": "6.17.9",
     "@sentry/typescript": "^5.20.0",
     "@types/jest": "^26.0.15",
     "@types/react": "^16.9.49",

sample/yarn.lock

@@ -4055,7 +4055,7 @@ arrify@^2.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
-asap@~2.0.6:
+asap@~2.0.3, asap@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -9678,7 +9678,14 @@ progress@^2.0.0, progress@^2.0.1:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-promise@^7.1.1, promise@^8.0.3, promise@^8.1.0:
+promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
+promise@^8.0.3:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e"
   integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==

src/js/index.ts

@@ -8,7 +8,7 @@ export {
   Severity,
   StackFrame,
   Stacktrace,
-  Status,
+  EventStatus,
   Thread,
   User,
 } from "@sentry/types";

src/js/integrations/reactnativeerrorhandlers.ts

@@ -76,7 +76,7 @@ export class ReactNativeErrorHandlers implements Integration {
    * - The package resolution fix no longer works with 0.67 on iOS Hermes.
    */
   private _polyfillPromise(): void {
-    /* eslint-disable import/no-extraneous-dependencies,@typescript-eslint/no-var-requires*/
+    /* eslint-disable import/no-extraneous-dependencies,@typescript-eslint/no-var-requires */
     const {
       polyfillGlobal,
     } = require("react-native/Libraries/Utilities/PolyfillFunctions");

src/js/tracing/utils.ts

@@ -1,9 +1,4 @@
-import {
-  IdleTransaction,
-  Span,
-  SpanStatus,
-  Transaction,
-} from "@sentry/tracing";
+import { IdleTransaction, Span, Transaction } from "@sentry/tracing";
 import { TransactionContext } from "@sentry/types";
 import { timestampInSeconds } from "@sentry/utils";
 
@@ -48,7 +43,7 @@ export function adjustTransactionDuration(
   const isOutdatedTransaction =
     endTimestamp && (diff > secToMs(maxDuration) || diff < 0);
   if (isOutdatedTransaction) {
-    transaction.setStatus(SpanStatus.DeadlineExceeded);
+    transaction.setStatus("deadline_exceeded");
     transaction.setTag("maxTransactionDurationExceeded", "true");
   }
 }

src/js/transports/native.ts

@@ -1,22 +1,17 @@
 import { Event, Response, Transport } from "@sentry/types";
-import { PromiseBuffer, SentryError } from "@sentry/utils";
+import { makePromiseBuffer, PromiseBuffer } from "@sentry/utils";
 
 import { NATIVE } from "../wrapper";
 
 /** Native Transport class implementation */
 export class NativeTransport implements Transport {
   /** A simple buffer holding all requests. */
-  protected readonly _buffer: PromiseBuffer<Response> = new PromiseBuffer(30);
+  protected readonly _buffer: PromiseBuffer<Response> = makePromiseBuffer(30);
 
   /**
    * @inheritDoc
    */
   public sendEvent(event: Event): PromiseLike<Response> {
-    if (!this._buffer.isReady()) {
-      return Promise.reject(
-        new SentryError("Not adding Promise due to buffer limit reached.")
-      );
-    }
     return this._buffer.add(() => NATIVE.sendEvent(event));
   }
 

src/js/wrapper.ts

@@ -5,7 +5,6 @@ import {
   Package,
   Response,
   Severity,
-  Status,
   User,
 } from "@sentry/types";
 import { logger, SentryError } from "@sentry/utils";
@@ -74,7 +73,7 @@ export const NATIVE: SentryNativeWrapper = {
     if (!this.enableNative) {
       return {
         reason: `Event was skipped as native SDK is not enabled.`,
-        status: Status.Skipped,
+        status: "skipped",
       };
     }
 
@@ -84,6 +83,9 @@ export const NATIVE: SentryNativeWrapper = {
 
     const event = this._processLevels(_event);
 
+    // Delete this metadata as this should not be sent to Sentry.
+    delete event.sdkProcessingMetadata;
+
     const header = {
       event_id: event.event_id,
       sdk: event.sdk,
@@ -156,12 +158,12 @@ export const NATIVE: SentryNativeWrapper = {
 
     if (envelopeWasSent) {
       return {
-        status: Status.Success,
+        status: "success",
       };
     }
 
     return {
-      status: Status.Failed,
+      status: "failed",
     };
   },
 

test/backend.test.ts

@@ -55,8 +55,8 @@ describe("Tests ReactNativeBackend", () => {
           dsn: "not a dsn",
           enableNative: true,
         });
-      } catch (e) {
-        expect(e.message).toBe("Invalid Dsn");
+      } catch (e: any) {
+        expect(e.message).toBe("Invalid Sentry Dsn: not a dsn");
       }
     });
 

test/tracing/reactnativetracing.test.ts

@@ -254,9 +254,9 @@ describe("ReactNativeTracing", () => {
             const spanRecorder = routeTransaction.spanRecorder;
             expect(spanRecorder).toBeDefined();
             if (spanRecorder) {
-              expect(spanRecorder.spans.length).toBe(2);
+              expect(spanRecorder.spans.length).toBeGreaterThan(1);
 
-              const span = spanRecorder.spans[1];
+              const span = spanRecorder.spans[spanRecorder.spans.length - 1];
 
               expect(span.op).toBe("app.start.cold");
               expect(span.description).toBe("Cold App Start");
@@ -324,9 +324,9 @@ describe("ReactNativeTracing", () => {
             const spanRecorder = routeTransaction.spanRecorder;
             expect(spanRecorder).toBeDefined();
             if (spanRecorder) {
-              expect(spanRecorder.spans.length).toBe(2);
+              expect(spanRecorder.spans.length).toBeGreaterThan(1);
 
-              const span = spanRecorder.spans[1];
+              const span = spanRecorder.spans[spanRecorder.spans.length - 1];
 
               expect(span.op).toBe("app.start.warm");
               expect(span.description).toBe("Warm App Start");
@@ -392,7 +392,7 @@ describe("ReactNativeTracing", () => {
             const spanRecorder = routeTransaction.spanRecorder;
             expect(spanRecorder).toBeDefined();
             if (spanRecorder) {
-              expect(spanRecorder.spans.length).toBe(1);
+              expect(spanRecorder.spans.length).toBe(2);
             }
 
             done();