ddtrace 0.50.0 → 0.51.1

data/lib/datadog/ci/ext/test.rb

@@ -8,12 +8,18 @@ module Datadog
         TAG_ARGUMENTS = 'test.arguments'.freeze
         TAG_FRAMEWORK = 'test.framework'.freeze
         TAG_NAME = 'test.name'.freeze
-        TAG_SKIP_REASON = 'test.skip_reason'.freeze
+        TAG_SKIP_REASON = 'test.skip_reason'.freeze # DEV: Not populated yet
         TAG_STATUS = 'test.status'.freeze
         TAG_SUITE = 'test.suite'.freeze
         TAG_TRAITS = 'test.traits'.freeze
         TAG_TYPE = 'test.type'.freeze
 
+        # Environment runtime tags
+        TAG_OS_ARCHITECTURE = 'os.architecture'.freeze
+        TAG_OS_PLATFORM = 'os.platform'.freeze
+        TAG_RUNTIME_NAME = 'runtime.name'.freeze
+        TAG_RUNTIME_VERSION = 'runtime.version'.freeze
+
         # TODO: is there a better place for SPAN_KIND?
         TAG_SPAN_KIND = 'span.kind'.freeze
 

data/lib/datadog/ci/test.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 require 'ddtrace/contrib/analytics'
 
 require 'datadog/ci/ext/app_types'
 require 'datadog/ci/ext/test'
 
+require 'rbconfig'
+
 module Datadog
   module CI
     # Common behavior for CI tests
@@ -41,6 +45,8 @@ module Datadog
         span.set_tag(Ext::Test::TAG_SUITE, tags[:test_suite]) if tags[:test_suite]
         span.set_tag(Ext::Test::TAG_TYPE, tags[:test_type]) if tags[:test_type]
 
+        set_environment_runtime_tags!(span)
+
         span
       end
 
@@ -58,6 +64,13 @@ module Datadog
         span.set_tag(Ext::Test::TAG_STATUS, Ext::Test::Status::SKIP)
         span.set_error(exception) unless exception.nil?
       end
+
+      private_class_method def self.set_environment_runtime_tags!(span)
+        span.set_tag(Ext::Test::TAG_OS_ARCHITECTURE, ::RbConfig::CONFIG['host_cpu'])
+        span.set_tag(Ext::Test::TAG_OS_PLATFORM, ::RbConfig::CONFIG['host_os'])
+        span.set_tag(Ext::Test::TAG_RUNTIME_NAME, Core::Environment::Ext::LANG_ENGINE)
+        span.set_tag(Ext::Test::TAG_RUNTIME_VERSION, Core::Environment::Ext::ENGINE_VERSION)
+      end
     end
   end
 end

data/lib/datadog/core/environment/cgroup.rb

@@ -0,0 +1,49 @@
+require 'datadog/core/environment/ext'
+
+module Datadog
+  module Core
+    module Environment
+      # Reads information from Linux cgroups.
+      # This information is used to extract information
+      # about the current Linux container identity.
+      # @see https://man7.org/linux/man-pages/man7/cgroups.7.html
+      module Cgroup
+        LINE_REGEX = /^(\d+):([^:]*):(.+)$/.freeze
+
+        Descriptor = Struct.new(
+          :id,
+          :groups,
+          :path,
+          :controllers
+        )
+
+        module_function
+
+        def descriptors(process = 'self')
+          [].tap do |descriptors|
+            begin
+              filepath = "/proc/#{process}/cgroup"
+
+              if File.exist?(filepath)
+                File.foreach("/proc/#{process}/cgroup") do |line|
+                  line = line.strip
+                  descriptors << parse(line) unless line.empty?
+                end
+              end
+            rescue StandardError => e
+              Datadog.logger.error("Error while parsing cgroup. Cause: #{e.message} Location: #{e.backtrace.first}")
+            end
+          end
+        end
+
+        def parse(line)
+          id, groups, path = line.scan(LINE_REGEX).first
+
+          Descriptor.new(id, groups, path).tap do |descriptor|
+            descriptor.controllers = groups.split(',') unless groups.nil?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/environment/class_count.rb

@@ -0,0 +1,19 @@
+module Datadog
+  module Core
+    module Environment
+      # Retrieves number of classes from runtime
+      module ClassCount
+        module_function
+
+        def value
+          ::ObjectSpace.count_objects[:T_CLASS]
+        end
+
+        def available?
+          ::ObjectSpace.respond_to?(:count_objects) \
+           && ::ObjectSpace.count_objects.key?(:T_CLASS)
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/environment/container.rb

@@ -0,0 +1,88 @@
+require 'datadog/core/environment/cgroup'
+
+module Datadog
+  module Core
+    module Environment
+      # For container environments
+      module Container
+        UUID_PATTERN = '[0-9a-f]{8}[-_]?[0-9a-f]{4}[-_]?[0-9a-f]{4}[-_]?[0-9a-f]{4}[-_]?[0-9a-f]{12}'.freeze
+        CONTAINER_PATTERN = '[0-9a-f]{64}'.freeze
+
+        PLATFORM_REGEX = /(?<platform>.*?)(?:.slice)?$/.freeze
+        POD_REGEX = /(?<pod>(pod)?#{UUID_PATTERN})(?:.slice)?$/.freeze
+        CONTAINER_REGEX = /(?<container>#{UUID_PATTERN}|#{CONTAINER_PATTERN})(?:.scope)?$/.freeze
+        FARGATE_14_CONTAINER_REGEX = /(?<container>[0-9a-f]{32}-[0-9]{10})/.freeze
+
+        Descriptor = Struct.new(
+          :platform,
+          :container_id,
+          :task_uid
+        )
+
+        module_function
+
+        def platform
+          descriptor.platform
+        end
+
+        def container_id
+          descriptor.container_id
+        end
+
+        def task_uid
+          descriptor.task_uid
+        end
+
+        def descriptor
+          @descriptor ||= Descriptor.new.tap do |descriptor|
+            begin
+              Cgroup.descriptors.each do |cgroup_descriptor|
+                # Parse container data from cgroup descriptor
+                path = cgroup_descriptor.path
+                next if path.nil?
+
+                # Split path into parts
+                parts = path.split('/')
+                parts.shift # Remove leading empty part
+
+                # Read info from path
+                next if parts.empty?
+
+                platform = parts[0][PLATFORM_REGEX, :platform]
+                container_id, task_uid = nil
+
+                case parts.length
+                when 0..1
+                  next
+                when 2
+                  container_id = parts[-1][CONTAINER_REGEX, :container] \
+                                || parts[-1][FARGATE_14_CONTAINER_REGEX, :container]
+                else
+                  if (container_id = parts[-1][CONTAINER_REGEX, :container])
+                    task_uid = parts[-2][POD_REGEX, :pod]
+                  else
+                    container_id = parts[-1][FARGATE_14_CONTAINER_REGEX, :container]
+                  end
+                end
+
+                # If container ID wasn't found, ignore.
+                # Path might describe a non-container environment.
+                next if container_id.nil?
+
+                descriptor.platform = platform
+                descriptor.container_id = container_id
+                descriptor.task_uid = task_uid
+
+                break
+              end
+            rescue StandardError => e
+              Datadog.logger.error(
+                "Error while parsing container info. Cause: #{e.message} Location: #{e.backtrace.first}"
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/environment/ext.rb

@@ -0,0 +1,26 @@
+require 'ddtrace/version'
+
+module Datadog
+  module Core
+    module Environment
+      module Ext
+        # Identity
+        LANG = 'ruby'.freeze
+        LANG_ENGINE = RUBY_ENGINE
+        LANG_INTERPRETER = "#{RUBY_ENGINE}-#{RUBY_PLATFORM}".freeze
+        LANG_PLATFORM = RUBY_PLATFORM
+        LANG_VERSION = RUBY_VERSION
+        RUBY_ENGINE = ::RUBY_ENGINE # e.g. 'ruby', 'jruby', 'truffleruby'
+        TRACER_VERSION = Datadog::VERSION::STRING
+
+        # e.g for CRuby '3.0.1', for JRuby '9.2.19.0', for TruffleRuby '21.1.0'
+        ENGINE_VERSION = if defined?(RUBY_ENGINE_VERSION)
+                           RUBY_ENGINE_VERSION
+                         else
+                           # CRuby < 2.3 doesn't support RUBY_ENGINE_VERSION
+                           RUBY_VERSION
+                         end
+      end
+    end
+  end
+end

data/lib/datadog/core/environment/gc.rb

@@ -0,0 +1,18 @@
+module Datadog
+  module Core
+    module Environment
+      # Retrieves garbage collection statistics
+      module GC
+        module_function
+
+        def stat
+          ::GC.stat
+        end
+
+        def available?
+          defined?(::GC) && ::GC.respond_to?(:stat)
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/environment/identity.rb

@@ -0,0 +1,50 @@
+require 'securerandom'
+require 'datadog/core/environment/ext'
+require 'ddtrace/utils/forking'
+
+module Datadog
+  module Core
+    module Environment
+      # For runtime identity
+      module Identity
+        extend Datadog::Utils::Forking
+
+        module_function
+
+        # Retrieves number of classes from runtime
+        def id
+          @id ||= SecureRandom.uuid
+
+          # Check if runtime has changed, e.g. forked.
+          after_fork! { @id = SecureRandom.uuid }
+
+          @id
+        end
+
+        def lang
+          Core::Environment::Ext::LANG
+        end
+
+        def lang_engine
+          Core::Environment::Ext::LANG_ENGINE
+        end
+
+        def lang_interpreter
+          Core::Environment::Ext::LANG_INTERPRETER
+        end
+
+        def lang_platform
+          Core::Environment::Ext::LANG_PLATFORM
+        end
+
+        def lang_version
+          Core::Environment::Ext::LANG_VERSION
+        end
+
+        def tracer_version
+          Core::Environment::Ext::TRACER_VERSION
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/environment/object_space.rb

@@ -0,0 +1,22 @@
+require 'objspace'
+
+module Datadog
+  module Core
+    module Environment
+      # Retrieves garbage collection statistics
+      # DEV: Currently only used for testing.
+      module ObjectSpace
+        module_function
+
+        def estimate_bytesize(object)
+          return 0 unless ::ObjectSpace.respond_to?(:memsize_of)
+
+          # Rough calculation of bytesize; not very accurate.
+          object.instance_variables.inject(::ObjectSpace.memsize_of(object)) do |sum, var|
+            sum + ::ObjectSpace.memsize_of(object.instance_variable_get(var))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/environment/socket.rb

@@ -0,0 +1,16 @@
+require 'socket'
+
+module Datadog
+  module Core
+    module Environment
+      # For runtime identity
+      module Socket
+        module_function
+
+        def hostname
+          ::Socket.gethostname
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/environment/thread_count.rb

@@ -0,0 +1,18 @@
+module Datadog
+  module Core
+    module Environment
+      # Retrieves number of threads from runtime
+      module ThreadCount
+        module_function
+
+        def value
+          Thread.list.count
+        end
+
+        def available?
+          Thread.respond_to?(:list)
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/environment/variable_helpers.rb

@@ -0,0 +1,39 @@
+module Datadog
+  module Core
+    # Namespace for handling application environment
+    module Environment
+      # Defines helper methods for environment
+      module VariableHelpers
+        def env_to_bool(var, default = nil)
+          var = decode_array(var)
+          var && ENV.key?(var) ? ENV[var].to_s.strip.downcase == 'true' : default
+        end
+
+        def env_to_int(var, default = nil)
+          var = decode_array(var)
+          var && ENV.key?(var) ? ENV[var].to_i : default
+        end
+
+        def env_to_float(var, default = nil)
+          var = decode_array(var)
+          var && ENV.key?(var) ? ENV[var].to_f : default
+        end
+
+        def env_to_list(var, default = [])
+          var = decode_array(var)
+          if var && ENV.key?(var)
+            ENV[var].split(',').map(&:strip)
+          else
+            default
+          end
+        end
+
+        private
+
+        def decode_array(var)
+          var.is_a?(Array) ? var.find { |env_var| ENV.key?(env_var) } : var
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace.rb

@@ -62,6 +62,7 @@ require 'ddtrace/contrib/httpclient/integration'
 require 'ddtrace/contrib/httprb/integration'
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/kafka/integration'
+require 'ddtrace/contrib/lograge/integration'
 require 'ddtrace/contrib/presto/integration'
 require 'ddtrace/contrib/que/integration'
 require 'ddtrace/contrib/mysql2/integration'
@@ -74,6 +75,7 @@ require 'ddtrace/contrib/rake/integration'
 require 'ddtrace/contrib/redis/integration'
 require 'ddtrace/contrib/resque/integration'
 require 'ddtrace/contrib/rest_client/integration'
+require 'ddtrace/contrib/semantic_logger/integration'
 require 'ddtrace/contrib/sequel/integration'
 require 'ddtrace/contrib/shoryuken/integration'
 require 'ddtrace/contrib/sidekiq/integration'

data/lib/ddtrace/auto_instrument.rb

@@ -1,3 +1,4 @@
 require 'ddtrace'
 
 Datadog.add_auto_instrument
+Datadog.profiler.start if Datadog.profiler

data/lib/ddtrace/buffer.rb

@@ -1,5 +1,5 @@
 require 'ddtrace/diagnostics/health'
-require 'ddtrace/runtime/object_space'
+require 'datadog/core/environment/object_space'
 
 # Trace buffer that accumulates traces for a consumer.
 # Consumption can happen from a different thread.
@@ -318,7 +318,7 @@ module Datadog
   #
   # TODO We should restructure this module, so that classes are not declared at top-level ::Datadog.
   # TODO Making such a change is potentially breaking for users manually configuring the tracer.
-  TraceBuffer = if Datadog::Ext::Runtime::RUBY_ENGINE == 'ruby'
+  TraceBuffer = if Datadog::Core::Environment::Ext::RUBY_ENGINE == 'ruby'
                   CRubyTraceBuffer
                 else
                   ThreadSafeTraceBuffer