Merge 44a2b3f into a1491be

Author: antonis

dev-packages/e2e-tests/package.json

@@ -13,8 +13,8 @@
   "devDependencies": {
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
+    "@sentry/core": "8.41.0",
     "@sentry/react-native": "6.4.0",
-    "@sentry/utils": "8.41.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
     "appium": "2.4.1",

dev-packages/e2e-tests/patch-scripts/rn.patch.app.build.gradle.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const { argv } = require('process');
 
 const parseArgs = require('minimist');
-const { logger } = require('@sentry/utils');
+const { logger } = require('@sentry/core');
 logger.enable();
 
 const args = parseArgs(argv.slice(2));

dev-packages/e2e-tests/patch-scripts/rn.patch.app.js

@@ -5,7 +5,7 @@ const path = require('path');
 const { argv, env } = require('process');
 
 const parseArgs = require('minimist');
-const { logger } = require('@sentry/utils');
+const { logger } = require('@sentry/core');
 logger.enable();
 
 const SENTRY_RELEASE = env.SENTRY_RELEASE;

dev-packages/e2e-tests/patch-scripts/rn.patch.gradle.properties.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const { argv } = require('process');
 
 const parseArgs = require('minimist');
-const { logger } = require('@sentry/utils');
+const { logger } = require('@sentry/core');
 logger.enable();
 
 const args = parseArgs(argv.slice(2));

dev-packages/e2e-tests/patch-scripts/rn.patch.metro.config.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const { argv } = require('process');
 
 const parseArgs = require('minimist');
-const { logger } = require('@sentry/utils');
+const { logger } = require('@sentry/core');
 logger.enable();
 
 const args = parseArgs(argv.slice(2));

dev-packages/e2e-tests/patch-scripts/rn.patch.podfile.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const { argv } = require('process');
 
 const parseArgs = require('minimist');
-const { logger } = require('@sentry/utils');
+const { logger } = require('@sentry/core');
 logger.enable();
 
 const args = parseArgs(argv.slice(2));

dev-packages/e2e-tests/patch-scripts/rn.patch.xcode.js

@@ -6,7 +6,7 @@ const { argv } = require('process');
 const xcode = require('xcode');
 const parseArgs = require('minimist');
 const semver = require('semver');
-const { logger } = require('@sentry/utils');
+const { logger } = require('@sentry/core');
 logger.enable();
 
 const args = parseArgs(argv.slice(2));

packages/core/package.json

@@ -33,7 +33,7 @@
     "test:sdk": "npx jest",
     "test:tools": "npx jest --config jest.config.tools.js",
     "test:watch": "npx jest --watch",
-    "yalc:add:sentry-javascript": "yalc add @sentry/browser @sentry/core @sentry/react @sentry/types @sentry/utils",
+    "yalc:add:sentry-javascript": "yalc add @sentry/browser @sentry/core @sentry/react @sentry/types",
     "fix": "npx run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint --config .eslintrc.js --fix .",
     "fix:prettier": "prettier  --config ../../.prettierrc.json --ignore-path ../../.prettierignore  --write \"{src,test,scripts,plugin/src}/**/**.ts\"",

packages/core/src/js/breadcrumb.ts

@@ -1,5 +1,5 @@
+import { severityLevelFromString } from '@sentry/core';
 import type { Breadcrumb, SeverityLevel } from '@sentry/types';
-import { severityLevelFromString } from '@sentry/utils';
 
 export const DEFAULT_BREADCRUMB_LEVEL: SeverityLevel = 'info';
 

packages/core/src/js/client.ts

@@ -1,5 +1,5 @@
 import { eventFromException, eventFromMessage } from '@sentry/browser';
-import { BaseClient } from '@sentry/core';
+import { BaseClient, dateTimestampInSeconds, logger, SentryError } from '@sentry/core';
 import type {
   ClientReportEnvelope,
   ClientReportItem,
@@ -11,7 +11,6 @@ import type {
   TransportMakeRequestResponse,
   UserFeedback,
 } from '@sentry/types';
-import { dateTimestampInSeconds, logger, SentryError } from '@sentry/utils';
 import { Alert } from 'react-native';
 
 import { getDevServer } from './integrations/debugsymbolicatorutils';

packages/core/src/js/integrations/debugsymbolicator.ts

@@ -1,5 +1,5 @@
+import { logger } from '@sentry/core';
 import type { Event, EventHint, Exception, Integration, StackFrame as SentryStackFrame } from '@sentry/types';
-import { logger } from '@sentry/utils';
 
 import type { ExtendedError } from '../utils/error';
 import { getFramesToPop, isErrorLike } from '../utils/error';

packages/core/src/js/integrations/debugsymbolicatorutils.ts

@@ -1,5 +1,5 @@
+import { logger } from '@sentry/core';
 import type { StackFrame as SentryStackFrame } from '@sentry/types';
-import { logger } from '@sentry/utils';
 
 import { ReactNativeLibraries } from '../utils/rnlibraries';
 import { createStealthXhr, XHR_READYSTATE_DONE } from '../utils/xhr';

packages/core/src/js/integrations/devicecontext.ts

@@ -1,6 +1,6 @@
 /* eslint-disable complexity */
+import { logger, severityLevelFromString } from '@sentry/core';
 import type { Client, Event, EventHint, Integration } from '@sentry/types';
-import { logger, severityLevelFromString } from '@sentry/utils';
 import { AppState } from 'react-native';
 
 import { breadcrumbFromObject } from '../breadcrumb';

packages/core/src/js/integrations/modulesloader.ts

@@ -1,5 +1,5 @@
+import { logger } from '@sentry/core';
 import type { Event, Integration } from '@sentry/types';
-import { logger } from '@sentry/utils';
 
 import { NATIVE } from '../wrapper';
 

packages/core/src/js/integrations/nativelinkederrors.ts

@@ -1,4 +1,5 @@
 import { exceptionFromError } from '@sentry/browser';
+import { isInstanceOf, isPlainObject, isString } from '@sentry/core';
 import type {
   Client,
   DebugImage,
@@ -10,7 +11,6 @@ import type {
   StackFrame,
   StackParser,
 } from '@sentry/types';
-import { isInstanceOf, isPlainObject, isString } from '@sentry/utils';
 
 import type { NativeStackFrames } from '../NativeRNSentry';
 import { NATIVE } from '../wrapper';

packages/core/src/js/integrations/reactnativeerrorhandlers.ts

@@ -1,6 +1,5 @@
-import { captureException, getClient, getCurrentScope } from '@sentry/core';
+import { addExceptionMechanism, captureException, getClient, getCurrentScope, logger } from '@sentry/core';
 import type { EventHint, Integration, SeverityLevel } from '@sentry/types';
-import { addExceptionMechanism, logger } from '@sentry/utils';
 
 import { createSyntheticError, isErrorLike } from '../utils/error';
 import { RN_GLOBAL_OBJ } from '../utils/worldwide';

packages/core/src/js/integrations/reactnativeerrorhandlersutils.ts

@@ -1,4 +1,4 @@
-import { logger } from '@sentry/utils';
+import { logger } from '@sentry/core';
 
 import { ReactNativeLibraries } from '../utils/rnlibraries';
 import { RN_GLOBAL_OBJ } from '../utils/worldwide';

packages/core/src/js/integrations/sdkinfo.ts

@@ -1,5 +1,5 @@
+import { logger } from '@sentry/core';
 import type { Event, Integration, Package, SdkInfo as SdkInfoType } from '@sentry/types';
-import { logger } from '@sentry/utils';
 
 import { isExpoGo, notWeb } from '../utils/environment';
 import { SDK_NAME, SDK_PACKAGE_NAME, SDK_VERSION } from '../version';

packages/core/src/js/integrations/spotlight.ts

@@ -1,5 +1,5 @@
+import { logger, serializeEnvelope } from '@sentry/core';
 import type { BaseTransportOptions, Client, ClientOptions, Envelope, Integration } from '@sentry/types';
-import { logger, serializeEnvelope } from '@sentry/utils';
 
 import { ReactNativeLibraries } from '../utils/rnlibraries';
 import { createStealthXhr, XHR_READYSTATE_DONE } from '../utils/xhr';

packages/core/src/js/integrations/viewhierarchy.ts

@@ -1,5 +1,5 @@
+import { logger } from '@sentry/core';
 import type { Attachment, Event, EventHint, Integration } from '@sentry/types';
-import { logger } from '@sentry/utils';
 
 import { NATIVE } from '../wrapper';
 

packages/core/src/js/profiling/cache.ts

@@ -1,4 +1,4 @@
-import { makeFifoCache } from '@sentry/utils';
+import { makeFifoCache } from '@sentry/core';
 
 import type { AndroidCombinedProfileEvent, CombinedProfileEvent } from './types';
 

packages/core/src/js/profiling/convertHermesProfile.ts

@@ -1,5 +1,5 @@
+import { logger } from '@sentry/core';
 import type { FrameId, StackId, ThreadCpuFrame, ThreadCpuSample, ThreadCpuStack, ThreadId } from '@sentry/types';
-import { logger } from '@sentry/utils';
 
 import { MAX_PROFILE_DURATION_MS } from './constants';
 import type * as Hermes from './hermes';

packages/core/src/js/profiling/debugid.ts

@@ -1,5 +1,5 @@
+import { GLOBAL_OBJ, logger } from '@sentry/core';
 import type { DebugImage } from '@sentry/types';
-import { GLOBAL_OBJ, logger } from '@sentry/utils';
 
 import { DEFAULT_BUNDLE_NAME } from './hermes';
 

packages/core/src/js/profiling/integration.ts

@@ -1,7 +1,6 @@
 /* eslint-disable complexity */
-import { getActiveSpan, getClient, spanIsSampled } from '@sentry/core';
+import { getActiveSpan, getClient, logger, spanIsSampled, uuid4 } from '@sentry/core';
 import type { Envelope, Event, Integration, Span, ThreadCpuProfile } from '@sentry/types';
-import { logger, uuid4 } from '@sentry/utils';
 import { Platform } from 'react-native';
 
 import type { ReactNativeClient } from '../client';

packages/core/src/js/profiling/utils.ts

@@ -1,6 +1,6 @@
 /* eslint-disable complexity */
+import { forEachEnvelopeItem, logger } from '@sentry/core';
 import type { Envelope, Event, ThreadCpuProfile } from '@sentry/types';
-import { forEachEnvelopeItem, logger } from '@sentry/utils';
 
 import { getDefaultEnvironment } from '../utils/environment';
 import { getDebugMetadata } from './debugid';

packages/core/src/js/replay/CustomMask.tsx

@@ -1,4 +1,4 @@
-import { logger } from '@sentry/utils';
+import { logger } from '@sentry/core';
 import * as React from 'react';
 import type { HostComponent, ViewProps } from 'react-native';
 import { UIManager, View } from 'react-native';

packages/core/src/js/replay/mobilereplay.ts

@@ -1,5 +1,5 @@
+import { logger } from '@sentry/core';
 import type { Client, DynamicSamplingContext, Event, Integration } from '@sentry/types';
-import { logger } from '@sentry/utils';
 
 import { isHardCrash } from '../misc';
 import { hasHooks } from '../utils/clientutils';

packages/core/src/js/replay/xhrUtils.ts

@@ -1,5 +1,5 @@
+import { dropUndefinedKeys } from '@sentry/core';
 import type { Breadcrumb, BreadcrumbHint, SentryWrappedXMLHttpRequest, XhrBreadcrumbHint } from '@sentry/types';
-import { dropUndefinedKeys } from '@sentry/utils';
 
 import type { RequestBody } from './networkUtils';
 import { getBodySize, parseContentLengthHeader } from './networkUtils';

packages/core/src/js/sdk.tsx

@@ -1,11 +1,10 @@
 /* eslint-disable complexity */
-import { captureFeedback, getClient, getGlobalScope,getIntegrationsToSetup, getIsolationScope,initAndBind, withScope as coreWithScope } from '@sentry/core';
+import { captureFeedback, getClient, getGlobalScope, getIntegrationsToSetup, getIsolationScope, initAndBind, logger, stackParserFromStackParserOptions, withScope as coreWithScope } from '@sentry/core';
 import {
   defaultStackParser,
   makeFetchTransport,
 } from '@sentry/react';
 import type { Breadcrumb, BreadcrumbHint, Integration, Scope, SendFeedbackParams, UserFeedback } from '@sentry/types';
-import { logger, stackParserFromStackParserOptions } from '@sentry/utils';
 import * as React from 'react';
 
 import { ReactNativeClient } from './client';

packages/core/src/js/tools/ModulesCollector.ts

@@ -1,4 +1,4 @@
-import { logger } from '@sentry/utils';
+import { logger } from '@sentry/core';
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { posix, sep } from 'path';
 

packages/core/src/js/tools/enableLogger.ts

@@ -1,4 +1,4 @@
-import { logger } from '@sentry/utils';
+import { logger } from '@sentry/core';
 
 /**
  * Enables debug logger when SENTRY_LOG_LEVEL=debug.

packages/core/src/js/tools/metroMiddleware.ts

@@ -1,5 +1,5 @@
+import { addContextToFrame, logger } from '@sentry/core';
 import type { StackFrame } from '@sentry/types';
-import { addContextToFrame, logger } from '@sentry/utils';
 import { readFile } from 'fs';
 import type { IncomingMessage, ServerResponse } from 'http';
 import type { InputConfigT, Middleware } from 'metro-config';

packages/core/src/js/tools/metroconfig.ts

@@ -1,4 +1,4 @@
-import { logger } from '@sentry/utils';
+import { logger } from '@sentry/core';
 import type { MetroConfig, MixedOutput, Module, ReadOnlyGraph } from 'metro';
 import type { CustomResolutionContext, CustomResolver, Resolution } from 'metro-resolver';
 import * as process from 'process';
@@ -246,8 +246,8 @@ export function withSentryFramesCollapsed(config: MetroConfig): MetroConfig {
   const originalCustomizeFrame = config.symbolicator?.customizeFrame;
   const collapseSentryInternalFrames = (frame: MetroFrame): boolean =>
     typeof frame.file === 'string' &&
-    (frame.file.includes('node_modules/@sentry/utils/cjs/instrument.js') ||
-      frame.file.includes('node_modules/@sentry/utils/cjs/logger.js'));
+    (frame.file.includes('node_modules/@sentry/core/cjs/instrument.js') ||
+      frame.file.includes('node_modules/@sentry/core/cjs/logger.js'));
 
   const customizeFrame = (frame: MetroFrame): MetroCustomizeFrameReturnValue => {
     const originalOrSentryCustomizeFrame = (

packages/core/src/js/tools/sentryBabelTransformerUtils.ts

@@ -1,4 +1,4 @@
-import { logger } from '@sentry/utils';
+import { logger } from '@sentry/core';
 import * as process from 'process';
 
 import type { BabelTransformer } from './vendor/metro/metroBabelTransformer';

packages/core/src/js/touchevents.tsx

@@ -1,6 +1,5 @@
-import { addBreadcrumb, getClient, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { addBreadcrumb, dropUndefinedKeys, getClient, logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import type { SeverityLevel } from '@sentry/types';
-import { dropUndefinedKeys, logger } from '@sentry/utils';
 import * as React from 'react';
 import type { GestureResponderEvent } from 'react-native';
 import { StyleSheet, View } from 'react-native';

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

@@ -1,6 +1,5 @@
-import { addBreadcrumb, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { addBreadcrumb, logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import type { Breadcrumb } from '@sentry/types';
-import { logger } from '@sentry/utils';
 
 import { startUserInteractionSpan } from './integrations/userInteraction';
 import { UI_ACTION } from './ops';

packages/core/src/js/tracing/integrations/appStart.ts

@@ -3,12 +3,13 @@ import {
   getCapturedScopesOnSpan,
   getClient,
   getCurrentScope,
+  logger,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SentryNonRecordingSpan,
   startInactiveSpan,
+  timestampInSeconds,
 } from '@sentry/core';
 import type { Client, Event, Integration, SpanJSON, TransactionEvent } from '@sentry/types';
-import { logger, timestampInSeconds } from '@sentry/utils';
 
 import {
   APP_START_COLD as APP_START_COLD_MEASUREMENT,

packages/core/src/js/tracing/integrations/nativeFrames.ts

@@ -1,5 +1,5 @@
+import { logger, timestampInSeconds } from '@sentry/core';
 import type { Client, Event, Integration, Measurements, MeasurementUnit, Span } from '@sentry/types';
-import { logger, timestampInSeconds } from '@sentry/utils';
 
 import type { NativeFramesResponse } from '../../NativeRNSentry';
 import { AsyncExpiringMap } from '../../utils/AsyncExpiringMap';

packages/core/src/js/tracing/integrations/stalltracking.ts

@@ -1,7 +1,6 @@
 /* eslint-disable max-lines */
-import { getRootSpan, spanToJSON } from '@sentry/core';
+import { getRootSpan, logger, spanToJSON, timestampInSeconds } from '@sentry/core';
 import type { Client, Integration, Measurements, MeasurementUnit, Span } from '@sentry/types';
-import { logger, timestampInSeconds } from '@sentry/utils';
 import type { AppStateStatus } from 'react-native';
 import { AppState } from 'react-native';
 

packages/core/src/js/tracing/integrations/userInteraction.ts

@@ -1,6 +1,12 @@
-import { getActiveSpan, getClient, getCurrentScope, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
+import {
+  getActiveSpan,
+  getClient,
+  getCurrentScope,
+  logger,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  spanToJSON,
+} from '@sentry/core';
 import type { Integration, Span, StartSpanOptions } from '@sentry/types';
-import { logger } from '@sentry/utils';
 
 import type { ReactNativeClientOptions } from '../../options';
 import { onlySampleIfChildSpans } from '../onSpanEndUtils';

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

@@ -1,6 +1,5 @@
-import { getSpanDescendants, SPAN_STATUS_ERROR, spanToJSON } from '@sentry/core';
+import { getSpanDescendants, logger, SPAN_STATUS_ERROR, spanToJSON } from '@sentry/core';
 import type { Client, Span } from '@sentry/types';
-import { logger } from '@sentry/utils';
 import type { AppStateStatus } from 'react-native';
 import { AppState } from 'react-native';
 

packages/core/src/js/tracing/reactnativeprofiler.tsx

@@ -1,5 +1,5 @@
+import { timestampInSeconds } from '@sentry/core';
 import { getClient, Profiler } from '@sentry/react';
-import { timestampInSeconds } from '@sentry/utils';
 
 import { createIntegration } from '../integrations/factory';
 import { _captureAppStart, _setRootComponentCreationTimestampMs } from '../tracing/integrations/appStart';

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

@@ -3,14 +3,16 @@ import {
   addBreadcrumb,
   getActiveSpan,
   getClient,
+  isPlainObject,
+  logger,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SPAN_STATUS_OK,
   spanToJSON,
   startInactiveSpan,
+  timestampInSeconds,
 } from '@sentry/core';
 import type { Client, Integration, Span } from '@sentry/types';
-import { isPlainObject, logger, timestampInSeconds } from '@sentry/utils';
 
 import type { NewFrameEvent } from '../utils/sentryeventemitter';
 import type { SentryEventEmitterFallback } from '../utils/sentryeventemitterfallback';

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

@@ -1,7 +1,9 @@
 import {
+  generatePropagationContext,
   getActiveSpan,
   getClient,
   getCurrentScope,
+  logger,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SentryNonRecordingSpan,
@@ -10,7 +12,6 @@ import {
   startIdleSpan as coreStartIdleSpan,
 } from '@sentry/core';
 import type { Client, Scope, Span, StartSpanOptions } from '@sentry/types';
-import { generatePropagationContext, logger } from '@sentry/utils';
 
 import { isRootSpan } from '../utils/span';
 import { adjustTransactionDuration, cancelInBackground } from './onSpanEndUtils';