more test fixes but they still leak :(

Author: Lms24

packages/opentelemetry/src/index.ts

@@ -25,6 +25,8 @@ export { isSentryRequestSpan } from './utils/isSentryRequest';
 export { getActiveSpan } from './utils/getActiveSpan';
 export { startSpan, startSpanManual, startInactiveSpan, withActiveSpan, continueTrace } from './trace';
 
+export { getDynamicSamplingContextFromSpan } from './utils/dynamicSamplingContext';
+
 // eslint-disable-next-line deprecation/deprecation
 export { setupGlobalHub } from './custom/hub';
 // eslint-disable-next-line deprecation/deprecation

packages/sveltekit/package.json

@@ -40,6 +40,7 @@
     "@sentry-internal/tracing": "8.0.0-alpha.2",
     "@sentry/core": "8.0.0-alpha.2",
     "@sentry/node": "8.0.0-alpha.2",
+    "@sentry/opentelemetry": "8.0.0-alpha.2",
     "@sentry/svelte": "8.0.0-alpha.2",
     "@sentry/types": "8.0.0-alpha.2",
     "@sentry/utils": "8.0.0-alpha.2",
@@ -68,7 +69,7 @@
     "fix": "eslint . --format stylish --fix",
     "lint": "eslint . --format stylish",
     "test": "yarn test:unit",
-    "test:unit": "vitest run",
+    "test:unit": "vitest run --outputDiffMaxLines=2000",
     "test:watch": "vitest --watch",
     "yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push --sig"
   },

packages/sveltekit/src/server/handle.ts

@@ -1,20 +1,20 @@
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  continueTrace,
   getActiveSpan,
-  getDynamicSamplingContextFromSpan,
   getRootSpan,
   setHttpStatus,
   spanToTraceHeader,
   withIsolationScope,
 } from '@sentry/core';
 import { startSpan } from '@sentry/core';
-import { captureException } from '@sentry/node';
+import { captureException, continueTrace } from '@sentry/node';
 import type { Span } from '@sentry/types';
 import { dynamicSamplingContextToSentryBaggageHeader, objectify } from '@sentry/utils';
 import type { Handle, ResolveOptions } from '@sveltejs/kit';
 
+import { getDynamicSamplingContextFromSpan } from '@sentry/opentelemetry';
+
 import { isHttpError, isRedirect } from '../common/utils';
 import { flushIfServerless, getTracePropagationData } from './utils';
 

packages/sveltekit/src/server/load.ts

@@ -1,10 +1,5 @@
-import {
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  continueTrace,
-  startSpan,
-} from '@sentry/core';
-import { captureException } from '@sentry/node';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startSpan } from '@sentry/core';
+import { captureException, continueTrace } from '@sentry/node';
 import { addNonEnumerableProperty, objectify } from '@sentry/utils';
 import type { LoadEvent, ServerLoadEvent } from '@sveltejs/kit';
 

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

@@ -326,6 +326,8 @@ describe('wrapServerLoadWithSentry calls trace', () => {
     expect(transactions).toHaveLength(1);
     const transaction = transactions[0];
 
+    console.log(JSON.stringify(transaction.contexts?.trace, null, 2));
+
     expect(transaction.contexts?.trace).toEqual({
       data: {
         [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
@@ -338,7 +340,6 @@ describe('wrapServerLoadWithSentry calls trace', () => {
       op: 'function.sveltekit.server.load',
       span_id: expect.any(String),
       trace_id: expect.not.stringContaining('1234567890abcdef1234567890abcdef'),
-      parent_span_id: expect.not.stringContaining('1234567890abcdef'),
       origin: 'auto.function.sveltekit',
       status: 'ok',
     });
@@ -354,7 +355,7 @@ describe('wrapServerLoadWithSentry calls trace', () => {
     });
   });
 
-  it("doesn't attach the DSC data if the baggage header not available", async () => {
+  it("doesn't attach the DSC data if the baggage header is not available", async () => {
     const transactions: Event[] = [];
 
     init({
@@ -381,12 +382,15 @@ describe('wrapServerLoadWithSentry calls trace', () => {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
         [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.sveltekit.server.load',
         'http.method': 'GET',
+        'otel.kind': 'INTERNAL',
+        'sentry.sample_rate': 1,
       },
       op: 'function.sveltekit.server.load',
       parent_span_id: '1234567890abcdef',
       span_id: expect.any(String),
       trace_id: '1234567890abcdef1234567890abcdef',
       origin: 'auto.function.sveltekit',
+      status: 'ok',
     });
     expect(transaction.transaction).toEqual('/users/[id]');
     expect(transaction.sdkProcessingMetadata?.dynamicSamplingContext).toEqual({});
@@ -422,12 +426,15 @@ describe('wrapServerLoadWithSentry calls trace', () => {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
         [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.sveltekit.server.load',
         'http.method': 'GET',
+        'otel.kind': 'INTERNAL',
+        'sentry.sample_rate': 1,
       },
       op: 'function.sveltekit.server.load',
       parent_span_id: '1234567890abcdef',
       span_id: expect.any(String),
       trace_id: '1234567890abcdef1234567890abcdef',
       origin: 'auto.function.sveltekit',
+      status: 'ok',
     });
     expect(transaction.transaction).toEqual('/users/123');
   });