Merge pull request #377 from alphagov/fix-race-condition-for-patch

alphagov · Jun 5, 2024 · d0108d3 · d0108d3
2 parents aaba23c + 7d51e7f
commit d0108d3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 9.11.2
+
+* Fix Logstasher monkey patch overriding patch from this library for OpenTelemetry errors ([#377](https://github.com/alphagov/govuk_app_config/pull/377))
+
 # 9.11.1
 
 * Fix OpenTelemetry errors when using with Logstasher gem ([#372](https://github.com/alphagov/govuk_app_config/pull/372))

diff --git a/lib/govuk_app_config/govuk_json_logging.rb b/lib/govuk_app_config/govuk_json_logging.rb
@@ -20,6 +20,8 @@ def self.configure(&block)
     config = Rails.application.config.logstasher
     if (!config.controller_monkey_patch && config.controller_monkey_patch != false) || config.controller_monkey_patch == true
       require_relative "./govuk_json_logging/rails_ext/action_controller/metal/instrumentation"
+      # Prevent the old monkey patch being applied
+      config.controller_monkey_patch = false
     end
 
     configuration = Configuration.new

diff --git a/lib/govuk_app_config/version.rb b/lib/govuk_app_config/version.rb
@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.11.1".freeze
+  VERSION = "9.11.2".freeze
 end