ddtrace 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 845f4614c8e20a84d26d9d14a22b5cddde0e1b27aeb7e093b5addf7a0cbd7490
-  data.tar.gz: 829de76d1ac7aa04f1eb9a1bd36ef3ff5fec7bfc5657015cea291fe8219ea162
+  metadata.gz: ae7238650b45da9d8bf8f5834af2a29153081e798c2c8733c9bffb8768b6c430
+  data.tar.gz: b9bc8f36d37b91d18754892bd8dbc92cd515b9e38caf8561e23b665f14ee5e9e
 SHA512:
-  metadata.gz: 6a3ed99fb7b1ddf340fa2f343f70d0f2ba456f6f45f62cd6f1a3250b05dafa2f44f18784899bd898d213eab37ca4921b618581b8faf0134c2bed325febb20c30
-  data.tar.gz: 6ef24c9b3559eb34705a4b43d325d4582bef7279627563641cae3675e26978ce92e5f953c277991866389083e57540622d232b58a44d44e4ede4fb370ff93b68
+  metadata.gz: 4b4cdffa9d4ee39e6763be4a87dbdf3e351fd29915d4eaea45dc9c800543c65c8eb21375138422280cfed5715d8f23e95e58190752af6631c14453d39b29b263
+  data.tar.gz: fbc970e48e5e5038775368618e672ab7b2405cd6ea9b899136b34e9ae776f26a92436087fb0810ef7d66574c2f694cdea03197cf980b08dc35a9defcf4c3dc74

data/CHANGELOG.md

@@ -2,6 +2,37 @@
 
 ## [Unreleased]
 
+## [1.14.0] - 2023-08-24
+
+### Added
+
+* Cucumber 8.0.0 support, test CI visibility with cucumber versions 6-8 ([#3061][])
+* Tracing: Add `ddsource` to #to_log_format ([#3025][])
+* Core: include peer service configurations in telemetry payload ([#3056][])
+* Tracing: Improve quantization ([#3041][])
+
+### Changed
+
+* Profiling: Disable profiler on Ruby 3.3 due to incompatibility ([#3054][])
+* Core: EnvironmentLogger adjustments ([#3020][], [#3057][])
+
+### Fixed
+
+* Appsec: Fix ASM setting for automated user events. ([#3070][])
+* Tracing: Fix ActiveRecord adapter name for Rails 7 ([#3051][])
+
+## [1.13.1] - 2023-08-14
+
+### Fixed
+
+* Tracing: `net/http` instrumentation excludes query string for `http.url` tag ([#3045][])
+* Tracing: Remove `log_tags` warning when given hash for log injection ([#3022][])
+* Tracing: Fix OpenSearch integration loading ([#3019][])
+* Core: Fix default hostname/port when mixing http and uds configuration ([#3037][])
+* Core: Disable Telemetry and Remote Configuration in development environments ([#3039][])
+* Profiling: Improve `Datadog::Profiling::HttpTransport` error logging ([#3038][])
+* Docs: Document known issues with hanging Resque workers ([#3033][])
+
 ## [1.13.0] - 2023-07-31
 
 ### Added
@@ -2503,7 +2534,9 @@ 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.13.0...master
+[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v1.14.0...master
+[1.14.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.13.1...1.14.0
+[1.13.1]: https://github.com/DataDog/dd-trace-rb/compare/v1.13.0...1.13.1
 [1.13.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.12.1...v1.13.0
 [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
@@ -3638,6 +3671,22 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#3005]: https://github.com/DataDog/dd-trace-rb/issues/3005
 [#3007]: https://github.com/DataDog/dd-trace-rb/issues/3007
 [#3011]: https://github.com/DataDog/dd-trace-rb/issues/3011
+[#3019]: https://github.com/DataDog/dd-trace-rb/issues/3019
+[#3020]: https://github.com/DataDog/dd-trace-rb/issues/3020
+[#3022]: https://github.com/DataDog/dd-trace-rb/issues/3022
+[#3025]: https://github.com/DataDog/dd-trace-rb/issues/3025
+[#3033]: https://github.com/DataDog/dd-trace-rb/issues/3033
+[#3037]: https://github.com/DataDog/dd-trace-rb/issues/3037
+[#3038]: https://github.com/DataDog/dd-trace-rb/issues/3038
+[#3039]: https://github.com/DataDog/dd-trace-rb/issues/3039
+[#3041]: https://github.com/DataDog/dd-trace-rb/issues/3041
+[#3045]: https://github.com/DataDog/dd-trace-rb/issues/3045
+[#3051]: https://github.com/DataDog/dd-trace-rb/issues/3051
+[#3054]: https://github.com/DataDog/dd-trace-rb/issues/3054
+[#3056]: https://github.com/DataDog/dd-trace-rb/issues/3056
+[#3057]: https://github.com/DataDog/dd-trace-rb/issues/3057
+[#3061]: https://github.com/DataDog/dd-trace-rb/issues/3061
+[#3070]: https://github.com/DataDog/dd-trace-rb/issues/3070
 [@AdrianLC]: https://github.com/AdrianLC
 [@Azure7111]: https://github.com/Azure7111
 [@BabyGroot]: https://github.com/BabyGroot

data/ext/ddtrace_profiling_native_extension/native_extension_helpers.rb

@@ -87,6 +87,7 @@ module Datadog
             on_unknown_os? ||
             on_unsupported_cpu_arch? ||
             on_unsupported_ruby_version? ||
+            on_ruby_3_3? ||
             expected_to_use_mjit_but_mjit_is_disabled? ||
             libdatadog_not_available? ||
             libdatadog_not_usable?
@@ -269,6 +270,20 @@ module Datadog
           ruby_version_not_supported if RUBY_VERSION.start_with?('2.1.', '2.2.')
         end
 
+        private_class_method def self.on_ruby_3_3?
+          incompatible_with_3_3 = explain_issue(
+            'the profiler in the current version of ddtrace does not yet support',
+            'Ruby version 3.3.',
+            '(See https://github.com/datadog/dd-trace-rb/issues/3053 for details).',
+            suggested: [
+              'Try upgrading to the latest ddtrace, as this issue may have been',
+              'fixed by now.',
+            ] + CONTACT_SUPPORT,
+          )
+
+          incompatible_with_3_3 if RUBY_VERSION.start_with?('3.3.')
+        end
+
         # On some Rubies, we require the mjit header to be present. If Ruby was installed without MJIT support, we also skip
         # building the extension.
         private_class_method def self.expected_to_use_mjit_but_mjit_is_disabled?

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

@@ -15,6 +15,10 @@ module Datadog
           'safe',
           'extended'
         ].freeze
+        APPSEC_VALID_TRACK_USER_EVENTS_ENABLED_VALUES = [
+          '1',
+          'true'
+        ].concat(APPSEC_VALID_TRACK_USER_EVENTS_MODE).freeze
 
         def self.extended(base)
           base = base.singleton_class unless base.is_a?(Class)
@@ -100,7 +104,7 @@ module Datadog
                     if env_value == 'disabled'
                       false
                     else
-                      ['1', 'true'].include?(env_value.strip.downcase)
+                      APPSEC_VALID_TRACK_USER_EVENTS_ENABLED_VALUES.include?(env_value.strip.downcase)
                     end
                   end
                 end
@@ -112,6 +116,8 @@ module Datadog
                   o.setter do |v|
                     if APPSEC_VALID_TRACK_USER_EVENTS_MODE.include?(v)
                       v
+                    elsif v == 'disabled'
+                      'safe'
                     else
                       Datadog.logger.warn(
                         'The appsec.track_user_events.mode value provided is not supported.' \

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

@@ -95,7 +95,7 @@ module Datadog
         end
 
         def adapter
-          if should_use_uds? && !mixed_http_and_uds?
+          if should_use_uds?
             Datadog::Transport::Ext::UnixSocket::ADAPTER
           else
             Datadog::Transport::Ext::HTTP::ADAPTER
@@ -222,6 +222,10 @@ module Datadog
         end
 
         def should_use_uds?
+          can_use_uds? && !mixed_http_and_uds?
+        end
+
+        def can_use_uds?
           parsed_url && unix_scheme?(parsed_url) ||
             # If no agent settings have been provided, we try to connect using a local unix socket.
             # We only do so if the socket is present when `ddtrace` runs.
@@ -272,7 +276,7 @@ module Datadog
             'Configuration mismatch: values differ between ' \
             "#{detected_configurations_in_priority_order
               .map { |config| "#{config.friendly_name} (#{config.value.inspect})" }.join(' and ')}" \
-            ". Using #{detected_configurations_in_priority_order.first.value.inspect}."
+            ". Using #{detected_configurations_in_priority_order.first.value.inspect} and ignoring other configuration."
           )
         end
 
@@ -297,18 +301,18 @@ module Datadog
         def mixed_http_and_uds?
           return @mixed_http_and_uds if defined?(@mixed_http_and_uds)
 
-          @mixed_http_and_uds = (configured_hostname || configured_port) && should_use_uds?
+          @mixed_http_and_uds = (configured_hostname || configured_port) && can_use_uds?
 
           if @mixed_http_and_uds
             warn_if_configuration_mismatch(
               [
                 DetectedConfiguration.new(
                   friendly_name: 'configuration of hostname/port for http/https use',
-                  value: "hostname: '#{configured_hostname}', port: #{configured_port.inspect}",
+                  value: "hostname: '#{hostname}', port: '#{port}'",
                 ),
                 DetectedConfiguration.new(
                   friendly_name: 'configuration for unix domain socket',
-                  value: "unix://#{uds_path}",
+                  value: parsed_url.to_s,
                 ),
               ]
             )

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

@@ -110,6 +110,8 @@ module Datadog
           else
             @logger.debug('Profiling is disabled')
           end
+
+          Core::Diagnostics::EnvironmentLogger.collect_and_log!
         end
 
         # Shuts down all the components in use.

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

@@ -2,6 +2,7 @@ require 'logger'
 
 require_relative 'base'
 require_relative 'ext'
+require_relative '../environment/execution'
 require_relative '../environment/ext'
 require_relative '../runtime/ext'
 require_relative '../telemetry/ext'
@@ -559,10 +560,21 @@ module Datadog
           #
           # @default `DD_INSTRUMENTATION_TELEMETRY_ENABLED` environment variable, otherwise `true`.
           #   Can be disabled as documented [here](https://docs.datadoghq.com/tracing/configure_data_security/#telemetry-collection).
+          #   By default, telemetry is disabled in development environments.
           # @return [Boolean]
           option :enabled do |o|
             o.env Core::Telemetry::Ext::ENV_ENABLED
-            o.default true
+            o.default do
+              if Datadog::Core::Environment::Execution.development?
+                Datadog.logger.debug do
+                  'Development environment detected, disabling Telemetry. ' \
+                    'You can enable it with DD_INSTRUMENTATION_TELEMETRY_ENABLED=true.'
+                end
+                false
+              else
+                true
+              end
+            end
             o.type :bool
           end
 
@@ -586,10 +598,21 @@ module Datadog
           # Enable remote configuration. This allows fetching of remote configuration for live updates.
           #
           # @default `DD_REMOTE_CONFIGURATION_ENABLED` environment variable, otherwise `true`.
+          #   By default, remote configuration is disabled in development environments.
           # @return [Boolean]
           option :enabled do |o|
             o.env Core::Remote::Ext::ENV_ENABLED
-            o.default true
+            o.default do
+              if Datadog::Core::Environment::Execution.development?
+                Datadog.logger.debug do
+                  'Development environment detected, disabling Remote Configuration. ' \
+                    'You can enable it with DD_REMOTE_CONFIGURATION_ENABLED=true.'
+                end
+                false
+              else
+                true
+              end
+            end
             o.type :bool
           end