Merge branch 'hotfix/v2.3.6'

roadiz · Jun 8, 2024 · a9ad8d1 · a9ad8d1
2 parents 5ffecbc + f83b39d
commit a9ad8d1
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to project will be documented in this file.
 
+## [2.3.6](https://github.com/roadiz/skeleton/compare/v2.3.5...v2.3.6) - 2024-06-08
+
+### Bug Fixes
+
+- Improved Sentry integration - ([0f07a87](https://github.com/roadiz/skeleton/commit/0f07a875cb2c68d1c20c290e64eb36f87afde31b)) - Ambroise Maupate
+
 ## [2.3.5](https://github.com/roadiz/skeleton/compare/v2.3.4...v2.3.5) - 2024-05-31
 
 ### Features

diff --git a/docker-compose.prod.yml → compose.prod.yml b/docker-compose.prod.yml → compose.prod.yml
diff --git a/docker-compose.restore.yml → compose.restore.yml b/docker-compose.restore.yml → compose.restore.yml
@@ -1,6 +1,6 @@
 # Restoring from a backup into development environment
 # Separate file to avoid running the restore services when using docker-compose up
-# docker compose -f docker-compose.restore.yml --env-file .env.local run --rm restore_files
+# docker compose -f compose.restore.yml --env-file .env.local run --rm restore_files
 #name: skeleton
 services:
     restore_files:

diff --git a/docker-compose.symfony.yml → compose.symfony.yml b/docker-compose.symfony.yml → compose.symfony.yml
diff --git a/docker-compose.yml → compose.yml b/docker-compose.yml → compose.yml
diff --git a/config/packages/monolog.yaml b/config/packages/monolog.yaml
@@ -52,19 +52,17 @@ when@prod:
                 handler: nested
                 excluded_http_codes: [404, 405]
                 buffer_size: 50 # How many messages should be saved? Prevent memory leaks
+                channels: ["!deprecation"]
             nested:
                 type: stream
                 path: php://stderr
                 level: info
                 formatter: monolog.formatter.json
-    #        sentry:
-    #            type: sentry
-    #            level: !php/const Monolog\Logger::ERROR
-    #            hub_id: Sentry\State\HubInterface
+                channels: ["!deprecation"]
             console:
                 type: console
                 process_psr_3_messages: false
-                channels: ["!event", "!doctrine"]
+                channels: ["!event", "!doctrine", "!deprecation"]
             custom:
                 type: service
                 id: RZ\Roadiz\CoreBundle\Logger\DoctrineHandler

diff --git a/config/packages/sentry.yaml b/config/packages/sentry.yaml
@@ -1,12 +1,23 @@
 parameters:
     env(SENTRY_ENVIRONMENT): 'preproduction'
 
-sentry:
-    register_error_listener: false
-
 when@prod:
     sentry:
         dsn: '%env(SENTRY_DSN)%'
+
+        # If you are using Monolog, you also need this additional configuration to log the errors correctly:
+        # https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
+        register_error_listener: false
+        register_error_handler: false
+
         options:
-            release: '%env(APP_VERSION)%'
+            release: '%env(API_VERSION)%'
             environment: '%env(SENTRY_ENVIRONMENT)%'
+
+    monolog:
+        handlers:
+            sentry:
+                type: sentry
+                level: !php/const Monolog\Logger::ERROR
+                hub_id: Sentry\State\HubInterface
+                fill_extra_context: true # Enables sending monolog context to Sentry