ddtrace 1.9.0 → 1.10.1

data/lib/ddtrace/transport/http/env.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Transport
     module HTTP

data/lib/ddtrace/transport/http/response.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../response'
 
 module Datadog

data/lib/ddtrace/transport/http/statistics.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../statistics'
 
 module Datadog

data/lib/ddtrace/transport/http/traces.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require 'json'
 
 require_relative '../traces'
@@ -27,7 +25,7 @@ module Datadog
 
         # Extensions for HTTP client
         module Client
-          def send_payload(request)
+          def send_traces_payload(request)
             send_request(request) do |api, env|
               api.send_traces(env)
             end

data/lib/ddtrace/transport/http.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# typed: true
-
 require 'uri'
 
 require_relative '../../datadog/core/environment/container'
@@ -18,8 +16,6 @@ module Datadog
   module Transport
     # Namespace for HTTP transport components
     module HTTP
-      include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
-
       # NOTE: Due to... legacy reasons... This class likes having a default `AgentSettings` instance to fall back to.
       # Because we generate this instance with an empty instance of `Settings`, the resulting `AgentSettings` below
       # represents only settings specified via environment variables + the usual defaults.

data/lib/ddtrace/transport/io/client.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../statistics'
 require_relative 'response'
 

data/lib/ddtrace/transport/io/response.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../response'
 
 module Datadog

data/lib/ddtrace/transport/io/traces.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../traces'
 
 require_relative 'response'
@@ -22,8 +20,6 @@ module Datadog
 
         # Extensions for HTTP client
         module Client
-          include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
-
           def send_traces(traces)
             # Build a request
             req = Transport::Traces::Request.new(Parcel.new(traces))

data/lib/ddtrace/transport/io.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../datadog/core/encoding'
 require_relative 'io/client'
 require_relative 'io/traces'

data/lib/ddtrace/transport/parcel.rb

@@ -1,12 +1,8 @@
-# typed: true
-
 module Datadog
   module Transport
     # Data transfer object for generic data
     # @abstract
     module Parcel
-      include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
-
       attr_reader \
         :data
 

data/lib/ddtrace/transport/request.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Transport
     # Defines request for transport operations

data/lib/ddtrace/transport/response.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 module Datadog
   module Transport
     # Defines abstract response for transport operations

data/lib/ddtrace/transport/serializable_trace.rb

@@ -1,7 +1,6 @@
-# typed: true
-
 require 'json'
 require 'msgpack'
+require 'datadog/tracing/utils'
 
 module Datadog
   module Transport
@@ -30,7 +29,7 @@ module Datadog
       # JSON serializer interface.
       # Used by older version of the transport.
       def to_json(*args)
-        trace.spans.map(&:to_hash).to_json(*args)
+        trace.spans.map { |s| SerializableSpan.new(s).to_hash }.to_json(*args)
       end
     end
 
@@ -41,6 +40,7 @@ module Datadog
 
       def initialize(span)
         @span = span
+        @trace_id = Tracing::Utils::TraceId.to_low_order(span.trace_id)
       end
 
       # MessagePack serializer interface. Making this object
@@ -77,7 +77,7 @@ module Datadog
         packer.write('parent_id')
         packer.write(span.parent_id)
         packer.write('trace_id')
-        packer.write(span.trace_id)
+        packer.write(@trace_id)
         packer.write('name')
         packer.write(span.name)
         packer.write('service')
@@ -99,7 +99,7 @@ module Datadog
       # JSON serializer interface.
       # Used by older version of the transport.
       def to_json(*args)
-        span.to_hash.to_json(*args)
+        to_hash.to_json(*args)
       end
 
       # Used for serialization
@@ -108,6 +108,10 @@ module Datadog
         time.to_i * 1000000000 + time.nsec
       end
 
+      def to_hash
+        span.to_hash.merge(trace_id: @trace_id)
+      end
+
       # Used for serialization
       # @return [Integer] in nanoseconds since Epoch
       def duration_nano(duration)

data/lib/ddtrace/transport/statistics.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../datadog/core/metrics/metric'
 require_relative '../../datadog/core/diagnostics/health'
 

data/lib/ddtrace/transport/trace_formatter.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../datadog/core/environment/identity'
 require_relative '../../datadog/core/environment/socket'
 require_relative '../../datadog/core/runtime/ext'
@@ -49,6 +47,7 @@ module Datadog
         tag_rate_limiter_rate!
         tag_sample_rate!
         tag_sampling_decision_maker!
+        tag_high_order_trace_id!
         tag_sampling_priority!
 
         trace
@@ -168,6 +167,12 @@ module Datadog
         )
       end
 
+      def tag_high_order_trace_id!
+        return unless (high_order_tid = trace.high_order_tid)
+
+        root_span.set_tag(Tracing::Metadata::Ext::Distributed::TAG_TID, high_order_tid)
+      end
+
       private
 
       def partial?

data/lib/ddtrace/transport/traces.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../datadog/core/chunker'
 require_relative 'parcel'
 require_relative 'request'
@@ -130,7 +128,7 @@ module Datadog
           responses = chunker.encode_in_chunks(traces.lazy).map do |encoded_traces, trace_count|
             request = Request.new(EncodedParcel.new(encoded_traces, trace_count))
 
-            client.send_payload(request).tap do |response|
+            client.send_traces_payload(request).tap do |response|
               if downgrade?(response)
                 downgrade!
                 return send_traces(traces)

data/lib/ddtrace/version.rb

@@ -1,10 +1,8 @@
-# typed: true
-
 module DDTrace
   module VERSION
     MAJOR = 1
-    MINOR = 9
-    PATCH = 0
+    MINOR = 10
+    PATCH = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/lib/ddtrace.rb

@@ -1,13 +1,9 @@
-# typed: strict
-
 # Load tracing
 require_relative 'datadog/tracing'
 require_relative 'datadog/tracing/contrib'
 
-# Load appsec
-require_relative 'datadog/appsec/autoload' # TODO: datadog/appsec?
-
 # Load other products (must follow tracing)
 require_relative 'datadog/profiling'
+require_relative 'datadog/appsec'
 require_relative 'datadog/ci'
 require_relative 'datadog/kit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -50,28 +50,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1.0.0
+        version: 1.6.2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1.0.0
+        version: 1.6.2.0.0
 - !ruby/object:Gem::Dependency
   name: libdatadog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1.1.0
+        version: 2.0.0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1.1.0
+        version: 2.0.0.1.0
 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
@@ -99,8 +99,6 @@ files:
 - ext/ddtrace_profiling_native_extension/clock_id.h
 - ext/ddtrace_profiling_native_extension/clock_id_from_pthread.c
 - ext/ddtrace_profiling_native_extension/clock_id_noop.c
-- ext/ddtrace_profiling_native_extension/collectors_cpu_and_wall_time.c
-- ext/ddtrace_profiling_native_extension/collectors_cpu_and_wall_time.h
 - ext/ddtrace_profiling_native_extension/collectors_cpu_and_wall_time_worker.c
 - ext/ddtrace_profiling_native_extension/collectors_dynamic_sampling_rate.c
 - ext/ddtrace_profiling_native_extension/collectors_dynamic_sampling_rate.h
@@ -108,6 +106,8 @@ files:
 - ext/ddtrace_profiling_native_extension/collectors_idle_sampling_helper.h
 - ext/ddtrace_profiling_native_extension/collectors_stack.c
 - ext/ddtrace_profiling_native_extension/collectors_stack.h
+- ext/ddtrace_profiling_native_extension/collectors_thread_context.c
+- ext/ddtrace_profiling_native_extension/collectors_thread_context.h
 - ext/ddtrace_profiling_native_extension/extconf.rb
 - ext/ddtrace_profiling_native_extension/helpers.h
 - ext/ddtrace_profiling_native_extension/http_transport.c
@@ -131,9 +131,9 @@ files:
 - lib/datadog/appsec/assets/blocked.text
 - lib/datadog/appsec/assets/waf_rules/README.md
 - lib/datadog/appsec/assets/waf_rules/recommended.json
-- lib/datadog/appsec/assets/waf_rules/risky.json
 - lib/datadog/appsec/assets/waf_rules/strict.json
 - lib/datadog/appsec/autoload.rb
+- lib/datadog/appsec/component.rb
 - lib/datadog/appsec/configuration.rb
 - lib/datadog/appsec/configuration/settings.rb
 - lib/datadog/appsec/contrib/auto_instrument.rb
@@ -142,19 +142,20 @@ files:
 - lib/datadog/appsec/contrib/patcher.rb
 - lib/datadog/appsec/contrib/rack/configuration/settings.rb
 - lib/datadog/appsec/contrib/rack/ext.rb
+- lib/datadog/appsec/contrib/rack/gateway/request.rb
+- lib/datadog/appsec/contrib/rack/gateway/response.rb
 - lib/datadog/appsec/contrib/rack/gateway/watcher.rb
 - lib/datadog/appsec/contrib/rack/integration.rb
 - lib/datadog/appsec/contrib/rack/patcher.rb
 - lib/datadog/appsec/contrib/rack/reactive/request.rb
 - lib/datadog/appsec/contrib/rack/reactive/request_body.rb
 - lib/datadog/appsec/contrib/rack/reactive/response.rb
-- lib/datadog/appsec/contrib/rack/request.rb
 - lib/datadog/appsec/contrib/rack/request_body_middleware.rb
 - lib/datadog/appsec/contrib/rack/request_middleware.rb
-- lib/datadog/appsec/contrib/rack/response.rb
 - lib/datadog/appsec/contrib/rails/configuration/settings.rb
 - lib/datadog/appsec/contrib/rails/ext.rb
 - lib/datadog/appsec/contrib/rails/framework.rb
+- lib/datadog/appsec/contrib/rails/gateway/request.rb
 - lib/datadog/appsec/contrib/rails/gateway/watcher.rb
 - lib/datadog/appsec/contrib/rails/integration.rb
 - lib/datadog/appsec/contrib/rails/patcher.rb
@@ -164,14 +165,22 @@ files:
 - lib/datadog/appsec/contrib/sinatra/configuration/settings.rb
 - lib/datadog/appsec/contrib/sinatra/ext.rb
 - lib/datadog/appsec/contrib/sinatra/framework.rb
+- lib/datadog/appsec/contrib/sinatra/gateway/request.rb
+- lib/datadog/appsec/contrib/sinatra/gateway/route_params.rb
 - lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb
 - lib/datadog/appsec/contrib/sinatra/integration.rb
 - lib/datadog/appsec/contrib/sinatra/patcher.rb
 - lib/datadog/appsec/contrib/sinatra/reactive/routed.rb
 - lib/datadog/appsec/contrib/sinatra/request_middleware.rb
 - lib/datadog/appsec/event.rb
+- lib/datadog/appsec/ext.rb
 - lib/datadog/appsec/extensions.rb
+- lib/datadog/appsec/instrumentation.rb
 - lib/datadog/appsec/instrumentation/gateway.rb
+- lib/datadog/appsec/instrumentation/gateway/argument.rb
+- lib/datadog/appsec/monitor.rb
+- lib/datadog/appsec/monitor/gateway/watcher.rb
+- lib/datadog/appsec/monitor/reactive/set_user.rb
 - lib/datadog/appsec/processor.rb
 - lib/datadog/appsec/rate_limiter.rb
 - lib/datadog/appsec/reactive/address_hash.rb
@@ -272,12 +281,14 @@ files:
 - lib/datadog/core/utils.rb
 - lib/datadog/core/utils/compression.rb
 - lib/datadog/core/utils/forking.rb
+- lib/datadog/core/utils/network.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
+- lib/datadog/core/vendor/ipaddr.rb
 - lib/datadog/core/vendor/multipart-post/LICENSE
 - lib/datadog/core/vendor/multipart-post/multipart.rb
 - lib/datadog/core/vendor/multipart-post/multipart/post.rb
@@ -323,12 +334,13 @@ files:
 - lib/datadog/profiling/backtrace_location.rb
 - lib/datadog/profiling/buffer.rb
 - lib/datadog/profiling/collectors/code_provenance.rb
-- lib/datadog/profiling/collectors/cpu_and_wall_time.rb
 - lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb
 - lib/datadog/profiling/collectors/dynamic_sampling_rate.rb
 - lib/datadog/profiling/collectors/idle_sampling_helper.rb
 - lib/datadog/profiling/collectors/old_stack.rb
 - lib/datadog/profiling/collectors/stack.rb
+- lib/datadog/profiling/collectors/thread_context.rb
+- lib/datadog/profiling/component.rb
 - lib/datadog/profiling/encoding/profile.rb
 - lib/datadog/profiling/event.rb
 - lib/datadog/profiling/events/stack.rb
@@ -363,6 +375,7 @@ files:
 - lib/datadog/tracing/analytics.rb
 - lib/datadog/tracing/buffer.rb
 - lib/datadog/tracing/client_ip.rb
+- lib/datadog/tracing/component.rb
 - lib/datadog/tracing/configuration/ext.rb
 - lib/datadog/tracing/configuration/settings.rb
 - lib/datadog/tracing/context.rb
@@ -833,7 +846,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications

data/ext/ddtrace_profiling_native_extension/collectors_cpu_and_wall_time.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include <ruby.h>
-
-void cpu_and_wall_time_collector_sample(VALUE self_instance, long current_monotonic_wall_time_ns);
-VALUE cpu_and_wall_time_collector_sample_after_gc(VALUE self_instance);
-void cpu_and_wall_time_collector_on_gc_start(VALUE self_instance);
-void cpu_and_wall_time_collector_on_gc_finish(VALUE self_instance);
-VALUE enforce_cpu_and_wall_time_collector_instance(VALUE object);