Allow for decorating the client builder

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Allow decorating the `ClientBuilderInterface` from the `register` method of a Service Provider (#290)
+
 ## 1.4.1
 
 - Fix default Monolog logger level being invalid when using the Log channel (#287)

src/Sentry/Laravel/ServiceProvider.php

@@ -6,6 +6,7 @@
 use Sentry\ClientBuilder;
 use Sentry\State\HubInterface;
 use Illuminate\Log\LogManager;
+use Sentry\ClientBuilderInterface;
 use Laravel\Lumen\Application as Lumen;
 use Sentry\Integration as SdkIntegration;
 use Illuminate\Foundation\Application as Laravel;
@@ -95,7 +96,7 @@ protected function registerArtisanCommands(): void
      */
     protected function configureAndRegisterClient(): void
     {
-        $this->app->singleton(static::$abstract, function () {
+        $this->app->bind(ClientBuilderInterface::class, function () {
             $basePath = base_path();
             $userConfig = $this->getUserConfig();
 
@@ -120,9 +121,18 @@ protected function configureAndRegisterClient(): void
             );
 
             $clientBuilder = ClientBuilder::create($options);
+
+            // Set the Laravel SDK identifier and version
             $clientBuilder->setSdkIdentifier(Version::SDK_IDENTIFIER);
             $clientBuilder->setSdkVersion(Version::SDK_VERSION);
 
+            return $clientBuilder;
+        });
+
+        $this->app->singleton(static::$abstract, function () {
+            /** @var \Sentry\ClientBuilderInterface $clientBuilder */
+            $clientBuilder = $this->app->make(ClientBuilderInterface::class);
+
             $options = $clientBuilder->getOptions();
 
             if ($options->hasDefaultIntegrations()) {

test/Sentry/ServiceClientBuilderDecoratorTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Sentry\Laravel\Tests;
+
+use Sentry\ClientBuilderInterface;
+use Sentry\Laravel\ServiceProvider;
+
+class ServiceClientBuilderDecoratorTest extends \Orchestra\Testbench\TestCase
+{
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('sentry.dsn', 'http://publickey:[email protected]/123');
+
+        $app->extend(ClientBuilderInterface::class, function (ClientBuilderInterface $clientBuilder) {
+            $clientBuilder->getOptions()->setEnvironment('from_service_container');
+
+            return $clientBuilder;
+        });
+    }
+
+    protected function getPackageProviders($app)
+    {
+        return [
+            ServiceProvider::class,
+        ];
+    }
+
+    public function testClientHasCustomSerializer()
+    {
+        /** @var \Sentry\Options $options */
+        $options = $this->app->make('sentry')->getClient()->getOptions();
+
+        $this->assertEquals('from_service_container', $options->getEnvironment());
+    }
+}