opentelemetry-instrumentation-concurrent_ruby 0.18.2 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2014ca4a849d67e0ff012d203ed95defb6ec847d7035e163a5024a56229b29b0
-  data.tar.gz: 35a0031a8e04314305a4c05893e60375db2bf1f219da97b4c25d14f021ea3668
+  metadata.gz: 38fc0370ca9ba419dcd660453f0e9d212ae72a57e60d426bbad999c12af9d340
+  data.tar.gz: 40bef73ed660e8ea412b16ed20ab87ae35f712d572994e9b20f7a68837fabdf9
 SHA512:
-  metadata.gz: 01d6b4c059890cf3d2a8b375a22d1f5bede5ca4e4410674fce14b45a666c52b9cc786c4f3211fcaddad4acbcfa4518cec90b9c2d1517670dbfd81501179b4e28
-  data.tar.gz: '0186e1576d45b2f8523800c6d5a48a6171cff504deb16fcb39549b514e4d8b648a6f6f29d6b10193fbcb0febd67ab13687725a8a4aa462c1237fe1bd2dc42401'
+  metadata.gz: 8d560698ab93692a06cfffbd0b666c8515c63353e5f89ec4fce35672e2918158ae1af49c89e8b84c4d85632fb85541c392b0b7f517a57d50a3e40479c0d0e5f7
+  data.tar.gz: 6e5227b916ea828642a25f152cece35492e71fd70c677dac7b51f5ca04adbcafc8b7ec698088029871388f876770a8cf4b70245f279851121a09e915422a0df5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-concurrent_ruby
 
+### v0.19.0 / 2021-09-29
+
+* ADDED: Add suport for `Concurrent::Promises::Future` 
+
 ### v0.18.2 / 2021-08-12
 
 * DOCS: Update docs to rely more on environment variable configuration 

data/lib/opentelemetry/instrumentation/concurrent_ruby/instrumentation.rb

@@ -16,17 +16,17 @@ module OpenTelemetry
         end
 
         present do
-          defined?(::Concurrent::Future)
+          defined?(::Concurrent::ThreadPoolExecutor)
         end
 
         private
 
         def require_dependencies
-          require_relative 'patches/future'
+          require_relative 'patches/thread_pool_executor'
         end
 
         def patch
-          ::Concurrent::Future.send(:include, Patches::Future)
+          ::Concurrent::ThreadPoolExecutor.prepend Patches::ThreadPoolExecutor
         end
       end
     end

data/lib/opentelemetry/instrumentation/concurrent_ruby/patches/thread_pool_executor.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module ConcurrentRuby
+      module Patches
+        # Concurrent::ThreadPoolExecutor patch for instrumentation
+        module ThreadPoolExecutor
+          # @see Concurrent::ExecutorService#post
+          def post(*args, **kwargs, &task)
+            context = OpenTelemetry::Context.current
+            return super unless context
+
+            super(*args, **kwargs) do
+              OpenTelemetry::Context.with_current(context) do
+                task.call(*args, **kwargs)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/instrumentation/concurrent_ruby/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ConcurrentRuby
-      VERSION = '0.18.2'
+      VERSION = '0.19.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-concurrent_ruby
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.19.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -178,18 +178,17 @@ files:
 - lib/opentelemetry-instrumentation-concurrent_ruby.rb
 - lib/opentelemetry/instrumentation.rb
 - lib/opentelemetry/instrumentation/concurrent_ruby.rb
-- lib/opentelemetry/instrumentation/concurrent_ruby/context_composite_executor_service.rb
 - lib/opentelemetry/instrumentation/concurrent_ruby/instrumentation.rb
-- lib/opentelemetry/instrumentation/concurrent_ruby/patches/future.rb
+- lib/opentelemetry/instrumentation/concurrent_ruby/patches/thread_pool_executor.rb
 - lib/opentelemetry/instrumentation/concurrent_ruby/version.rb
 homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-concurrent_ruby/v0.18.2/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-concurrent_ruby/v0.19.0/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/concurrent_ruby
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-concurrent_ruby/v0.18.2
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-concurrent_ruby/v0.19.0
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/opentelemetry/instrumentation/concurrent_ruby/context_composite_executor_service.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright The OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-require 'concurrent/executor/executor_service'
-require 'forwardable'
-
-module OpenTelemetry
-  module Instrumentation
-    module ConcurrentRuby
-      # Wraps existing executor to carry over trace context
-      class ContextCompositeExecutorService
-        extend Forwardable
-        include Concurrent::ExecutorService
-
-        attr_accessor :composited_executor
-
-        def initialize(composited_executor)
-          @composited_executor = composited_executor
-        end
-
-        # post method runs the task within composited executor
-        # in a different thread
-        def post(*args, &task)
-          context = OpenTelemetry::Context.current
-
-          @composited_executor.post(*args) do
-            OpenTelemetry::Context.with_current(context) do
-              yield
-            end
-          end
-        end
-
-        delegate %i[can_overflow? serialized?] => :composited_executor
-      end
-    end
-  end
-end

data/lib/opentelemetry/instrumentation/concurrent_ruby/patches/future.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright The OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-require_relative '../context_composite_executor_service'
-
-module OpenTelemetry
-  module Instrumentation
-    module ConcurrentRuby
-      module Patches
-        # Concurrent::Future patch for instrumentation
-        module Future
-          def self.included(base)
-            base.class_eval do
-              alias_method :ns_initialize_without_otel, :ns_initialize
-              remove_method(:ns_initialize)
-
-              def ns_initialize(value, opts)
-                ns_initialize_without_otel(value, opts)
-
-                @executor = ContextCompositeExecutorService.new(@executor)
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end