Merge branch 'master' into namespacePool

Author: cleptric

composer.json

@@ -15,7 +15,7 @@
         "php": "^7.2||^8.0",
         "guzzlehttp/psr7": "^2.1.1",
         "jean85/pretty-package-versions": "^1.5||^2.0",
-        "sentry/sentry": "^4.11.0",
+        "sentry/sentry": "^4.14.1",
         "symfony/cache-contracts": "^1.1||^2.4||^3.6",
         "symfony/config": "^4.4.20||^5.0.11||^6.0||^7.0",
         "symfony/console": "^4.4.20||^5.0.11||^6.0||^7.0",

src/Tracing/Doctrine/DBAL/TracingDriverConnectionForV2V3.php

@@ -246,10 +246,10 @@ private function traceFunction(string $spanOperation, string $spanDescription, \
      *
      * @param array<string, mixed> $params The connection params
      *
-     * @return array<string, string>
-     *
      * @phpstan-param ConnectionParams $params
      *
+     * @return array<string, string>
+     *
      * @see https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/database.md
      */
     private function getSpanData(string $databasePlatform, array $params): array

src/Tracing/Doctrine/DBAL/TracingDriverConnectionForV4.php

@@ -244,10 +244,10 @@ private function traceFunction(string $spanOperation, string $spanDescription, \
      *
      * @param array<string, mixed> $params The connection params
      *
-     * @return array<string, string>
-     *
      * @phpstan-param ConnectionParams $params
      *
+     * @return array<string, string>
+     *
      * @see https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/database.md
      */
     private function getSpanData(string $databasePlatform, array $params): array

src/Tracing/HttpClient/AbstractTraceableHttpClient.php

@@ -18,7 +18,6 @@
 
 use function Sentry\getBaggage;
 use function Sentry\getTraceparent;
-use function Sentry\getW3CTraceparent;
 
 /**
  * This is an implementation of the {@see HttpClientInterface} that decorates
@@ -59,7 +58,6 @@ public function request(string $method, string $url, array $options = []): Respo
             if (self::shouldAttachTracingHeaders($client, $uri)) {
                 $headers['baggage'] = getBaggage();
                 $headers['sentry-trace'] = getTraceparent();
-                $headers['traceparent'] = getW3CTraceparent();
             }
 
             $options['headers'] = $headers;

src/Twig/SentryExtension.php

@@ -10,7 +10,6 @@
 
 use function Sentry\getBaggage;
 use function Sentry\getTraceparent;
-use function Sentry\getW3CTraceparent;
 
 final class SentryExtension extends AbstractExtension
 {
@@ -43,10 +42,12 @@ public function getTraceMeta(): string
 
     /**
      * Returns an HTML meta tag named `traceparent`.
+     *
+     * @deprecated since version 5.3. To be removed in version 6.0.
      */
     public function getW3CTraceMeta(): string
     {
-        return \sprintf('<meta name="traceparent" content="%s" />', getW3CTraceparent());
+        return '';
     }
 
     /**

tests/EventListener/TracingRequestListenerTest.php

@@ -129,45 +129,6 @@ public function handleKernelRequestEventDataProvider(): \Generator
             $transactionContext,
         ];
 
-        $samplingContext = DynamicSamplingContext::fromHeader('');
-        $samplingContext->freeze();
-
-        $transactionContext = new TransactionContext();
-        $transactionContext->setTraceId(new TraceId('566e3688a61d4bc888951642d6f14a19'));
-        $transactionContext->setParentSpanId(new SpanId('566e3688a61d4bc8'));
-        $transactionContext->setParentSampled(true);
-        $transactionContext->setName('GET http://www.example.com/');
-        $transactionContext->setSource(TransactionSource::url());
-        $transactionContext->setOp('http.server');
-        $transactionContext->setOrigin('auto.http.server');
-        $transactionContext->setStartTimestamp(1613493597.010275);
-        $transactionContext->setData([
-            'net.host.port' => '80',
-            'http.request.method' => 'GET',
-            'http.url' => 'http://www.example.com/',
-            'http.flavor' => '1.1',
-            'route' => '<unknown>',
-            'net.host.name' => 'www.example.com',
-        ]);
-        $transactionContext->getMetadata()->setDynamicSamplingContext($samplingContext);
-        $transactionContext->getMetadata()->setSampleRand(0.1337);
-
-        yield 'request.headers.traceparent EXISTS' => [
-            new Options(),
-            Request::create(
-                'http://www.example.com',
-                'GET',
-                [],
-                [],
-                [],
-                [
-                    'REQUEST_TIME_FLOAT' => 1613493597.010275,
-                    'HTTP_traceparent' => '00-566e3688a61d4bc888951642d6f14a19-566e3688a61d4bc8-01',
-                ]
-            ),
-            $transactionContext,
-        ];
-
         $samplingContext = DynamicSamplingContext::fromHeader('sentry-trace_id=566e3688a61d4bc888951642d6f14a19,sentry-public_key=public,sentry-sample_rate=1');
         $samplingContext->freeze();
 

tests/Tracing/HttpClient/TraceableHttpClientTest.php

@@ -176,7 +176,7 @@ public function testRequestDoesContainsTracingHeadersWithoutTransaction(): void
             'trace_propagation_targets' => ['www.example.com'],
         ]);
         $client = $this->createMock(ClientInterface::class);
-        $client->expects($this->exactly(5))
+        $client->expects($this->exactly(4))
             ->method('getOptions')
             ->willReturn($options);
 
@@ -200,7 +200,6 @@ public function testRequestDoesContainsTracingHeadersWithoutTransaction(): void
         $this->assertSame('POST', $response->getInfo('http_method'));
         $this->assertSame('https://www.example.com/test-page', $response->getInfo('url'));
         $this->assertSame([\sprintf('sentry-trace: %s', $propagationContext->toTraceparent())], $mockResponse->getRequestOptions()['normalized_headers']['sentry-trace']);
-        $this->assertSame([\sprintf('traceparent: %s', $propagationContext->toW3CTraceparent())], $mockResponse->getRequestOptions()['normalized_headers']['traceparent']);
         $this->assertSame([\sprintf('baggage: %s', $propagationContext->toBaggage())], $mockResponse->getRequestOptions()['normalized_headers']['baggage']);
     }
 

tests/Twig/SentryExtensionTest.php

@@ -73,50 +73,6 @@ public function testTraceMetaFunctionWithActiveSpan(): void
         $this->assertSame('<meta name="sentry-trace" content="a3c01c41d7b94b90aee23edac90f4319-e69c2aef0ec34f2a-1" />', $environment->render('foo.twig'));
     }
 
-    public function testW3CTraceMetaFunctionWithNoActiveSpan(): void
-    {
-        $environment = new Environment(new ArrayLoader(['foo.twig' => '{{ sentry_w3c_trace_meta() }}']));
-        $environment->addExtension(new SentryExtension());
-
-        $propagationContext = PropagationContext::fromDefaults();
-        $propagationContext->setTraceId(new TraceId('566e3688a61d4bc888951642d6f14a19'));
-        $propagationContext->setSpanId(new SpanId('566e3688a61d4bc8'));
-
-        $hub = new Hub(null, new Scope($propagationContext));
-
-        SentrySdk::setCurrentHub($hub);
-
-        $this->assertSame('<meta name="traceparent" content="00-566e3688a61d4bc888951642d6f14a19-566e3688a61d4bc8-00" />', $environment->render('foo.twig'));
-    }
-
-    public function testW3CTraceMetaFunctionWithActiveSpan(): void
-    {
-        $environment = new Environment(new ArrayLoader(['foo.twig' => '{{ sentry_w3c_trace_meta() }}']));
-        $environment->addExtension(new SentryExtension());
-
-        $client = $this->createMock(ClientInterface::class);
-        $client->expects($this->atLeastOnce())
-            ->method('getOptions')
-            ->willReturn(new Options([
-                'traces_sample_rate' => 1.0,
-                'release' => '1.0.0',
-                'environment' => 'development',
-            ]));
-
-        $hub = new Hub($client);
-
-        SentrySdk::setCurrentHub($hub);
-
-        $transaction = new Transaction(new TransactionContext());
-        $transaction->setTraceId(new TraceId('a3c01c41d7b94b90aee23edac90f4319'));
-        $transaction->setSpanId(new SpanId('e69c2aef0ec34f2a'));
-        $transaction->setSampled(true);
-
-        $hub->setSpan($transaction);
-
-        $this->assertSame('<meta name="traceparent" content="00-a3c01c41d7b94b90aee23edac90f4319-e69c2aef0ec34f2a-01" />', $environment->render('foo.twig'));
-    }
-
     public function testBaggageMetaFunctionWithNoActiveSpan(): void
     {
         $environment = new Environment(new ArrayLoader(['foo.twig' => '{{ sentry_baggage_meta() }}']));