ddtrace 1.2.0 → 1.3.0

data/lib/datadog/tracing.rb

@@ -1,7 +1,7 @@
 # typed: false
 
-require 'datadog/core'
-require 'datadog/tracing/pipeline'
+require_relative 'core'
+require_relative 'tracing/pipeline'
 
 module Datadog
   # Datadog APM tracing public API.
@@ -18,7 +18,7 @@ module Datadog
         tracer.trace(name, continue_from: continue_from, **span_options, &block)
       end
 
-      # (see Datadog:::Tracing::Tracer#continue_trace!)
+      # (see Datadog::Tracing::Tracer#continue_trace!)
       # @public_api
       def continue_trace!(digest, &block)
         tracer.continue_trace!(digest, &block)
@@ -45,7 +45,7 @@ module Datadog
         current_tracer.active_trace
       end
 
-      # (see Datadog:::Tracing::Tracer#active_span)
+      # (see Datadog::Tracing::Tracer#active_span)
       # @public_api
       def active_span
         current_tracer = tracer
@@ -54,7 +54,7 @@ module Datadog
         current_tracer.active_span
       end
 
-      # (see Datadog:::Tracing::TraceSegment#keep!)
+      # (see Datadog::Tracing::TraceSegment#keep!)
       # If no trace is active, no action is taken.
       # @public_api
       def keep!
@@ -62,7 +62,7 @@ module Datadog
         active_trace.keep! if trace
       end
 
-      # (see Datadog:::Tracing::TraceSegment#reject!)
+      # (see Datadog::Tracing::TraceSegment#reject!)
       # If no trace is active, no action is taken.
       # @public_api
       def reject!
@@ -70,7 +70,7 @@ module Datadog
         active_trace.reject! if trace
       end
 
-      # (see Datadog:::Tracing::Tracer#active_correlation)
+      # (see Datadog::Tracing::Tracer#active_correlation)
       # @public_api
       def correlation
         current_tracer = tracer
@@ -113,7 +113,7 @@ module Datadog
         current_tracer.shutdown!
       end
 
-      # (see Datadog:::Tracing::Pipeline.before_flush)
+      # (see Datadog::Tracing::Pipeline.before_flush)
       def before_flush(*processors, &processor_block)
         Pipeline.before_flush(*processors, &processor_block)
       end

data/lib/ddtrace/auto_instrument.rb

@@ -3,7 +3,7 @@
 # Entrypoint file for auto instrumentation.
 #
 # This file's path is part of the @public_api.
-require 'ddtrace'
-require 'datadog/tracing/contrib/auto_instrument'
+require_relative '../ddtrace'
+require_relative '../datadog/tracing/contrib/auto_instrument'
 
 Datadog::Profiling.start_if_enabled

data/lib/ddtrace/transport/ext.rb

@@ -13,6 +13,13 @@ module Datadog
 
         HEADER_CONTAINER_ID = 'Datadog-Container-ID'.freeze
         HEADER_DD_API_KEY = 'DD-API-KEY'.freeze
+        # Tells agent that `_dd.top_level` metrics have been set by the tracer.
+        # The agent will not calculate top-level spans but instead trust the tracer tagging.
+        #
+        # This prevents partially flushed traces being mistakenly marked as top-level.
+        #
+        # Setting this header to any non-empty value enables this feature.
+        HEADER_CLIENT_COMPUTED_TOP_LEVEL = 'Datadog-Client-Computed-Top-Level'.freeze
         HEADER_META_LANG = 'Datadog-Meta-Lang'.freeze
         HEADER_META_LANG_VERSION = 'Datadog-Meta-Lang-Version'.freeze
         HEADER_META_LANG_INTERPRETER = 'Datadog-Meta-Lang-Interpreter'.freeze

data/lib/ddtrace/transport/http/adapters/net.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'ddtrace/transport/response'
-require 'datadog/core/vendor/multipart-post/net/http/post/multipart'
+require_relative '../../response'
+require_relative '../../../../datadog/core/vendor/multipart-post/net/http/post/multipart'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http/adapters/test.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'ddtrace/transport/response'
+require_relative '../../response'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http/adapters/unix_socket.rb

@@ -1,8 +1,8 @@
 # typed: false
 
 require 'net/http'
-require 'ddtrace/transport/ext'
-require 'ddtrace/transport/http/adapters/net'
+require_relative '../../ext'
+require_relative 'net'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http/api/map.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'ddtrace/transport/http/api/fallbacks'
+require_relative 'fallbacks'
 
 module Datadog
   module Transport

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

@@ -1,11 +1,11 @@
 # typed: false
 
-require 'datadog/core/encoding'
+require_relative '../../../datadog/core/encoding'
 
-require 'ddtrace/transport/http/api/map'
-require 'ddtrace/transport/http/api/spec'
+require_relative 'api/map'
+require_relative 'api/spec'
 
-require 'ddtrace/transport/http/traces'
+require_relative 'traces'
 
 module Datadog
   module Transport

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

@@ -1,10 +1,10 @@
 # typed: true
 
-require 'datadog/core/configuration/agent_settings_resolver'
-require 'ddtrace/transport/http/adapters/registry'
-require 'ddtrace/transport/http/api/map'
-require 'ddtrace/transport/http/api/instance'
-require 'ddtrace/transport/http/client'
+require_relative '../../../datadog/core/configuration/agent_settings_resolver'
+require_relative 'adapters/registry'
+require_relative 'api/map'
+require_relative 'api/instance'
+require_relative 'client'
 
 module Datadog
   module Transport

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

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'ddtrace/transport/http/statistics'
-require 'ddtrace/transport/http/env'
+require_relative 'statistics'
+require_relative 'env'
 
 module Datadog
   module Transport

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

@@ -1,6 +1,6 @@
 # typed: false
 
-require 'ddtrace/transport/response'
+require_relative '../response'
 
 module Datadog
   module Transport

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

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'ddtrace/transport/statistics'
+require_relative '../statistics'
 
 module Datadog
   module Transport

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

@@ -2,11 +2,11 @@
 
 require 'json'
 
-require 'ddtrace/transport/traces'
-require 'ddtrace/transport/http/client'
-require 'ddtrace/transport/http/response'
-require 'ddtrace/transport/http/api/endpoint'
-require 'ddtrace/transport/http/api/instance'
+require_relative '../traces'
+require_relative 'client'
+require_relative 'response'
+require_relative 'api/endpoint'
+require_relative 'api/instance'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 # typed: true
 
 require 'uri'
 
-require 'datadog/core/environment/container'
-require 'datadog/core/environment/ext'
-require 'ddtrace/transport/ext'
-require 'ddtrace/transport/http/adapters/net'
-require 'ddtrace/transport/http/adapters/test'
-require 'ddtrace/transport/http/adapters/unix_socket'
-require 'ddtrace/transport/http/api'
-require 'ddtrace/transport/http/builder'
-require 'ddtrace/version'
+require_relative '../../datadog/core/environment/container'
+require_relative '../../datadog/core/environment/ext'
+require_relative 'ext'
+require_relative 'http/adapters/net'
+require_relative 'http/adapters/test'
+require_relative 'http/adapters/unix_socket'
+require_relative 'http/api'
+require_relative 'http/builder'
+require_relative '../version'
 
 module Datadog
   module Transport
@@ -67,6 +69,7 @@ module Datadog
 
       def default_headers
         {
+          Datadog::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_TOP_LEVEL => '1',
           Datadog::Transport::Ext::HTTP::HEADER_META_LANG => Datadog::Core::Environment::Ext::LANG,
           Datadog::Transport::Ext::HTTP::HEADER_META_LANG_VERSION => Datadog::Core::Environment::Ext::LANG_VERSION,
           Datadog::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER => Datadog::Core::Environment::Ext::LANG_INTERPRETER,

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

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'ddtrace/transport/statistics'
-require 'ddtrace/transport/io/response'
+require_relative '../statistics'
+require_relative 'response'
 
 module Datadog
   module Transport

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

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'ddtrace/transport/response'
+require_relative '../response'
 
 module Datadog
   module Transport

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

@@ -1,9 +1,9 @@
 # typed: false
 
-require 'ddtrace/transport/traces'
+require_relative '../traces'
 
-require 'ddtrace/transport/io/response'
-require 'ddtrace/transport/io/client'
+require_relative 'response'
+require_relative 'client'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/io.rb

@@ -1,8 +1,8 @@
 # typed: true
 
-require 'datadog/core/encoding'
-require 'ddtrace/transport/io/client'
-require 'ddtrace/transport/io/traces'
+require_relative '../../datadog/core/encoding'
+require_relative 'io/client'
+require_relative 'io/traces'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/statistics.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'datadog/core/metrics/metric'
-require 'datadog/core/diagnostics/health'
+require_relative '../../datadog/core/metrics/metric'
+require_relative '../../datadog/core/diagnostics/health'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/trace_formatter.rb

@@ -1,10 +1,10 @@
 # typed: true
 
-require 'datadog/core/environment/identity'
-require 'datadog/core/environment/socket'
-require 'datadog/core/runtime/ext'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/trace_segment'
+require_relative '../../datadog/core/environment/identity'
+require_relative '../../datadog/core/environment/socket'
+require_relative '../../datadog/core/runtime/ext'
+require_relative '../../datadog/tracing/metadata/ext'
+require_relative '../../datadog/tracing/trace_segment'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/traces.rb

@@ -1,10 +1,10 @@
 # typed: true
 
-require 'datadog/core/chunker'
-require 'ddtrace/transport/parcel'
-require 'ddtrace/transport/request'
-require 'ddtrace/transport/serializable_trace'
-require 'ddtrace/transport/trace_formatter'
+require_relative '../../datadog/core/chunker'
+require_relative 'parcel'
+require_relative 'request'
+require_relative 'serializable_trace'
+require_relative 'trace_formatter'
 
 module Datadog
   module Transport

data/lib/ddtrace/version.rb

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

data/lib/ddtrace.rb

@@ -1,13 +1,13 @@
 # typed: strict
 
 # Load tracing
-require 'datadog/tracing'
-require 'datadog/tracing/contrib'
+require_relative 'datadog/tracing'
+require_relative 'datadog/tracing/contrib'
 
 # Load appsec
-require 'datadog/appsec/autoload' # TODO: datadog/appsec?
+require_relative 'datadog/appsec/autoload' # TODO: datadog/appsec?
 
 # Load other products (must follow tracing)
-require 'datadog/profiling'
-require 'datadog/ci'
-require 'datadog/kit'
+require_relative 'datadog/profiling'
+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.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -53,21 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0.2.0
 - !ruby/object:Gem::Dependency
-  name: libddprof
+  name: libdatadog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0.1.0
+        version: 0.7.0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0.1.0
+        version: 0.7.0.1.0
 description: |
-  ddtrace is Datadog’s tracing client for Ruby. It is used to trace requests
+  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
   have great visiblity into bottlenecks and troublesome requests.
 email:
@@ -79,10 +79,7 @@ extensions:
 - ext/ddtrace_profiling_loader/extconf.rb
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
 - CHANGELOG.md
-- CONTRIBUTING.md
 - LICENSE
 - LICENSE-3rdparty.csv
 - LICENSE.Apache
@@ -90,16 +87,6 @@ files:
 - NOTICE
 - README.md
 - bin/ddtracerb
-- ddtrace.gemspec
-- docs/0.x-trace.png
-- docs/1.0-trace.png
-- docs/AutoInstrumentation.md
-- docs/Deprecation.md
-- docs/DevelopmentGuide.md
-- docs/GettingStarted.md
-- docs/ProfilingDevelopment.md
-- docs/PublicApi.md
-- docs/UpgradeGuide.md
 - ext/ddtrace_profiling_loader/ddtrace_profiling_loader.c
 - ext/ddtrace_profiling_loader/extconf.rb
 - ext/ddtrace_profiling_native_extension/NativeExtensionDesign.md
@@ -107,15 +94,18 @@ files:
 - 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_stack.c
 - ext/ddtrace_profiling_native_extension/collectors_stack.h
 - ext/ddtrace_profiling_native_extension/extconf.rb
+- ext/ddtrace_profiling_native_extension/helpers.h
 - ext/ddtrace_profiling_native_extension/http_transport.c
-- ext/ddtrace_profiling_native_extension/libddprof_helpers.h
+- ext/ddtrace_profiling_native_extension/libdatadog_helpers.h
 - ext/ddtrace_profiling_native_extension/native_extension_helpers.rb
 - 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/stack_recorder.c
 - ext/ddtrace_profiling_native_extension/stack_recorder.h
@@ -442,6 +432,7 @@ files:
 - lib/datadog/tracing/contrib/delayed_job/integration.rb
 - lib/datadog/tracing/contrib/delayed_job/patcher.rb
 - lib/datadog/tracing/contrib/delayed_job/plugin.rb
+- lib/datadog/tracing/contrib/delayed_job/server_internal_tracer/worker.rb
 - lib/datadog/tracing/contrib/elasticsearch/configuration/settings.rb
 - lib/datadog/tracing/contrib/elasticsearch/ext.rb
 - lib/datadog/tracing/contrib/elasticsearch/integration.rb
@@ -635,7 +626,8 @@ files:
 - lib/datadog/tracing/contrib/sidekiq/patcher.rb
 - lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/heartbeat.rb
 - lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/job_fetch.rb
-- lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_push.rb
+- lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/redis_info.rb
+- lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_poller.rb
 - lib/datadog/tracing/contrib/sidekiq/server_tracer.rb
 - lib/datadog/tracing/contrib/sidekiq/tracing.rb
 - lib/datadog/tracing/contrib/sinatra/configuration/settings.rb
@@ -765,7 +757,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications

data/.editorconfig

@@ -1,22 +0,0 @@
-# EditorConfig is awesome: https://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.h]
-indent_style = space
-indent_size = 2
-
-[*.c]
-indent_style = space
-indent_size = 2
-
-[*.yml]
-indent_style = space
-indent_size = 2

data/.gitignore

@@ -1,58 +0,0 @@
-*.gem
-*.rbc
-*.swp
-*.nix
-*.vim
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-/log/
-TODO
-ext/**/skipped_reason.txt
-
-# Used by dotenv library to load environment variables.
-# .env
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-/html/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-.ruby-version
-.ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-# Ignore local variables
-.envrc
-
-# lock files
-Gemfile.lock
-
-# Appraisal gemfiles (they can always be regenerated by running `appraisal install`)
-gemfiles/*.gemfile
-
-# bundle config
-gemfiles/.bundle
-
-# Native extension binaries
-lib/*.bundle
-lib/*.so
-
-# Extra file kept by sorbet for debugging usage, as documented in https://sorbet.org/docs/adopting#step-6-source-control
-sorbet/rbi/hidden-definitions/errors.txt

data/CONTRIBUTING.md

@@ -1,81 +0,0 @@
-# Contributing
-
-Community contributions to the Datadog tracing library for Ruby are welcome! See below for some basic guidelines.
-
-## Want to request a new feature?
-
-Many great ideas for new features come from the community, and we'd be happy to consider yours!
-
-To share your request, you can [open a Github issue](https://github.com/DataDog/dd-trace-rb/issues/new) with the details about what you'd like to see. At a minimum, please provide:
-
- - The goal of the new feature
- - A description of how it might be used or behave
- - Links to any important resources (e.g. Github repos, websites, screenshots, specifications, diagrams)
-
-Additionally, if you can, include:
-
- - A description of how it could be accomplished
- - Code snippets that might demonstrate its use or implementation
- - Screenshots or mockups that visually demonstrate the feature
- - Links to similar features that would serve as a good comparison
- - (Any other details that would be useful for implementing this feature!)
-
-## Found a bug?
-
-For any urgent matters (such as outages) or issues concerning the Datadog service or UI, contact our support team via https://docs.datadoghq.com/help/ for direct, faster assistance.
-
-You may submit bug reports concerning the Datadog tracing library for Ruby by [opening a Github issue](https://github.com/DataDog/dd-trace-rb/issues/new). At a minimum, please provide:
-
- - A description of the problem
- - Steps to reproduce
- - Expected behavior
- - Actual behavior
- - Errors (with stack traces) or warnings received
- - Any details you can share about your configuration including:
-    - Ruby version & platform
-    - `ddtrace` version
-    - Versions of any other relevant gems (or a `Gemfile.lock` if available)
-    - Any configuration settings for the trace library (e.g. `initializers/datadog.rb`)
-
-If at all possible, also provide:
-
- - Logs (from the tracer/application/agent) or other diagnostics
- - Screenshots, links, or other visual aids that are publicly accessible
- - Code sample or test that reproduces the problem
- - An explanation of what causes the bug and/or how it can be fixed
-
-Reports that include rich detail are better, and ones with code that reproduce the bug are best.
-
-## Have a patch?
-
-We welcome code contributions to the library, which you can [submit as a pull request](https://github.com/DataDog/dd-trace-rb/pull/new/master). To create a pull request:
-
-1. **Fork the repository** from https://github.com/DataDog/dd-trace-rb
-2. **Make any changes** for your patch.
-3. **Write tests** that demonstrate how the feature works or how the bug is fixed. See the [DevelopmentGuide](https://github.com/DataDog/dd-trace-rb/blob/master/docs/DevelopmentGuide.md) for detailed test instructions.
-4. **Update any documentation** such as `docs/GettingStarted.md`, especially for new features.
-5. **Submit the pull request** from your fork back to the latest revision of the `master` branch on https://github.com/DataDog/dd-trace-rb.
-
-The pull request will be run through our CI pipeline, and a project member will review the changes with you. At a minimum, to be accepted and merged, pull requests must:
-
- - Have a stated goal and detailed description of the changes made
- - Include thorough test coverage and documentation, where applicable
- - Pass all tests and code quality checks (linting/coverage/benchmarks) on CI
- - Receive at least one approval from a project member with push permissions
-
-We also recommend that you share in your description:
-
- - Any motivations or intent for the contribution
- - Links to any issues/pull requests it might be related to
- - Links to any webpages or other external resources that might be related to the change
- - Screenshots, code samples, or other visual aids that demonstrate the changes or how they are implemented
- - Benchmarks if the feature is anticipated to have performance implications
- - Any limitations, constraints or risks that are important to consider
-
-For more information on common topics such as debugging locally, or how to write new integrations, check out [our development guide](https://github.com/DataDog/dd-trace-rb/blob/master/docs/DevelopmentGuide.md). If at any point you have a question or need assistance with your pull request, feel free to mention a project member! We're always happy to help contributors with their pull requests.
-
-## Final word
-
-Many thanks to all of our contributors, and looking forward to seeing you on Github! :tada:
-
- - Datadog Ruby APM Team