fix: custom tags not passing to js reporter

Author: imorland

README.md

@@ -37,7 +37,7 @@ use FoF\Sentry\Extend\Sentry;
 
 return [
     // Other extenders
-    
+
     (new Sentry())
         ->setRelease('my-app-v1.2.3')
         ->setEnvironment('production')
@@ -73,26 +73,6 @@ Add a custom tag to all Sentry events (applied to both backend and frontend):
     ->addTag('php_version', PHP_VERSION);
 ```
 
-##### `addBackendConfig(string $key, $value)`
-
-Add a custom configuration option for the PHP SDK:
-
-```php
-(new Sentry())
-    ->addBackendConfig('max_breadcrumbs', 50)
-    ->addBackendConfig('send_default_pii', true);
-```
-
-##### `addFrontendConfig(string $key, $value)`
-
-Add a custom configuration option for the JavaScript SDK:
-
-```php
-(new Sentry())
-    ->addFrontendConfig('maxBreadcrumbs', 50)
-    ->addFrontendConfig('debug', true);
-```
-
 #### Example: Setting Environment Variables
 
 You can use environment variables to configure Sentry:

src/Content/SentryJavaScript.php

@@ -11,6 +11,8 @@
 
 namespace FoF\Sentry\Content;
 
+use Flarum\Foundation\Application;
+use Flarum\Foundation\Config;
 use Flarum\Frontend\Document;
 use Flarum\Http\UrlGenerator;
 use Flarum\Settings\SettingsRepositoryInterface;
@@ -33,11 +35,17 @@ class SentryJavaScript
      */
     private $container;
 
-    public function __construct(SettingsRepositoryInterface $settings, UrlGenerator $url, Container $container)
+    /**
+     * @var Config
+     */
+    private $config;
+
+    public function __construct(SettingsRepositoryInterface $settings, UrlGenerator $url, Container $container, Config $config)
     {
         $this->settings = $settings;
         $this->url = $url;
         $this->container = $container;
+        $this->config = $config;
     }
 
     public function __invoke(Document $document)
@@ -84,12 +92,18 @@ public function __invoke(Document $document)
             'tracesSampleRate'         => $tracesSampleRate,
             'replaysSessionSampleRate' => $replaysSessionSampleRate,
             'replaysOnErrorSampleRate' => $replaysErrorSampleRate,
+            'tags'                     => [
+                'flarum'  => Application::VERSION,
+                'offline' => $this->config['offline'] ? 'true' : 'false',
+                'debug'   => $this->config->inDebugMode() ? 'true' : 'false',
+            ],
         ];
 
-        // Merge with custom config
-        if ($this->container->bound('fof.sentry.frontend.config')) {
-            $customConfig = $this->container->make('fof.sentry.frontend.config');
-            $config = array_merge($config, $customConfig);
+        // Retrieve custom tags if they exist
+        if ($this->container->bound('fof.sentry.tags')) {
+            $customTags = $this->container->make('fof.sentry.tags');
+            // Merge custom tags with the default ones
+            $config['tags'] = array_merge($config['tags'], $customTags);
         }
 
         // Add the config to the document payload
@@ -99,17 +113,18 @@ public function __invoke(Document $document)
         $document->foot[] = "
                 <script>
                     if (window.Sentry) {
+                        const sentryConfig = app.data['fof-sentry'] || {};
                         const client = Sentry.createClient({
-                            dsn: '$dsn',
-                            environment: '$environment',
-                            scrubEmails: ".($shouldScrubEmailsFromUserData ? 'true' : 'false').',
-                            showFeedback: '.($showFeedback ? 'true' : 'false').',
-
-                            captureConsole: '.($captureConsole ? 'true' : 'false').",
-
-                            tracesSampleRate: $tracesSampleRate,
-                            replaysSessionSampleRate: $replaysSessionSampleRate,
-                            replaysOnErrorSampleRate: $replaysErrorSampleRate,
+                            dsn: sentryConfig.dsn || '$dsn',
+                            environment: sentryConfig.environment || '$environment',
+                            release: sentryConfig.release || '$release',
+                            scrubEmails: sentryConfig.scrubEmails !== undefined ? sentryConfig.scrubEmails : ".($shouldScrubEmailsFromUserData ? 'true' : 'false').',
+                            showFeedback: sentryConfig.showFeedback !== undefined ? sentryConfig.showFeedback : '.($showFeedback ? 'true' : 'false').',
+                            captureConsole: sentryConfig.captureConsole !== undefined ? sentryConfig.captureConsole : '.($captureConsole ? 'true' : 'false').",
+                            tracesSampleRate: sentryConfig.tracesSampleRate !== undefined ? sentryConfig.tracesSampleRate : $tracesSampleRate,
+                            replaysSessionSampleRate: sentryConfig.replaysSessionSampleRate !== undefined ? sentryConfig.replaysSessionSampleRate : $replaysSessionSampleRate,
+                            replaysOnErrorSampleRate: sentryConfig.replaysOnErrorSampleRate !== undefined ? sentryConfig.replaysOnErrorSampleRate : $replaysErrorSampleRate,
+                            tags: sentryConfig.tags || {}
                         });
 
                         Sentry.getCurrentHub().bindClient(client);

src/Extend/Sentry.php

@@ -21,8 +21,6 @@ class Sentry implements ExtenderInterface
 {
     private $customRelease = null;
     private $customEnvironment = null;
-    private $backendConfig = [];
-    private $frontendConfig = [];
     private $tags = [];
 
     /**
@@ -53,36 +51,6 @@ public function setEnvironment(string $environment): self
         return $this;
     }
 
-    /**
-     * Add a custom configuration option for the PHP SDK.
-     *
-     * @param string $key   Configuration key
-     * @param mixed  $value Configuration value
-     *
-     * @return self
-     */
-    public function addBackendConfig(string $key, $value): self
-    {
-        $this->backendConfig[$key] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Add a custom configuration option for the JavaScript SDK.
-     *
-     * @param string $key   Configuration key
-     * @param mixed  $value Configuration value
-     *
-     * @return self
-     */
-    public function addFrontendConfig(string $key, $value): self
-    {
-        $this->frontendConfig[$key] = $value;
-
-        return $this;
-    }
-
     /**
      * Add a tag that will be sent with all events.
      *
@@ -114,22 +82,13 @@ public function extend(Container $container, ?Extension $extension = null)
             });
         }
 
-        // Add backend config options
-        if (!empty($this->backendConfig)) {
-            $container->extend('fof.sentry.backend.config', function ($config) {
-                return array_merge($config ?? [], $this->backendConfig);
-            });
-        }
-
-        // Add frontend config options
-        if (!empty($this->frontendConfig)) {
-            $container->extend('fof.sentry.frontend.config', function ($config) {
-                return array_merge($config ?? [], $this->frontendConfig);
-            });
-        }
-
         // Add tags to backend
         if (!empty($this->tags)) {
+            // Register tags in the container so they can be accessed by SentryJavaScript
+            $container->singleton('fof.sentry.tags', function () {
+                return $this->tags;
+            });
+
             $container->extend(HubInterface::class, function (HubInterface $hub) {
                 $hub->configureScope(function (Scope $scope) {
                     foreach ($this->tags as $key => $value) {