fix test

Author: mydea

packages/sveltekit/test/server/handle.test.ts

@@ -1,7 +1,8 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, addTracingExtensions, spanToJSON } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, addTracingExtensions, spanIsSampled, spanToJSON } from '@sentry/core';
+import type { Transaction as TransactionClass } from '@sentry/core';
 import { NodeClient, setCurrentClient } from '@sentry/node-experimental';
 import * as SentryNode from '@sentry/node-experimental';
-import type { Transaction } from '@sentry/types';
+import type { Span, Transaction } from '@sentry/types';
 import type { Handle } from '@sveltejs/kit';
 import { redirect } from '@sveltejs/kit';
 import { vi } from 'vitest';
@@ -117,9 +118,9 @@ describe('handleSentry', () => {
     });
 
     it("creates a transaction if there's no active span", async () => {
-      let ref: any = undefined;
+      let _span: Span | undefined = undefined;
       client.on('finishTransaction', (transaction: Transaction) => {
-        ref = transaction;
+        _span = transaction;
       });
 
       try {
@@ -128,22 +129,25 @@ describe('handleSentry', () => {
         //
       }
 
-      expect(ref).toBeDefined();
+      expect(_span!).toBeDefined();
 
-      expect(spanToJSON(ref).description).toEqual('GET /users/[id]');
-      expect(spanToJSON(ref).op).toEqual('http.server');
-      expect(ref.status).toEqual(isError ? 'internal_error' : 'ok');
-      expect(ref.attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]).toEqual('route');
+      expect(spanToJSON(_span!).description).toEqual('GET /users/[id]');
+      expect(spanToJSON(_span!).op).toEqual('http.server');
+      expect(spanToJSON(_span!).status).toEqual(isError ? 'internal_error' : 'ok');
+      expect(spanToJSON(_span!).data?.[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]).toEqual('route');
 
-      expect(ref.endTimestamp).toBeDefined();
-      expect(ref.spanRecorder.spans).toHaveLength(1);
+      expect(spanToJSON(_span!).timestamp).toBeDefined();
+
+      // eslint-disable-next-line deprecation/deprecation
+      const spans = (_span! as TransactionClass).spanRecorder?.spans;
+      expect(spans).toHaveLength(1);
     });
 
     it('creates a child span for nested server calls (i.e. if there is an active span)', async () => {
-      let ref: any = undefined;
+      let _span: Span | undefined = undefined;
       let txnCount = 0;
       client.on('finishTransaction', (transaction: Transaction) => {
-        ref = transaction;
+        _span = transaction;
         ++txnCount;
       });
 
@@ -164,17 +168,19 @@ describe('handleSentry', () => {
       }
 
       expect(txnCount).toEqual(1);
-      expect(ref).toBeDefined();
+      expect(_span!).toBeDefined();
+
+      expect(spanToJSON(_span!).description).toEqual('GET /users/[id]');
+      expect(spanToJSON(_span!).op).toEqual('http.server');
+      expect(spanToJSON(_span!).status).toEqual(isError ? 'internal_error' : 'ok');
+      expect(spanToJSON(_span!).data?.[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]).toEqual('route');
 
-      expect(spanToJSON(ref).description).toEqual('GET /users/[id]');
-      expect(spanToJSON(ref).op).toEqual('http.server');
-      expect(ref.status).toEqual(isError ? 'internal_error' : 'ok');
-      expect(ref.attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]).toEqual('route');
+      expect(spanToJSON(_span!).timestamp).toBeDefined();
 
-      expect(ref.endTimestamp).toBeDefined();
+      // eslint-disable-next-line deprecation/deprecation
+      const spans = (_span! as TransactionClass).spanRecorder?.spans?.map(spanToJSON);
 
-      expect(ref.spanRecorder.spans).toHaveLength(2);
-      const spans = ref.spanRecorder.spans.map(spanToJSON);
+      expect(spans).toHaveLength(2);
       expect(spans).toEqual(
         expect.arrayContaining([
           expect.objectContaining({ op: 'http.server', description: 'GET /users/[id]' }),
@@ -198,9 +204,9 @@ describe('handleSentry', () => {
         },
       });
 
-      let ref: any = undefined;
+      let _span: Span | undefined = undefined;
       client.on('finishTransaction', (transaction: Transaction) => {
-        ref = transaction;
+        _span = transaction;
       });
 
       try {
@@ -209,10 +215,10 @@ describe('handleSentry', () => {
         //
       }
 
-      expect(ref).toBeDefined();
-      expect(ref.traceId).toEqual('1234567890abcdef1234567890abcdef');
-      expect(ref.parentSpanId).toEqual('1234567890abcdef');
-      expect(ref.sampled).toEqual(true);
+      expect(_span!).toBeDefined();
+      expect(_span!.spanContext().traceId).toEqual('1234567890abcdef1234567890abcdef');
+      expect(spanToJSON(_span!).parent_span_id).toEqual('1234567890abcdef');
+      expect(spanIsSampled(_span!)).toEqual(true);
     });
 
     it('creates a transaction with dynamic sampling context from baggage header', async () => {
@@ -238,9 +244,9 @@ describe('handleSentry', () => {
         },
       });
 
-      let ref: any = undefined;
+      let _span: Span | undefined = undefined;
       client.on('finishTransaction', (transaction: Transaction) => {
-        ref = transaction;
+        _span = transaction;
       });
 
       try {
@@ -249,8 +255,8 @@ describe('handleSentry', () => {
         //
       }
 
-      expect(ref).toBeDefined();
-      expect(ref.metadata.dynamicSamplingContext).toEqual({
+      expect(_span!).toBeDefined();
+      expect(_span.metadata.dynamicSamplingContext).toEqual({
         environment: 'production',
         release: '1.0.0',
         public_key: 'dogsarebadatkeepingsecrets',
@@ -302,9 +308,9 @@ describe('handleSentry', () => {
     });
 
     it("doesn't create a transaction if there's no route", async () => {
-      let ref: any = undefined;
+      let _span: Span | undefined = undefined;
       client.on('finishTransaction', (transaction: Transaction) => {
-        ref = transaction;
+        _span = transaction;
       });
 
       try {
@@ -313,13 +319,13 @@ describe('handleSentry', () => {
         //
       }
 
-      expect(ref).toBeUndefined();
+      expect(_span!).toBeUndefined();
     });
 
     it("Creates a transaction if there's no route but `handleUnknownRequests` is true", async () => {
-      let ref: any = undefined;
+      let _span: Span | undefined = undefined;
       client.on('finishTransaction', (transaction: Transaction) => {
-        ref = transaction;
+        _span = transaction;
       });
 
       try {
@@ -331,7 +337,7 @@ describe('handleSentry', () => {
         //
       }
 
-      expect(ref).toBeDefined();
+      expect(_span!).toBeDefined();
     });
   });
 });

packages/sveltekit/test/server/load.test.ts

@@ -203,7 +203,6 @@ describe('wrapLoadWithSentry calls trace', () => {
         },
         op: 'function.sveltekit.load',
         name: '/users/[id]',
-        status: 'ok',
       },
       expect.any(Function),
     );
@@ -222,7 +221,6 @@ describe('wrapLoadWithSentry calls trace', () => {
         },
         op: 'function.sveltekit.load',
         name: '/users/123',
-        status: 'ok',
       },
       expect.any(Function),
     );
@@ -258,7 +256,6 @@ describe('wrapServerLoadWithSentry calls trace', () => {
         name: '/users/[id]',
         parentSampled: true,
         parentSpanId: '1234567890abcdef',
-        status: 'ok',
         traceId: '1234567890abcdef1234567890abcdef',
         data: {
           'http.method': 'GET',
@@ -291,7 +288,6 @@ describe('wrapServerLoadWithSentry calls trace', () => {
         },
         op: 'function.sveltekit.server.load',
         name: '/users/[id]',
-        status: 'ok',
         metadata: {},
         data: {
           'http.method': 'GET',
@@ -316,7 +312,6 @@ describe('wrapServerLoadWithSentry calls trace', () => {
         name: '/users/[id]',
         parentSampled: true,
         parentSpanId: '1234567890abcdef',
-        status: 'ok',
         traceId: '1234567890abcdef1234567890abcdef',
         data: {
           'http.method': 'GET',
@@ -347,7 +342,6 @@ describe('wrapServerLoadWithSentry calls trace', () => {
         name: '/users/123',
         parentSampled: true,
         parentSpanId: '1234567890abcdef',
-        status: 'ok',
         traceId: '1234567890abcdef1234567890abcdef',
         data: {
           'http.method': 'GET',