ddtrace 1.21.0 → 1.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 223ae0480854efa00a669acefedd34748a08bec69b0a10fdfa3d49112d30ea13
-  data.tar.gz: e6013cf6647797fbefd898c11760a13140fd1427ec069ce3a797f3367ebc8f4b
+  metadata.gz: 88e2b5d32d76e7c167d43a9868aed0903f8b82936bd0faf8eb10e02ae83d5928
+  data.tar.gz: 65927b5d7037a853debb4da6cd71dda3dec0dd6b765bd90230ac3fa2904655f4
 SHA512:
-  metadata.gz: f868c1ce84455bd994da7b662ce29686238a40d2a31c5828fe21ba33bae4d9756b7e54e2e4a69028f299ad7c2cdd3f49485d690135c9213db83a94d0d044fae1
-  data.tar.gz: 8cee7869c4f9fe4bb5c07a000d11741199e65b02a8c31bbbe9e1d7f94cb5e46d68adfd43449ebe3645f0ff127094620234eafd1cb84d2bdbfb1534738faaf6aa
+  metadata.gz: c467f5c384aeae1fe813df7a2b081e36c665f7a5f550322b9fbfafc402ad70d1d81ba578094bf4064a9d1c8a97f94be8b998ae2d2218c18e0bfaba97b754d5ea
+  data.tar.gz: 8510f7f8afa6a89591bb128389ab210e2d6f3049c23a2d2ef3f58c4f0c042abe5cc865b6b5efe5198f116a6c98cea34cbf6e257078477744aa66db66aa3e6f1f

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [1.21.1] - 2024-03-20
+
+### Added
+
+* Backports auto instrument shim with `datadog/auto_instrument` ([#3535][])
+
+### Fixed
+
+* Fix ActiveRecord resolving invalid string ([#3523][])
+* Revert `http.route` tagging to fix instrumentation failure for Rails 7.1 apps ([#3539][])
+* Fix wrong permissions on released gem files ([#3531][])
+
 ## [1.21.0] - 2024-03-14
 
 ### Highlights
@@ -2764,7 +2776,8 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1
 Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 
 
-[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v1.21.0...master
+[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v1.21.1...master
+[1.21.1]: https://github.com/DataDog/dd-trace-rb/compare/v1.21.0...v1.21.1
 [1.21.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.20.0...v1.21.0
 [1.20.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.19.0...v1.20.0
 [1.19.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.18.0...v1.19.0
@@ -4056,6 +4069,10 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#3518]: https://github.com/DataDog/dd-trace-rb/issues/3518
 [#3519]: https://github.com/DataDog/dd-trace-rb/issues/3519
 [#3520]: https://github.com/DataDog/dd-trace-rb/issues/3520
+[#3523]: https://github.com/DataDog/dd-trace-rb/issues/3523
+[#3531]: https://github.com/DataDog/dd-trace-rb/issues/3531
+[#3535]: https://github.com/DataDog/dd-trace-rb/issues/3535
+[#3539]: https://github.com/DataDog/dd-trace-rb/issues/3539
 [@AdrianLC]: https://github.com/AdrianLC
 [@Azure7111]: https://github.com/Azure7111
 [@BabyGroot]: https://github.com/BabyGroot
@@ -4207,4 +4224,4 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@y-yagi]: https://github.com/y-yagi
 [@yujideveloper]: https://github.com/yujideveloper
 [@yukimurasawa]: https://github.com/yukimurasawa
-[@zachmccormick]: https://github.com/zachmccormick
+[@zachmccormick]: https://github.com/zachmccormick

data/lib/datadog/auto_instrument.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative '../ddtrace/auto_instrument'

data/lib/datadog/tracing/contrib/action_mailer/events/deliver.rb

@@ -37,7 +37,7 @@ module Datadog
 
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_DELIVER)
 
-              # Since email date can contain PII we disable by default
+              # Since email data can contain PII we disable by default
               # Some of these fields can be either strings or arrays, so we try to normalize
               # https://github.com/rails/rails/blob/18707ab17fa492eb25ad2e8f9818a320dc20b823/actionmailer/lib/action_mailer/base.rb#L742-L754
               if configuration[:email_data] == true

data/lib/datadog/tracing/contrib/active_record/configuration/resolver.rb

@@ -65,9 +65,14 @@ module Datadog
 
               config
             rescue => e
+              # Resolving a valid database configuration should not raise an exception,
+              # but if it does, it can be due to adding a broken pattern match prior to this call.
+              #
+              # `db_config` input may contain sensitive information such as passwords,
+              # hence provide a succinct summary for the error logging.
               Datadog.logger.error(
-                "Failed to resolve ActiveRecord configuration key #{db_config.inspect}. " \
-                "Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+                'Failed to resolve ActiveRecord database configuration. '\
+                "Cause: #{e.class.name} Source: #{Array(e.backtrace).first}"
               )
 
               nil
@@ -85,9 +90,11 @@ module Datadog
               normalized
             rescue => e
               Datadog.logger.error(
-                "Failed to resolve ActiveRecord configuration key #{matcher.inspect}. " \
-                "Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+                "Failed to resolve key #{matcher.inspect}. " \
+                "Cause: #{e.class.name} Source: #{Array(e.backtrace).first}"
               )
+
+              nil
             end
 
             #

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

@@ -50,7 +50,7 @@ module Datadog
                      end
 
             # Apply the settings
-            config.configure(options, &block)
+            config.configure(options, &block) if config
             config
           end
 

data/lib/datadog/tracing/contrib/grape/endpoint.rb

@@ -94,8 +94,6 @@ module Datadog
 
                 span.set_error(payload[:exception_object]) if exception_is_error?(payload[:exception_object])
 
-                integration_route = endpoint.env['grape.routing_args'][:route_info].pattern.origin
-
                 # override the current span with this notification values
                 span.set_tag(Ext::TAG_ROUTE_ENDPOINT, api_view) unless api_view.nil?
                 span.set_tag(Ext::TAG_ROUTE_PATH, path)
@@ -103,9 +101,6 @@ module Datadog
 
                 span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, request_method)
                 span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, path)
-
-                trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, integration_route)
-                trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH, endpoint.env['SCRIPT_NAME'])
               ensure
                 span.start(start)
                 span.finish(finish)

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

@@ -66,10 +66,6 @@ module Datadog
             end
           end
 
-          # rubocop:disable Metrics/CyclomaticComplexity
-          # rubocop:disable Metrics/PerceivedComplexity
-          # rubocop:disable Metrics/MethodLength
-          # rubocop:disable Metrics/AbcSize
           def call(env)
             # Find out if this is rack within rack
             previous_request_span = env[Ext::RACK_ENV_REQUEST_SPAN]
@@ -111,30 +107,6 @@ module Datadog
 
             # call the rest of the stack
             status, headers, response = @app.call(env)
-
-            if status != 404 && (last_route = request_trace.get_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE))
-              last_script_name = request_trace.get_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH)
-
-              # If the last_script_name is empty but the env['SCRIPT_NAME'] is NOT empty
-              # then the current rack request was not routed and must be accounted for
-              # which only happens in pure nested rack requests i.e /rack/rack/hello/world
-              #
-              # To account for the unaccounted nested rack requests of /rack/hello/world,
-              # we use 'PATH_INFO knowing that rack cannot have named parameters
-              if last_script_name == '' && env['SCRIPT_NAME'] != ''
-                last_script_name = last_route
-                last_route = env['PATH_INFO']
-              end
-
-              # Clear the route and route path tags from the request trace to avoid possibility of misplacement
-              request_trace.clear_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE)
-              request_trace.clear_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH)
-
-              # Ensure tags are placed in rack.request span as desired
-              request_span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, last_script_name + last_route)
-              request_span.clear_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH)
-            end
-
             [status, headers, response]
 
           # rubocop:disable Lint/RescueException
@@ -170,6 +142,10 @@ module Datadog
           end
           # rubocop:enable Lint/RescueException
 
+          # rubocop:disable Metrics/AbcSize
+          # rubocop:disable Metrics/CyclomaticComplexity
+          # rubocop:disable Metrics/PerceivedComplexity
+          # rubocop:disable Metrics/MethodLength
           def set_request_tags!(trace, request_span, env, status, headers, response, original_env)
             request_header_collection = Header::RequestHeaderCollection.new(env)
 

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

@@ -5,24 +5,11 @@ require_relative 'log_injection'
 require_relative 'middlewares'
 require_relative 'utils'
 require_relative '../semantic_logger/patcher'
-require_relative 'ext'
 
 module Datadog
   module Tracing
     module Contrib
       module Rails
-        # Patcher to trace rails routing done by JourneyRouter
-        module JourneyRouterPatch
-          def find_routes(*args)
-            result = super
-            integration_route = result.first[2].path.spec.to_s.gsub(/\(\.:format\)/, '') if result.any?
-            request_trace = Tracing.active_trace || TraceOperation.new
-            request_trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, integration_route)
-            request_trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH, args.first.env['SCRIPT_NAME'])
-            result
-          end
-        end
-
         # Patcher enables patching of 'rails' module.
         module Patcher
           include Contrib::Patcher
@@ -54,9 +41,6 @@ module Datadog
               # Sometimes we don't want to activate middleware e.g. OpenTracing, etc.
               add_middleware(app) if Datadog.configuration.tracing[:rails][:middleware]
 
-              # ActionDispatch::Journey is not available or incompatible in Rails < 4.2.
-              ActionDispatch::Journey::Router.prepend(JourneyRouterPatch) if Integration.version >= Gem::Version.new('4.2')
-
               Rails::LogInjection.configure_log_tags(app.config)
             end
           end

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

@@ -47,16 +47,16 @@ module Datadog
               configuration = Datadog.configuration.tracing[:sinatra]
               return super unless Tracing.enabled?
 
-              integration_route = Sinatra::Env.route_path(env)
+              datadog_route = Sinatra::Env.route_path(env)
 
               Tracing.trace(
                 Ext::SPAN_ROUTE,
                 service: configuration[:service_name],
                 span_type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
-                resource: "#{request.request_method} #{integration_route}",
+                resource: "#{request.request_method} #{datadog_route}",
               ) do |span, trace|
                 span.set_tag(Ext::TAG_APP_NAME, settings.name || settings.superclass.name)
-                span.set_tag(Ext::TAG_ROUTE_PATH, integration_route)
+                span.set_tag(Ext::TAG_ROUTE_PATH, datadog_route)
 
                 if request.script_name && !request.script_name.empty?
                   span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name)
@@ -73,9 +73,6 @@ module Datadog
 
                 Contrib::Analytics.set_measured(span)
 
-                _, path = env['sinatra.route'].split(' ', 2)
-                trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, path)
-                trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH, env['SCRIPT_NAME'])
                 super
               end
             end

data/lib/datadog/tracing/metadata/ext.rb

@@ -86,8 +86,6 @@ module Datadog
           TYPE_TEMPLATE = 'template'
           TAG_CLIENT_IP = 'http.client_ip'
           HEADER_USER_AGENT = 'User-Agent'
-          TAG_ROUTE = 'http.route'
-          TAG_ROUTE_PATH = 'http.route.path'
 
           # General header functionality
           module Headers

data/lib/ddtrace/version.rb

@@ -4,7 +4,7 @@ module DDTrace
   module VERSION
     MAJOR = 1
     MINOR = 21
-    PATCH = 0
+    PATCH = 1
     PRE = nil
     BUILD = nil
     # PRE and BUILD above are modified for dev gems during gem build GHA workflow

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.21.1
 platform: ruby
 authors:
 - Datadog, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -221,6 +221,7 @@ files:
 - lib/datadog/appsec/utils/http.rb
 - lib/datadog/appsec/utils/http/media_range.rb
 - lib/datadog/appsec/utils/http/media_type.rb
+- lib/datadog/auto_instrument.rb
 - lib/datadog/core.rb
 - lib/datadog/core/backport.rb
 - lib/datadog/core/buffer/cruby.rb
@@ -889,7 +890,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
   changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -907,8 +908,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.4.21
+signing_key:
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications
 test_files: []