fix stuff

Author: mydea

docs/migration/v8-to-v9.md

@@ -150,7 +150,6 @@ Sentry.init({
 The following changes are unlikely to affect users of the SDK. They are listed here only for completion sake, and to alert users that may be relying on internal behavior.
 
 - `client._prepareEvent()` now requires a currentScope & isolationScope to be passed as last arugments
-- `client._processEvent()` is now private (was protected)
 
 ### `@sentry/browser`
 

packages/core/src/baseclient.ts

@@ -764,7 +764,12 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
    * @param currentScope A scope containing event metadata.
    * @returns A SyncPromise that resolves with the event or rejects in case event was/will not be send.
    */
-  private _processEvent(event: Event, hint: EventHint, currentScope: Scope, isolationScope: Scope): PromiseLike<Event> {
+  protected _processEvent(
+    event: Event,
+    hint: EventHint,
+    currentScope: Scope,
+    isolationScope: Scope,
+  ): PromiseLike<Event> {
     const options = this.getOptions();
     const { sampleRate } = options;
 

packages/core/test/lib/serverruntimeclient.test.ts renamed to packages/core/test/lib/server-runtime-client.test.ts

@@ -1,6 +1,6 @@
 import type { Event, EventHint } from '../../src/types-hoist';
 
-import { createTransport } from '../../src';
+import { Scope, createTransport } from '../../src';
 import type { ServerRuntimeClientOptions } from '../../src/server-runtime-client';
 import { ServerRuntimeClient } from '../../src/server-runtime-client';
 
@@ -18,14 +18,17 @@ function getDefaultClientOptions(options: Partial<ServerRuntimeClientOptions> =
 describe('ServerRuntimeClient', () => {
   let client: ServerRuntimeClient;
 
+  const currentScope = new Scope();
+  const isolationScope = new Scope();
+
   describe('_prepareEvent', () => {
     test('adds platform to event', () => {
       const options = getDefaultClientOptions({ dsn: PUBLIC_DSN });
       const client = new ServerRuntimeClient({ ...options, platform: 'blargh' });
 
       const event: Event = {};
       const hint: EventHint = {};
-      (client as any)._prepareEvent(event, hint);
+      client['_prepareEvent'](event, hint, currentScope, isolationScope);
 
       expect(event.platform).toEqual('blargh');
     });
@@ -36,7 +39,7 @@ describe('ServerRuntimeClient', () => {
 
       const event: Event = {};
       const hint: EventHint = {};
-      (client as any)._prepareEvent(event, hint);
+      client['_prepareEvent'](event, hint, currentScope, isolationScope);
 
       expect(event.server_name).toEqual('server');
     });
@@ -47,7 +50,7 @@ describe('ServerRuntimeClient', () => {
 
       const event: Event = {};
       const hint: EventHint = {};
-      (client as any)._prepareEvent(event, hint);
+      client['_prepareEvent'](event, hint, currentScope, isolationScope);
 
       expect(event.contexts?.runtime).toEqual({
         name: 'edge',
@@ -60,7 +63,7 @@ describe('ServerRuntimeClient', () => {
 
       const event: Event = { contexts: { runtime: { name: 'foo', version: '1.2.3' } } };
       const hint: EventHint = {};
-      (client as any)._prepareEvent(event, hint);
+      client['_prepareEvent'](event, hint, currentScope, isolationScope);
 
       expect(event.contexts?.runtime).toEqual({ name: 'foo', version: '1.2.3' });
       expect(event.contexts?.runtime).not.toEqual({ name: 'edge' });

packages/node/test/sdk/client.test.ts

@@ -2,8 +2,7 @@ import * as os from 'os';
 import { ProxyTracer } from '@opentelemetry/api';
 import * as opentelemetryInstrumentationPackage from '@opentelemetry/instrumentation';
 import type { Event, EventHint } from '@sentry/core';
-import { SDK_VERSION, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
-
+import { SDK_VERSION, Scope, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
 import { setOpenTelemetryContextAsyncContextStrategy } from '@sentry/opentelemetry';
 import { NodeClient } from '../../src';
 import { getDefaultNodeClientOptions } from '../helpers/getDefaultNodeClientOptions';
@@ -65,13 +64,16 @@ describe('NodeClient', () => {
   });
 
   describe('_prepareEvent', () => {
+    const currentScope = new Scope();
+    const isolationScope = new Scope();
+
     test('adds platform to event', () => {
       const options = getDefaultNodeClientOptions({});
       const client = new NodeClient(options);
 
       const event: Event = {};
       const hint: EventHint = {};
-      client['_prepareEvent'](event, hint);
+      client['_prepareEvent'](event, hint, currentScope, isolationScope);
 
       expect(event.platform).toEqual('node');
     });
@@ -82,7 +84,7 @@ describe('NodeClient', () => {
 
       const event: Event = {};
       const hint: EventHint = {};
-      client['_prepareEvent'](event, hint);
+      client['_prepareEvent'](event, hint, currentScope, isolationScope);
 
       expect(event.contexts?.runtime).toEqual({
         name: 'node',
@@ -96,7 +98,7 @@ describe('NodeClient', () => {
 
       const event: Event = {};
       const hint: EventHint = {};
-      client['_prepareEvent'](event, hint);
+      client['_prepareEvent'](event, hint, currentScope, isolationScope);
 
       expect(event.server_name).toEqual('foo');
     });
@@ -108,7 +110,7 @@ describe('NodeClient', () => {
 
       const event: Event = {};
       const hint: EventHint = {};
-      client['_prepareEvent'](event, hint);
+      client['_prepareEvent'](event, hint, currentScope, isolationScope);
 
       expect(event.server_name).toEqual('foo');
 
@@ -121,7 +123,7 @@ describe('NodeClient', () => {
 
       const event: Event = {};
       const hint: EventHint = {};
-      client['_prepareEvent'](event, hint);
+      client['_prepareEvent'](event, hint, currentScope, isolationScope);
 
       expect(event.server_name).toEqual(os.hostname());
     });
@@ -132,7 +134,7 @@ describe('NodeClient', () => {
 
       const event: Event = { contexts: { runtime: { name: 'foo', version: '1.2.3' } } };
       const hint: EventHint = {};
-      client['_prepareEvent'](event, hint);
+      client['_prepareEvent'](event, hint, currentScope, isolationScope);
 
       expect(event.contexts?.runtime).toEqual({ name: 'foo', version: '1.2.3' });
       expect(event.contexts?.runtime).not.toEqual({ name: 'node', version: process.version });
@@ -144,7 +146,7 @@ describe('NodeClient', () => {
 
       const event: Event = { server_name: 'foo' };
       const hint: EventHint = {};
-      client['_prepareEvent'](event, hint);
+      client['_prepareEvent'](event, hint, currentScope, isolationScope);
 
       expect(event.server_name).toEqual('foo');
       expect(event.server_name).not.toEqual('bar');