datadog 2.28.0 → 2.41.0

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative '../rack/ext'
-require_relative '../rack/header_tagging'
-require_relative 'env'
-require_relative 'ext'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "../rack/ext"
+require_relative "../rack/header_tagging"
+require_relative "env"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -28,6 +28,7 @@ module Datadog
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span|
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               # this is kept nil until we set a correct one (either in the route or with a fallback in the ensure below)
               # the nil signals that there's no good one yet and is also seen by profiler, when sampling the resource
               span.resource = nil
@@ -56,7 +57,7 @@ module Datadog
 
               # If this app handled the request, then Contrib::Sinatra::Tracer OR Contrib::Sinatra::Base set the
               # resource; if no resource was set, let's use a fallback
-              span.resource = env['REQUEST_METHOD'] if span.resource.nil?
+              span.resource = env["REQUEST_METHOD"] if span.resource.nil?
 
               rack_request_span = env[Contrib::Rack::Ext::RACK_ENV_REQUEST_SPAN]
 
@@ -71,7 +72,7 @@ module Datadog
 
                   span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, sinatra_response.status)
                   if Datadog.configuration.tracing.http_error_statuses.server.include?(sinatra_response.status)
-                    span.set_error(env['sinatra.error'])
+                    span.set_error(env["sinatra.error"])
                   end
                 end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
+require_relative "../../configuration/settings"
 
 module Datadog
   module Tracing

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

@@ -7,19 +7,19 @@ module Datadog
         # Sneakers integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SNEAKERS_ENABLED'
+          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'
-          SPAN_JOB = 'sneakers.job'
-          TAG_JOB_ROUTING_KEY = 'sneakers.routing_key'
-          TAG_JOB_QUEUE = 'sneakers.queue'
-          TAG_JOB_BODY = 'sneakers.body'
-          TAG_COMPONENT = 'sneakers'
-          TAG_OPERATION_JOB = 'job'
-          TAG_MESSAGING_SYSTEM = 'rabbitmq'
-          TAG_RABBITMQ_ROUTING_KEY = 'messaging.rabbitmq.routing_key'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_SNEAKERS_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_SNEAKERS_ANALYTICS_SAMPLE_RATE"
+          SERVICE_NAME = "sneakers"
+          SPAN_JOB = "sneakers.job"
+          TAG_JOB_ROUTING_KEY = "sneakers.routing_key"
+          TAG_JOB_QUEUE = "sneakers.queue"
+          TAG_JOB_BODY = "sneakers.body"
+          TAG_COMPONENT = "sneakers"
+          TAG_OPERATION_JOB = "job"
+          TAG_MESSAGING_SYSTEM = "rabbitmq"
+          TAG_RABBITMQ_ROUTING_KEY = "messaging.rabbitmq.routing_key"
         end
       end
     end

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'ext'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "ext"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -13,13 +13,24 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('2.12.0')
+          MINIMUM_SNEAKERS_VERSION = Gem::Version.new("2.12.0")
+          # All versions are supported. Kicks first version is 3.0.0.
+          MINIMUM_KICKS_VERSION = Gem::Version.new("3.0.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :sneakers, auto_patch: true
-
+          register_alias_for :sneakers, as: :kicks
+
+          # Sneakers development continues in the Kicks gem.
+          # The **only** thing that has changed is the gem name,
+          # even the file naming and module namespacing are the same (require 'sneakers', `::Sneakers`).
+          #
+          # The last version of Sneakers is 2.12.0.
+          # The first version of Kicks is 3.0.0. We currently support all versions of Kicks.
+          #
+          # @see https://github.com/jondot/sneakers/commit/9780692624c666b6db8266d2d5710f709cb0f2e2
           def self.version
-            Gem.loaded_specs['sneakers']&.version
+            Gem.loaded_specs["sneakers"]&.version || Gem.loaded_specs["kicks"]&.version
           end
 
           def self.loaded?
@@ -27,7 +38,7 @@ module Datadog
           end
 
           def self.compatible?
-            super && version >= MINIMUM_VERSION
+            super && !!(version&.>= MINIMUM_SNEAKERS_VERSION)
           end
 
           def new_configuration

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'tracer'
+require_relative "../patcher"
+require_relative "tracer"
 
 module Datadog
   module Tracing

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
 
 module Datadog
   module Tracing
@@ -18,10 +18,11 @@ module Datadog
             trace_options = {
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
-              on_error: configuration[:on_error]
+              on_error: configuration[:on_error],
             }
 
             Tracing.trace(Ext::SPAN_JOB, **trace_options) do |request_span|
+              request_span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               request_span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_MESSAGING_SYSTEM)
 
               request_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
@@ -35,7 +36,7 @@ module Datadog
               # Measure service stats
               Contrib::Analytics.set_measured(request_span)
 
-              request_span.resource = @app.to_proc.binding.eval('self.class').to_s
+              request_span.resource = @app.to_proc.binding.eval("self.class").to_s
               request_span.set_tag(Ext::TAG_JOB_ROUTING_KEY, delivery_info.routing_key)
               request_span.set_tag(Ext::TAG_RABBITMQ_ROUTING_KEY, delivery_info.routing_key)
               request_span.set_tag(Ext::TAG_JOB_QUEUE, delivery_info.consumer.queue.name)

data/lib/datadog/tracing/contrib/span_attribute_schema.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'ext'
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -87,7 +87,7 @@ module Datadog
         private_class_method :filter_peer_service_sources
 
         def self.not_empty_tag?(tag)
-          tag && (tag != '')
+          tag && (tag != "")
         end
 
         private_class_method :not_empty_tag?

data/lib/datadog/tracing/contrib/status_range_env_parser.rb

@@ -8,10 +8,10 @@ module Datadog
         class << self
           def call(value)
             [].tap do |array|
-              value.split(',').each do |e|
+              value.split(",").each do |e|
                 next unless e
 
-                v = e.split('-')
+                v = e.split("-")
 
                 case v.length
                 when 0 then next

data/lib/datadog/tracing/contrib/status_range_matcher.rb

@@ -27,6 +27,10 @@ module Datadog
             end
           end
         end
+
+        def to_s
+          @ranges.map { |range| range.is_a?(Range) ? "#{range.begin}-#{range.end}" : range.to_s }.join(",")
+        end
       end
     end
   end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing

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

@@ -7,19 +7,19 @@ module Datadog
         # Stripe integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_STRIPE_ENABLED'
+          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'
-          SPAN_TYPE_REQUEST = 'custom'
-          TAG_COMPONENT = 'stripe'
-          TAG_OPERATION_REQUEST = 'request'
-          TAG_REQUEST_HTTP_STATUS = 'stripe.request.http_status'
-          TAG_REQUEST_ID = 'stripe.request.id'
-          TAG_REQUEST_METHOD = 'stripe.request.method'
-          TAG_REQUEST_NUM_RETRIES = 'stripe.request.num_retries'
-          TAG_REQUEST_PATH = 'stripe.request.path'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_STRIPE_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_STRIPE_ANALYTICS_SAMPLE_RATE"
+          SPAN_REQUEST = "stripe.request"
+          SPAN_TYPE_REQUEST = "custom"
+          TAG_COMPONENT = "stripe"
+          TAG_OPERATION_REQUEST = "request"
+          TAG_REQUEST_HTTP_STATUS = "stripe.request.http_status"
+          TAG_REQUEST_ID = "stripe.request.id"
+          TAG_REQUEST_METHOD = "stripe.request.method"
+          TAG_REQUEST_NUM_RETRIES = "stripe.request.num_retries"
+          TAG_REQUEST_PATH = "stripe.request.path"
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,13 +12,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('5.15.0')
+          MINIMUM_VERSION = Gem::Version.new("5.15.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :stripe
 
           def self.version
-            Gem.loaded_specs['stripe']&.version
+            Gem.loaded_specs["stripe"]&.version
           end
 
           def self.loaded?

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'request'
+require_relative "../patcher"
+require_relative "request"
 
 module Datadog
   module Tracing

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../../analytics'
-require_relative 'ext'
+require_relative "../../metadata/ext"
+require_relative "../../analytics"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -55,7 +55,7 @@ module Datadog
             span.set_tag(Ext::TAG_REQUEST_PATH, event.path)
             span.set_tag(Ext::TAG_REQUEST_NUM_RETRIES, event.num_retries.to_s)
           rescue => e
-            Datadog.logger.debug(e.message)
+            Datadog.logger.debug { "#{e.class}: #{e.message}" }
           end
 
           def configuration

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sucker_punch'
+require "sucker_punch"
 
 module Datadog
   module Tracing

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

@@ -7,20 +7,20 @@ module Datadog
         # SuckerPunch integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SUCKER_PUNCH_ENABLED'
+          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'
-          SPAN_PERFORM = 'sucker_punch.perform'
-          SPAN_PERFORM_ASYNC = 'sucker_punch.perform_async'
-          SPAN_PERFORM_IN = 'sucker_punch.perform_in'
-          TAG_PERFORM_IN = 'sucker_punch.perform_in'
-          TAG_QUEUE = 'sucker_punch.queue'
-          TAG_COMPONENT = 'sucker_punch'
-          TAG_OPERATION_PERFORM = 'perform'
-          TAG_OPERATION_PERFORM_ASYNC = 'perform_async'
-          TAG_OPERATION_PERFORM_IN = 'perform_in'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_SUCKER_PUNCH_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_SUCKER_PUNCH_ANALYTICS_SAMPLE_RATE"
+          SERVICE_NAME = "sucker_punch"
+          SPAN_PERFORM = "sucker_punch.perform"
+          SPAN_PERFORM_ASYNC = "sucker_punch.perform_async"
+          SPAN_PERFORM_IN = "sucker_punch.perform_in"
+          TAG_PERFORM_IN = "sucker_punch.perform_in"
+          TAG_QUEUE = "sucker_punch.queue"
+          TAG_COMPONENT = "sucker_punch"
+          TAG_OPERATION_PERFORM = "perform"
+          TAG_OPERATION_PERFORM_ASYNC = "perform_async"
+          TAG_OPERATION_PERFORM_IN = "perform_in"
         end
       end
     end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'sucker_punch'
+require "sucker_punch"
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -86,6 +86,7 @@ module Datadog
 
               def __with_instrumentation(name)
                 Datadog::Tracing.trace(name, service: datadog_configuration[:service_name]) do |span|
+                  span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                   span.type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
                   span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                   span.set_tag(Ext::TAG_QUEUE, to_s)

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,13 +12,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('2.0.0')
+          MINIMUM_VERSION = Gem::Version.new("2.0.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :sucker_punch, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['sucker_punch']&.version
+            Gem.loaded_specs["sucker_punch"]&.version
           end
 
           def self.loaded?

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'ext'
+require_relative "../patcher"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -18,8 +18,8 @@ module Datadog
           end
 
           def patch
-            require_relative 'exception_handler'
-            require_relative 'instrumentation'
+            require_relative "exception_handler"
+            require_relative "instrumentation"
 
             ExceptionHandler.patch!
             Instrumentation.patch!

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
-require_relative '../../propagation/sql_comment'
+require_relative "../../propagation/sql_comment"
 
 module Datadog
   module Tracing
@@ -51,6 +51,12 @@ module Datadog
               o.default false
             end
 
+            option :inject_sql_basehash do |o|
+              o.type :bool
+              o.env Contrib::Propagation::SqlComment::Ext::ENV_DBM_INJECT_SQL_BASEHASH
+              o.default false
+            end
+
             option :peer_service do |o|
               o.type :string, nilable: true
               o.env Ext::ENV_PEER_SERVICE

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

@@ -7,18 +7,18 @@ module Datadog
         # 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_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'
+          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 = ([Ext::TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
         end
       end

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

@@ -1,11 +1,11 @@
 # 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'
+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
@@ -23,6 +23,7 @@ module Datadog
               service = Datadog.configuration_for(self, :service_name) || datadog_configuration[:service_name]
 
               Tracing.trace(Ext::SPAN_QUERY, service: service) do |span, trace_op|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.resource = sql
                 span.type = Tracing::Metadata::Ext::SQL::TYPE
 
@@ -33,11 +34,6 @@ module Datadog
                   )
                 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)
 
@@ -57,7 +53,9 @@ module Datadog
                 Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
 
                 propagation_mode = Contrib::Propagation::SqlComment::Mode.new(
-                  comment_propagation, datadog_configuration[:append_comment]
+                  comment_propagation,
+                  datadog_configuration[:append_comment],
+                  datadog_configuration[:inject_sql_basehash]
                 )
 
                 Contrib::Propagation::SqlComment.annotate!(span, propagation_mode)

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,13 +12,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('2.0.0')
+          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']&.version
+            Gem.loaded_specs["trilogy"]&.version
           end
 
           def self.loaded?

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'instrumentation'
+require_relative "../patcher"
+require_relative "instrumentation"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/utils/database.rb

@@ -6,9 +6,9 @@ module Datadog
       module Utils
         # Common database-related utility functions.
         module Database
-          VENDOR_DEFAULT = 'defaultdb'
-          VENDOR_POSTGRES = 'postgres'
-          VENDOR_SQLITE = 'sqlite'
+          VENDOR_DEFAULT = "defaultdb"
+          VENDOR_POSTGRES = "postgres"
+          VENDOR_SQLITE = "sqlite"
 
           module_function
 
@@ -16,9 +16,9 @@ module Datadog
             case vendor
             when nil
               VENDOR_DEFAULT
-            when 'postgresql'
+            when "postgresql"
               VENDOR_POSTGRES
-            when 'sqlite3'
+            when "sqlite3"
               VENDOR_SQLITE
             else
               vendor