contrast-agent 4.14.0 → 4.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd48ab0d63bb36fd51e032c360b2ffebe0c387a57e2b70a5e025c1af9667bfb
-  data.tar.gz: 7aaf091b2e3fd2ced8c8b11708db4a8e216bf55b7499fc235940e93ebff2ef1a
+  metadata.gz: 8ab9eae65aeefbeb3c12102f71287c60856783238067a7c461fcf534aaa65712
+  data.tar.gz: 1fe74d85374374f40a11c47e44ab0da1042a3f99d607fdfd697a45cc321b45b0
 SHA512:
-  metadata.gz: 56fbdd193cc27bcd7e21fe5c4f237276c616e4633344db18b6f27e7e73c99979131cbb9922a2d0cf947c0b666dd3a0d5098b120a805d8cf7b52bc73c6becc535
-  data.tar.gz: dce071438c0f996567c9867b4ab59900d2225fc3afc59887ffbd850705981f59f228360899084711fe88c9d566e33cdb20f3d5a9127b30efaa0c689274c84159
+  metadata.gz: df020b9d0ff09e61107e280f6e76411f9a9b75c1c94f7082ef52d487e5f88b940e75996dd869d648ac0af654f5f84e48b1f691fdcc9e5f294a565d2bb1a39b7d
+  data.tar.gz: 8bd869bfacbb82aea7b0cf55ff806fded4bae5c6b0454185c4c422bdd14ee07fd1edb3f4b843e702765a4693b51697a0497129d73d3d3652f32cc50056ed783b

data/lib/contrast/agent/version.rb

@@ -3,6 +3,6 @@
 
 module Contrast
   module Agent
-    VERSION = '4.14.0'
+    VERSION = '4.14.1'
   end
 end

data/lib/contrast/extension/thread.rb

@@ -10,22 +10,41 @@
 # exists mostly for reference.
 #
 # Scope HAS to exist per-fiber.
+# Check to see if Thread#initialize has been prepended. If it hasn't, then we should use the alias approach, so that
+# others can continue to alias it. If it has been, then we must use prepend ourselves.
+if Thread.instance_method(:initialize).owner == Thread
+  # Alias-chaining Thread#initialize.
+  class Thread
+    alias_method :cs__initialize, :initialize
 
-# Monkey-patching Thread#initialize.
-class Thread
-  alias_method :cs__initialize, :initialize
+    def initialize *args, &block
+      # Thread.current still references the original(callee) thread that is instantiating this new fiber during
+      # initialization.
+      Contrast::Components::Scope::MONITOR.synchronize do
+        if (current_context = Thread.current[:current_context])
+          self[:current_context] = current_context.dup
+        end
 
-  def initialize *args, &block
-    # Thread.current still references the original(callee) thread that is
-    # instantiating this new fiber during initialization
-    Contrast::Components::Scope::MONITOR.synchronize do
-      if (current_context = Thread.current[:current_context])
-        self[:current_context] = current_context.dup
+        Contrast::Components::Scope.sweep_dead_ecs
       end
 
-      Contrast::Components::Scope.sweep_dead_ecs
+      cs__initialize(*args, &block)
+    end
+  end
+else
+  # Prepending Thread#initialize.
+  module ContrastThread
+    def initialize *args, &block
+      # Thread.current still references the original(callee) thread that is instantiating this new fiber during
+      # initialization.
+      Contrast::Components::Scope::MONITOR.synchronize do
+        if (current_context = Thread.current[:current_context])
+          self[:current_context] = current_context.dup
+        end
+        Contrast::Components::Scope.sweep_dead_ecs
+      end
+      super
     end
-
-    cs__initialize(*args, &block)
   end
+  Thread.prepend(ContrastThread)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrast-agent
 version: !ruby/object:Gem::Version
-  version: 4.14.0
+  version: 4.14.1
 platform: ruby
 authors:
 - galen.palmer@contrastsecurity.com
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -617,20 +617,20 @@ executables:
 - contrast_service
 extensions:
 - ext/cs__common/extconf.rb
-- ext/cs__assess_basic_object/extconf.rb
-- ext/cs__assess_string/extconf.rb
-- ext/cs__assess_hash/extconf.rb
-- ext/cs__assess_module/extconf.rb
-- ext/cs__assess_kernel/extconf.rb
+- ext/cs__assess_fiber_track/extconf.rb
 - ext/cs__assess_array/extconf.rb
+- ext/cs__assess_string/extconf.rb
+- ext/cs__assess_regexp/extconf.rb
+- ext/cs__assess_yield_track/extconf.rb
+- ext/cs__assess_active_record_named/extconf.rb
 - ext/cs__contrast_patch/extconf.rb
+- ext/cs__assess_kernel/extconf.rb
+- ext/cs__assess_hash/extconf.rb
+- ext/cs__assess_string_interpolation26/extconf.rb
 - ext/cs__os_information/extconf.rb
 - ext/cs__assess_marshal_module/extconf.rb
-- ext/cs__assess_fiber_track/extconf.rb
-- ext/cs__assess_string_interpolation26/extconf.rb
-- ext/cs__assess_active_record_named/extconf.rb
-- ext/cs__assess_regexp/extconf.rb
-- ext/cs__assess_yield_track/extconf.rb
+- ext/cs__assess_basic_object/extconf.rb
+- ext/cs__assess_module/extconf.rb
 extra_rdoc_files: []
 files:
 - ".clang-format"