ddtrace 1.20.0 → 1.21.0

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

@@ -5,11 +5,24 @@ require_relative 'log_injection'
 require_relative 'middlewares'
 require_relative 'utils'
 require_relative '../semantic_logger/patcher'
+require_relative 'ext'
 
 module Datadog
   module Tracing
     module Contrib
       module Rails
+        # Patcher to trace rails routing done by JourneyRouter
+        module JourneyRouterPatch
+          def find_routes(*args)
+            result = super
+            integration_route = result.first[2].path.spec.to_s.gsub(/\(\.:format\)/, '') if result.any?
+            request_trace = Tracing.active_trace || TraceOperation.new
+            request_trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, integration_route)
+            request_trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH, args.first.env['SCRIPT_NAME'])
+            result
+          end
+        end
+
         # Patcher enables patching of 'rails' module.
         module Patcher
           include Contrib::Patcher
@@ -41,6 +54,9 @@ module Datadog
               # Sometimes we don't want to activate middleware e.g. OpenTracing, etc.
               add_middleware(app) if Datadog.configuration.tracing[:rails][:middleware]
 
+              # ActionDispatch::Journey is not available or incompatible in Rails < 4.2.
+              ActionDispatch::Journey::Router.prepend(JourneyRouterPatch) if Integration.version >= Gem::Version.new('4.2')
+
               Rails::LogInjection.configure_log_tags(app.config)
             end
           end

data/lib/datadog/tracing/contrib/sinatra/tracer.rb

@@ -47,16 +47,16 @@ module Datadog
               configuration = Datadog.configuration.tracing[:sinatra]
               return super unless Tracing.enabled?
 
-              datadog_route = Sinatra::Env.route_path(env)
+              integration_route = Sinatra::Env.route_path(env)
 
               Tracing.trace(
                 Ext::SPAN_ROUTE,
                 service: configuration[:service_name],
                 span_type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
-                resource: "#{request.request_method} #{datadog_route}",
+                resource: "#{request.request_method} #{integration_route}",
               ) do |span, trace|
                 span.set_tag(Ext::TAG_APP_NAME, settings.name || settings.superclass.name)
-                span.set_tag(Ext::TAG_ROUTE_PATH, datadog_route)
+                span.set_tag(Ext::TAG_ROUTE_PATH, integration_route)
 
                 if request.script_name && !request.script_name.empty?
                   span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name)
@@ -73,6 +73,9 @@ module Datadog
 
                 Contrib::Analytics.set_measured(span)
 
+                _, path = env['sinatra.route'].split(' ', 2)
+                trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, path)
+                trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH, env['SCRIPT_NAME'])
                 super
               end
             end

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

@@ -86,6 +86,8 @@ module Datadog
           TYPE_TEMPLATE = 'template'
           TAG_CLIENT_IP = 'http.client_ip'
           HEADER_USER_AGENT = 'User-Agent'
+          TAG_ROUTE = 'http.route'
+          TAG_ROUTE_PATH = 'http.route.path'
 
           # General header functionality
           module Headers

data/lib/datadog/tracing/trace_operation.rb

@@ -137,13 +137,12 @@ module Datadog
       end
 
       def keep!
-        self.sampled = true
         self.sampling_priority = Sampling::Ext::Priority::USER_KEEP
         set_tag(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER, Tracing::Sampling::Ext::Decision::MANUAL)
+        self.sampled = true # Just in case the in-app sampler had decided to drop this span, we revert that decision.
       end
 
       def reject!
-        self.sampled = false
         self.sampling_priority = Sampling::Ext::Priority::USER_REJECT
         set_tag(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER, Tracing::Sampling::Ext::Decision::MANUAL)
       end

data/lib/datadog/tracing/transport/http.rb

@@ -71,6 +71,7 @@ module Datadog
             Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_VERSION => Datadog::Core::Environment::Ext::LANG_VERSION,
             Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER =>
               Datadog::Core::Environment::Ext::LANG_INTERPRETER,
+            Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER_VENDOR => Core::Environment::Ext::LANG_ENGINE,
             Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION =>
               Datadog::Core::Environment::Ext::TRACER_VERSION
           }.tap do |headers|

data/lib/datadog/tracing/transport/trace_formatter.rb

@@ -2,6 +2,8 @@
 
 require_relative '../../core/environment/identity'
 require_relative '../../core/environment/socket'
+require_relative '../../core/environment/git'
+require_relative '../../core/git/ext'
 require_relative '../../core/runtime/ext'
 require_relative '../metadata/ext'
 require_relative '../trace_segment'
@@ -13,6 +15,7 @@ module Datadog
       class TraceFormatter
         attr_reader \
           :root_span,
+          :first_span,
           :trace
 
         def self.format!(trace)
@@ -22,6 +25,9 @@ module Datadog
         def initialize(trace)
           @trace = trace
           @root_span = find_root_span(trace)
+          # source code integration uses the "first span in trace chunk" concept instead of root span
+          # see: https://github.com/DataDog/dd-trace-rb/pull/3424
+          @first_span = trace.spans.first
         end
 
         # Modifies a trace so suitable for transport
@@ -54,6 +60,11 @@ module Datadog
           tag_sampling_priority!
           tag_profiling_enabled!
 
+          if first_span
+            tag_git_repository_url!
+            tag_git_commit_sha!
+          end
+
           trace
         end
 
@@ -185,6 +196,18 @@ module Datadog
           )
         end
 
+        def tag_git_repository_url!
+          return if git_repository_url.nil?
+
+          first_span.set_tag(Core::Git::Ext::TAG_REPOSITORY_URL, git_repository_url)
+        end
+
+        def tag_git_commit_sha!
+          return if git_commit_sha.nil?
+
+          first_span.set_tag(Core::Git::Ext::TAG_COMMIT_SHA, git_commit_sha)
+        end
+
         private
 
         def partial?
@@ -203,6 +226,14 @@ module Datadog
           # when root span is not found, fall back to last span (partial flush)
           root_span || trace.spans.last
         end
+
+        def git_repository_url
+          Core::Environment::Git.git_repository_url
+        end
+
+        def git_commit_sha
+          Core::Environment::Git.git_commit_sha
+        end
       end
     end
   end

data/lib/ddtrace/version.rb

@@ -3,7 +3,7 @@
 module DDTrace
   module VERSION
     MAJOR = 1
-    MINOR = 20
+    MINOR = 21
     PATCH = 0
     PRE = nil
     BUILD = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.21.0
 platform: ruby
 authors:
 - Datadog, Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.1.0
+        version: 6.0.0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.1.0
+        version: 6.0.0.2.0
 - !ruby/object:Gem::Dependency
   name: datadog-ci
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.1
 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
@@ -88,9 +88,10 @@ email:
 - dev@datadoghq.com
 executables:
 - ddtracerb
+- ddprofrb
 extensions:
-- ext/ddtrace_profiling_native_extension/extconf.rb
-- ext/ddtrace_profiling_loader/extconf.rb
+- ext/datadog_profiling_native_extension/extconf.rb
+- ext/datadog_profiling_loader/extconf.rb
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
@@ -100,47 +101,46 @@ files:
 - LICENSE.BSD3
 - NOTICE
 - README.md
+- bin/ddprofrb
 - bin/ddtracerb
-- ext/ddtrace_profiling_loader/ddtrace_profiling_loader.c
-- ext/ddtrace_profiling_loader/extconf.rb
-- ext/ddtrace_profiling_native_extension/NativeExtensionDesign.md
-- 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_worker.c
-- ext/ddtrace_profiling_native_extension/collectors_discrete_dynamic_sampler.c
-- ext/ddtrace_profiling_native_extension/collectors_discrete_dynamic_sampler.h
-- ext/ddtrace_profiling_native_extension/collectors_dynamic_sampling_rate.c
-- ext/ddtrace_profiling_native_extension/collectors_dynamic_sampling_rate.h
-- ext/ddtrace_profiling_native_extension/collectors_gc_profiling_helper.c
-- ext/ddtrace_profiling_native_extension/collectors_gc_profiling_helper.h
-- ext/ddtrace_profiling_native_extension/collectors_idle_sampling_helper.c
-- 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/heap_recorder.c
-- ext/ddtrace_profiling_native_extension/heap_recorder.h
-- ext/ddtrace_profiling_native_extension/helpers.h
-- ext/ddtrace_profiling_native_extension/http_transport.c
-- ext/ddtrace_profiling_native_extension/libdatadog_helpers.c
-- ext/ddtrace_profiling_native_extension/libdatadog_helpers.h
-- ext/ddtrace_profiling_native_extension/native_extension_helpers.rb
-- ext/ddtrace_profiling_native_extension/pid_controller.c
-- ext/ddtrace_profiling_native_extension/pid_controller.h
-- ext/ddtrace_profiling_native_extension/private_vm_api_access.c
-- ext/ddtrace_profiling_native_extension/private_vm_api_access.h
-- ext/ddtrace_profiling_native_extension/profiling.c
-- ext/ddtrace_profiling_native_extension/ruby_helpers.c
-- ext/ddtrace_profiling_native_extension/ruby_helpers.h
-- ext/ddtrace_profiling_native_extension/setup_signal_handler.c
-- ext/ddtrace_profiling_native_extension/setup_signal_handler.h
-- ext/ddtrace_profiling_native_extension/stack_recorder.c
-- ext/ddtrace_profiling_native_extension/stack_recorder.h
-- ext/ddtrace_profiling_native_extension/time_helpers.c
-- ext/ddtrace_profiling_native_extension/time_helpers.h
+- ext/datadog_profiling_loader/datadog_profiling_loader.c
+- ext/datadog_profiling_loader/extconf.rb
+- ext/datadog_profiling_native_extension/NativeExtensionDesign.md
+- ext/datadog_profiling_native_extension/clock_id.h
+- ext/datadog_profiling_native_extension/clock_id_from_pthread.c
+- ext/datadog_profiling_native_extension/clock_id_noop.c
+- ext/datadog_profiling_native_extension/collectors_cpu_and_wall_time_worker.c
+- ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.c
+- ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.h
+- ext/datadog_profiling_native_extension/collectors_dynamic_sampling_rate.c
+- ext/datadog_profiling_native_extension/collectors_dynamic_sampling_rate.h
+- ext/datadog_profiling_native_extension/collectors_gc_profiling_helper.c
+- ext/datadog_profiling_native_extension/collectors_gc_profiling_helper.h
+- ext/datadog_profiling_native_extension/collectors_idle_sampling_helper.c
+- ext/datadog_profiling_native_extension/collectors_idle_sampling_helper.h
+- ext/datadog_profiling_native_extension/collectors_stack.c
+- ext/datadog_profiling_native_extension/collectors_stack.h
+- ext/datadog_profiling_native_extension/collectors_thread_context.c
+- ext/datadog_profiling_native_extension/collectors_thread_context.h
+- ext/datadog_profiling_native_extension/extconf.rb
+- ext/datadog_profiling_native_extension/heap_recorder.c
+- ext/datadog_profiling_native_extension/heap_recorder.h
+- ext/datadog_profiling_native_extension/helpers.h
+- 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/native_extension_helpers.rb
+- ext/datadog_profiling_native_extension/private_vm_api_access.c
+- ext/datadog_profiling_native_extension/private_vm_api_access.h
+- ext/datadog_profiling_native_extension/profiling.c
+- ext/datadog_profiling_native_extension/ruby_helpers.c
+- ext/datadog_profiling_native_extension/ruby_helpers.h
+- ext/datadog_profiling_native_extension/setup_signal_handler.c
+- ext/datadog_profiling_native_extension/setup_signal_handler.h
+- ext/datadog_profiling_native_extension/stack_recorder.c
+- ext/datadog_profiling_native_extension/stack_recorder.h
+- ext/datadog_profiling_native_extension/time_helpers.c
+- ext/datadog_profiling_native_extension/time_helpers.h
 - lib/datadog/appsec.rb
 - lib/datadog/appsec/assets.rb
 - lib/datadog/appsec/assets/blocked.html
@@ -245,6 +245,7 @@ files:
 - lib/datadog/core/environment/execution.rb
 - lib/datadog/core/environment/ext.rb
 - lib/datadog/core/environment/gc.rb
+- lib/datadog/core/environment/git.rb
 - lib/datadog/core/environment/identity.rb
 - lib/datadog/core/environment/platform.rb
 - lib/datadog/core/environment/socket.rb
@@ -338,6 +339,7 @@ files:
 - lib/datadog/core/utils/safe_dup.rb
 - lib/datadog/core/utils/sequence.rb
 - lib/datadog/core/utils/time.rb
+- lib/datadog/core/utils/url.rb
 - lib/datadog/core/vendor/ipaddr.rb
 - lib/datadog/core/vendor/multipart-post/LICENSE
 - lib/datadog/core/vendor/multipart-post/multipart.rb
@@ -387,10 +389,10 @@ files:
 - 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/info.rb
 - lib/datadog/profiling/collectors/stack.rb
 - lib/datadog/profiling/collectors/thread_context.rb
 - lib/datadog/profiling/component.rb
-- lib/datadog/profiling/diagnostics/environment_logger.rb
 - lib/datadog/profiling/exporter.rb
 - lib/datadog/profiling/ext.rb
 - lib/datadog/profiling/ext/forking.rb
@@ -517,6 +519,7 @@ files:
 - lib/datadog/tracing/contrib/aws/service/sqs.rb
 - lib/datadog/tracing/contrib/aws/service/states.rb
 - lib/datadog/tracing/contrib/aws/services.rb
+- lib/datadog/tracing/contrib/concurrent_ruby/async_patch.rb
 - lib/datadog/tracing/contrib/concurrent_ruby/configuration/settings.rb
 - lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb
 - lib/datadog/tracing/contrib/concurrent_ruby/ext.rb
@@ -886,7 +889,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
   changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -904,8 +907,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.4.21
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications
 test_files: []

data/ext/ddtrace_profiling_native_extension/pid_controller.c

@@ -1,57 +0,0 @@
-/*
- * Copyright 2023 Datadog, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Originally imported from https://github.com/DataDog/java-profiler/blob/11fe6206c31a14c6e5134e8401eaec8b22c618d7/ddprof-lib/src/main/cpp/pidController.cpp
-
-#include "pid_controller.h"
-
-#include <math.h>
-
-inline static double computeAlpha(float cutoff) {
-    if (cutoff <= 0)
-        return 1;
-    // α(fₙ) = cos(2πfₙ) - 1 + √( cos(2πfₙ)² - 4 cos(2πfₙ) + 3 )
-    const double c = cos(2 * ((double) M_PI) * cutoff);
-    return c - 1 + sqrt(c * c - 4 * c + 3);
-}
-
-void pid_controller_init(pid_controller *controller, u64 target_per_second, double proportional_gain, double integral_gain, double derivative_gain, int sampling_window, double cutoff_secs) {
-    controller->_target = target_per_second * sampling_window;
-    controller->_proportional_gain = proportional_gain;
-    controller->_integral_gain = integral_gain * sampling_window;
-    controller->_derivative_gain = derivative_gain / sampling_window;
-    controller->_alpha = computeAlpha(sampling_window / cutoff_secs);
-    controller->_avg_error= 0;
-    controller->_integral_value = 0;
-}
-
-double pid_controller_compute(pid_controller *controller, u64 input, double time_delta_coefficient) {
-    // time_delta_coefficient allows variable sampling window
-    // the values are linearly scaled using that coefficient to reinterpret the given value within the expected sampling window
-    double absolute_error = (((double) controller->_target) - ((double) input)) * time_delta_coefficient;
-
-    double avg_error = (controller->_alpha * absolute_error) + ((1 - controller->_alpha) * controller->_avg_error);
-    double derivative = avg_error - controller->_avg_error;
-
-    // PID formula:
-    // u[k] = Kp e[k] + Ki e_i[k] + Kd e_d[k], control signal
-    double signal = controller->_proportional_gain * absolute_error + controller->_integral_gain * controller->_integral_value + controller->_derivative_gain * derivative;
-
-    controller->_integral_value += absolute_error;
-    controller->_avg_error = avg_error;
-
-    return signal;
-}

data/ext/ddtrace_profiling_native_extension/pid_controller.h

@@ -1,45 +0,0 @@
-/*
- * Copyright 2023 Datadog, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Originally imported from https://github.com/DataDog/java-profiler/blob/11fe6206c31a14c6e5134e8401eaec8b22c618d7/ddprof-lib/src/main/cpp/pidController.h
-
-#ifndef _PIDCONTROLLER_H
-#define _PIDCONTROLLER_H
-
-// From arch.h in java-profiler
-typedef unsigned long long u64;
-
-/*
- * A simple implementation of a PID controller.
- * Heavily influenced by https://tttapa.github.io/Pages/Arduino/Control-Theory/Motor-Fader/PID-Cpp-Implementation.html 
- */
-
-typedef struct {
-        u64 _target;
-        double _proportional_gain;
-        double _derivative_gain;
-        double _integral_gain;
-        double _alpha;
-
-        double _avg_error;
-        long long _integral_value;
-} pid_controller;
-
-void pid_controller_init(pid_controller *controller, u64 target_per_second, double proportional_gain, double integral_gain, double derivative_gain, int sampling_window, double cutoff_secs);
-        
-double pid_controller_compute(pid_controller *controller, u64 input, double time_delta_seconds);
-
-#endif

data/lib/datadog/profiling/diagnostics/environment_logger.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'date'
-require 'json'
-require 'rbconfig'
-require_relative '../../core/diagnostics/environment_logger'
-
-module Datadog
-  module Profiling
-    module Diagnostics
-      # Collects and logs Profiling diagnostic information
-      module EnvironmentLogger
-        extend Core::Diagnostics::EnvironmentLogging
-
-        def self.collect_and_log!
-          log_once! do
-            data = EnvironmentCollector.collect_config!
-            log_configuration!('PROFILING', data.to_json)
-          end
-        rescue => e
-          logger.warn("Failed to collect profiling environment information: #{e} Location: #{Array(e.backtrace).first}")
-        end
-      end
-
-      # Collects environment information for Profiling diagnostic logging
-      module EnvironmentCollector
-        def self.collect_config!(*args)
-          {
-            profiling_enabled: profiling_enabled
-          }
-        end
-
-        def self.profiling_enabled
-          !!Datadog.configuration.profiling.enabled
-        end
-      end
-    end
-  end
-end