datadog 2.33.0 → 2.34.0

data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb

@@ -66,11 +66,6 @@ module Datadog
                 span.set_tag(header, value)
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_SERVER)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SERVICE)

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

@@ -63,11 +63,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

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

@@ -68,11 +68,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 

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

@@ -66,11 +66,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 

data/lib/datadog/tracing/contrib/mongodb/subscribers.rb

@@ -41,11 +41,6 @@ module Datadog
               )
             end
 
-            # Tag original global service name if not used
-            if span.service != Datadog.configuration.service
-              span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-            end
-
             span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)

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

@@ -34,11 +34,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
                 span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 

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

@@ -62,11 +62,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 # Set url tags
                 span.set_tag(OpenSearch::Ext::TAG_URL, url)
                 span.set_tag(OpenSearch::Ext::TAG_HOST, host)

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

@@ -160,11 +160,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)

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

@@ -92,11 +92,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 if (host_port = @options[:server])
                   host, port = Core::Utils.extract_host_port(host_port)
                   if host && port

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

@@ -48,11 +48,6 @@ module Datadog
               # Measure service stats
               Contrib::Analytics.set_measured(span)
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Ext::TAG_TOPIC, payload[:topic])
               span.set_tag(Ext::TAG_CONSUMER, payload[:consumer_class])
               span.set_tag(Ext::TAG_PARTITION, payload[:partition])

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

@@ -21,11 +21,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
 

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

@@ -46,11 +46,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

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

@@ -51,11 +51,6 @@ module Datadog
             end
 
             def set_common_tags(span, db)
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
 

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

@@ -33,11 +33,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
                 span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 

data/lib/datadog/tracing/distributed/datadog_tags_codec.rb

@@ -6,19 +6,6 @@ module Datadog
       # Encodes and decodes distributed 'x-datadog-tags' tags for transport
       # to and from external processes.
       module DatadogTagsCodec
-        # Backport `Regexp::match?` because it is measurably the most performant
-        # way to check if a string matches a regular expression.
-        module RefineRegexp
-          unless Regexp.method_defined?(:match?)
-            refine ::Regexp do
-              def match?(*args)
-                !match(*args).nil?
-              end
-            end
-          end
-        end
-        using RefineRegexp
-
         # ASCII characters 32-126, except `,`, `=`, and ` `. At least one character.
         VALID_KEY_CHARS = /\A(?:(?![,= ])[\u0020-\u007E])+\Z/.freeze
         # ASCII characters 32-126, except `,`. At least one character.

data/lib/datadog/tracing/distributed/trace_context.rb

@@ -75,34 +75,6 @@ module Datadog
 
         private
 
-        # Refinements to ensure newer rubies do not suffer performance impact
-        # by needing to use older APIs.
-        module Refine
-          # Backport `Regexp::match?` because it is measurably the most performant
-          # way to check if a string matches a regular expression.
-          unless Regexp.method_defined?(:match?)
-            refine ::Regexp do
-              def match?(*args)
-                !match(*args).nil?
-              end
-            end
-          end
-
-          unless String.method_defined?(:delete_prefix)
-            refine ::String do
-              def delete_prefix(prefix)
-                prefix = prefix.to_s
-                if rindex(prefix, 0)
-                  self[prefix.length..-1]
-                else
-                  dup
-                end
-              end
-            end
-          end
-        end
-        using Refine
-
         # @see https://www.w3.org/TR/trace-context/#traceparent-header
         def build_traceparent(digest)
           build_traceparent_string(

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

@@ -33,6 +33,9 @@ module Datadog
 
         TAG_APM_ENABLED = '_dd.apm.enabled'
 
+        # Set to the global service name when a span's service is overridden
+        TAG_BASE_SERVICE = '_dd.base_service'
+
         # Defines constants for trace analytics
         # @public_api
         module Analytics

data/lib/datadog/tracing/span_operation.rb

@@ -270,6 +270,9 @@ module Datadog
         # Stop timing
         stop(end_time)
 
+        # Allow subscribers to enrich the span before it is finalized.
+        events.before_finish.publish(self)
+
         # Build span
         # Memoize for performance reasons
         @span = build_span
@@ -400,12 +403,14 @@ module Datadog
           :logger,
           :after_finish,
           :after_stop,
+          :before_finish,
           :before_start
 
         def initialize(logger: Datadog.logger)
           @logger = logger
           @after_finish = AfterFinish.new
           @after_stop = AfterStop.new
+          @before_finish = BeforeFinish.new
           @before_start = BeforeStart.new
         end
 
@@ -429,6 +434,14 @@ module Datadog
           end
         end
 
+        # Triggered just before the span is finalized into a Span object.
+        # Subscribers can still mutate tags on the SpanOperation at this point.
+        class BeforeFinish < Tracing::Event
+          def initialize
+            super(:before_finish)
+          end
+        end
+
         # Triggered just before the span is started.
         class BeforeStart < Tracing::Event
           def initialize

data/lib/datadog/tracing/trace_operation.rb

@@ -301,6 +301,11 @@ module Datadog
           start_span(span_op)
         end
 
+        # Before finish: allow enrichment before the span is finalized, publish events.
+        span_events.before_finish.subscribe do |span_op|
+          before_finish_span(span_op)
+        end
+
         # After finish: deactivate the span, record, publish events.
         span_events.after_finish.subscribe do |span, span_op|
           finish_span(span, span_op, parent)
@@ -449,6 +454,7 @@ module Datadog
         include Tracing::Events
 
         attr_reader \
+          :span_before_finish,
           :span_before_start,
           :span_finished,
           :trace_finished,
@@ -456,6 +462,7 @@ module Datadog
           :trace_resource_change
 
         def initialize
+          @span_before_finish = SpanBeforeFinish.new
           @span_before_start = SpanBeforeStart.new
           @span_finished = SpanFinished.new
           @trace_finished = TraceFinished.new
@@ -463,6 +470,14 @@ module Datadog
           @trace_resource_change = TraceResourceChange.new
         end
 
+        # Triggered just before a span is finalized, mirroring SpanOperation::Events::BeforeFinish.
+        # Subscribers can still mutate tags on the SpanOperation at this point.
+        class SpanBeforeFinish < Tracing::Event
+          def initialize
+            super(:span_before_finish)
+          end
+        end
+
         # Triggered before a span starts.
         class SpanBeforeStart < Tracing::Event
           def initialize
@@ -546,6 +561,13 @@ module Datadog
         logger.debug { "Error starting span on trace: #{e.class}: #{e.message} Backtrace: #{e.backtrace.first(3)}" }
       end
 
+      def before_finish_span(span_op)
+        # Publish :span_before_finish event
+        events.span_before_finish.publish(span_op, self)
+      rescue => e
+        logger.debug { "Error in before_finish_span on trace: #{e.class}: #{e.message} Backtrace: #{e.backtrace.first(3)}" }
+      end
+
       # For traces with automatic context management (auto_finish),
       # when the local root span finishes, the trace also finishes.
       # The trace cannot receive new spans after finished.

data/lib/datadog/tracing/tracer.rb

@@ -417,6 +417,12 @@ module Datadog
           event_span_op.service ||= @default_service
         end
 
+        events.span_before_finish.subscribe do |event_span_op, _event_trace_op|
+          if event_span_op.service && event_span_op.service != @default_service
+            event_span_op.set_tag(Tracing::Metadata::Ext::TAG_BASE_SERVICE, @default_service)
+          end
+        end
+
         events.trace_propagated.subscribe do |event_trace_op|
           sample_trace(event_trace_op)
         end

data/lib/datadog/version.rb

@@ -3,7 +3,7 @@
 module Datadog
   module VERSION
     MAJOR = 2
-    MINOR = 33
+    MINOR = 34
     PATCH = 0
     PRE = nil
     BUILD = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.33.0
+  version: 2.34.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-13 00:00:00.000000000 Z
+date: 2026-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -153,6 +153,7 @@ files:
 - ext/datadog_profiling_native_extension/http_transport.c
 - ext/datadog_profiling_native_extension/libdatadog_helpers.c
 - ext/datadog_profiling_native_extension/libdatadog_helpers.h
+- ext/datadog_profiling_native_extension/macos_sampler_thread.h
 - ext/datadog_profiling_native_extension/native_extension_helpers.rb
 - ext/datadog_profiling_native_extension/private_vm_api_access.c
 - ext/datadog_profiling_native_extension/private_vm_api_access.h
@@ -470,7 +471,7 @@ files:
 - lib/datadog/core/utils.rb
 - lib/datadog/core/utils/array.rb
 - lib/datadog/core/utils/at_fork_monkey_patch.rb
-- lib/datadog/core/utils/base64.rb
+- lib/datadog/core/utils/base64_codec.rb
 - lib/datadog/core/utils/duration.rb
 - lib/datadog/core/utils/fnv.rb
 - lib/datadog/core/utils/forking.rb
@@ -582,13 +583,17 @@ files:
 - lib/datadog/opentelemetry/api/context.rb
 - lib/datadog/opentelemetry/api/trace/span.rb
 - lib/datadog/opentelemetry/configuration/settings.rb
+- lib/datadog/opentelemetry/ext.rb
+- lib/datadog/opentelemetry/logs.rb
 - lib/datadog/opentelemetry/metrics.rb
 - lib/datadog/opentelemetry/sdk/configurator.rb
 - lib/datadog/opentelemetry/sdk/id_generator.rb
+- lib/datadog/opentelemetry/sdk/logs_exporter.rb
 - lib/datadog/opentelemetry/sdk/metrics_exporter.rb
 - lib/datadog/opentelemetry/sdk/propagator.rb
 - lib/datadog/opentelemetry/sdk/span_processor.rb
 - lib/datadog/opentelemetry/sdk/trace/span.rb
+- lib/datadog/opentelemetry/signal_configuration.rb
 - lib/datadog/opentelemetry/trace.rb
 - lib/datadog/profiling.rb
 - lib/datadog/profiling/collectors/code_provenance.rb
@@ -619,10 +624,12 @@ files:
 - lib/datadog/profiling/tasks/setup.rb
 - lib/datadog/single_step_instrument.rb
 - lib/datadog/symbol_database.rb
+- lib/datadog/symbol_database/component.rb
 - lib/datadog/symbol_database/configuration.rb
 - lib/datadog/symbol_database/extractor.rb
 - lib/datadog/symbol_database/file_hash.rb
 - lib/datadog/symbol_database/logger.rb
+- lib/datadog/symbol_database/remote.rb
 - lib/datadog/symbol_database/scope.rb
 - lib/datadog/symbol_database/scope_batcher.rb
 - lib/datadog/symbol_database/service_version.rb
@@ -1130,8 +1137,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.33.0/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.33.0
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.34.0/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.34.0
 post_install_message: 'JRuby support in the datadog gem is deprecated. Details: https://dtdg.co/jruby-deprecation'
 rdoc_options: []
 require_paths: