ddtrace 0.29.1 → 0.30.0

data/lib/ddtrace/contrib/active_model_serializers/patcher.rb

@@ -12,19 +12,12 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:active_model_serializers)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:active_model_serializers) do
-            begin
-              # Subscribe to ActiveModelSerializers events
-              Events.subscribe!
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply ActiveModelSerializers integration: #{e}")
-            end
-          end
+          Events.subscribe!
         end
 
         def get_option(option)

data/lib/ddtrace/contrib/active_record/patcher.rb

@@ -10,18 +10,12 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:active_record)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:active_record) do
-            begin
-              Events.subscribe!
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Active Record integration: #{e}")
-            end
-          end
+          Events.subscribe!
         end
       end
     end

data/lib/ddtrace/contrib/active_support/cache/patcher.rb

@@ -11,21 +11,15 @@ module Datadog
 
           module_function
 
-          def patched?
-            done?(:cache)
+          def target_version
+            Integration.version
           end
 
           def patch
-            do_once(:cache) do
-              begin
-                patch_cache_store_read
-                patch_cache_store_fetch
-                patch_cache_store_write
-                patch_cache_store_delete
-              rescue StandardError => e
-                Datadog::Tracer.log.error("Unable to apply Active Support cache integration: #{e}")
-              end
-            end
+            patch_cache_store_read
+            patch_cache_store_fetch
+            patch_cache_store_write
+            patch_cache_store_delete
           end
 
           def cache_store_class(meth)
@@ -33,27 +27,19 @@ module Datadog
           end
 
           def patch_cache_store_read
-            do_once(:patch_cache_store_read) do
-              cache_store_class(:read).send(:prepend, Cache::Instrumentation::Read)
-            end
+            cache_store_class(:read).send(:prepend, Cache::Instrumentation::Read)
           end
 
           def patch_cache_store_fetch
-            do_once(:patch_cache_store_fetch) do
-              cache_store_class(:fetch).send(:prepend, Cache::Instrumentation::Fetch)
-            end
+            cache_store_class(:fetch).send(:prepend, Cache::Instrumentation::Fetch)
           end
 
           def patch_cache_store_write
-            do_once(:patch_cache_store_write) do
-              cache_store_class(:write).send(:prepend, Cache::Instrumentation::Write)
-            end
+            cache_store_class(:write).send(:prepend, Cache::Instrumentation::Write)
           end
 
           def patch_cache_store_delete
-            do_once(:patch_cache_store_delete) do
-              cache_store_class(:delete).send(:prepend, Cache::Instrumentation::Delete)
-            end
+            cache_store_class(:delete).send(:prepend, Cache::Instrumentation::Delete)
           end
         end
       end

data/lib/ddtrace/contrib/active_support/patcher.rb

@@ -10,18 +10,12 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:active_support)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:active_support) do
-            begin
-              Cache::Patcher.patch
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Active Support integration: #{e}")
-            end
-          end
+          Cache::Patcher.patch
         end
       end
     end

data/lib/ddtrace/contrib/aws/patcher.rb

@@ -11,22 +11,16 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:aws)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:aws) do
-            begin
-              require 'ddtrace/contrib/aws/parsed_context'
-              require 'ddtrace/contrib/aws/instrumentation'
-              require 'ddtrace/contrib/aws/services'
-
-              add_plugin(Seahorse::Client::Base, *loaded_constants)
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply AWS integration: #{e}")
-            end
-          end
+          require 'ddtrace/contrib/aws/parsed_context'
+          require 'ddtrace/contrib/aws/instrumentation'
+          require 'ddtrace/contrib/aws/services'
+
+          add_plugin(Seahorse::Client::Base, *loaded_constants)
         end
 
         def add_plugin(*targets)

data/lib/ddtrace/contrib/concurrent_ruby/patcher.rb

@@ -9,20 +9,13 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:concurrent_ruby)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:concurrent_ruby) do
-            begin
-              require 'ddtrace/contrib/concurrent_ruby/future_patch'
-
-              patch_future
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Future integration: #{e}")
-            end
-          end
+          require 'ddtrace/contrib/concurrent_ruby/future_patch'
+          patch_future
         end
 
         # Propagate tracing context in Concurrent::Future

data/lib/ddtrace/contrib/dalli/patcher.rb

@@ -12,19 +12,13 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:dalli)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:dalli) do
-            begin
-              add_pin!
-              ::Dalli::Server.send(:include, Instrumentation)
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Dalli integration: #{e}")
-            end
-          end
+          add_pin!
+          ::Dalli::Server.send(:include, Instrumentation)
         end
 
         # DEPRECATED: Only kept for users still using `Dalli.datadog_pin` to configure.

data/lib/ddtrace/contrib/delayed_job/patcher.rb

@@ -10,19 +10,13 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:delayed_job)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:delayed_job) do
-            begin
-              require 'ddtrace/contrib/delayed_job/plugin'
-              add_instrumentation(::Delayed::Worker)
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply DelayedJob integration: #{e}")
-            end
-          end
+          require 'ddtrace/contrib/delayed_job/plugin'
+          add_instrumentation(::Delayed::Worker)
         end
 
         def add_instrumentation(klass)

data/lib/ddtrace/contrib/elasticsearch/patcher.rb

@@ -13,23 +13,17 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:elasticsearch)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:elasticsearch) do
-            begin
-              require 'uri'
-              require 'json'
-              require 'ddtrace/pin'
-              require 'ddtrace/contrib/elasticsearch/quantize'
-
-              patch_elasticsearch_transport_client
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Elasticsearch integration: #{e}")
-            end
-          end
+          require 'uri'
+          require 'json'
+          require 'ddtrace/pin'
+          require 'ddtrace/contrib/elasticsearch/quantize'
+
+          patch_elasticsearch_transport_client
         end
 
         # rubocop:disable Metrics/MethodLength

data/lib/ddtrace/contrib/ethon/patcher.rb

@@ -7,19 +7,17 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:ethon)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:ethon) do
-            require 'ddtrace/ext/app_types'
-            require 'ddtrace/contrib/ethon/easy_patch'
-            require 'ddtrace/contrib/ethon/multi_patch'
+          require 'ddtrace/ext/app_types'
+          require 'ddtrace/contrib/ethon/easy_patch'
+          require 'ddtrace/contrib/ethon/multi_patch'
 
-            ::Ethon::Easy.send(:include, EasyPatch)
-            ::Ethon::Multi.send(:include, MultiPatch)
-          end
+          ::Ethon::Easy.send(:include, EasyPatch)
+          ::Ethon::Multi.send(:include, MultiPatch)
         end
       end
     end

data/lib/ddtrace/contrib/excon/patcher.rb

@@ -9,20 +9,13 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:excon)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:excon) do
-            begin
-              require 'ddtrace/contrib/excon/middleware'
-
-              add_middleware
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Excon integration: #{e}")
-            end
-          end
+          require 'ddtrace/contrib/excon/middleware'
+          add_middleware
         end
 
         def add_middleware

data/lib/ddtrace/contrib/faraday/patcher.rb

@@ -12,22 +12,16 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:faraday)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:faraday) do
-            begin
-              require 'ddtrace/contrib/faraday/middleware'
+          require 'ddtrace/contrib/faraday/middleware'
 
-              add_pin!
-              register_middleware!
-              add_default_middleware!
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Faraday integration: #{e}")
-            end
-          end
+          add_pin!
+          register_middleware!
+          add_default_middleware!
         end
 
         def add_pin!

data/lib/ddtrace/contrib/grape/patcher.rb

@@ -14,24 +14,18 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:grape)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:grape) do
-            begin
-              # Patch endpoints
-              ::Grape::Endpoint.send(:include, Instrumentation)
+          # Patch endpoints
+          ::Grape::Endpoint.send(:include, Instrumentation)
 
-              add_pin!
+          add_pin!
 
-              # Subscribe to ActiveSupport events
-              Datadog::Contrib::Grape::Endpoint.subscribe
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Grape integration: #{e}")
-            end
-          end
+          # Subscribe to ActiveSupport events
+          Datadog::Contrib::Grape::Endpoint.subscribe
         end
 
         def add_pin!

data/lib/ddtrace/contrib/graphql/patcher.rb

@@ -9,22 +9,16 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:graphql)
+        def target_version
+          Integration.version
         end
 
         def patch
           return if get_option(:schemas).nil?
 
-          do_once(:graphql) do
-            begin
-              require 'ddtrace/ext/app_types'
-              require 'ddtrace/ext/http'
-              get_option(:schemas).each { |s| patch_schema!(s) }
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply GraphQL integration: #{e}")
-            end
-          end
+          require 'ddtrace/ext/app_types'
+          require 'ddtrace/ext/http'
+          get_option(:schemas).each { |s| patch_schema!(s) }
         end
 
         def patch_schema!(schema)

data/lib/ddtrace/contrib/grpc/patcher.rb

@@ -10,24 +10,18 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:grpc)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:grpc) do
-            begin
-              require 'ddtrace/propagation/grpc_propagator'
-              require 'ddtrace/contrib/grpc/datadog_interceptor'
-              require 'ddtrace/contrib/grpc/intercept_with_datadog'
+          require 'ddtrace/propagation/grpc_propagator'
+          require 'ddtrace/contrib/grpc/datadog_interceptor'
+          require 'ddtrace/contrib/grpc/intercept_with_datadog'
 
-              add_pin!
+          add_pin!
 
-              prepend_interceptor
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply gRPC integration: #{e}")
-            end
-          end
+          prepend_interceptor
         end
 
         def add_pin!

data/lib/ddtrace/contrib/http/patcher.rb

@@ -12,19 +12,13 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:http)
+        def target_version
+          Integration.version
         end
 
         # patch applies our patch if needed
         def patch
-          do_once(:http) do
-            begin
-              ::Net::HTTP.send(:include, Instrumentation)
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply net/http integration: #{e}")
-            end
-          end
+          ::Net::HTTP.send(:include, Instrumentation)
         end
       end
     end