remove unneeded transaction

Author: mydea

packages/opentelemetry/src/custom/transaction.ts

@@ -1,7 +1,6 @@
 import type { Hub } from '@sentry/core';
 import { Transaction } from '@sentry/core';
-import type { ClientOptions, Hub as HubInterface, Scope, TransactionContext } from '@sentry/types';
-import { uuid4 } from '@sentry/utils';
+import type { ClientOptions, Hub as HubInterface, TransactionContext } from '@sentry/types';
 
 /**
  * This is a fork of core's tracing/hubextensions.ts _startTransaction,
@@ -13,7 +12,7 @@ export function startTransaction(hub: HubInterface, transactionContext: Transact
   const options: Partial<ClientOptions> = (client && client.getOptions()) || {};
 
   // eslint-disable-next-line deprecation/deprecation
-  const transaction = new OpenTelemetryTransaction(transactionContext, hub as Hub);
+  const transaction = new Transaction(transactionContext, hub as Hub);
   // Since we do not do sampling here, we assume that this is _always_ sampled
   // Any sampling decision happens in OpenTelemetry's sampler
   transaction.initSpanRecorder(options._experiments && (options._experiments.maxSpans as number));
@@ -23,29 +22,3 @@ export function startTransaction(hub: HubInterface, transactionContext: Transact
   }
   return transaction;
 }
-
-/**
- * This is a fork of the base Transaction with OTEL specific stuff added.
- */
-export class OpenTelemetryTransaction extends Transaction {
-  /**
-   * Finish the transaction, but apply the given scope instead of the current one.
-   */
-  public finishWithScope(endTimestamp?: number, scope?: Scope): string | undefined {
-    const event = this._finishTransaction(endTimestamp);
-
-    if (!event) {
-      return undefined;
-    }
-
-    // eslint-disable-next-line deprecation/deprecation
-    const client = this._hub.getClient();
-
-    if (!client) {
-      return undefined;
-    }
-
-    const eventId = uuid4();
-    return client.captureEvent(event, { event_id: eventId }, scope);
-  }
-}

packages/opentelemetry/src/spanExporter.ts

@@ -3,6 +3,8 @@ import type { ExportResult } from '@opentelemetry/core';
 import { ExportResultCode } from '@opentelemetry/core';
 import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base';
 import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
+import type {
+  Transaction} from '@sentry/core';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
   flush,
@@ -13,9 +15,8 @@ import {
 } from '@sentry/core';
 import type { Scope, Span as SentrySpan, SpanOrigin, TransactionSource } from '@sentry/types';
 import { logger } from '@sentry/utils';
-
-import type { OpenTelemetryTransaction } from './custom/transaction';
 import { startTransaction } from './custom/transaction';
+
 import { DEBUG_BUILD } from './debug-build';
 import { InternalSentrySemanticAttributes } from './semanticAttributes';
 import { convertOtelTimeToSeconds } from './utils/convertOtelTimeToSeconds';
@@ -161,7 +162,7 @@ function parseSpan(span: ReadableSpan): { op?: string; origin?: SpanOrigin; sour
   return { origin, op, source };
 }
 
-function createTransactionForOtelSpan(span: ReadableSpan): OpenTelemetryTransaction {
+function createTransactionForOtelSpan(span: ReadableSpan): Transaction {
   const scope = getSpanScope(span);
   // eslint-disable-next-line deprecation/deprecation
   const hub = getSpanHub(span) || getCurrentHub();
@@ -196,7 +197,7 @@ function createTransactionForOtelSpan(span: ReadableSpan): OpenTelemetryTransact
     origin,
     tags,
     sampled: true,
-  }) as OpenTelemetryTransaction;
+  });
 
   return transaction;
 }

packages/opentelemetry/test/custom/transaction.test.ts

@@ -1,158 +1,13 @@
-import { getCurrentHub, setCurrentClient, spanToJSON } from '@sentry/core';
-import { OpenTelemetryScope } from '../../src/custom/scope';
-import { OpenTelemetryTransaction, startTransaction } from '../../src/custom/transaction';
+import { Transaction, getCurrentHub, setCurrentClient, spanToJSON } from '@sentry/core';
+import { startTransaction } from '../../src/custom/transaction';
 import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
 
-describe('NodeExperimentalTransaction', () => {
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  it('works with finishWithScope without arguments', () => {
-    const client = new TestClient(getDefaultTestClientOptions());
-
-    const mockSend = jest.spyOn(client, 'captureEvent').mockImplementation(() => 'mocked');
-
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = getCurrentHub();
-    setCurrentClient(client);
-    client.init();
-
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = new OpenTelemetryTransaction({ name: 'test', sampled: true }, hub);
-
-    const res = transaction.finishWithScope();
-
-    expect(mockSend).toBeCalledTimes(1);
-    expect(mockSend).toBeCalledWith(
-      expect.objectContaining({
-        contexts: {
-          trace: {
-            data: {
-              'sentry.origin': 'manual',
-            },
-            span_id: expect.any(String),
-            trace_id: expect.any(String),
-            origin: 'manual',
-          },
-        },
-        spans: [],
-        start_timestamp: expect.any(Number),
-        tags: {},
-        timestamp: expect.any(Number),
-        transaction: 'test',
-        type: 'transaction',
-        sdkProcessingMetadata: {
-          source: 'custom',
-          spanMetadata: {},
-          dynamicSamplingContext: {
-            environment: 'production',
-            trace_id: expect.any(String),
-            transaction: 'test',
-            sampled: 'true',
-          },
-        },
-        transaction_info: { source: 'custom' },
-      }),
-      { event_id: expect.any(String) },
-      undefined,
-    );
-    expect(res).toBe('mocked');
-  });
-
-  it('works with finishWithScope with endTime', () => {
-    const client = new TestClient(getDefaultTestClientOptions());
-
-    const mockSend = jest.spyOn(client, 'captureEvent').mockImplementation(() => 'mocked');
-
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = getCurrentHub();
-    setCurrentClient(client);
-    client.init();
-
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = new OpenTelemetryTransaction({ name: 'test', startTimestamp: 123456, sampled: true }, hub);
-
-    const res = transaction.finishWithScope(1234567);
-
-    expect(mockSend).toBeCalledTimes(1);
-    expect(mockSend).toBeCalledWith(
-      expect.objectContaining({
-        start_timestamp: 123456,
-        timestamp: 1234567,
-      }),
-      { event_id: expect.any(String) },
-      undefined,
-    );
-    expect(res).toBe('mocked');
-  });
-
-  it('works with finishWithScope with endTime & scope', () => {
-    const client = new TestClient(getDefaultTestClientOptions());
-
-    const mockSend = jest.spyOn(client, 'captureEvent').mockImplementation(() => 'mocked');
-
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = getCurrentHub();
-    setCurrentClient(client);
-    client.init();
-
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = new OpenTelemetryTransaction({ name: 'test', startTimestamp: 123456, sampled: true }, hub);
-
-    const scope = new OpenTelemetryScope();
-    scope.setTags({
-      tag1: 'yes',
-      tag2: 'no',
-    });
-    scope.setContext('os', { name: 'Custom OS' });
-
-    const res = transaction.finishWithScope(1234567, scope);
-
-    expect(mockSend).toBeCalledTimes(1);
-    expect(mockSend).toBeCalledWith(
-      expect.objectContaining({
-        contexts: {
-          trace: {
-            data: {
-              'sentry.origin': 'manual',
-            },
-            span_id: expect.any(String),
-            trace_id: expect.any(String),
-            origin: 'manual',
-          },
-        },
-        spans: [],
-        start_timestamp: 123456,
-        tags: {},
-        timestamp: 1234567,
-        transaction: 'test',
-        type: 'transaction',
-        sdkProcessingMetadata: {
-          source: 'custom',
-          spanMetadata: {},
-          dynamicSamplingContext: {
-            environment: 'production',
-            trace_id: expect.any(String),
-            transaction: 'test',
-            sampled: 'true',
-          },
-        },
-        transaction_info: { source: 'custom' },
-      }),
-      { event_id: expect.any(String) },
-      scope,
-    );
-    expect(res).toBe('mocked');
-  });
-});
-
 describe('startTranscation', () => {
   afterEach(() => {
     jest.resetAllMocks();
   });
 
-  it('creates a NodeExperimentalTransaction', () => {
+  it('creates a Transaction', () => {
     const client = new TestClient(getDefaultTestClientOptions());
     // eslint-disable-next-line deprecation/deprecation
     const hub = getCurrentHub();
@@ -161,7 +16,7 @@ describe('startTranscation', () => {
 
     const transaction = startTransaction(hub, { name: 'test' });
 
-    expect(transaction).toBeInstanceOf(OpenTelemetryTransaction);
+    expect(transaction).toBeInstanceOf(Transaction);
     expect(transaction['_sampled']).toBe(undefined);
     // eslint-disable-next-line deprecation/deprecation
     expect(transaction.spanRecorder).toBeDefined();
@@ -197,7 +52,7 @@ describe('startTranscation', () => {
       traceId: 'trace1',
     });
 
-    expect(transaction).toBeInstanceOf(OpenTelemetryTransaction);
+    expect(transaction).toBeInstanceOf(Transaction);
     // eslint-disable-next-line deprecation/deprecation
     expect(transaction.metadata).toEqual({
       source: 'custom',