From 980f5ff88ba746a7053b3ff23567b7fee287d070 Mon Sep 17 00:00:00 2001
From: Katie Byers <lobsterkatie@gmail.com>
Date: Thu, 9 Dec 2021 11:01:18 -0800
Subject: [PATCH] use new field for transaction sampling data

---
 packages/core/src/request.ts           |  7 +------
 packages/core/test/lib/request.test.ts | 29 +++-----------------------
 packages/tracing/src/transaction.ts    |  2 +-
 packages/types/src/debugMeta.ts        |  1 -
 4 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/packages/core/src/request.ts b/packages/core/src/request.ts
index 31c51d4f87a5..f483cbc596c7 100644
--- a/packages/core/src/request.ts
+++ b/packages/core/src/request.ts
@@ -55,13 +55,8 @@ export function eventToSentryRequest(event: Event, api: APIDetails): SentryReque
   const eventType = event.type || 'event';
   const useEnvelope = eventType === 'transaction' || !!api.tunnel;
 
-  const { transactionSampling, ...metadata } = event.debug_meta || {};
+  const { transactionSampling } = event.sdkProcessingMetadata || {};
   const { method: samplingMethod, rate: sampleRate } = transactionSampling || {};
-  if (Object.keys(metadata).length === 0) {
-    delete event.debug_meta;
-  } else {
-    event.debug_meta = metadata;
-  }
 
   // prevent this data from being sent to sentry
   delete event.sdkProcessingMetadata;
diff --git a/packages/core/test/lib/request.test.ts b/packages/core/test/lib/request.test.ts
index c75ef32fa0b6..cbca79b51477 100644
--- a/packages/core/test/lib/request.test.ts
+++ b/packages/core/test/lib/request.test.ts
@@ -1,4 +1,4 @@
-import { DebugMeta, Event, SentryRequest } from '@sentry/types';
+import { Event, SentryRequest } from '@sentry/types';
 
 import { initAPIDetails } from '../../src/api';
 import { eventToSentryRequest, sessionToSentryRequest } from '../../src/request';
@@ -40,11 +40,12 @@ describe('eventToSentryRequest', () => {
       transaction: '/dogs/are/great/',
       type: 'transaction',
       user: { id: '1121', username: 'CharlieDog', ip_address: '11.21.20.12' },
+      sdkProcessingMetadata: {},
     };
   });
 
   it('adds transaction sampling information to item header', () => {
-    event.debug_meta = { transactionSampling: { method: 'client_rate', rate: 0.1121 } };
+    event.sdkProcessingMetadata = { transactionSampling: { method: 'client_rate', rate: 0.1121 } };
 
     const result = eventToSentryRequest(event, api);
     const envelope = parseEnvelopeRequest(result);
@@ -56,30 +57,6 @@ describe('eventToSentryRequest', () => {
     );
   });
 
-  it('removes transaction sampling information (and only that) from debug_meta', () => {
-    event.debug_meta = {
-      transactionSampling: { method: 'client_sampler', rate: 0.1121 },
-      dog: 'Charlie',
-    } as DebugMeta;
-
-    const result = eventToSentryRequest(event, api);
-    const envelope = parseEnvelopeRequest(result);
-
-    expect('transactionSampling' in envelope.event.debug_meta).toBe(false);
-    expect('dog' in envelope.event.debug_meta).toBe(true);
-  });
-
-  it('removes debug_meta entirely if it ends up empty', () => {
-    event.debug_meta = {
-      transactionSampling: { method: 'client_rate', rate: 0.1121 },
-    } as DebugMeta;
-
-    const result = eventToSentryRequest(event, api);
-    const envelope = parseEnvelopeRequest(result);
-
-    expect('debug_meta' in envelope.event).toBe(false);
-  });
-
   it('adds sdk info to envelope header', () => {
     const result = eventToSentryRequest(event, api);
     const envelope = parseEnvelopeRequest(result);
diff --git a/packages/tracing/src/transaction.ts b/packages/tracing/src/transaction.ts
index 5143881ab159..8b614ceeaa2d 100644
--- a/packages/tracing/src/transaction.ts
+++ b/packages/tracing/src/transaction.ts
@@ -132,7 +132,7 @@ export class Transaction extends SpanClass implements TransactionInterface {
       timestamp: this.endTimestamp,
       transaction: this.name,
       type: 'transaction',
-      debug_meta: this.metadata,
+      sdkProcessingMetadata: this.metadata,
     };
 
     const hasMeasurements = Object.keys(this._measurements).length > 0;
diff --git a/packages/types/src/debugMeta.ts b/packages/types/src/debugMeta.ts
index 2fe67eed0575..d0cbfeb46118 100644
--- a/packages/types/src/debugMeta.ts
+++ b/packages/types/src/debugMeta.ts
@@ -3,7 +3,6 @@
  **/
 export interface DebugMeta {
   images?: Array<DebugImage>;
-  transactionSampling?: { rate?: number; method?: string };
 }
 
 /**