ddtrace 1.0.0.beta1 → 1.0.0.beta2

data/lib/ddtrace/transport/trace_formatter.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 require 'datadog/core/environment/identity'
 require 'datadog/core/environment/socket'
 require 'datadog/core/runtime/ext'
@@ -30,6 +32,11 @@ module Datadog
         # trace metadata, we must put our trace
         # metadata on the root span. This "root span"
         # is needed by the agent/API to ingest the trace.
+
+        # Apply generic trace tags. Any more specific value will be overridden
+        # by the subsequent calls below.
+        set_trace_tags!
+
         set_resource!
 
         tag_agent_sample_rate!
@@ -52,11 +59,21 @@ module Datadog
         # If the trace resource is undefined, or the root span wasn't
         # specified, don't set this. We don't want to overwrite the
         # resource of a span that is in the middle of the trace.
-        return if trace.resource.nil? || !@found_root_span
+        return if trace.resource.nil? || partial?
 
         root_span.resource = trace.resource
       end
 
+      def set_trace_tags!
+        # If the root span wasn't specified, don't set this. We don't want to
+        # misset or overwrite the tags of a span that is in the middle of the
+        # trace.
+        return if partial?
+
+        root_span.set_tags(trace.send(:meta))
+        root_span.set_tags(trace.send(:metrics))
+      end
+
       def tag_agent_sample_rate!
         return unless trace.agent_sample_rate
 
@@ -149,6 +166,10 @@ module Datadog
 
       private
 
+      def partial?
+        !@found_root_span
+      end
+
       def find_root_span(trace)
         # TODO: Should we memoize this?
         #       Would be safe, but `spans` is mutable, so if
@@ -157,6 +178,8 @@ module Datadog
         root_span_id = trace.send(:root_span_id)
         root_span = trace.spans.find { |s| s.id == root_span_id } if root_span_id
         @found_root_span = !root_span.nil?
+
+        # when root span is not found, fall back to last span (partial flush)
         root_span || trace.spans.last
       end
     end

data/lib/ddtrace/transport/traces.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core/chunker'
 require 'ddtrace/transport/parcel'
 require 'ddtrace/transport/request'

data/lib/ddtrace/version.rb

@@ -1,25 +1,27 @@
 # typed: true
+
 module DDTrace
   module VERSION
     MAJOR = 1
     MINOR = 0
     PATCH = 0
-    PRE = 'beta1'.freeze
+    PRE = 'beta2'.freeze
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
 
     MINIMUM_RUBY_VERSION = '2.1.0'.freeze
 
-    # Ruby 3.2 is not supported: Ruby 3.x support as implemented using *args
-    # needs ruby2_keywords to continue working, yet the scheduled removal of
-    # ruby2_keywords when Ruby 2.6 is EOL'd (i.e on Ruby 3.2 release) would
-    # leave the code with no option, other than to move to *args, **kwargs.
+    # A maximum version was initially added in https://github.com/DataDog/dd-trace-rb/pull/1495 because we expected
+    # the `ruby2_keywords` method to be removed (see the PR for the discussion).
+    # That is because Ruby 3.x support as implemented using `*args` needs `ruby2_keywords` to continue working,
+    # but if `ruby2_keywords` gets removed we would need to change the code to use `*args, **kwargs`.
     #
-    # See https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
+    # Now Ruby 3.2.0-preview1 is out and `ruby2_keywords` are still there, and there's even a recent change for it
+    # in https://github.com/ruby/ruby/pull/5684 that is documented as "ruby2_keywords needed in 3.2+".
     #
-    # This constraint can only be removed when the dependency on ruby2_keywords is
-    # dropped. An allowance is nonetheless made to test prerelease versions.
-    # The version constraint may be bumped if the removal is postponed.
-    MAXIMUM_RUBY_VERSION = '3.2'.freeze
+    # So for now let's bump the maximum version to < 3.3 to allow the Ruby 3.2 series to be supported and we can keep
+    # an eye on the Ruby 3.2 test releases to see if anything changes. (Otherwise, once Ruby 3.2.0 stable is out, we
+    # should probably bump this to 3.4, and so on...)
+    MAXIMUM_RUBY_VERSION = '3.3'.freeze
   end
 end

data/lib/ddtrace.rb

@@ -1,31 +1,12 @@
+# typed: strict
+
 # Load tracing
 require 'datadog/tracing'
-
-# Load tracing extensions
 require 'datadog/tracing/contrib'
-require 'datadog/tracing/contrib/auto_instrument'
-require 'datadog/tracing/contrib/extensions'
-require 'datadog/opentelemetry/extensions'
-require 'ddtrace/auto_instrument_base'
 
 # Load appsec
 require 'datadog/appsec/autoload' # TODO: datadog/appsec?
 
-# Global namespace that includes all Datadog functionality.
-# @public_api
-module Datadog
-  extend AutoInstrumentBase
-
-  # Load built-in Datadog integrations
-  Tracing::Contrib::Extensions.extend!
-
-  # Load Contrib auto instrumentation
-  extend Tracing::Contrib::AutoInstrument
-
-  # Load and extend OpenTelemetry compatibility by default
-  extend OpenTelemetry::Extensions
-end
-
 # Load other products (must follow tracing)
 require 'datadog/profiling'
 require 'datadog/ci'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.10.14
+        version: 0.10.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.10.14
+        version: 0.10.15
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.14.2.0.a
+        version: 1.2.1.0.0.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.14.2.0.a
+        version: 1.2.1.0.0.a
 description: |
   ddtrace is Datadog’s tracing client for Ruby. It is used to trace requests
   as they flow across web servers, databases and microservices so that developers
@@ -132,6 +132,7 @@ files:
 - lib/datadog/appsec/event.rb
 - lib/datadog/appsec/extensions.rb
 - lib/datadog/appsec/instrumentation/gateway.rb
+- lib/datadog/appsec/processor.rb
 - lib/datadog/appsec/rate_limiter.rb
 - lib/datadog/appsec/reactive/address_hash.rb
 - lib/datadog/appsec/reactive/engine.rb
@@ -206,6 +207,7 @@ files:
 - lib/datadog/core/utils/forking.rb
 - lib/datadog/core/utils/object_set.rb
 - lib/datadog/core/utils/only_once.rb
+- lib/datadog/core/utils/safe_dup.rb
 - lib/datadog/core/utils/sequence.rb
 - lib/datadog/core/utils/string_table.rb
 - lib/datadog/core/utils/time.rb
@@ -223,8 +225,6 @@ files:
 - lib/datadog/core/workers/polling.rb
 - lib/datadog/core/workers/queue.rb
 - lib/datadog/core/workers/runtime_metrics.rb
-- lib/datadog/opentelemetry/extensions.rb
-- lib/datadog/opentelemetry/span.rb
 - lib/datadog/opentracer.rb
 - lib/datadog/opentracer/binary_propagator.rb
 - lib/datadog/opentracer/carrier.rb
@@ -630,6 +630,7 @@ files:
 - lib/datadog/tracing/flush.rb
 - lib/datadog/tracing/metadata.rb
 - lib/datadog/tracing/metadata/analytics.rb
+- lib/datadog/tracing/metadata/errors.rb
 - lib/datadog/tracing/metadata/ext.rb
 - lib/datadog/tracing/metadata/tagging.rb
 - lib/datadog/tracing/pipeline.rb
@@ -709,14 +710,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications

data/lib/datadog/opentelemetry/extensions.rb

@@ -1,14 +0,0 @@
-# typed: true
-require 'datadog/tracing/span_operation'
-require 'datadog/opentelemetry/span'
-
-module Datadog
-  module OpenTelemetry
-    # Defines extensions to ddtrace for OpenTelemetry support
-    module Extensions
-      def self.extended(base)
-        Datadog::Tracing::SpanOperation.prepend(OpenTelemetry::Span)
-      end
-    end
-  end
-end

data/lib/datadog/opentelemetry/span.rb

@@ -1,34 +0,0 @@
-# typed: false
-require 'datadog/core/environment/ext'
-
-module Datadog
-  module OpenTelemetry
-    # Extensions for Datadog::Span
-    module Span
-      TAG_SERVICE_NAME = 'service.name'.freeze
-      TAG_SERVICE_VERSION = 'service.version'.freeze
-
-      def set_tag(key, value)
-        # Configure sampling priority if they give us a forced tracing tag
-        # DEV: Do not set if the value they give us is explicitly "false"
-        case key
-        when TAG_SERVICE_NAME
-          if defined?(super)
-            # Set original tag and Datadog version tag
-            self.service = value
-            super
-          end
-        when TAG_SERVICE_VERSION
-          if defined?(super)
-            # Set original tag and Datadog version tag
-            super
-            super(Datadog::Core::Environment::Ext::TAG_VERSION, value)
-          end
-        else
-          # Otherwise, set the tag normally.
-          super if defined?(super)
-        end
-      end
-    end
-  end
-end