Adjust @sentry/node-core unit tests

Author: andreiborza

dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/s3/test.ts

@@ -14,7 +14,7 @@ const EXPECTED_TRANSCATION = {
         'rpc.system': 'aws-api',
         'rpc.method': 'PutObject',
         'rpc.service': 'S3',
-        'aws.region': 'us-east-1',
+        'cloud.region': 'us-east-1',
         'aws.s3.bucket': 'ot-demo-test',
         'otel.kind': 'CLIENT',
       }),

dev-packages/node-integration-tests/suites/express/tracing/test.ts

@@ -327,8 +327,7 @@ describe('express tracing', () => {
             const runner = createRunner()
               .expect({
                 transaction: {
-                  // TODO(v10): This is incorrect on OpenTelemetry v1 but can be fixed in v2
-                  transaction: `GET ${status_code === 404 ? '/' : url}`,
+                  transaction: `GET ${url}`,
                   contexts: {
                     trace: {
                       span_id: expect.stringMatching(/[a-f0-9]{16}/),

dev-packages/node-integration-tests/suites/tracing/kafkajs/test.ts

@@ -15,14 +15,14 @@ describe('kafkajs', () => {
         })
         .expect({
           transaction: {
-            transaction: 'test-topic',
+            transaction: 'send test-topic',
             contexts: {
               trace: expect.objectContaining({
                 op: 'message',
                 status: 'ok',
                 data: expect.objectContaining({
                   'messaging.system': 'kafka',
-                  'messaging.destination': 'test-topic',
+                  'messaging.destination.name': 'test-topic',
                   'otel.kind': 'PRODUCER',
                   'sentry.op': 'message',
                   'sentry.origin': 'auto.kafkajs.otel.producer',
@@ -33,14 +33,14 @@ describe('kafkajs', () => {
         })
         .expect({
           transaction: {
-            transaction: 'test-topic',
+            transaction: 'process test-topic',
             contexts: {
               trace: expect.objectContaining({
                 op: 'message',
                 status: 'ok',
                 data: expect.objectContaining({
                   'messaging.system': 'kafka',
-                  'messaging.destination': 'test-topic',
+                  'messaging.destination.name': 'test-topic',
                   'otel.kind': 'CONSUMER',
                   'sentry.op': 'message',
                   'sentry.origin': 'auto.kafkajs.otel.consumer',

packages/node-core/test/helpers/mockSdkInit.ts

@@ -1,6 +1,6 @@
 import { context, propagation, ProxyTracerProvider, trace } from '@opentelemetry/api';
 import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
-import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
+import { type SpanProcessor, BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
 import {
   ATTR_SERVICE_NAME,
   ATTR_SERVICE_VERSION,
@@ -130,6 +130,30 @@ export function cleanupOtel(_provider?: BasicTracerProvider): void {
   resetGlobals();
 }
 
+export function getSpanProcessor(): SentrySpanProcessor | undefined {
+  const client = getClient<NodeClient>();
+  if (!client?.traceProvider) {
+    return undefined;
+  }
+
+  const provider = getProvider(client.traceProvider);
+  if (!provider) {
+    return undefined;
+  }
+
+  // Access the span processors from the provider via _activeSpanProcessor
+  // Casted as any because _activeSpanProcessor is marked as readonly
+  const multiSpanProcessor = (provider as any)._activeSpanProcessor as
+    | (SpanProcessor & { _spanProcessors?: SpanProcessor[] })
+    | undefined;
+
+  const spanProcessor = multiSpanProcessor?.['_spanProcessors']?.find(
+    (spanProcessor: SpanProcessor) => spanProcessor instanceof SentrySpanProcessor,
+  ) as SentrySpanProcessor | undefined;
+
+  return spanProcessor;
+}
+
 export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
   let provider = _provider || getClient<NodeClient>()?.traceProvider || trace.getTracerProvider();
 

packages/node-core/test/integration/transactions.test.ts

@@ -1,11 +1,9 @@
 import { context, trace, TraceFlags } from '@opentelemetry/api';
-import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
 import type { TransactionEvent } from '@sentry/core';
 import { debug, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-import { SentrySpanProcessor } from '@sentry/opentelemetry';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 import * as Sentry from '../../src';
-import { cleanupOtel, getProvider, mockSdkInit } from '../helpers/mockSdkInit';
+import { cleanupOtel, getSpanProcessor, mockSdkInit } from '../helpers/mockSdkInit';
 
 describe('Integration | Transactions', () => {
   afterEach(() => {
@@ -562,13 +560,7 @@ describe('Integration | Transactions', () => {
 
     mockSdkInit({ tracesSampleRate: 1, beforeSendTransaction });
 
-    const provider = getProvider();
-    const multiSpanProcessor = provider?.activeSpanProcessor as
-      | (SpanProcessor & { _spanProcessors?: SpanProcessor[] })
-      | undefined;
-    const spanProcessor = multiSpanProcessor?.['_spanProcessors']?.find(
-      spanProcessor => spanProcessor instanceof SentrySpanProcessor,
-    ) as SentrySpanProcessor | undefined;
+    const spanProcessor = getSpanProcessor();
 
     const exporter = spanProcessor ? spanProcessor['_exporter'] : undefined;
 

packages/opentelemetry/test/trace.test.ts

@@ -20,16 +20,16 @@ import {
   withScope,
 } from '@sentry/core';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { getParentSpanId } from '../../../packages/opentelemetry/src/utils/getParentSpanId';
 import { continueTrace, startInactiveSpan, startSpan, startSpanManual } from '../src/trace';
 import type { AbstractSpan } from '../src/types';
 import { getActiveSpan } from '../src/utils/getActiveSpan';
 import { getSamplingDecision } from '../src/utils/getSamplingDecision';
 import { getSpanKind } from '../src/utils/getSpanKind';
 import { makeTraceState } from '../src/utils/makeTraceState';
 import { spanHasAttributes, spanHasName } from '../src/utils/spanTypes';
-import { cleanupOtel, mockSdkInit } from './helpers/mockSdkInit';
 import { isSpan } from './helpers/isSpan';
-import { getParentSpanId } from '../../../packages/opentelemetry/src/utils/getParentSpanId';
+import { cleanupOtel, mockSdkInit } from './helpers/mockSdkInit';
 
 describe('trace', () => {
   beforeEach(() => {