datadog 2.1.0 → 2.2.0

data/lib/datadog/tracing/trace_operation.rb

@@ -181,6 +181,7 @@ module Datadog
         start_time: nil,
         tags: nil,
         type: nil,
+        id: nil,
         &block
       )
         # Don't allow more span measurements if the
@@ -197,7 +198,8 @@ module Datadog
           service: service,
           start_time: start_time,
           tags: tags,
-          type: type
+          type: type,
+          id: id
         )
 
         # Start span measurement
@@ -212,7 +214,8 @@ module Datadog
         service: nil,
         start_time: nil,
         tags: nil,
-        type: nil
+        type: nil,
+        id: nil
       )
         begin
           # Resolve span options:
@@ -249,7 +252,8 @@ module Datadog
             start_time: start_time,
             tags: tags,
             trace_id: trace_id,
-            type: type
+            type: type,
+            id: id
           )
         rescue StandardError => e
           Datadog.logger.debug { "Failed to build new span: #{e}" }

data/lib/datadog/tracing/trace_segment.rb

@@ -132,10 +132,13 @@ module Datadog
           || sampling_priority == Sampling::Ext::Priority::USER_KEEP
       end
 
+      # Returns the high order part of the trace id as a hexadecimal string; the most significant 64 bits.
+      # The String returned is padded with zeros, having a fixed length of 16 characters.
+      # If the high order part is zero, it returns nil.
       def high_order_tid
         high_order = Tracing::Utils::TraceId.to_high_order(@id)
 
-        high_order.to_s(16) if high_order != 0
+        format('%016x', high_order) if high_order != 0
       end
 
       protected

data/lib/datadog/tracing/tracer.rb

@@ -114,6 +114,7 @@ module Datadog
       # @param [Time] start_time time which the span should have started.
       # @param [Hash<String,String>] tags extra tags which should be added to the span.
       # @param [String] type the type of the span. See {Datadog::Tracing::Metadata::Ext::AppTypes}.
+      # @param [Integer] the id of the new span.
       # @return [Object] If a block is provided, returns the result of the block execution.
       # @return [Datadog::Tracing::SpanOperation] If no block is provided, returns the active,
       #         unfinished {Datadog::Tracing::SpanOperation}.
@@ -130,6 +131,7 @@ module Datadog
         start_time: nil,
         tags: nil,
         type: nil,
+        id: nil,
         &block
       )
         return skip_trace(name, &block) unless enabled
@@ -162,6 +164,7 @@ module Datadog
               tags: tags,
               type: type,
               _trace: trace,
+              id: id,
               &block
             )
           end
@@ -178,7 +181,8 @@ module Datadog
             start_time: start_time,
             tags: tags,
             type: type,
-            _trace: trace
+            _trace: trace,
+            id: id
           )
         end
       end
@@ -375,6 +379,7 @@ module Datadog
         tags: nil,
         type: nil,
         _trace: nil,
+        id: nil,
         &block
       )
         trace = _trace || start_trace(continue_from: continue_from)
@@ -391,6 +396,7 @@ module Datadog
             service: service,
             tags: resolve_tags(tags),
             type: type,
+            id: id,
             &block
           )
         else
@@ -403,7 +409,8 @@ module Datadog
             service: service,
             start_time: start_time,
             tags: resolve_tags(tags),
-            type: type
+            type: type,
+            id: id
           )
 
           span.start(start_time)

data/lib/datadog/tracing.rb

@@ -23,6 +23,7 @@ module Datadog
         start_time: nil,
         tags: nil,
         type: nil,
+        id: nil,
         &block
       )
 
@@ -35,6 +36,7 @@ module Datadog
           start_time: start_time,
           tags: tags,
           type: type,
+          id: id,
           &block
         )
       end
@@ -117,9 +119,11 @@ module Datadog
       # # dd.env=prod dd.service=auth dd.version=13.8 dd.trace_id=5458478252992251 dd.span_id=7117552347370098 My message
       # ```
       #
-      # @return [String] correlation information
+      # @return [String] correlation information; or an empty String if Tracing is disabled (`!enabled?`)
       # @public_api
       def log_correlation
+        return '' unless enabled?
+
         correlation.to_log_format
       end
 

data/lib/datadog/version.rb

@@ -3,7 +3,7 @@
 module Datadog
   module VERSION
     MAJOR = 2
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
     PRE = nil
     BUILD = nil
@@ -21,6 +21,6 @@ module Datadog
     # To allow testing with the next unreleased version of Ruby, the version check is performed
     # as `< #{MAXIMUM_RUBY_VERSION}`, meaning prereleases of MAXIMUM_RUBY_VERSION are allowed
     # but not stable MAXIMUM_RUBY_VERSION releases.
-    MAXIMUM_RUBY_VERSION = '3.4'
+    MAXIMUM_RUBY_VERSION = '3.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-10 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.1.0
+        version: 10.0.0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.1.0
+        version: 10.0.0.1.0
 description: |
   datadog is Datadog's client library for Ruby. It includes a suite of tools
   which provide visibility into the performance and security of Ruby applications,
@@ -223,6 +223,7 @@ files:
 - lib/datadog/core/configuration/option_definition.rb
 - lib/datadog/core/configuration/options.rb
 - lib/datadog/core/configuration/settings.rb
+- lib/datadog/core/deprecations.rb
 - lib/datadog/core/diagnostics/environment_logger.rb
 - lib/datadog/core/diagnostics/health.rb
 - lib/datadog/core/encoding.rb
@@ -281,17 +282,20 @@ files:
 - lib/datadog/core/remote/worker.rb
 - lib/datadog/core/runtime/ext.rb
 - lib/datadog/core/runtime/metrics.rb
-- lib/datadog/core/telemetry/client.rb
+- lib/datadog/core/telemetry/component.rb
 - lib/datadog/core/telemetry/emitter.rb
 - lib/datadog/core/telemetry/event.rb
 - lib/datadog/core/telemetry/ext.rb
-- lib/datadog/core/telemetry/heartbeat.rb
 - lib/datadog/core/telemetry/http/adapters/net.rb
 - lib/datadog/core/telemetry/http/env.rb
 - lib/datadog/core/telemetry/http/ext.rb
 - lib/datadog/core/telemetry/http/response.rb
 - lib/datadog/core/telemetry/http/transport.rb
+- lib/datadog/core/telemetry/metric.rb
+- lib/datadog/core/telemetry/metrics_collection.rb
+- lib/datadog/core/telemetry/metrics_manager.rb
 - lib/datadog/core/telemetry/request.rb
+- lib/datadog/core/telemetry/worker.rb
 - lib/datadog/core/transport/ext.rb
 - lib/datadog/core/transport/http/adapters/net.rb
 - lib/datadog/core/transport/http/adapters/registry.rb
@@ -312,6 +316,7 @@ files:
 - lib/datadog/core/utils/hash.rb
 - lib/datadog/core/utils/network.rb
 - lib/datadog/core/utils/only_once.rb
+- lib/datadog/core/utils/only_once_successful.rb
 - lib/datadog/core/utils/safe_dup.rb
 - lib/datadog/core/utils/sequence.rb
 - lib/datadog/core/utils/time.rb
@@ -355,6 +360,7 @@ files:
 - lib/datadog/profiling/crashtracker.rb
 - lib/datadog/profiling/exporter.rb
 - lib/datadog/profiling/ext.rb
+- lib/datadog/profiling/ext/dir_monkey_patches.rb
 - lib/datadog/profiling/ext/forking.rb
 - lib/datadog/profiling/flush.rb
 - lib/datadog/profiling/http_transport.rb
@@ -447,6 +453,9 @@ files:
 - lib/datadog/tracing/contrib/active_record/integration.rb
 - lib/datadog/tracing/contrib/active_record/patcher.rb
 - lib/datadog/tracing/contrib/active_record/utils.rb
+- lib/datadog/tracing/contrib/active_support/cache/event.rb
+- lib/datadog/tracing/contrib/active_support/cache/events.rb
+- lib/datadog/tracing/contrib/active_support/cache/events/cache.rb
 - lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb
 - lib/datadog/tracing/contrib/active_support/cache/patcher.rb
 - lib/datadog/tracing/contrib/active_support/cache/redis.rb
@@ -536,6 +545,8 @@ files:
 - lib/datadog/tracing/contrib/graphql/patcher.rb
 - lib/datadog/tracing/contrib/graphql/trace_patcher.rb
 - lib/datadog/tracing/contrib/graphql/tracing_patcher.rb
+- lib/datadog/tracing/contrib/graphql/unified_trace.rb
+- lib/datadog/tracing/contrib/graphql/unified_trace_patcher.rb
 - lib/datadog/tracing/contrib/grpc.rb
 - lib/datadog/tracing/contrib/grpc/configuration/settings.rb
 - lib/datadog/tracing/contrib/grpc/datadog_interceptor.rb
@@ -664,6 +675,7 @@ files:
 - lib/datadog/tracing/contrib/rails/middlewares.rb
 - lib/datadog/tracing/contrib/rails/patcher.rb
 - lib/datadog/tracing/contrib/rails/railtie.rb
+- lib/datadog/tracing/contrib/rails/runner.rb
 - lib/datadog/tracing/contrib/rails/utils.rb
 - lib/datadog/tracing/contrib/rake/configuration/settings.rb
 - lib/datadog/tracing/contrib/rake/ext.rb
@@ -840,7 +852,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.2.0/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.2.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -852,14 +865,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.4'
+      version: '3.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications

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

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'emitter'
-require_relative 'event'
-require_relative 'heartbeat'
-require_relative '../utils/forking'
-
-module Datadog
-  module Core
-    module Telemetry
-      # Telemetry entrypoint, coordinates sending telemetry events at various points in app lifecycle.
-      class Client
-        attr_reader \
-          :enabled,
-          :unsupported
-
-        include Core::Utils::Forking
-
-        # @param enabled [Boolean] Determines whether telemetry events should be sent to the API
-        # @param heartbeat_interval_seconds [Float] How frequently heartbeats will be reported, in seconds.
-        # @param [Boolean] dependency_collection Whether to send the `app-dependencies-loaded` event
-        def initialize(heartbeat_interval_seconds:, dependency_collection:, enabled: true)
-          @enabled = enabled
-          @emitter = Emitter.new
-          @stopped = false
-          @unsupported = false
-          @started = false
-          @dependency_collection = dependency_collection
-
-          @worker = Telemetry::Heartbeat.new(enabled: @enabled, heartbeat_interval_seconds: heartbeat_interval_seconds) do
-            next unless @started # `started!` should be the first event, thus ensure that `heartbeat!` is not sent first.
-
-            heartbeat!
-          end
-        end
-
-        def disable!
-          @enabled = false
-          @worker.enabled = false
-        end
-
-        def started!
-          return if !@enabled || forked?
-
-          res = @emitter.request(Event::AppStarted.new)
-
-          if res.not_found? # Telemetry is only supported by agent versions 7.34 and up
-            Datadog.logger.debug('Agent does not support telemetry; disabling future telemetry events.')
-            disable!
-            @unsupported = true # Prevent telemetry from getting re-enabled
-            return res
-          end
-
-          @emitter.request(Event::AppDependenciesLoaded.new) if @dependency_collection
-
-          @started = true
-        end
-
-        def emit_closing!
-          return if !@enabled || forked?
-
-          @emitter.request(Event::AppClosing.new)
-        end
-
-        def stop!
-          return if @stopped
-
-          @worker.stop(true, 0)
-          @stopped = true
-        end
-
-        def integrations_change!
-          return if !@enabled || forked?
-
-          @emitter.request(Event::AppIntegrationsChange.new)
-        end
-
-        # Report configuration changes caused by Remote Configuration.
-        def client_configuration_change!(changes)
-          return if !@enabled || forked?
-
-          @emitter.request(Event::AppClientConfigurationChange.new(changes, 'remote_config'))
-        end
-
-        private
-
-        def heartbeat!
-          return if !@enabled || forked?
-
-          @emitter.request(Event::AppHeartbeat.new)
-        end
-      end
-    end
-  end
-end

data/lib/datadog/core/telemetry/heartbeat.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../worker'
-require_relative '../workers/polling'
-
-module Datadog
-  module Core
-    module Telemetry
-      # Periodically (every DEFAULT_INTERVAL_SECONDS) sends a heartbeat event to the telemetry API.
-      class Heartbeat < Core::Worker
-        include Core::Workers::Polling
-
-        def initialize(heartbeat_interval_seconds:, enabled: true, &block)
-          # Workers::Polling settings
-          self.enabled = enabled
-          # Workers::IntervalLoop settings
-          self.loop_base_interval = heartbeat_interval_seconds
-          self.fork_policy = Core::Workers::Async::Thread::FORK_POLICY_STOP
-          super(&block)
-          start
-        end
-
-        def loop_wait_before_first_iteration?; end
-
-        private
-
-        def start
-          perform
-        end
-      end
-    end
-  end
-end