ddtrace 1.11.1 → 1.12.1

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

@@ -104,8 +104,10 @@ module Datadog
                 set_nilable_tag!(span, :http_proxy, Ext::TAG_PROXY)
                 set_nilable_tag!(span, :model_version, Ext::TAG_MODEL_VERSION)
 
-                # Tag as an external peer service
-                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+                if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                  # Tag as an external peer service
+                  span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+                end
 
                 # Set analytics sample rate
                 if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])

data/lib/datadog/tracing/contrib/propagation/sql_comment.rb

@@ -28,8 +28,16 @@ module Datadog
             }
 
             if mode.full?
-              tags[Ext::KEY_TRACEPARENT] =
-                Tracing::Distributed::TraceContext.new(fetcher: nil).send(:build_traceparent, trace_op.to_digest)
+              # When tracing is disabled, trace_operation is a dummy object that does not contain data to build traceparent
+              if datadog_configuration.tracing.enabled
+                tags[Ext::KEY_TRACEPARENT] =
+                  Tracing::Distributed::TraceContext.new(fetcher: nil).send(:build_traceparent, trace_op.to_digest)
+              else
+                Datadog.logger.warn(
+                  'Sql comment propagation with `full` mode is aborted, because tracing is disabled. '\
+                  'Please set `Datadog.configuration.tracing.enabled = true` to continue.'
+                )
+              end
             end
 
             "#{Comment.new(tags)} #{sql}"

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

@@ -26,7 +26,15 @@ module Datadog
               o.lazy
             end
 
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+            option :service_name do |o|
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  '',
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
+              o.lazy
+            end
           end
         end
       end

data/lib/datadog/tracing/contrib/racecar/event.rb

@@ -41,7 +41,9 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
 
               # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              end
 
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])

data/lib/datadog/tracing/contrib/rack/middlewares.rb

@@ -261,7 +261,9 @@ module Datadog
             )
 
             # Set peer service (so its not believed to belong to this app)
-            span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, configuration[:web_service_name])
+            if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, configuration[:web_service_name])
+            end
 
             span
           end

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

@@ -32,7 +32,12 @@ module Datadog
             end
 
             option :service_name do |o|
-              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
               o.lazy
             end
           end

data/lib/datadog/tracing/contrib/redis/tags.rb

@@ -17,7 +17,10 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
 
               # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, client.host)
 
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)

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

@@ -29,7 +29,12 @@ module Datadog
             option :distributed_tracing, default: true
 
             option :service_name do |o|
-              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
               o.lazy
             end
 

data/lib/datadog/tracing/contrib/rest_client/request_patch.rb

@@ -40,7 +40,10 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 
               # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, uri.host)
 
               # Set analytics sample rate

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

@@ -2,7 +2,7 @@
 
 # typed: ignore
 
-require_relative 'patcher'
+require_relative '../patcher'
 require_relative 'ext'
 require_relative 'instrumentation'
 

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

@@ -23,7 +23,10 @@ module Datadog
               Tracing.trace(Ext::SPAN_QUERY) do |span|
                 span.service =  Datadog.configuration_for(self, :service_name) \
                                 || Datadog.configuration.tracing[:sequel][:service_name] \
-                                || adapter_name
+                                || Contrib::SpanAttributeSchema.fetch_service_name(
+                                  '',
+                                  adapter_name
+                                )
                 span.resource = opts[:query]
                 span.span_type = Tracing::Metadata::Ext::SQL::TYPE
                 Utils.set_common_tags(span, self)

data/lib/datadog/tracing/contrib/sequel/dataset.rb

@@ -42,7 +42,10 @@ module Datadog
               Tracing.trace(Ext::SPAN_QUERY) do |span|
                 span.service =  Datadog.configuration_for(db, :service_name) \
                                 || Datadog.configuration.tracing[:sequel][:service_name] \
-                                || adapter_name
+                                || Contrib::SpanAttributeSchema.fetch_service_name(
+                                  '',
+                                  adapter_name
+                                )
                 span.resource = opts[:query]
                 span.span_type = Tracing::Metadata::Ext::SQL::TYPE
                 Utils.set_common_tags(span, db)

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

@@ -53,7 +53,10 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
 
               # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              end
+
               # TODO: Extract host for Sequel with JDBC. The easiest way seem to be through
               # TODO: the database URI. Unfortunately, JDBC URIs do not work with `URI.parse`.
               # host, _port = extract_host_port_from_uri(db.uri)

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

@@ -1,6 +1,5 @@
 require 'set'
 
-require_relative '../../core'
 require_relative '../metadata/ext'
 
 module Datadog

data/lib/datadog/tracing/correlation.rb

@@ -1,4 +1,3 @@
-require_relative '../core'
 require_relative 'utils'
 require_relative 'metadata/ext'
 

data/lib/datadog/tracing/distributed/headers/ext.rb

@@ -5,7 +5,7 @@ module Datadog
     module Distributed
       module Headers
         # DEV-2.0: This module only exists for backwards compatibility with the public API. It should be removed.
-        # @deprecated use [Datadog::Tracing::Distributed::Ext]
+        # @deprecated use [Datadog::Tracing::Distributed::Datadog] and [Datadog::Tracing::Distributed::B3]
         # @public_api
         module Ext
           HTTP_HEADER_TRACE_ID = 'x-datadog-trace-id'

data/lib/datadog/tracing/event.rb

@@ -1,5 +1,3 @@
-require_relative '../core'
-
 module Datadog
   module Tracing
     # Event behavior and DSL

data/lib/datadog/tracing/pipeline.rb

@@ -1,5 +1,3 @@
-require_relative '../core'
-
 require_relative 'pipeline/span_filter'
 require_relative 'pipeline/span_processor'
 

data/lib/datadog/tracing/runtime/metrics.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../core'
-
 module Datadog
   module Tracing
     module Runtime

data/lib/datadog/tracing/sampling/rate_by_service_sampler.rb

@@ -1,4 +1,3 @@
-require_relative '../../core'
 require_relative 'rate_by_key_sampler'
 
 module Datadog

data/lib/datadog/tracing/sampling/rate_sampler.rb

@@ -1,5 +1,3 @@
-require_relative '../../core'
-
 require_relative 'sampler'
 require_relative '../utils'
 

data/lib/datadog/tracing/sampling/rule.rb

@@ -1,5 +1,3 @@
-require_relative '../../core'
-
 require_relative 'matcher'
 require_relative 'rate_sampler'
 

data/lib/datadog/tracing/sampling/rule_sampler.rb

@@ -1,5 +1,3 @@
-require_relative '../../core'
-
 require_relative 'ext'
 require_relative 'rate_limiter'
 require_relative 'rule'

data/lib/datadog/tracing/span_operation.rb

@@ -1,6 +1,5 @@
 require 'time'
 
-require_relative '../core'
 require_relative '../core/environment/identity'
 require_relative '../core/utils'
 require_relative '../core/utils/time'

data/lib/datadog/tracing/sync_writer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../core'
-
 require_relative 'pipeline'
 require_relative 'runtime/metrics'
 require_relative 'writer'

data/lib/datadog/tracing/trace_operation.rb

@@ -1,4 +1,3 @@
-require_relative '../core'
 require_relative '../core/environment/identity'
 require_relative '../core/utils'
 

data/lib/datadog/tracing/tracer.rb

@@ -1,4 +1,3 @@
-require_relative '../core'
 require_relative '../core/environment/ext'
 require_relative '../core/environment/socket'
 

data/lib/datadog/tracing/workers/trace_writer.rb

@@ -1,4 +1,3 @@
-require_relative '../../core'
 require_relative '../../core/worker'
 require_relative '../../core/workers/async'
 require_relative '../../core/workers/polling'

data/lib/datadog/tracing/workers.rb

@@ -1,5 +1,3 @@
-require_relative '../core'
-
 require_relative 'buffer'
 require_relative 'pipeline'
 

data/lib/datadog/tracing/writer.rb

@@ -1,5 +1,3 @@
-require_relative '../core'
-
 require_relative 'event'
 require_relative 'runtime/metrics'
 require_relative 'workers'

data/lib/ddtrace/version.rb

@@ -3,7 +3,7 @@
 module DDTrace
   module VERSION
     MAJOR = 1
-    MINOR = 11
+    MINOR = 12
     PATCH = 1
     PRE = nil
     BUILD = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.12.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -28,36 +28,30 @@ dependencies:
   name: debase-ruby_core_source
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.16
-    - - "<="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.16
-    - - "<="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2.0.0
+        version: 1.9.0.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2.0.0
+        version: 1.9.0.0.0
 - !ruby/object:Gem::Dependency
   name: libdatadog
   requirement: !ruby/object:Gem::Requirement
@@ -137,10 +131,8 @@ files:
 - lib/datadog/appsec/configuration.rb
 - lib/datadog/appsec/configuration/settings.rb
 - lib/datadog/appsec/contrib/auto_instrument.rb
-- lib/datadog/appsec/contrib/configuration/settings.rb
 - lib/datadog/appsec/contrib/integration.rb
 - lib/datadog/appsec/contrib/patcher.rb
-- lib/datadog/appsec/contrib/rack/configuration/settings.rb
 - lib/datadog/appsec/contrib/rack/ext.rb
 - lib/datadog/appsec/contrib/rack/gateway/request.rb
 - lib/datadog/appsec/contrib/rack/gateway/response.rb
@@ -152,7 +144,6 @@ files:
 - lib/datadog/appsec/contrib/rack/reactive/response.rb
 - lib/datadog/appsec/contrib/rack/request_body_middleware.rb
 - lib/datadog/appsec/contrib/rack/request_middleware.rb
-- lib/datadog/appsec/contrib/rails/configuration/settings.rb
 - lib/datadog/appsec/contrib/rails/ext.rb
 - lib/datadog/appsec/contrib/rails/framework.rb
 - lib/datadog/appsec/contrib/rails/gateway/request.rb
@@ -162,7 +153,6 @@ files:
 - lib/datadog/appsec/contrib/rails/reactive/action.rb
 - lib/datadog/appsec/contrib/rails/request.rb
 - lib/datadog/appsec/contrib/rails/request_middleware.rb
-- lib/datadog/appsec/contrib/sinatra/configuration/settings.rb
 - lib/datadog/appsec/contrib/sinatra/ext.rb
 - lib/datadog/appsec/contrib/sinatra/framework.rb
 - lib/datadog/appsec/contrib/sinatra/gateway/request.rb
@@ -191,6 +181,7 @@ files:
 - lib/datadog/appsec/reactive/subscriber.rb
 - lib/datadog/appsec/remote.rb
 - lib/datadog/appsec/response.rb
+- lib/datadog/appsec/scope.rb
 - lib/datadog/appsec/utils.rb
 - lib/datadog/appsec/utils/http.rb
 - lib/datadog/appsec/utils/http/media_range.rb
@@ -497,6 +488,14 @@ files:
 - lib/datadog/tracing/contrib/aws/integration.rb
 - lib/datadog/tracing/contrib/aws/parsed_context.rb
 - lib/datadog/tracing/contrib/aws/patcher.rb
+- lib/datadog/tracing/contrib/aws/service/base.rb
+- lib/datadog/tracing/contrib/aws/service/dynamodb.rb
+- lib/datadog/tracing/contrib/aws/service/eventbridge.rb
+- lib/datadog/tracing/contrib/aws/service/kinesis.rb
+- lib/datadog/tracing/contrib/aws/service/s3.rb
+- lib/datadog/tracing/contrib/aws/service/sns.rb
+- lib/datadog/tracing/contrib/aws/service/sqs.rb
+- lib/datadog/tracing/contrib/aws/service/states.rb
 - lib/datadog/tracing/contrib/aws/services.rb
 - lib/datadog/tracing/contrib/concurrent_ruby/configuration/settings.rb
 - lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb
@@ -883,7 +882,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications

data/lib/datadog/appsec/contrib/configuration/settings.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../../core/configuration/base'
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Configuration
-        # Common settings for all integrations
-        # TODO: move to datadog/appsec/configuration or remove?
-        class Settings
-          include Datadog::Core::Configuration::Base
-
-          option :enabled, default: true
-          option :service_name
-        end
-      end
-    end
-  end
-end

data/lib/datadog/appsec/contrib/rack/configuration/settings.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../configuration/settings'
-require_relative '../ext'
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Rack
-        module Configuration
-          # Custom settings for the Rack integration
-          class Settings < Datadog::AppSec::Contrib::Configuration::Settings
-            option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/appsec/contrib/rails/configuration/settings.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../configuration/settings'
-require_relative '../ext'
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Rails
-        module Configuration
-          # Custom settings for the Rack integration
-          class Settings < Datadog::AppSec::Contrib::Configuration::Settings
-            option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../configuration/settings'
-require_relative '../ext'
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Sinatra
-        module Configuration
-          # Custom settings for the Rack integration
-          class Settings < Datadog::AppSec::Contrib::Configuration::Settings
-            option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
-            end
-          end
-        end
-      end
-    end
-  end
-end