ddtrace 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59174b63b257f636df60be99956c8e221fcf046ace610c57eb01192fac6560ad
-  data.tar.gz: 647e8de04a54a65b40ad7b20061a015f510966f7643c192df30f3710a8335386
+  metadata.gz: 7755d42a1b84dda8386f13ce2edc3854f09e1e227d5786546b19ea31a60cc03b
+  data.tar.gz: 57ee6f72d29b72305c8272b98dc4b7d08a66f9463820d9963aa487723094d1f7
 SHA512:
-  metadata.gz: b677b76e9e3b00df5e9c5b33bfe8c6007cd867053366364769391bb1b41457e9e380c5869bb85cc97071969e4e6164fcbe89148aaac11828bdc9de7957cc5d21
-  data.tar.gz: 33d66238def0a52a491175d015bfe80e15b84e975abc974710d8b892fb76ffe4ff336a15f23341ecd94b5979d7015d75dc93587d7e227d0bd759c6fdb5c782c4
+  metadata.gz: e9c5d234fb1261e202bf8d4ae00417f31f325dbcc9ceb9081277ac96a04114316456fed6d21f3de343dbe6192e4a0ceccb4504e5b1a59bbb44fe2666042a7890
+  data.tar.gz: effa42b2181771676d69ea5efb946cd6bd4617853b36f75b9655a710d369f57a200dded1cdc8b86642eaf60174c20b44da3b3de29fbfddfd76c6845364927fe2

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## [Unreleased]
 
+## [1.12.1] - 2023-06-14
+
+### Added
+Appsec: Add `appsec.blocked` tag to span ([#2895][])
+Profiling:  Add workaround for legacy profiler incompatibility with ruby-cloud-profiler gem ([#2891][])
+Core: Allow setting remote configuration service name ([#2853][])
+
+### Changed
+Appsec: Change the value format for the WAF address `server.request.query` ([#2903][])
+Profiling: Log pkg-config command when building profiling native extension
+
+### Fixed
+Appsec: Update blocked response content_type resolution ([#2900][])
+Appsec: Ensure to use service entry span. ([#2898][])
+Tracing: Fix AWS integration constant loading ([#2896][])
+
 ## [1.12.0] - 2023-06-02
 
 ### Added
@@ -2438,7 +2454,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.12.0...master
+[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v1.12.1...master
+[1.12.1]: https://github.com/DataDog/dd-trace-rb/compare/v1.12.0...v1.12.1
 [1.12.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.11.1...v1.12.0
 [1.11.1]: https://github.com/DataDog/dd-trace-rb/compare/v1.10.1...v1.11.1
 [1.11.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.10.1...v1.11.0
@@ -3504,6 +3521,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#2829]: https://github.com/DataDog/dd-trace-rb/issues/2829
 [#2836]: https://github.com/DataDog/dd-trace-rb/issues/2836
 [#2840]: https://github.com/DataDog/dd-trace-rb/issues/2840
+[#2853]: https://github.com/DataDog/dd-trace-rb/issues/2853
 [#2854]: https://github.com/DataDog/dd-trace-rb/issues/2854
 [#2855]: https://github.com/DataDog/dd-trace-rb/issues/2855
 [#2856]: https://github.com/DataDog/dd-trace-rb/issues/2856
@@ -3517,6 +3535,12 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#2875]: https://github.com/DataDog/dd-trace-rb/issues/2875
 [#2883]: https://github.com/DataDog/dd-trace-rb/issues/2883
 [#2890]: https://github.com/DataDog/dd-trace-rb/issues/2890
+[#2891]: https://github.com/DataDog/dd-trace-rb/issues/2891
+[#2895]: https://github.com/DataDog/dd-trace-rb/issues/2895
+[#2896]: https://github.com/DataDog/dd-trace-rb/issues/2896
+[#2898]: https://github.com/DataDog/dd-trace-rb/issues/2898
+[#2900]: https://github.com/DataDog/dd-trace-rb/issues/2900
+[#2903]: https://github.com/DataDog/dd-trace-rb/issues/2903
 [@AdrianLC]: https://github.com/AdrianLC
 [@Azure7111]: https://github.com/Azure7111
 [@BabyGroot]: https://github.com/BabyGroot

data/ext/ddtrace_profiling_native_extension/extconf.rb

@@ -175,6 +175,8 @@ Logging.message("[ddtrace] PKG_CONFIG_PATH set to #{ENV['PKG_CONFIG_PATH'].inspe
 $stderr.puts("Using libdatadog #{Libdatadog::VERSION} from #{Libdatadog.pkgconfig_folder}")
 
 unless pkg_config('datadog_profiling_with_rpath')
+  Logging.message("[ddtrace] Ruby detected the pkg-config command is #{$PKGCONFIG.inspect}\n")
+
   skip_building_extension!(
     if Datadog::Profiling::NativeExtensionHelpers::Supported.pkg_config_missing?
       Datadog::Profiling::NativeExtensionHelpers::Supported::PKG_CONFIG_IS_MISSING

data/lib/datadog/appsec/contrib/rack/gateway/request.rb

@@ -25,11 +25,13 @@ module Datadog
             def query
               # Downstream libddwaf expects keys and values to be extractable
               # separately so we can't use [[k, v], ...]. We also want to allow
-              # duplicate keys, so we use [{k, v}, ...] instead.
-              request.query_string.split('&').map do |e|
+              # duplicate keys, so we use {k => [v, ...], ...} instead, taking into
+              # account that {k => [v1, v2, ...], ...} is possible for duplicate keys.
+              request.query_string.split('&').each.with_object({}) do |e, hash|
                 k, v = e.split('=').map { |s| CGI.unescape(s) }
+                hash[k] ||= []
 
-                { k => v }
+                hash[k] << v
               end
             end
 

data/lib/datadog/appsec/contrib/rack/gateway/watcher.rb

@@ -28,21 +28,21 @@ module Datadog
                   scope = gateway_request.env[Datadog::AppSec::Ext::SCOPE_KEY]
 
                   AppSec::Reactive::Operation.new('rack.request') do |op|
-                    trace = active_trace
-                    span = active_span
-
                     Rack::Reactive::Request.subscribe(op, scope.processor_context) do |result, _block|
                       if result.status == :match
                         # TODO: should this hash be an Event instance instead?
                         event = {
                           waf_result: result,
-                          trace: trace,
-                          span: span,
+                          trace: scope.trace,
+                          span: scope.service_entry_span,
                           request: gateway_request,
                           actions: result.actions
                         }
 
-                        span.set_tag('appsec.event', 'true') if span
+                        if scope.service_entry_span
+                          scope.service_entry_span.set_tag('appsec.blocked', 'true') if result.actions.include?('block')
+                          scope.service_entry_span.set_tag('appsec.event', 'true')
+                        end
 
                         scope.processor_context.events << event
                       end
@@ -71,21 +71,21 @@ module Datadog
                   scope = gateway_response.scope
 
                   AppSec::Reactive::Operation.new('rack.response') do |op|
-                    trace = active_trace
-                    span = active_span
-
                     Rack::Reactive::Response.subscribe(op, scope.processor_context) do |result, _block|
                       if result.status == :match
                         # TODO: should this hash be an Event instance instead?
                         event = {
                           waf_result: result,
-                          trace: trace,
-                          span: span,
+                          trace: scope.trace,
+                          span: scope.service_entry_span,
                           response: gateway_response,
                           actions: result.actions
                         }
 
-                        span.set_tag('appsec.event', 'true') if span
+                        if scope.service_entry_span
+                          scope.service_entry_span.set_tag('appsec.blocked', 'true') if result.actions.include?('block')
+                          scope.service_entry_span.set_tag('appsec.event', 'true')
+                        end
 
                         scope.processor_context.events << event
                       end
@@ -114,21 +114,21 @@ module Datadog
                   scope = gateway_request.env[Datadog::AppSec::Ext::SCOPE_KEY]
 
                   AppSec::Reactive::Operation.new('rack.request.body') do |op|
-                    trace = active_trace
-                    span = active_span
-
                     Rack::Reactive::RequestBody.subscribe(op, scope.processor_context) do |result, _block|
                       if result.status == :match
                         # TODO: should this hash be an Event instance instead?
                         event = {
                           waf_result: result,
-                          trace: trace,
-                          span: span,
+                          trace: scope.trace,
+                          span: scope.service_entry_span,
                           request: gateway_request,
                           actions: result.actions
                         }
 
-                        span.set_tag('appsec.event', 'true') if span
+                        if scope.service_entry_span
+                          scope.service_entry_span.set_tag('appsec.blocked', 'true') if result.actions.include?('block')
+                          scope.service_entry_span.set_tag('appsec.event', 'true')
+                        end
 
                         scope.processor_context.events << event
                       end
@@ -149,24 +149,6 @@ module Datadog
                   [ret, res]
                 end
               end
-
-              private
-
-              def active_trace
-                # TODO: factor out tracing availability detection
-
-                return unless defined?(Datadog::Tracing)
-
-                Datadog::Tracing.active_trace
-              end
-
-              def active_span
-                # TODO: factor out tracing availability detection
-
-                return unless defined?(Datadog::Tracing)
-
-                Datadog::Tracing.active_span
-              end
             end
           end
         end

data/lib/datadog/appsec/contrib/rack/request_middleware.rb

@@ -53,7 +53,7 @@ module Datadog
 
             gateway_request = Gateway::Request.new(env)
 
-            add_appsec_tags(processor, active_trace, active_span, env)
+            add_appsec_tags(processor, scope.trace, scope.service_entry_span, env)
 
             request_return, request_response = catch(::Datadog::AppSec::Ext::INTERRUPT) do
               Instrumentation.gateway.push('rack.request', gateway_request) do
@@ -79,7 +79,7 @@ module Datadog
               e[:request]  ||= gateway_request
             end
 
-            AppSec::Event.record(active_span, *scope.processor_context.events)
+            AppSec::Event.record(scope.service_entry_span, *scope.processor_context.events)
 
             if response_response && response_response.any? { |action, _event| action == :block }
               request_return = AppSec::Response.negotiate(env).to_rack
@@ -88,7 +88,7 @@ module Datadog
             request_return
           ensure
             if scope
-              add_waf_runtime_tags(active_span, scope.processor_context)
+              add_waf_runtime_tags(scope.service_entry_span, scope.processor_context)
               Datadog::AppSec::Scope.deactivate_scope
             end
           end

data/lib/datadog/appsec/contrib/rails/gateway/watcher.rb

@@ -24,21 +24,21 @@ module Datadog
                   scope = gateway_request.env[Datadog::AppSec::Ext::SCOPE_KEY]
 
                   AppSec::Reactive::Operation.new('rails.request.action') do |op|
-                    trace = active_trace
-                    span = active_span
-
                     Rails::Reactive::Action.subscribe(op, scope.processor_context) do |result, _block|
                       if result.status == :match
                         # TODO: should this hash be an Event instance instead?
                         event = {
                           waf_result: result,
-                          trace: trace,
-                          span: span,
+                          trace: scope.trace,
+                          span: scope.service_entry_span,
                           request: gateway_request,
                           actions: result.actions
                         }
 
-                        span.set_tag('appsec.event', 'true') if span
+                        if scope.service_entry_span
+                          scope.service_entry_span.set_tag('appsec.blocked', 'true') if result.actions.include?('block')
+                          scope.service_entry_span.set_tag('appsec.event', 'true')
+                        end
 
                         scope.processor_context.events << event
                       end
@@ -59,24 +59,6 @@ module Datadog
                   [ret, res]
                 end
               end
-
-              private
-
-              def active_trace
-                # TODO: factor out tracing availability detection
-
-                return unless defined?(Datadog::Tracing)
-
-                Datadog::Tracing.active_trace
-              end
-
-              def active_span
-                # TODO: factor out tracing availability detection
-
-                return unless defined?(Datadog::Tracing)
-
-                Datadog::Tracing.active_span
-              end
             end
           end
         end

data/lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb

@@ -26,21 +26,21 @@ module Datadog
                   scope = gateway_request.env[Datadog::AppSec::Ext::SCOPE_KEY]
 
                   AppSec::Reactive::Operation.new('sinatra.request.dispatch') do |op|
-                    trace = active_trace
-                    span = active_span
-
                     Rack::Reactive::RequestBody.subscribe(op, scope.processor_context) do |result, _block|
                       if result.status == :match
                         # TODO: should this hash be an Event instance instead?
                         event = {
                           waf_result: result,
-                          trace: trace,
-                          span: span,
+                          trace: scope.trace,
+                          span: scope.service_entry_span,
                           request: gateway_request,
                           actions: result.actions
                         }
 
-                        span.set_tag('appsec.event', 'true') if span
+                        if scope.service_entry_span
+                          scope.service_entry_span.set_tag('appsec.blocked', 'true') if result.actions.include?('block')
+                          scope.service_entry_span.set_tag('appsec.event', 'true')
+                        end
 
                         scope.processor_context.events << event
                       end
@@ -69,21 +69,21 @@ module Datadog
                   scope = gateway_request.env[Datadog::AppSec::Ext::SCOPE_KEY]
 
                   AppSec::Reactive::Operation.new('sinatra.request.routed') do |op|
-                    trace = active_trace
-                    span = active_span
-
                     Sinatra::Reactive::Routed.subscribe(op, scope.processor_context) do |result, _block|
                       if result.status == :match
                         # TODO: should this hash be an Event instance instead?
                         event = {
                           waf_result: result,
-                          trace: trace,
-                          span: span,
+                          trace: scope.trace,
+                          span: scope.service_entry_span,
                           request: gateway_request,
                           actions: result.actions
                         }
 
-                        span.set_tag('appsec.event', 'true') if span
+                        if scope.service_entry_span
+                          scope.service_entry_span.set_tag('appsec.blocked', 'true') if result.actions.include?('block')
+                          scope.service_entry_span.set_tag('appsec.event', 'true')
+                        end
 
                         scope.processor_context.events << event
                       end
@@ -104,24 +104,6 @@ module Datadog
                   [ret, res]
                 end
               end
-
-              private
-
-              def active_trace
-                # TODO: factor out tracing availability detection
-
-                return unless defined?(Datadog::Tracing)
-
-                Datadog::Tracing.active_trace
-              end
-
-              def active_span
-                # TODO: factor out tracing availability detection
-
-                return unless defined?(Datadog::Tracing)
-
-                Datadog::Tracing.active_span
-              end
             end
           end
         end

data/lib/datadog/appsec/event.rb

@@ -47,7 +47,6 @@ module Datadog
         end
       end
 
-      # rubocop:disable Metrics/MethodLength
       def self.record_via_span(span, *events)
         events.group_by { |e| e[:trace] }.each do |trace, event_group|
           unless trace
@@ -62,52 +61,53 @@ module Datadog
           )
 
           # prepare and gather tags to apply
-          trace_tags = event_group.each_with_object({}) do |event, tags|
-            # TODO: assume HTTP request context for now
+          service_entry_tags = build_service_entry_tags(event_group)
+          # complex types are unsupported, we need to serialize to a string
+          triggers = service_entry_tags.delete('_dd.appsec.triggers')
+          span.set_tag('_dd.appsec.json', JSON.dump({ triggers: triggers }))
 
-            if (request = event[:request])
-              request_headers = request.headers.select do |k, _|
-                ALLOWED_REQUEST_HEADERS.include?(k.downcase)
-              end
+          # apply tags to service entry span
+          service_entry_tags.each do |key, value|
+            span.set_tag(key, value)
+          end
+        end
+      end
 
-              request_headers.each do |header, value|
-                tags["http.request.headers.#{header}"] = value
-              end
+      def self.build_service_entry_tags(event_group)
+        event_group.each_with_object({}) do |event, tags|
+          # TODO: assume HTTP request context for now
 
-              tags['http.host'] = request.host
-              tags['http.useragent'] = request.user_agent
-              tags['network.client.ip'] = request.remote_addr
+          if (request = event[:request])
+            request_headers = request.headers.select do |k, _|
+              ALLOWED_REQUEST_HEADERS.include?(k.downcase)
             end
 
-            if (response = event[:response])
-              response_headers = response.headers.select do |k, _|
-                ALLOWED_RESPONSE_HEADERS.include?(k.downcase)
-              end
-
-              response_headers.each do |header, value|
-                tags["http.response.headers.#{header}"] = value
-              end
+            request_headers.each do |header, value|
+              tags["http.request.headers.#{header}"] = value
             end
 
-            tags['_dd.origin'] = 'appsec'
-
-            # accumulate triggers
-            tags['_dd.appsec.triggers'] ||= []
-            tags['_dd.appsec.triggers'] += event[:waf_result].data
+            tags['http.host'] = request.host
+            tags['http.useragent'] = request.user_agent
+            tags['network.client.ip'] = request.remote_addr
           end
 
-          # apply tags to root span
-
-          # complex types are unsupported, we need to serialize to a string
-          triggers = trace_tags.delete('_dd.appsec.triggers')
-          span.set_tag('_dd.appsec.json', JSON.dump({ triggers: triggers }))
+          if (response = event[:response])
+            response_headers = response.headers.select do |k, _|
+              ALLOWED_RESPONSE_HEADERS.include?(k.downcase)
+            end
 
-          trace_tags.each do |key, value|
-            span.set_tag(key, value)
+            response_headers.each do |header, value|
+              tags["http.response.headers.#{header}"] = value
+            end
           end
+
+          tags['_dd.origin'] = 'appsec'
+
+          # accumulate triggers
+          tags['_dd.appsec.triggers'] ||= []
+          tags['_dd.appsec.triggers'] += event[:waf_result].data
         end
       end
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/datadog/appsec/monitor/gateway/watcher.rb

@@ -24,21 +24,21 @@ module Datadog
                 scope = Datadog::AppSec.active_scope
 
                 AppSec::Reactive::Operation.new('identity.set_user') do |op|
-                  trace = active_trace
-                  span = active_span
-
                   Monitor::Reactive::SetUser.subscribe(op, scope.processor_context) do |result, _block|
                     if result.status == :match
                       # TODO: should this hash be an Event instance instead?
                       event = {
                         waf_result: result,
-                        trace: trace,
-                        span: span,
+                        trace: scope.trace,
+                        span: scope.service_entry_span,
                         user: user,
                         actions: result.actions
                       }
 
-                      span.set_tag('appsec.event', 'true') if span
+                      if scope.service_entry_span
+                        scope.service_entry_span.set_tag('appsec.blocked', 'true') if result.actions.include?('block')
+                        scope.service_entry_span.set_tag('appsec.event', 'true')
+                      end
 
                       scope.processor_context.events << event
                     end
@@ -59,24 +59,6 @@ module Datadog
                 [ret, res]
               end
             end
-
-            private
-
-            def active_trace
-              # TODO: factor out tracing availability detection
-
-              return unless defined?(Datadog::Tracing)
-
-              Datadog::Tracing.active_trace
-            end
-
-            def active_span
-              # TODO: factor out tracing availability detection
-
-              return unless defined?(Datadog::Tracing)
-
-              Datadog::Tracing.active_span
-            end
           end
         end
       end

data/lib/datadog/appsec/response.rb

@@ -36,30 +36,34 @@ module Datadog
           Response.new(
             status: 403,
             headers: { 'Content-Type' => content_type },
-            body: [Datadog::AppSec::Assets.blocked(format: FORMAT_MAP[content_type])]
+            body: [Datadog::AppSec::Assets.blocked(format: CONTENT_TYPE_TO_FORMAT[content_type])]
           )
         end
 
         private
 
-        FORMAT_MAP = {
-          'text/plain' => :text,
-          'text/html' => :html,
+        CONTENT_TYPE_TO_FORMAT = {
           'application/json' => :json,
+          'text/html' => :html,
+          'text/plain' => :text,
         }.freeze
 
-        DEFAULT_CONTENT_TYPE = 'text/plain'
+        DEFAULT_CONTENT_TYPE = 'application/json'
 
         def content_type(env)
           return DEFAULT_CONTENT_TYPE unless env.key?('HTTP_ACCEPT')
 
-          accepted = env['HTTP_ACCEPT'].split(',').map { |m| Utils::HTTP::MediaRange.new(m) }.sort!.reverse!
+          accept_types = env['HTTP_ACCEPT'].split(',').map(&:strip)
 
-          accepted.each_with_object(DEFAULT_CONTENT_TYPE) do |range, _default|
-            match = FORMAT_MAP.keys.find { |type| range === type }
+          accepted = accept_types.map { |m| Utils::HTTP::MediaRange.new(m) }.sort!.reverse!
 
-            return match if match
+          accepted.each do |range|
+            type_match = CONTENT_TYPE_TO_FORMAT.keys.find { |type| range === type }
+
+            return type_match if type_match
           end
+
+          DEFAULT_CONTENT_TYPE
         rescue Datadog::AppSec::Utils::HTTP::MediaRange::ParseError
           DEFAULT_CONTENT_TYPE
         end

data/lib/datadog/core/configuration/settings.rb

@@ -549,6 +549,14 @@ module Datadog
             o.default { env_to_float(Core::Remote::Ext::ENV_POLL_INTERVAL_SECONDS, 5.0) }
             o.lazy
           end
+
+          # Declare service name to bind to remote configuration. Use when
+          # DD_SERVICE does not match the correct integration for which remote
+          # configuration applies.
+          #
+          # @default `nil`.
+          # @return [String,nil]
+          option :service
         end
 
         # TODO: Tracing should manage its own settings.

data/lib/datadog/core/remote/client.rb

@@ -136,7 +136,7 @@ module Datadog
             runtime_id: Core::Environment::Identity.id,
             language: Core::Environment::Identity.lang,
             tracer_version: tracer_version_semver2,
-            service: Datadog.configuration.service,
+            service: service_name,
             env: Datadog.configuration.env,
             tags: client_tracer_tags,
           }
@@ -167,6 +167,10 @@ module Datadog
           }
         end
 
+        def service_name
+          Datadog.configuration.remote.service || Datadog.configuration.service
+        end
+
         def tracer_version_semver2
           @tracer_version_semver2 ||= Core::Environment::Identity.tracer_version_semver2
         end

data/lib/datadog/profiling/component.rb

@@ -79,6 +79,8 @@ module Datadog
             no_signals_workaround_enabled: no_signals_workaround_enabled?(settings),
           )
         else
+          load_pprof_support
+
           recorder = build_profiler_old_recorder(settings)
           collector = build_profiler_oldstack_collector(settings, recorder, optional_tracer)
         end
@@ -255,6 +257,19 @@ module Datadog
           true
         end
       end
+
+      # The old profiler's pprof support conflicts with the ruby-cloud-profiler gem.
+      #
+      # This is not a problem for almost all customers, since we now default everyone to use the new CPU Profiling 2.0
+      # profiler. But the issue was still triggered, because currently we still _load_ both the old and new profiling
+      # code paths.
+      #
+      # To work around this issue, and because we plan on deleting the old profiler soon, rather than poking at the
+      # pprof support code, we only load the conflicting file when the old profiler is in use. This way customers using
+      # the new profiler will not be affected by the issue any longer.
+      private_class_method def self.load_pprof_support
+        require_relative 'pprof/pprof_pb'
+      end
     end
   end
 end

data/lib/datadog/profiling.rb

@@ -197,7 +197,8 @@ module Datadog
       require_relative 'profiling/profiler'
       require_relative 'profiling/native_extension'
       require_relative 'profiling/trace_identifiers/helper'
-      require_relative 'profiling/pprof/pprof_pb'
+      # This file is loaded in Profiling::Component#load_pprof_support; see notes there for why
+      # require_relative 'profiling/pprof/pprof_pb'
       require_relative 'profiling/tag_builder'
       require_relative 'profiling/http_transport'
 

data/lib/datadog/tracing/contrib/aws/service/dynamodb.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/aws/service/eventbridge.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/aws/service/kinesis.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/aws/service/s3.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/aws/service/sns.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/aws/service/sqs.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/aws/service/{stepfunctions.rb → states.rb}

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/aws/services.rb

@@ -1,3 +1,11 @@
+require_relative './service/sqs'
+require_relative './service/sns'
+require_relative './service/dynamodb'
+require_relative './service/kinesis'
+require_relative './service/eventbridge'
+require_relative './service/states'
+require_relative './service/s3'
+
 module Datadog
   module Tracing
     module Contrib

data/lib/ddtrace/version.rb

@@ -4,7 +4,7 @@ module DDTrace
   module VERSION
     MAJOR = 1
     MINOR = 12
-    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.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -495,7 +495,7 @@ files:
 - 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/stepfunctions.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