move trace_id into tracestate

Author: lobsterkatie

packages/core/src/request.ts

@@ -52,7 +52,6 @@ export function transactionToSentryRequest(event: Event, api: API): SentryReques
   const envelopeHeaders = JSON.stringify({
     event_id: event.event_id,
     sent_at: new Date().toISOString(),
-    trace_id: event.contexts?.trace?.trace_id,
     trace: tracestate, // trace context for dynamic sampling on relay
   });
 

packages/tracing/src/transaction.ts

@@ -144,6 +144,7 @@ export class Transaction extends SpanClass implements TransactionInterface {
     const { environment, release } = client.getOptions() || {};
 
     const dataStr = JSON.stringify({
+      trace_id: this.traceId,
       public_key: dsn.user,
       environment: environment || 'no environment specified',
       release: release || 'no release specified',