ddtrace 1.18.0 → 1.20.0

data/lib/datadog/tracing/contrib/sidekiq/configuration/settings.rb

@@ -18,6 +18,7 @@ module Datadog
               o.default true
             end
 
+            # @!visibility private
             option :analytics_enabled do |o|
               o.type :bool
               o.env Ext::ENV_ANALYTICS_ENABLED

data/lib/datadog/tracing/contrib/sidekiq/ext.rb

@@ -9,6 +9,7 @@ module Datadog
         module Ext
           CLIENT_SERVICE_NAME = 'sidekiq-client'
           ENV_ENABLED = 'DD_TRACE_SIDEKIQ_ENABLED'
+          # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_SIDEKIQ_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SIDEKIQ_ANALYTICS_SAMPLE_RATE'
           ENV_TAG_JOB_ARGS = 'DD_SIDEKIQ_TAG_JOB_ARGS'

data/lib/datadog/tracing/contrib/sinatra/configuration/settings.rb

@@ -19,6 +19,7 @@ module Datadog
               o.default true
             end
 
+            # @!visibility private
             option :analytics_enabled do |o|
               o.type :bool, nilable: true
               o.env Ext::ENV_ANALYTICS_ENABLED

data/lib/datadog/tracing/contrib/sinatra/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_SINATRA_ENABLED'
+          # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_SINATRA_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SINATRA_ANALYTICS_SAMPLE_RATE'
           RACK_ENV_SINATRA_REQUEST_SPAN = 'datadog.sinatra_request_span'

data/lib/datadog/tracing/contrib/sneakers/configuration/settings.rb

@@ -16,6 +16,7 @@ module Datadog
               o.default true
             end
 
+            # @!visibility private
             option :analytics_enabled do |o|
               o.type :bool
               o.env Ext::ENV_ANALYTICS_ENABLED

data/lib/datadog/tracing/contrib/sneakers/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_SNEAKERS_ENABLED'
+          # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_SNEAKERS_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SNEAKERS_ANALYTICS_SAMPLE_RATE'
           SERVICE_NAME = 'sneakers'

data/lib/datadog/tracing/contrib/stripe/configuration/settings.rb

@@ -17,6 +17,7 @@ module Datadog
               o.default true
             end
 
+            # @!visibility private
             option :analytics_enabled do |o|
               o.type :bool
               o.env Ext::ENV_ANALYTICS_ENABLED

data/lib/datadog/tracing/contrib/stripe/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_STRIPE_ENABLED'
+          # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_STRIPE_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_STRIPE_ANALYTICS_SAMPLE_RATE'
           SPAN_REQUEST = 'stripe.request'

data/lib/datadog/tracing/contrib/sucker_punch/configuration/settings.rb

@@ -17,6 +17,7 @@ module Datadog
               o.default true
             end
 
+            # @!visibility private
             option :analytics_enabled do |o|
               o.type :bool
               o.env Ext::ENV_ANALYTICS_ENABLED

data/lib/datadog/tracing/contrib/sucker_punch/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_SUCKER_PUNCH_ENABLED'
+          # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_SUCKER_PUNCH_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SUCKER_PUNCH_ANALYTICS_SAMPLE_RATE'
           SERVICE_NAME = 'sucker_punch'

data/lib/datadog/tracing/contrib/trilogy/configuration/settings.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require_relative '../../configuration/settings'
+require_relative '../ext'
+
+require_relative '../../propagation/sql_comment'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Trilogy
+        module Configuration
+          # Custom settings for the Trilogy integration
+          # @public_api
+          class Settings < Contrib::Configuration::Settings
+            option :enabled do |o|
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
+            end
+
+            option :analytics_enabled do |o|
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+            end
+
+            option :analytics_sample_rate do |o|
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+            end
+
+            option :service_name do |o|
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
+            end
+
+            option :comment_propagation do |o|
+              o.type :string
+              o.env Contrib::Propagation::SqlComment::Ext::ENV_DBM_PROPAGATION_MODE
+              o.default Contrib::Propagation::SqlComment::Ext::DISABLED
+            end
+
+            option :peer_service do |o|
+              o.type :string, nilable: true
+              o.env Ext::ENV_PEER_SERVICE
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/contrib/trilogy/ext.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Trilogy
+        # Trilogy integration constants
+        # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
+        module Ext
+          ENV_ENABLED = 'DD_TRACE_TRILOGY_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_TRILOGY_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_TRILOGY_PEER_SERVICE'
+
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_TRILOGY_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_TRILOGY_ANALYTICS_SAMPLE_RATE'
+          DEFAULT_PEER_SERVICE_NAME = 'trilogy'
+          SPAN_QUERY = 'trilogy.query'
+          TAG_DB_NAME = 'trilogy.db.name'
+          TAG_COMPONENT = 'trilogy'
+          TAG_OPERATION_QUERY = 'query'
+          TAG_SYSTEM = 'mysql'
+          PEER_SERVICE_SOURCES = (Array[Ext::TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/contrib/trilogy/instrumentation.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative '../ext'
+require_relative '../propagation/sql_comment'
+require_relative '../propagation/sql_comment/mode'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Trilogy
+        # Trilogy patch module
+        module Instrumentation
+          def self.included(base)
+            base.prepend(InstanceMethods)
+          end
+
+          # Trilogy patch instance methods
+          module InstanceMethods
+            def query(sql)
+              service = Datadog.configuration_for(self, :service_name) || datadog_configuration[:service_name]
+
+              Tracing.trace(Ext::SPAN_QUERY, service: service) do |span, trace_op|
+                span.resource = sql
+                span.span_type = Tracing::Metadata::Ext::SQL::TYPE
+
+                if datadog_configuration[:peer_service]
+                  span.set_tag(
+                    Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                    datadog_configuration[:peer_service]
+                  )
+                end
+
+                # Tag original global service name if not used
+                if span.service != Datadog.configuration.service
+                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+                end
+
+                span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
+                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+
+                span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+                span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
+
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, connection_options[:host])
+
+                # Set analytics sample rate
+                Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
+
+                span.set_tag(Ext::TAG_DB_NAME, connection_options[:database])
+                span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, connection_options[:host])
+                span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, connection_options[:port])
+
+                Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
+
+                propagation_mode = Contrib::Propagation::SqlComment::Mode.new(comment_propagation)
+
+                Contrib::Propagation::SqlComment.annotate!(span, propagation_mode)
+                sql = Contrib::Propagation::SqlComment.prepend_comment(
+                  sql,
+                  span,
+                  trace_op,
+                  propagation_mode
+                )
+
+                super(sql)
+              end
+            end
+
+            private
+
+            def datadog_configuration
+              Datadog.configuration.tracing[:trilogy]
+            end
+
+            def analytics_enabled?
+              datadog_configuration[:analytics_enabled]
+            end
+
+            def analytics_sample_rate
+              datadog_configuration[:analytics_sample_rate]
+            end
+
+            def comment_propagation
+              datadog_configuration[:comment_propagation]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/contrib/trilogy/integration.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Trilogy
+        # Description of Trilogy integration
+        class Integration
+          include Contrib::Integration
+
+          MINIMUM_VERSION = Gem::Version.new('2.0.0')
+
+          # @public_api Changing the integration name or integration options can cause breaking changes
+          register_as :trilogy
+
+          def self.version
+            Gem.loaded_specs['trilogy'] && Gem.loaded_specs['trilogy'].version
+          end
+
+          def self.loaded?
+            !defined?(::Trilogy).nil?
+          end
+
+          def self.compatible?
+            super && version >= MINIMUM_VERSION
+          end
+
+          def new_configuration
+            Configuration::Settings.new
+          end
+
+          def patcher
+            Patcher
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/contrib/trilogy/patcher.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative '../patcher'
+require_relative 'instrumentation'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Trilogy
+        # Patcher enables patching of 'trilogy' module.
+        module Patcher
+          include Contrib::Patcher
+
+          module_function
+
+          def target_version
+            Integration.version
+          end
+
+          def patch
+            patch_trilogy_client
+          end
+
+          def patch_trilogy_client
+            ::Trilogy.include(Instrumentation)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/contrib.rb

@@ -79,3 +79,4 @@ require_relative 'contrib/sinatra/integration'
 require_relative 'contrib/sneakers/integration'
 require_relative 'contrib/stripe/integration'
 require_relative 'contrib/sucker_punch/integration'
+require_relative 'contrib/trilogy/integration'

data/lib/datadog/tracing.rb

@@ -73,8 +73,14 @@ module Datadog
       # (see Datadog::Tracing::Tracer#active_correlation)
       # @public_api
       def correlation
-        current_tracer = tracer
-        return unless current_tracer
+        # We access this in this way as:
+        # * If the components have not been initialized, it doesn't make sense to initialize ddtrace just to say
+        #   'nil' here
+        # * It prevents recursive initialization attempts, see https://github.com/DataDog/dd-trace-rb/issues/3385
+        components = Datadog.send(:components, allow_initialization: false)
+        current_tracer = components.tracer if components
+
+        return Datadog::Tracing::Correlation::Identifier.new unless current_tracer
 
         current_tracer.active_correlation
       end

data/lib/ddtrace/version.rb

@@ -3,7 +3,7 @@
 module DDTrace
   module VERSION
     MAJOR = 1
-    MINOR = 18
+    MINOR = 20
     PATCH = 0
     PRE = nil
     BUILD = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 description: |
   ddtrace is Datadog's tracing client for Ruby. It is used to trace requests
   as they flow across web servers, databases and microservices so that developers
@@ -108,8 +108,12 @@ files:
 - ext/ddtrace_profiling_native_extension/clock_id_from_pthread.c
 - ext/ddtrace_profiling_native_extension/clock_id_noop.c
 - ext/ddtrace_profiling_native_extension/collectors_cpu_and_wall_time_worker.c
+- ext/ddtrace_profiling_native_extension/collectors_discrete_dynamic_sampler.c
+- ext/ddtrace_profiling_native_extension/collectors_discrete_dynamic_sampler.h
 - ext/ddtrace_profiling_native_extension/collectors_dynamic_sampling_rate.c
 - ext/ddtrace_profiling_native_extension/collectors_dynamic_sampling_rate.h
+- ext/ddtrace_profiling_native_extension/collectors_gc_profiling_helper.c
+- ext/ddtrace_profiling_native_extension/collectors_gc_profiling_helper.h
 - ext/ddtrace_profiling_native_extension/collectors_idle_sampling_helper.c
 - ext/ddtrace_profiling_native_extension/collectors_idle_sampling_helper.h
 - ext/ddtrace_profiling_native_extension/collectors_stack.c
@@ -117,6 +121,8 @@ files:
 - ext/ddtrace_profiling_native_extension/collectors_thread_context.c
 - ext/ddtrace_profiling_native_extension/collectors_thread_context.h
 - ext/ddtrace_profiling_native_extension/extconf.rb
+- ext/ddtrace_profiling_native_extension/heap_recorder.c
+- ext/ddtrace_profiling_native_extension/heap_recorder.h
 - ext/ddtrace_profiling_native_extension/helpers.h
 - ext/ddtrace_profiling_native_extension/http_transport.c
 - ext/ddtrace_profiling_native_extension/libdatadog_helpers.c
@@ -272,6 +278,8 @@ files:
 - lib/datadog/core/remote/dispatcher.rb
 - lib/datadog/core/remote/ext.rb
 - lib/datadog/core/remote/negotiation.rb
+- lib/datadog/core/remote/tie.rb
+- lib/datadog/core/remote/tie/tracing.rb
 - lib/datadog/core/remote/transport/config.rb
 - lib/datadog/core/remote/transport/http.rb
 - lib/datadog/core/remote/transport/http/api.rb
@@ -301,6 +309,7 @@ files:
 - lib/datadog/core/telemetry/v1/configuration.rb
 - lib/datadog/core/telemetry/v1/dependency.rb
 - lib/datadog/core/telemetry/v1/host.rb
+- lib/datadog/core/telemetry/v1/install_signature.rb
 - lib/datadog/core/telemetry/v1/integration.rb
 - lib/datadog/core/telemetry/v1/product.rb
 - lib/datadog/core/telemetry/v1/telemetry_request.rb
@@ -787,6 +796,11 @@ files:
 - lib/datadog/tracing/contrib/sucker_punch/instrumentation.rb
 - lib/datadog/tracing/contrib/sucker_punch/integration.rb
 - lib/datadog/tracing/contrib/sucker_punch/patcher.rb
+- lib/datadog/tracing/contrib/trilogy/configuration/settings.rb
+- lib/datadog/tracing/contrib/trilogy/ext.rb
+- lib/datadog/tracing/contrib/trilogy/instrumentation.rb
+- lib/datadog/tracing/contrib/trilogy/integration.rb
+- lib/datadog/tracing/contrib/trilogy/patcher.rb
 - lib/datadog/tracing/contrib/utils/database.rb
 - lib/datadog/tracing/contrib/utils/quantization/hash.rb
 - lib/datadog/tracing/contrib/utils/quantization/http.rb