ddtrace 0.50.0 → 0.53.0

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

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module HTTP

data/lib/ddtrace/contrib/http/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/contrib/http/ext'
 

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

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module HTTP

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

@@ -1,3 +1,4 @@
+# typed: false
 require 'uri'
 require 'ddtrace/pin'
 require 'ddtrace/ext/app_types'

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

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/version'
 
 require 'ddtrace/contrib/integration'

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

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/contrib/http/ext'
 require 'ddtrace/contrib/http/instrumentation'

data/lib/ddtrace/contrib/http_annotation_helper.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     # Contains methods helpful for tracing/annotating HTTP request libraries

data/lib/ddtrace/contrib/httpclient/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/contrib/httpclient/ext'
 

data/lib/ddtrace/contrib/httpclient/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Httpclient

data/lib/ddtrace/contrib/httpclient/instrumentation.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/ext/app_types'
 require 'ddtrace/ext/http'
 require 'ddtrace/ext/net'

data/lib/ddtrace/contrib/httpclient/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/httpclient/configuration/settings'
 require 'ddtrace/contrib/configuration/resolvers/pattern_resolver'

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

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/contrib/httpclient/instrumentation'
 require 'ddtrace/utils/only_once'
@@ -28,7 +29,7 @@ module Datadog
             begin
               ::HTTPClient.include(Instrumentation)
             rescue StandardError => e
-              Datadog::Logger.error("Unable to apply httpclient integration: #{e}")
+              Datadog.logger.error("Unable to apply httpclient integration: #{e}")
             end
           end
         end

data/lib/ddtrace/contrib/httprb/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/contrib/httprb/ext'
 

data/lib/ddtrace/contrib/httprb/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Httprb

data/lib/ddtrace/contrib/httprb/instrumentation.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/ext/app_types'
 require 'ddtrace/ext/http'
 require 'ddtrace/ext/net'

data/lib/ddtrace/contrib/httprb/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/httprb/configuration/settings'
 require 'ddtrace/contrib/configuration/resolvers/pattern_resolver'

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

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/contrib/httprb/instrumentation'
 require 'ddtrace/utils/only_once'
@@ -28,7 +29,7 @@ module Datadog
             begin
               ::HTTP::Client.include(Instrumentation)
             rescue StandardError => e
-              Datadog::Logger.error("Unable to apply httprb integration: #{e}")
+              Datadog.logger.error("Unable to apply httprb integration: #{e}")
             end
           end
         end

data/lib/ddtrace/contrib/integration.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/configurable'
 require 'ddtrace/contrib/patchable'
 require 'ddtrace/contrib/registerable'

data/lib/ddtrace/contrib/kafka/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/contrib/kafka/ext'
 

data/lib/ddtrace/contrib/kafka/consumer_event.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Kafka

data/lib/ddtrace/contrib/kafka/consumer_group_event.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Kafka

data/lib/ddtrace/contrib/kafka/event.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/active_support/notifications/event'
 require 'ddtrace/contrib/kafka/ext'

data/lib/ddtrace/contrib/kafka/events/connection/request.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/kafka/ext'
 require 'ddtrace/contrib/kafka/event'
 

data/lib/ddtrace/contrib/kafka/events/consumer/process_batch.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/kafka/ext'
 require 'ddtrace/contrib/kafka/event'
 require 'ddtrace/contrib/kafka/consumer_event'

data/lib/ddtrace/contrib/kafka/events/consumer/process_message.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/kafka/ext'
 require 'ddtrace/contrib/kafka/event'
 require 'ddtrace/contrib/kafka/consumer_event'

data/lib/ddtrace/contrib/kafka/events/consumer_group/heartbeat.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/kafka/ext'
 require 'ddtrace/contrib/kafka/event'
 require 'ddtrace/contrib/kafka/consumer_event'

data/lib/ddtrace/contrib/kafka/events/consumer_group/join_group.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/kafka/ext'
 require 'ddtrace/contrib/kafka/event'
 require 'ddtrace/contrib/kafka/consumer_event'

data/lib/ddtrace/contrib/kafka/events/consumer_group/leave_group.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/kafka/ext'
 require 'ddtrace/contrib/kafka/event'
 require 'ddtrace/contrib/kafka/consumer_event'

data/lib/ddtrace/contrib/kafka/events/consumer_group/sync_group.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/kafka/ext'
 require 'ddtrace/contrib/kafka/event'
 require 'ddtrace/contrib/kafka/consumer_event'

data/lib/ddtrace/contrib/kafka/events/produce_operation/send_messages.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/kafka/ext'
 require 'ddtrace/contrib/kafka/event'
 

data/lib/ddtrace/contrib/kafka/events/producer/deliver_messages.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/kafka/ext'
 require 'ddtrace/contrib/kafka/event'
 

data/lib/ddtrace/contrib/kafka/events.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/kafka/events/connection/request'
 require 'ddtrace/contrib/kafka/events/consumer/process_batch'
 require 'ddtrace/contrib/kafka/events/consumer/process_message'

data/lib/ddtrace/contrib/kafka/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Kafka

data/lib/ddtrace/contrib/kafka/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/kafka/configuration/settings'
 require 'ddtrace/contrib/kafka/patcher'

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

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/ext/app_types'
 require 'ddtrace/contrib/kafka/ext'

data/lib/ddtrace/contrib/lograge/configuration/settings.rb

@@ -0,0 +1,19 @@
+# typed: false
+require 'ddtrace/contrib/configuration/settings'
+require 'ddtrace/contrib/lograge/ext'
+
+module Datadog
+  module Contrib
+    module Lograge
+      module Configuration
+        # Custom settings for the Lograge integration
+        class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/lograge/ext.rb

@@ -0,0 +1,11 @@
+# typed: true
+module Datadog
+  module Contrib
+    module Lograge
+      # Lograge integration constants
+      module Ext
+        ENV_ENABLED = 'DD_TRACE_LOGRAGE_ENABLED'.freeze
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/lograge/instrumentation.rb

@@ -0,0 +1,39 @@
+# typed: true
+module Datadog
+  module Contrib
+    module Lograge
+      # Instrumentation for Lograge
+      module Instrumentation
+        def self.included(base)
+          base.prepend(InstanceMethods)
+        end
+
+        # Instance methods for configuration
+        module InstanceMethods
+          def custom_options(event)
+            original_custom_options = super(event)
+
+            # Retrieves trace information for current thread
+            correlation = Datadog.tracer.active_correlation
+            # merge original lambda with datadog context
+
+            datadog_trace_log_hash = {
+              # Adds IDs as tags to log output
+              dd: {
+                # To preserve precision during JSON serialization, use strings for large numbers
+                trace_id: correlation.trace_id.to_s,
+                span_id: correlation.span_id.to_s,
+                env: correlation.env.to_s,
+                service: correlation.service.to_s,
+                version: correlation.version.to_s
+              },
+              ddsource: ['ruby']
+            }
+
+            datadog_trace_log_hash.merge(original_custom_options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/lograge/integration.rb

@@ -0,0 +1,46 @@
+# typed: false
+require 'ddtrace/contrib/integration'
+require 'ddtrace/contrib/lograge/configuration/settings'
+require 'ddtrace/contrib/lograge/patcher'
+
+module Datadog
+  module Contrib
+    module Lograge
+      # Description of Lograge integration
+      class Integration
+        include Contrib::Integration
+
+        MINIMUM_VERSION = Gem::Version.new('0.11.0')
+
+        register_as :lograge
+
+        def self.version
+          Gem.loaded_specs['lograge'] && Gem.loaded_specs['lograge'].version
+        end
+
+        def self.loaded?
+          !defined?(::Lograge::LogSubscribers::Base).nil?
+        end
+
+        def self.compatible?
+          super && version >= MINIMUM_VERSION
+        end
+
+        # enabled by rails integration and has a hard dependancy on rails
+        # so can safely say this shouldn't ever be part of auto instrumentation
+        # https://github.com/roidrage/lograge/blob/1729eab7956bb95c5992e4adab251e4f93ff9280/lograge.gemspec#L18-L20
+        def auto_instrument?
+          false
+        end
+
+        def default_configuration
+          Configuration::Settings.new
+        end
+
+        def patcher
+          Patcher
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# typed: true
+require 'ddtrace/contrib/patcher'
+require 'ddtrace/contrib/lograge/instrumentation'
+
+module Datadog
+  module Contrib
+    # Datadog Lograge integration.
+    module Lograge
+      # Patcher enables patching of 'lograge' module.
+      module Patcher
+        include Contrib::Patcher
+
+        module_function
+
+        def target_version
+          Integration.version
+        end
+
+        # patch applies our patch
+        def patch
+          ::Lograge::LogSubscribers::Base.include(Instrumentation)
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/mongodb/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/contrib/mongodb/ext'
 

data/lib/ddtrace/contrib/mongodb/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module MongoDB

data/lib/ddtrace/contrib/mongodb/instrumentation.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/pin'
 require 'ddtrace/ext/net'
 require 'ddtrace/ext/app_types'

data/lib/ddtrace/contrib/mongodb/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/mongodb/configuration/settings'
 require 'ddtrace/contrib/mongodb/patcher'

data/lib/ddtrace/contrib/mongodb/parsers.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     # MongoDB module includes classes and functions to instrument MongoDB clients

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

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/contrib/mongodb/ext'
 require 'ddtrace/contrib/mongodb/instrumentation'

data/lib/ddtrace/contrib/mongodb/subscribers.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/mongodb/ext'
 require 'ddtrace/contrib/mongodb/parsers'

data/lib/ddtrace/contrib/mysql2/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/contrib/mysql2/ext'
 

data/lib/ddtrace/contrib/mysql2/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Mysql2

data/lib/ddtrace/contrib/mysql2/instrumentation.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/ext/app_types'
 require 'ddtrace/ext/integration'
 require 'ddtrace/ext/net'

data/lib/ddtrace/contrib/mysql2/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/mysql2/configuration/settings'
 require 'ddtrace/contrib/mysql2/patcher'

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

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/contrib/mysql2/instrumentation'
 

data/lib/ddtrace/contrib/patchable.rb

@@ -1,3 +1,4 @@
+# typed: false
 module Datadog
   module Contrib
     # Base provides features that are shared across all integrations

data/lib/ddtrace/contrib/patcher.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/utils/only_once'
 
 module Datadog
@@ -38,7 +39,7 @@ module Datadog
         # @param e [Exception]
         def on_patch_error(e)
           # Log the error
-          Datadog.logger.error("Failed to apply #{patch_name} patch. Cause: #{e} Location: #{e.backtrace.first}")
+          Datadog.logger.error("Failed to apply #{patch_name} patch. Cause: #{e} Location: #{Array(e.backtrace).first}")
 
           # Emit a metric
           tags = default_tags

data/lib/ddtrace/contrib/presto/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/contrib/presto/ext'
 

data/lib/ddtrace/contrib/presto/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Presto

data/lib/ddtrace/contrib/presto/instrumentation.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/net'
 require 'ddtrace/ext/sql'
 require 'ddtrace/ext/app_types'

data/lib/ddtrace/contrib/presto/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/presto/configuration/settings'
 require 'ddtrace/contrib/presto/patcher'

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

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/contrib/presto/ext'
 require 'ddtrace/contrib/presto/instrumentation'

data/lib/ddtrace/contrib/qless/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/contrib/qless/ext'
 

data/lib/ddtrace/contrib/qless/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Qless

data/lib/ddtrace/contrib/qless/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/qless/configuration/settings'
 require 'ddtrace/contrib/qless/patcher'

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

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/ext/app_types'
 
@@ -6,6 +7,7 @@ module Datadog
     module Qless
       # Patcher enables patching of 'qless' module.
       module Patcher
+        include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
         include Contrib::Patcher
 
         module_function

data/lib/ddtrace/contrib/qless/qless_job.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/ext/app_types'
 require 'ddtrace/contrib/analytics'
 require 'qless'

data/lib/ddtrace/contrib/qless/tracer_cleaner.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Qless

data/lib/ddtrace/contrib/que/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require 'ddtrace/contrib/configuration/settings'

data/lib/ddtrace/contrib/que/ext.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 module Datadog

data/lib/ddtrace/contrib/que/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require 'ddtrace/contrib/integration'

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

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require 'ddtrace/contrib/que/tracer'

data/lib/ddtrace/contrib/que/tracer.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require 'ddtrace/contrib/analytics'

data/lib/ddtrace/contrib/racecar/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/contrib/racecar/ext'
 

data/lib/ddtrace/contrib/racecar/event.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/active_support/notifications/event'
 require 'ddtrace/contrib/racecar/ext'

data/lib/ddtrace/contrib/racecar/events/batch.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/racecar/ext'
 require 'ddtrace/contrib/racecar/event'
 

data/lib/ddtrace/contrib/racecar/events/consume.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/racecar/ext'
 require 'ddtrace/contrib/racecar/event'
 

data/lib/ddtrace/contrib/racecar/events/message.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/racecar/ext'
 require 'ddtrace/contrib/racecar/event'
 

data/lib/ddtrace/contrib/racecar/events.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/racecar/events/batch'
 require 'ddtrace/contrib/racecar/events/message'
 require 'ddtrace/contrib/racecar/events/consume'

data/lib/ddtrace/contrib/racecar/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Racecar

data/lib/ddtrace/contrib/racecar/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/racecar/configuration/settings'
 require 'ddtrace/contrib/racecar/patcher'