Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/sentry/publish/sentry.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'),

Expand Down
2 changes: 0 additions & 2 deletions src/sentry/src/Aspect/SingletonAspect.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 0 additions & 1 deletion src/sentry/src/Util/Carrier.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
]);
}

Expand Down
1 change: 0 additions & 1 deletion src/sentry/src/Util/CarrierPacker.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]);
}
Expand Down
5 changes: 2 additions & 3 deletions tests/Sentry/CarrierTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
});

Expand Down Expand Up @@ -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();
Expand Down