Merge branch 'master' into 3.x

Author: cleptric

src/Sentry/Laravel/Console/TestCommand.php

@@ -139,7 +139,6 @@ public function log($level, $message, array $context = []): void
             $transactionContext = new TransactionContext();
             $transactionContext->setSampled(true);
             $transactionContext->setName('Sentry Test Transaction');
-            $transactionContext->setSource(TransactionSource::custom());
             $transactionContext->setOp('sentry.test');
 
             $transaction = $hub->startTransaction($transactionContext);

src/Sentry/Laravel/Integration.php

@@ -6,7 +6,6 @@
 use Illuminate\Support\Str;
 use Sentry\SentrySdk;
 use Sentry\Tracing\Span;
-use Sentry\Tracing\TransactionSource;
 use function Sentry\addBreadcrumb;
 use function Sentry\configureScope;
 use Sentry\Breadcrumb;
@@ -123,48 +122,27 @@ public static function flushEvents(): void
      * @param \Illuminate\Routing\Route $route
      *
      * @return string
-     *
-     * @internal   This helper is used in various places to extra meaninful info from a Laravel Route object.
-     * @deprecated This will be removed in version 3.0, use `extractNameAndSourceForRoute` instead.
      */
     public static function extractNameForRoute(Route $route): string
     {
-        return self::extractNameAndSourceForRoute($route)[0];
-    }
-
-    /**
-     * Extract the readable name for a route and the transaction source for where that route name came from.
-     *
-     * @param \Illuminate\Routing\Route $route
-     *
-     * @return array{0: string, 1: \Sentry\Tracing\TransactionSource}
-     *
-     * @internal This helper is used in various places to extra meaninful info from a Laravel Route object.
-     */
-    public static function extractNameAndSourceForRoute(Route $route): array
-    {
-        $source = null;
         $routeName = null;
 
-        // some.action (route name/alias)
+        // someaction (route name/alias)
         if ($route->getName()) {
-            $source = TransactionSource::component();
             $routeName = self::extractNameForNamedRoute($route->getName());
         }
 
         // Some\Controller@someAction (controller action)
         if (empty($routeName) && $route->getActionName()) {
-            $source = TransactionSource::component();
             $routeName = self::extractNameForActionRoute($route->getActionName());
         }
 
-        // /some/{action} // Fallback to the route uri (with parameter placeholders)
+        // /someaction // Fallback to the url
         if (empty($routeName) || $routeName === 'Closure') {
-            $source = TransactionSource::route();
             $routeName = '/' . ltrim($route->uri(), '/');
         }
 
-        return [$routeName, $source];
+        return $routeName;
     }
 
     /**
@@ -228,25 +206,7 @@ public static function sentryTracingMeta(): string
         }
 
         $content = sprintf('<meta name="sentry-trace" content="%s"/>', $span->toTraceparent());
-
-        return $content;
-    }
-
-    /**
-     * Retrieve the meta tags with baggage information to link this request to front-end requests.
-     * This propagates the Dynamic Sampling Context.
-     *
-     * @return string
-     */
-    public static function sentryBaggageMeta(): string
-    {
-        $span = self::currentTracingSpan();
-
-        if ($span === null) {
-            return '';
-        }
-
-        $content = sprintf('<meta name="baggage" content="%s"/>', $span->toBaggage());
+        // $content .= sprintf('<meta name="sentry-trace-data" content="%s"/>', $span->getDescription());
 
         return $content;
     }

src/Sentry/Laravel/Tracing/EventHandler.php

@@ -16,14 +16,11 @@
 use Sentry\Tracing\SpanContext;
 use Sentry\Tracing\SpanStatus;
 use Sentry\Tracing\TransactionContext;
-use Sentry\Tracing\TransactionSource;
 
 class EventHandler
 {
     public const QUEUE_PAYLOAD_TRACE_PARENT_DATA = 'sentry_trace_parent_data';
 
-    public const QUEUE_PAYLOAD_BAGGAGE_DATA = 'sentry_baggage_data';
-
     /**
      * Map event handlers to events.
      *
@@ -265,10 +262,11 @@ protected function queueJobProcessingHandler(QueueEvents\JobProcessing $event):
         }
 
         if ($parentSpan === null) {
-            $baggage = $event->job->payload()[self::QUEUE_PAYLOAD_BAGGAGE_DATA] ?? null;
             $traceParent = $event->job->payload()[self::QUEUE_PAYLOAD_TRACE_PARENT_DATA] ?? null;
 
-            $context = TransactionContext::fromHeaders($traceParent ?? '', $baggage ?? '');
+            $context = $traceParent === null
+                ? new TransactionContext
+                : TransactionContext::fromSentryTrace($traceParent);
 
             // If the parent transaction was not sampled we also stop the queue job from being recorded
             if ($context->getParentSampled() === false) {
@@ -296,7 +294,6 @@ protected function queueJobProcessingHandler(QueueEvents\JobProcessing $event):
 
         if ($context instanceof TransactionContext) {
             $context->setName($resolvedJobName ?? $event->job->getName());
-            $context->setSource(TransactionSource::task());
         }
 
         $context->setOp('queue.process');

src/Sentry/Laravel/Tracing/Integrations/LighthouseIntegration.php

@@ -13,7 +13,6 @@
 use Sentry\Laravel\Integration;
 use Sentry\SentrySdk;
 use Sentry\Tracing\SpanContext;
-use Sentry\Tracing\TransactionSource;
 
 class LighthouseIntegration implements IntegrationInterface
 {
@@ -158,7 +157,7 @@ private function updateTransactionName(): void
             return;
         }
 
-        array_walk($groupedOperations, static function (&$operations, string $operationType) {
+        array_walk($groupedOperations, static function (array &$operations, string $operationType) {
             sort($operations, SORT_STRING);
 
             $operations = "{$operationType}{" . implode(',', $operations) . '}';
@@ -169,7 +168,6 @@ private function updateTransactionName(): void
         $transactionName = 'lighthouse?' . implode('&', $groupedOperations);
 
         $transaction->setName($transactionName);
-        $transaction->getMetadata()->setSource(TransactionSource::custom());
 
         Integration::setTransaction($transactionName);
     }

src/Sentry/Laravel/Tracing/Middleware.php

@@ -11,7 +11,6 @@
 use Sentry\Tracing\Span;
 use Sentry\Tracing\SpanContext;
 use Sentry\Tracing\TransactionContext;
-use Sentry\Tracing\TransactionSource;
 use Symfony\Component\HttpFoundation\Response;
 
 class Middleware
@@ -102,11 +101,11 @@ public function setBootedTimestamp(?float $timestamp = null): void
     private function startTransaction(Request $request, HubInterface $sentry): void
     {
         $requestStartTime = $request->server('REQUEST_TIME_FLOAT', microtime(true));
+        $sentryTraceHeader = $request->header('sentry-trace');
 
-        $context = TransactionContext::fromHeaders(
-            $request->header('sentry-trace', ''),
-            $request->header('baggage', '')
-        );
+        $context = $sentryTraceHeader
+            ? TransactionContext::fromSentryTrace($sentryTraceHeader)
+            : new TransactionContext;
 
         $context->setOp('http.server');
         $context->setData([
@@ -180,9 +179,9 @@ private function hydrateRequestData(Request $request): void
         $route = $request->route();
 
         if ($route instanceof Route) {
-            [$transactionName, $transactionSource] = Integration::extractNameAndSourceForRoute($route);
-
-            $this->updateTransactionNameIfDefault($transactionName, $transactionSource);
+            $this->updateTransactionNameIfDefault(
+                Integration::extractNameForRoute($route)
+            );
 
             $this->transaction->setData([
                 'name' => $route->getName(),
@@ -191,15 +190,15 @@ private function hydrateRequestData(Request $request): void
             ]);
         }
 
-        $this->updateTransactionNameIfDefault('/' . ltrim($request->path(), '/'), TransactionSource::url());
+        $this->updateTransactionNameIfDefault('/' . ltrim($request->path(), '/'));
     }
 
     private function hydrateResponseData(Response $response): void
     {
         $this->transaction->setHttpStatus($response->getStatusCode());
     }
 
-    private function updateTransactionNameIfDefault(?string $name, ?TransactionSource $source): void
+    private function updateTransactionNameIfDefault(?string $name): void
     {
         // Ignore empty names (and `null`) for caller convenience
         if (empty($name)) {
@@ -214,6 +213,5 @@ private function updateTransactionNameIfDefault(?string $name, ?TransactionSourc
         }
 
         $this->transaction->setName($name);
-        $this->transaction->getMetadata()->setSource($source ?? TransactionSource::custom());
     }
 }