Merge branch 'main' into warren/revisit-log-parsing-logic

Author: wrn14897

packages/browser/.eslintrc.json

@@ -10,18 +10,17 @@
     "sourceType": "module",
     "ecmaVersion": 2020
   },
-  "plugins": ["@typescript-eslint", "jest"],
+  "plugins": ["@typescript-eslint", "jest", "prettier", "simple-import-sort"],
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:jest/recommended",
-    "prettier"
+    "plugin:prettier/recommended"
   ],
   "rules": {
-    // The following rule is enabled only to supplement the inline suppression
-    // examples, and because it is not a recommended rule, you should either
-    // disable it, or understand what it enforces.
-    // https://typescript-eslint.io/rules/explicit-function-return-type/
-    "@typescript-eslint/explicit-function-return-type": "warn"
+    "@typescript-eslint/explicit-function-return-type": "warn",
+    "prettier/prettier": "error",
+    "simple-import-sort/exports": "error",
+    "simple-import-sort/imports": "error"
   }
 }

packages/browser/src/index.ts

@@ -1,11 +1,10 @@
+import type { RumOtelWebConfig } from '@hyperdx/otel-web';
 import Rum from '@hyperdx/otel-web';
 import SessionRecorder from '@hyperdx/otel-web-session-recorder';
 import opentelemetry, { Attributes } from '@opentelemetry/api';
 
 import { resolveAsyncGlobal } from './utils';
 
-import type { RumOtelWebConfig } from '@hyperdx/otel-web';
-
 type ErrorBoundaryComponent = any; // TODO: Define ErrorBoundary type
 
 type Instrumentations = RumOtelWebConfig['instrumentations'];

packages/instrumentation-exception/.eslintrc.json

@@ -10,20 +10,19 @@
     "sourceType": "module",
     "ecmaVersion": 2020
   },
-  "plugins": ["@typescript-eslint", "jest"],
+  "plugins": ["@typescript-eslint", "jest", "prettier", "simple-import-sort"],
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:jest/recommended",
-    "prettier"
+    "plugin:prettier/recommended"
   ],
   "rules": {
-    // The following rule is enabled only to supplement the inline suppression
-    // examples, and because it is not a recommended rule, you should either
-    // disable it, or understand what it enforces.
-    // https://typescript-eslint.io/rules/explicit-function-return-type/
     "@typescript-eslint/ban-ts-comment": "warn",
     "@typescript-eslint/explicit-function-return-type": "warn",
-    "@typescript-eslint/no-this-alias": "warn"
+    "@typescript-eslint/no-this-alias": "warn",
+    "prettier/prettier": "error",
+    "simple-import-sort/exports": "error",
+    "simple-import-sort/imports": "error"
   }
 }

packages/instrumentation-exception/src/browser/eventbuilder.ts

@@ -83,8 +83,8 @@ function eventFromPlainObject(
           type: isEvent(exception)
             ? exception.constructor.name
             : isUnhandledRejection
-            ? 'UnhandledRejection'
-            : 'Error',
+              ? 'UnhandledRejection'
+              : 'Error',
           value: getNonErrorObjectExceptionValue(exception, {
             isUnhandledRejection,
           }),

packages/instrumentation-exception/src/browser/helpers.ts

@@ -1,11 +1,11 @@
 import { captureException, withScope } from '@sentry/core';
 import type { Mechanism, WrappedFunction } from '@sentry/types';
 import {
-  GLOBAL_OBJ,
   addExceptionMechanism,
   addExceptionTypeValue,
   addNonEnumerableProperty,
   getOriginalFunction,
+  GLOBAL_OBJ,
   markFunctionWrapped,
 } from '@sentry/utils';
 

packages/instrumentation-exception/src/browser/index.ts

@@ -1,22 +1,22 @@
-import type { ClientOptions, Event, EventHint } from '@sentry/types';
+import { getEventProcessor } from '@hyperdx/instrumentation-sentry-node';
+import { Attributes, diag, Span, trace, Tracer } from '@opentelemetry/api';
 import {
   dedupeIntegration,
   functionToStringIntegration,
   inboundFiltersIntegration,
   prepareEvent,
 } from '@sentry/core';
-import { Attributes, Span, Tracer, diag, trace } from '@opentelemetry/api';
-import { getEventProcessor } from '@hyperdx/instrumentation-sentry-node';
+import type { ClientOptions, Event, EventHint } from '@sentry/types';
 
+import { name as PKG_NAME, version as PKG_VERSION } from '../../package.json';
+import { eventFromUnknownInput } from './eventbuilder';
 import { browserApiErrorsIntegration } from './integrations/browserapierrors';
 import { contextLinesIntegration } from './integrations/contextlines';
-import { defaultStackParser } from './stack-parsers';
-import { eventFromUnknownInput } from './eventbuilder';
 import { globalHandlersIntegration } from './integrations/globalhandlers';
 import { httpContextIntegration } from './integrations/httpcontext';
 import { hyperdxIntegration } from './integrations/hyperdx';
 import { linkedErrorsIntegration } from './integrations/linkederrors';
-import { name as PKG_NAME, version as PKG_VERSION } from '../../package.json';
+import { defaultStackParser } from './stack-parsers';
 
 // TODO: does it make sense to have a default tracer here?
 const defaultTracer = trace.getTracer(PKG_NAME, PKG_VERSION);

packages/instrumentation-exception/src/browser/instrumentations/HyperDXErrorInstrumentation.ts

@@ -1,12 +1,12 @@
-import * as shimmer from 'shimmer';
 import { Span } from '@opentelemetry/api';
 import {
   InstrumentationBase,
   InstrumentationConfig,
 } from '@opentelemetry/instrumentation';
+import * as shimmer from 'shimmer';
 
 import { recordException } from '../';
-import { limitLen, getElementXPath } from './utils';
+import { getElementXPath, limitLen } from './utils';
 
 // FIXME take timestamps from events?
 
@@ -109,8 +109,8 @@ export class HyperDXErrorInstrumentation extends InstrumentationBase {
       useful(err.name)
         ? err.name
         : err.constructor && err.constructor.name
-        ? err.constructor.name
-        : 'Error',
+          ? err.constructor.name
+          : 'Error',
     );
     span.setAttribute('error.message', limitLen(msg, MESSAGE_LIMIT));
     addStackIfUseful(span, err);

packages/instrumentation-exception/src/browser/integrations/contextlines.ts

@@ -1,8 +1,8 @@
 import { defineIntegration } from '@sentry/core';
 import type { Event, IntegrationFn, StackFrame } from '@sentry/types';
 import {
-  GLOBAL_OBJ,
   addContextToFrame,
+  GLOBAL_OBJ,
   stripUrlQueryAndFragment,
 } from '@sentry/utils';
 

packages/instrumentation-exception/src/browser/integrations/globalhandlers.ts

@@ -1,5 +1,5 @@
-import { captureEvent, defineIntegration, getClient } from '@sentry/core';
 import { diag } from '@opentelemetry/api';
+import { captureEvent, defineIntegration, getClient } from '@sentry/core';
 import type {
   Client,
   Event,
@@ -8,12 +8,12 @@ import type {
   StackParser,
 } from '@sentry/types';
 import {
-  UNKNOWN_FUNCTION,
   addGlobalErrorInstrumentationHandler,
   addGlobalUnhandledRejectionInstrumentationHandler,
   getLocationHref,
   isPrimitive,
   isString,
+  UNKNOWN_FUNCTION,
 } from '@sentry/utils';
 
 import { eventFromUnknownInput } from '../eventbuilder';

packages/instrumentation-exception/src/browser/integrations/httpcontext.ts

@@ -1,4 +1,5 @@
 import { defineIntegration } from '@sentry/core';
+
 import { WINDOW } from '../helpers';
 
 /**

packages/instrumentation-exception/src/browser/integrations/hyperdx.ts

@@ -1,5 +1,5 @@
-import type { Event, IntegrationFn, StackFrame } from '@sentry/types';
 import { defineIntegration } from '@sentry/core';
+import type { Event, IntegrationFn, StackFrame } from '@sentry/types';
 
 const INTEGRATION_NAME = 'HyperDX';
 

packages/instrumentation-exception/src/browser/integrations/linkederrors.ts

@@ -1,6 +1,7 @@
 import { defineIntegration } from '@sentry/core';
 import type { IntegrationFn } from '@sentry/types';
 import { applyAggregateErrorsToEvent } from '@sentry/utils';
+
 import { exceptionFromError } from '../eventbuilder';
 
 interface LinkedErrorsOptions {

packages/instrumentation-exception/src/browser/stack-parsers.ts

@@ -28,7 +28,7 @@ import type {
   StackLineParser,
   StackLineParserFn,
 } from '@sentry/types';
-import { UNKNOWN_FUNCTION, createStackParser } from '@sentry/utils';
+import { createStackParser, UNKNOWN_FUNCTION } from '@sentry/utils';
 
 const OPERA10_PRIORITY = 10;
 const OPERA11_PRIORITY = 20;

packages/instrumentation-exception/src/index.ts

@@ -1,5 +1,5 @@
-export { recordException } from './node';
 export * from './instrumentation';
+export { recordException } from './node';
 export * from './types';
 
 // error handlers

packages/instrumentation-exception/src/instrumentation.ts

@@ -1,10 +1,10 @@
+import { diag, trace, TracerProvider } from '@opentelemetry/api';
 import { InstrumentationBase } from '@opentelemetry/instrumentation';
-import { TracerProvider, diag, trace } from '@opentelemetry/api';
 
-import { ExceptionInstrumentationConfig } from './types';
 import { name as PKG_NAME, version as PKG_VERSION } from '../package.json';
 import { onUncaughtExceptionIntegration } from './node/integrations/onuncaughtexception';
 import { onUnhandledRejectionIntegration } from './node/integrations/onunhandledrejection';
+import { ExceptionInstrumentationConfig } from './types';
 
 /** Exception instrumentation for OpenTelemetry */
 export class ExceptionInstrumentation extends InstrumentationBase {

packages/instrumentation-exception/src/node/index.ts

@@ -1,23 +1,23 @@
+import { getEventProcessor } from '@hyperdx/instrumentation-sentry-node';
+import { Attributes, diag, Span, trace, Tracer } from '@opentelemetry/api';
+import { inboundFiltersIntegration, prepareEvent } from '@sentry/core';
 import type {
   Client,
   ClientOptions,
   Event,
   EventHint,
   Integration,
 } from '@sentry/types';
-import { inboundFiltersIntegration, prepareEvent } from '@sentry/core';
-import { Attributes, Span, Tracer, diag, trace } from '@opentelemetry/api';
 import { eventFromUnknownInput } from '@sentry/utils';
-import { getEventProcessor } from '@hyperdx/instrumentation-sentry-node';
 
+import { name as PKG_NAME, version as PKG_VERSION } from '../../package.json';
+import { nodeContextIntegration } from './integrations/context';
 import { contextLinesIntegration } from './integrations/contextlines';
-import { defaultStackParser } from './sdk/api';
 import { hyperdxIntegration } from './integrations/hyperdx';
-import { isCjs } from './utils/commonjs';
 import { localVariablesIntegration } from './integrations/local-variables';
 import { modulesIntegration } from './integrations/modules';
-import { nodeContextIntegration } from './integrations/context';
-import { name as PKG_NAME, version as PKG_VERSION } from '../../package.json';
+import { defaultStackParser } from './sdk/api';
+import { isCjs } from './utils/commonjs';
 
 // TODO: does it make sense to have a default tracer here?
 const defaultTracer = trace.getTracer(PKG_NAME, PKG_VERSION);

packages/instrumentation-exception/src/node/integrations/context.ts

@@ -1,9 +1,10 @@
 /* eslint-disable max-lines */
 import { execFile } from 'node:child_process';
-import { readFile, readdir } from 'node:fs';
+import { readdir, readFile } from 'node:fs';
 import * as os from 'node:os';
 import { join } from 'node:path';
 import { promisify } from 'node:util';
+
 import { defineIntegration } from '@sentry/core';
 import type {
   AppContext,

packages/instrumentation-exception/src/node/integrations/contextlines.ts

@@ -1,7 +1,8 @@
 import { promises } from 'node:fs';
+
 import { defineIntegration } from '@sentry/core';
 import type { Event, IntegrationFn, StackFrame } from '@sentry/types';
-import { LRUMap, addContextToFrame } from '@sentry/utils';
+import { addContextToFrame, LRUMap } from '@sentry/utils';
 
 const FILE_CONTENT_CACHE = new LRUMap<string, string[] | null>(100);
 const DEFAULT_LINES_OF_CONTEXT = 7;

packages/instrumentation-exception/src/node/integrations/hyperdx.ts

@@ -1,5 +1,5 @@
-import type { Event, IntegrationFn } from '@sentry/types';
 import { defineIntegration } from '@sentry/core';
+import type { Event, IntegrationFn } from '@sentry/types';
 
 import { getSentryRelease } from '../sdk/api';
 

packages/instrumentation-exception/src/node/integrations/local-variables/common.ts

@@ -1,4 +1,5 @@
 import type { Debugger } from 'node:inspector';
+
 import type { StackFrame, StackParser } from '@sentry/types';
 
 export type Variables = Record<string, unknown>;

packages/instrumentation-exception/src/node/integrations/local-variables/index.ts

@@ -1,4 +1,5 @@
 import type { Integration } from '@sentry/types';
+
 import { NODE_VERSION } from '../../nodeVersion';
 import type { LocalVariablesIntegrationOptions } from './common';
 import { localVariablesAsyncIntegration } from './local-variables-async';

packages/instrumentation-exception/src/node/integrations/local-variables/local-variables-async.ts

@@ -1,7 +1,8 @@
 import { Worker } from 'node:worker_threads';
+
 import { defineIntegration } from '@sentry/core';
 import type { Event, Exception, IntegrationFn } from '@sentry/types';
-import { LRUMap, logger } from '@sentry/utils';
+import { logger, LRUMap } from '@sentry/utils';
 
 import type {
   FrameVariables,

packages/instrumentation-exception/src/node/integrations/local-variables/local-variables-sync.ts

@@ -4,16 +4,18 @@ import type {
   Runtime,
   Session,
 } from 'node:inspector';
+
 import { defineIntegration } from '@sentry/core';
 import type {
   Event,
   Exception,
   IntegrationFn,
   StackParser,
 } from '@sentry/types';
-import { LRUMap, logger } from '@sentry/utils';
+import { logger, LRUMap } from '@sentry/utils';
 
 import { NODE_MAJOR } from '../../nodeVersion';
+import { defaultStackParser } from '../../sdk/api';
 import type {
   FrameVariables,
   LocalVariablesIntegrationOptions,
@@ -27,7 +29,6 @@ import {
   hashFrames,
   hashFromStack,
 } from './common';
-import { defaultStackParser } from '../../sdk/api';
 
 type OnPauseEvent = InspectorNotification<Debugger.PausedEventDataType>;
 export interface DebugSession {

packages/instrumentation-exception/src/node/integrations/local-variables/worker.ts

@@ -1,8 +1,10 @@
 import type { Debugger, InspectorNotification, Runtime } from 'node:inspector';
 import { Session } from 'node:inspector/promises';
 import { parentPort, workerData } from 'node:worker_threads';
+
 import type { StackParser } from '@sentry/types';
 import { createStackParser, nodeStackLineParser } from '@sentry/utils';
+
 import { createGetModuleFromFilename } from '../../utils/module';
 import type {
   LocalVariablesWorkerArgs,

packages/instrumentation-exception/src/node/integrations/modules.ts

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
+
 import { defineIntegration } from '@sentry/core';
 import type { IntegrationFn } from '@sentry/types';
 

packages/instrumentation-exception/src/node/integrations/onuncaughtexception.ts

@@ -1,8 +1,8 @@
-import { defineIntegration } from '@sentry/core';
 import { diag } from '@opentelemetry/api';
+import { defineIntegration } from '@sentry/core';
 
-import { logAndExitProcess } from '../utils/errorhandling';
 import { recordException } from '..';
+import { logAndExitProcess } from '../utils/errorhandling';
 
 type OnFatalErrorHandler = typeof logAndExitProcess;
 

packages/instrumentation-exception/src/node/integrations/onunhandledrejection.ts

@@ -1,10 +1,10 @@
+import { diag } from '@opentelemetry/api';
+import { defineIntegration } from '@sentry/core';
 import type { IntegrationFn } from '@sentry/types';
 import { consoleSandbox } from '@sentry/utils';
-import { defineIntegration } from '@sentry/core';
-import { diag } from '@opentelemetry/api';
 
-import { logAndExitProcess } from '../utils/errorhandling';
 import { recordException } from '..';
+import { logAndExitProcess } from '../utils/errorhandling';
 
 export type UnhandledRejectionMode = 'none' | 'warn' | 'strict';
 

packages/instrumentation-exception/src/node/sdk/api.ts

@@ -2,10 +2,11 @@
 
 import type { StackParser } from '@sentry/types';
 import {
-  GLOBAL_OBJ,
   createStackParser,
+  GLOBAL_OBJ,
   nodeStackLineParser,
 } from '@sentry/utils';
+
 import { createGetModuleFromFilename } from '../utils/module';
 
 /**

packages/instrumentation-exception/src/node/utils/errorhandling.ts

@@ -1,5 +1,5 @@
-import { consoleSandbox } from '@sentry/utils';
 import { diag } from '@opentelemetry/api';
+import { consoleSandbox } from '@sentry/utils';
 
 const DEFAULT_SHUTDOWN_TIMEOUT = 2000;