Merge branch 'master' into logs

Author: cleptric

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 4.14.0
+
+### Bug Fixes
+
+- Fix tracing when using Laravel Octane [(#997)](https://github.com/getsentry/sentry-laravel/pull/997)
+
+  When using Laravel Octane, the SDK now correctly cleans up it's state after each request, ensuring that traces are correctly reported.
+
+### Misc
+
+- Add `sentry` prefix to publish group name [(#992)](https://github.com/getsentry/sentry-laravel/pull/992)
+
+  When running `php artisan vendor:publish`, the Sentry package exports are now prefixed with `sentry`, making it easier to distinguish from other packages.
+
+- Remove support for `traceparent` header [(#994)](https://github.com/getsentry/sentry-laravel/pull/994)
+
+  The W3C's `traceparent` header is no longer automatically picked up and emitted by the SDK to prevent non-Sentry SDKs from starting a trace that is unwanted.
+
 ## 4.13.0
 
 The Sentry SDK team is happy to announce the immediate availability of Sentry Laravel SDK v4.13.0.

src/Sentry/Laravel/Console/PublishCommand.php

@@ -105,6 +105,10 @@ private function setEnvValues(array $values): bool
 
                     $this->info("Updated {$envKey} with new value in your `.env` file.");
                 } else {
+                    // Ensure there is a newline before writing env variables
+                    if (substr($envFileContents, -1) !== "\n") {
+                        $envFileContents .= "\n";
+                    }
                     $envFileContents .= "{$envKey}={$envValue}\n";
 
                     $this->info("Added {$envKey} to your `.env` file.");

src/Sentry/Laravel/ServiceProvider.php

@@ -107,7 +107,7 @@ public function boot(): void
             if ($this->app instanceof Laravel) {
                 $this->publishes([
                     __DIR__ . '/../../../config/sentry.php' => config_path(static::$abstract . '.php'),
-                ], 'config');
+                ], 'sentry-config');
             }
 
             $this->registerArtisanCommands();

src/Sentry/Laravel/Tracing/Middleware.php

@@ -73,7 +73,7 @@ public function __construct(bool $continueAfterResponse = true)
     public function handle(Request $request, Closure $next)
     {
         if (app()->bound(HubInterface::class)) {
-            $this->startTransaction($request, app(HubInterface::class));
+            $this->startTransaction($request);
         }
 
         return $next($request);
@@ -89,12 +89,14 @@ public function handle(Request $request, Closure $next)
      */
     public function terminate(Request $request, $response): void
     {
-        // If there is no transaction or the HubInterface is not bound in the container there is nothing for us to do
-        if ($this->transaction === null || !app()->bound(HubInterface::class)) {
+        // If there is no transaction there is nothing for us to do
+        if ($this->transaction === null) {
             return;
         }
 
         if ($this->shouldRouteBeIgnored($request)) {
+            $this->discardTransaction();
+
             return;
         }
 
@@ -132,10 +134,12 @@ public function setBootedTimestamp(?float $timestamp = null): void
         $this->bootedTimestamp = $timestamp ?? microtime(true);
     }
 
-    private function startTransaction(Request $request, HubInterface $sentry): void
+    private function startTransaction(Request $request): void
     {
+        $hub = SentrySdk::getCurrentHub();
+
         // Prevent starting a new transaction if we are already in a transaction
-        if ($sentry->getTransaction() !== null) {
+        if ($hub->getTransaction() !== null) {
             return;
         }
 
@@ -168,9 +172,9 @@ private function startTransaction(Request $request, HubInterface $sentry): void
             'http.request.method' => strtoupper($request->method()),
         ]);
 
-        $transaction = $sentry->startTransaction($context);
+        $transaction = $hub->startTransaction($context);
 
-        SentrySdk::getCurrentHub()->setSpan($transaction);
+        $hub->setSpan($transaction);
 
         // If this transaction is not sampled, we can stop here to prevent doing work for nothing
         if (!$transaction->getSampled()) {
@@ -188,7 +192,17 @@ private function startTransaction(Request $request, HubInterface $sentry): void
                 ->setStartTimestamp($bootstrapSpan ? $bootstrapSpan->getEndTimestamp() : microtime(true))
         );
 
-        SentrySdk::getCurrentHub()->setSpan($this->appSpan);
+        $hub->setSpan($this->appSpan);
+    }
+
+    private function discardTransaction(): void
+    {
+        $this->appSpan = null;
+        $this->transaction = null;
+        $this->didRouteMatch = false;
+        $this->bootedTimestamp = null;
+
+        SentrySdk::getCurrentHub()->setSpan(null);
     }
 
     private function addAppBootstrapSpan(): ?Span

src/Sentry/Laravel/Version.php

@@ -5,5 +5,5 @@
 final class Version
 {
     public const SDK_IDENTIFIER = 'sentry.php.laravel';
-    public const SDK_VERSION = '4.13.0';
+    public const SDK_VERSION = '4.14.0';
 }