From 83d2f7a3c209535d36690825610e9e97e1fa7f9d Mon Sep 17 00:00:00 2001
From: Deeka Wong <8337659+huangdijia@users.noreply.github.com>
Date: Tue, 11 Nov 2025 12:39:15 +0800
Subject: [PATCH 1/2] refactor(sentry): remove deprecated features and unused
 configuration

- Remove `enable_tracing` config option from sentry.php (deprecated/unused)
- Remove Metrics-related singleton aspects (Metrics::getInstance and MetricsUnit::getInstance)
- Remove W3C traceparent from Carrier and CarrierPacker utilities

This cleanup simplifies the Sentry integration by removing features that are no longer needed.
---
 src/sentry/publish/sentry.php             | 3 ---
 src/sentry/src/Aspect/SingletonAspect.php | 2 --
 src/sentry/src/Util/Carrier.php           | 1 -
 src/sentry/src/Util/CarrierPacker.php     | 1 -
 4 files changed, 7 deletions(-)

diff --git a/src/sentry/publish/sentry.php b/src/sentry/publish/sentry.php
index fdf57f565..8fbfa03b8 100644
--- a/src/sentry/publish/sentry.php
+++ b/src/sentry/publish/sentry.php
@@ -23,9 +23,6 @@
     // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#sample_rate
     'sample_rate' => env('SENTRY_SAMPLE_RATE') === null ? 1.0 : (float) env('SENTRY_SAMPLE_RATE'),
 
-    // Switch tracing on/off
-    'enable_tracing' => env('SENTRY_ENABLE_TRACING', true),
-
     // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#traces_sample_rate
     'traces_sample_rate' => env('SENTRY_TRACES_SAMPLE_RATE') === null ? 1.0 : (float) env('SENTRY_TRACES_SAMPLE_RATE'),
 
diff --git a/src/sentry/src/Aspect/SingletonAspect.php b/src/sentry/src/Aspect/SingletonAspect.php
index 958e070ae..bcd559415 100644
--- a/src/sentry/src/Aspect/SingletonAspect.php
+++ b/src/sentry/src/Aspect/SingletonAspect.php
@@ -22,8 +22,6 @@ class SingletonAspect extends AbstractAspect
         \Sentry\EventType::class . '::getInstance',
         \Sentry\MonitorScheduleUnit::class . '::getInstance',
         \Sentry\Integration\IntegrationRegistry::class . '::getInstance',
-        \Sentry\Metrics\Metrics::class . '::getInstance',
-        \Sentry\Metrics\MetricsUnit::class . '::getInstance',
         \Sentry\State\HubAdapter::class . '::getInstance',
         \Sentry\Tracing\SpanStatus::class . '::getInstance',
         \Sentry\Tracing\TransactionSource::class . '::getInstance',
diff --git a/src/sentry/src/Util/Carrier.php b/src/sentry/src/Util/Carrier.php
index a67f586fa..2e3ffd14c 100644
--- a/src/sentry/src/Util/Carrier.php
+++ b/src/sentry/src/Util/Carrier.php
@@ -57,7 +57,6 @@ public static function fromSpan(Span $span): static
         return new static([
             Constants::SENTRY_TRACE => $span->toTraceparent(),
             Constants::BAGGAGE => $span->toBaggage(),
-            Constants::TRACEPARENT => $span->toW3CTraceparent(),
         ]);
     }
 
diff --git a/src/sentry/src/Util/CarrierPacker.php b/src/sentry/src/Util/CarrierPacker.php
index 57d9ea3fd..bc2ddfe60 100644
--- a/src/sentry/src/Util/CarrierPacker.php
+++ b/src/sentry/src/Util/CarrierPacker.php
@@ -43,7 +43,6 @@ public function pack(Span $span, array $extra = []): string
         return json_encode([
             Constants::SENTRY_TRACE => $span->toTraceparent(),
             Constants::BAGGAGE => $span->toBaggage(),
-            Constants::TRACEPARENT => $span->toW3CTraceparent(),
             ...$extra,
         ]);
     }

From 5c2cfd681dd7ae1af4fc13a737e51bafb7bb7a2d Mon Sep 17 00:00:00 2001
From: Deeka Wong <8337659+huangdijia@users.noreply.github.com>
Date: Tue, 11 Nov 2025 12:43:31 +0800
Subject: [PATCH 2/2] fix(tests): remove traceparent key from Carrier data
 expectations

---
 tests/Sentry/CarrierTest.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/Sentry/CarrierTest.php b/tests/Sentry/CarrierTest.php
index 5fe0f9bfe..e6bc09629 100644
--- a/tests/Sentry/CarrierTest.php
+++ b/tests/Sentry/CarrierTest.php
@@ -69,10 +69,9 @@
         $carrier = Carrier::fromSpan($span);
         $data = $carrier->toArray();
 
-        expect($data)->toHaveKeys(['sentry-trace', 'baggage', 'traceparent']);
+        expect($data)->toHaveKeys(['sentry-trace', 'baggage']);
         expect($data['sentry-trace'])->toBeString();
         expect($data['baggage'])->toBeString();
-        expect($data['traceparent'])->toBeString();
     });
 });
 
@@ -287,7 +286,7 @@
 
         $data = $carrier->toArray();
         expect($data)->toHaveKey('custom');
-        expect($data)->toHaveKeys(['sentry-trace', 'baggage', 'traceparent']);
+        expect($data)->toHaveKeys(['sentry-trace', 'baggage']);
 
         // Test round trip
         $json = $carrier->toJson();