From 683dd7bd79917b1dc519c75bc6b043730ca00554 Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Fri, 3 May 2024 14:05:41 -0400 Subject: [PATCH] remove gemfile changes, sync changes with main, fix tests --- gemfiles/ruby_2.5_sinatra_2.gemfile | 42 ---- gemfiles/ruby_2.5_sinatra_2.gemfile.lock | 172 -------------- gemfiles/ruby_2.6_sinatra_2.gemfile | 46 ---- gemfiles/ruby_2.6_sinatra_2.gemfile.lock | 211 ----------------- gemfiles/ruby_2.6_sinatra_3.gemfile | 46 ---- gemfiles/ruby_2.6_sinatra_3.gemfile.lock | 213 ------------------ gemfiles/ruby_2.7_sinatra_2.gemfile.lock | 5 - gemfiles/ruby_2.7_sinatra_3.gemfile.lock | 5 - gemfiles/ruby_3.0_sinatra_2.gemfile.lock | 5 - gemfiles/ruby_3.0_sinatra_3.gemfile.lock | 5 - gemfiles/ruby_3.0_sinatra_4.gemfile.lock | 5 - gemfiles/ruby_3.1_sinatra_2.gemfile.lock | 5 - gemfiles/ruby_3.1_sinatra_3.gemfile.lock | 5 - gemfiles/ruby_3.1_sinatra_4.gemfile.lock | 5 - gemfiles/ruby_3.2_sinatra_2.gemfile.lock | 5 - gemfiles/ruby_3.2_sinatra_3.gemfile.lock | 5 - gemfiles/ruby_3.2_sinatra_4.gemfile.lock | 5 - gemfiles/ruby_3.3_sinatra_2.gemfile.lock | 5 - gemfiles/ruby_3.3_sinatra_3.gemfile.lock | 5 - gemfiles/ruby_3.3_sinatra_4.gemfile.lock | 5 - .../opentelemetry/sdk/span_processor.rb | 4 +- lib/datadog/tracing/span_operation.rb | 3 +- spec/datadog/opentelemetry_spec.rb | 6 +- spec/datadog/tracing/span_operation_spec.rb | 2 +- 24 files changed, 7 insertions(+), 808 deletions(-) delete mode 100644 gemfiles/ruby_2.5_sinatra_2.gemfile delete mode 100644 gemfiles/ruby_2.5_sinatra_2.gemfile.lock delete mode 100644 gemfiles/ruby_2.6_sinatra_2.gemfile delete mode 100644 gemfiles/ruby_2.6_sinatra_2.gemfile.lock delete mode 100644 gemfiles/ruby_2.6_sinatra_3.gemfile delete mode 100644 gemfiles/ruby_2.6_sinatra_3.gemfile.lock diff --git a/gemfiles/ruby_2.5_sinatra_2.gemfile b/gemfiles/ruby_2.5_sinatra_2.gemfile deleted file mode 100644 index 7a5eaee80b8..00000000000 --- a/gemfiles/ruby_2.5_sinatra_2.gemfile +++ /dev/null @@ -1,42 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", "~> 2.4.0" -gem "benchmark-ips", "~> 2.8" -gem "benchmark-memory", "< 0.2" -gem "builder" -gem "climate_control", "~> 0.2.0" -gem "concurrent-ruby" -gem "extlz4", "~> 0.3", ">= 0.3.3" -gem "json-schema", "< 3" -gem "memory_profiler", "~> 0.9" -gem "os", "~> 1.1" -gem "pimpmychangelog", ">= 0.1.2" -gem "pry" -gem "pry-nav" -gem "pry-stack_explorer" -gem "rake", ">= 10.5" -gem "rake-compiler", "~> 1.1", ">= 1.1.1" -gem "redcarpet", "~> 3.4" -gem "rspec", "~> 3.12" -gem "rspec-collection_matchers", "~> 1.1" -gem "rspec-wait", "~> 0" -gem "rspec_junit_formatter", ">= 0.5.1" -gem "rspec_n", "~> 1.3" -gem "simplecov", git: "https://github.com/DataDog/simplecov", ref: "3bb6b7ee58bf4b1954ca205f50dd44d6f41c57db" -gem "simplecov-cobertura", "~> 2.1.0" -gem "warning", "~> 1" -gem "webmock", ">= 3.10.0" -gem "yard", "~> 0.9" -gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" -gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1", "< 3.19.2"] -gem "sinatra", "~> 2" -gem "rack-contrib" -gem "rack-test" - -group :check do - -end - -gemspec path: "../" diff --git a/gemfiles/ruby_2.5_sinatra_2.gemfile.lock b/gemfiles/ruby_2.5_sinatra_2.gemfile.lock deleted file mode 100644 index 5c3c7ae60a0..00000000000 --- a/gemfiles/ruby_2.5_sinatra_2.gemfile.lock +++ /dev/null @@ -1,172 +0,0 @@ -GIT - remote: https://github.com/DataDog/simplecov - revision: 3bb6b7ee58bf4b1954ca205f50dd44d6f41c57db - ref: 3bb6b7ee58bf4b1954ca205f50dd44d6f41c57db - specs: - simplecov (0.21.2) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - -PATH - remote: .. - specs: - datadog (2.0.0.beta2) - debase-ruby_core_source (= 3.3.1) - libdatadog (~> 7.0.0.1.0) - libddwaf (~> 1.14.0.0.0) - msgpack - -GEM - remote: https://rubygems.org/ - specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - appraisal (2.4.1) - bundler - rake - thor (>= 0.14.0) - benchmark-ips (2.13.0) - benchmark-memory (0.1.2) - memory_profiler (~> 0.9) - bigdecimal (3.1.7) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) - builder (3.2.4) - climate_control (0.2.0) - coderay (1.1.3) - colorize (0.8.1) - concurrent-ruby (1.2.3) - crack (1.0.0) - bigdecimal - rexml - cri (2.15.11) - debase-ruby_core_source (3.3.1) - debug_inspector (1.2.0) - diff-lcs (1.5.1) - docile (1.4.0) - dogstatsd-ruby (5.6.1) - extlz4 (0.3.4) - ffi (1.16.3) - google-protobuf (3.19.1) - google-protobuf (3.19.1-x86_64-linux) - hashdiff (1.1.0) - json-schema (2.8.1) - addressable (>= 2.4) - libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) - memory_profiler (0.9.14) - method_source (1.1.0) - msgpack (1.7.2) - mustermann (2.0.2) - ruby2_keywords (~> 0.0.1) - os (1.1.4) - pimpmychangelog (0.1.3) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) - pry-nav (1.0.0) - pry (>= 0.9.10, < 0.15) - pry-stack_explorer (0.4.13) - binding_of_caller (~> 0.7) - pry (~> 0.13) - public_suffix (4.0.7) - rack (2.2.9) - rack-contrib (2.4.0) - rack (< 4) - rack-protection (2.2.4) - rack - rack-test (2.1.0) - rack (>= 1.3) - rake (13.2.1) - rake-compiler (1.2.7) - rake - redcarpet (3.6.0) - rexml (3.2.6) - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-collection_matchers (1.2.1) - rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.13.0) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.1) - rspec-wait (0.0.10) - rspec (>= 3.0) - rspec_junit_formatter (0.6.0) - rspec-core (>= 2, < 4, != 2.12.0) - rspec_n (1.3.0) - colorize (~> 0.8.0) - cri (~> 2.15.3) - ruby2_keywords (0.0.5) - simplecov-cobertura (2.1.0) - rexml - simplecov (~> 0.19) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - sinatra (2.2.4) - mustermann (~> 2.0) - rack (~> 2.2) - rack-protection (= 2.2.4) - tilt (~> 2.0) - thor (1.2.2) - tilt (2.3.0) - warning (1.3.0) - webmock (3.23.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - yard (0.9.36) - -PLATFORMS - aarch64-linux - x86_64-linux - -DEPENDENCIES - appraisal (~> 2.4.0) - benchmark-ips (~> 2.8) - benchmark-memory (< 0.2) - builder - climate_control (~> 0.2.0) - concurrent-ruby - datadog! - dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - extlz4 (~> 0.3, >= 0.3.3) - google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) - json-schema (< 3) - memory_profiler (~> 0.9) - os (~> 1.1) - pimpmychangelog (>= 0.1.2) - pry - pry-nav - pry-stack_explorer - rack-contrib - rack-test - rake (>= 10.5) - rake-compiler (~> 1.1, >= 1.1.1) - redcarpet (~> 3.4) - rspec (~> 3.12) - rspec-collection_matchers (~> 1.1) - rspec-wait (~> 0) - rspec_junit_formatter (>= 0.5.1) - rspec_n (~> 1.3) - simplecov! - simplecov-cobertura (~> 2.1.0) - sinatra (~> 2) - warning (~> 1) - webmock (>= 3.10.0) - yard (~> 0.9) - -BUNDLED WITH - 2.3.27 diff --git a/gemfiles/ruby_2.6_sinatra_2.gemfile b/gemfiles/ruby_2.6_sinatra_2.gemfile deleted file mode 100644 index 5caee35d32e..00000000000 --- a/gemfiles/ruby_2.6_sinatra_2.gemfile +++ /dev/null @@ -1,46 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", "~> 2.4.0" -gem "benchmark-ips", "~> 2.8" -gem "benchmark-memory", "< 0.2" -gem "builder" -gem "climate_control", "~> 0.2.0" -gem "concurrent-ruby" -gem "extlz4", "~> 0.3", ">= 0.3.3" -gem "json-schema", "< 3" -gem "memory_profiler", "~> 0.9" -gem "os", "~> 1.1" -gem "pimpmychangelog", ">= 0.1.2" -gem "pry" -gem "pry-byebug" -gem "pry-stack_explorer" -gem "rake", ">= 10.5" -gem "rake-compiler", "~> 1.1", ">= 1.1.1" -gem "redcarpet", "~> 3.4" -gem "rspec", "~> 3.12" -gem "rspec-collection_matchers", "~> 1.1" -gem "rspec-wait", "~> 0" -gem "rspec_junit_formatter", ">= 0.5.1" -gem "rspec_n", "~> 1.3" -gem "simplecov", git: "https://github.com/DataDog/simplecov", ref: "3bb6b7ee58bf4b1954ca205f50dd44d6f41c57db" -gem "simplecov-cobertura", "~> 2.1.0" -gem "warning", "~> 1" -gem "webmock", ">= 3.10.0" -gem "yard", "~> 0.9" -gem "rubocop", "~> 1.50.0", require: false -gem "rubocop-packaging", "~> 0.5.2", require: false -gem "rubocop-performance", "~> 1.9", require: false -gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false -gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" -gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1", "< 3.19.2"] -gem "sinatra", "~> 2" -gem "rack-contrib" -gem "rack-test" - -group :check do - -end - -gemspec path: "../" diff --git a/gemfiles/ruby_2.6_sinatra_2.gemfile.lock b/gemfiles/ruby_2.6_sinatra_2.gemfile.lock deleted file mode 100644 index 5fa13cc6773..00000000000 --- a/gemfiles/ruby_2.6_sinatra_2.gemfile.lock +++ /dev/null @@ -1,211 +0,0 @@ -GIT - remote: https://github.com/DataDog/simplecov - revision: 3bb6b7ee58bf4b1954ca205f50dd44d6f41c57db - ref: 3bb6b7ee58bf4b1954ca205f50dd44d6f41c57db - specs: - simplecov (0.21.2) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - -PATH - remote: .. - specs: - datadog (2.0.0.beta2) - debase-ruby_core_source (= 3.3.1) - libdatadog (~> 7.0.0.1.0) - libddwaf (~> 1.14.0.0.0) - msgpack - -GEM - remote: https://rubygems.org/ - specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - appraisal (2.4.1) - bundler - rake - thor (>= 0.14.0) - ast (2.4.2) - benchmark-ips (2.13.0) - benchmark-memory (0.1.2) - memory_profiler (~> 0.9) - bigdecimal (3.1.7) - binding_of_caller (1.0.1) - debug_inspector (>= 1.2.0) - builder (3.2.4) - byebug (11.1.3) - climate_control (0.2.0) - coderay (1.1.3) - colorize (0.8.1) - concurrent-ruby (1.2.3) - crack (1.0.0) - bigdecimal - rexml - cri (2.15.11) - debase-ruby_core_source (3.3.1) - debug_inspector (1.2.0) - diff-lcs (1.5.1) - docile (1.4.0) - dogstatsd-ruby (5.6.1) - extlz4 (0.3.4) - ffi (1.16.3) - google-protobuf (3.19.1) - google-protobuf (3.19.1-x86_64-linux) - hashdiff (1.1.0) - json (2.7.2) - json-schema (2.8.1) - addressable (>= 2.4) - libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) - memory_profiler (0.9.14) - method_source (1.1.0) - msgpack (1.7.2) - mustermann (2.0.2) - ruby2_keywords (~> 0.0.1) - os (1.1.4) - parallel (1.24.0) - parser (3.3.1.0) - ast (~> 2.4.1) - racc - pimpmychangelog (0.1.3) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.8.0) - byebug (~> 11.0) - pry (~> 0.10) - pry-stack_explorer (0.6.1) - binding_of_caller (~> 1.0) - pry (~> 0.13) - public_suffix (5.0.5) - racc (1.7.3) - rack (2.2.9) - rack-contrib (2.4.0) - rack (< 4) - rack-protection (2.2.4) - rack - rack-test (2.1.0) - rack (>= 1.3) - rainbow (3.1.1) - rake (13.2.1) - rake-compiler (1.2.7) - rake - redcarpet (3.6.0) - regexp_parser (2.9.0) - rexml (3.2.6) - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-collection_matchers (1.2.1) - rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.13.0) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.1) - rspec-wait (0.0.10) - rspec (>= 3.0) - rspec_junit_formatter (0.6.0) - rspec-core (>= 2, < 4, != 2.12.0) - rspec_n (1.4.0) - colorize (~> 0.8.0) - cri (~> 2.15.3) - rubocop (1.50.2) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.2.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.18.0) - rubocop (~> 1.41) - rubocop-packaging (0.5.2) - rubocop (>= 1.33, < 2.0) - rubocop-performance (1.17.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rspec (2.20.0) - rubocop (~> 1.33) - rubocop-capybara (~> 2.17) - ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - simplecov-cobertura (2.1.0) - rexml - simplecov (~> 0.19) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - sinatra (2.2.4) - mustermann (~> 2.0) - rack (~> 2.2) - rack-protection (= 2.2.4) - tilt (~> 2.0) - thor (1.3.1) - tilt (2.3.0) - unicode-display_width (2.5.0) - warning (1.3.0) - webmock (3.23.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - yard (0.9.36) - -PLATFORMS - aarch64-linux - x86_64-linux - -DEPENDENCIES - appraisal (~> 2.4.0) - benchmark-ips (~> 2.8) - benchmark-memory (< 0.2) - builder - climate_control (~> 0.2.0) - concurrent-ruby - datadog! - dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - extlz4 (~> 0.3, >= 0.3.3) - google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) - json-schema (< 3) - memory_profiler (~> 0.9) - os (~> 1.1) - pimpmychangelog (>= 0.1.2) - pry - pry-byebug - pry-stack_explorer - rack-contrib - rack-test - rake (>= 10.5) - rake-compiler (~> 1.1, >= 1.1.1) - redcarpet (~> 3.4) - rspec (~> 3.12) - rspec-collection_matchers (~> 1.1) - rspec-wait (~> 0) - rspec_junit_formatter (>= 0.5.1) - rspec_n (~> 1.3) - rubocop (~> 1.50.0) - rubocop-packaging (~> 0.5.2) - rubocop-performance (~> 1.9) - rubocop-rspec (~> 2.20, < 2.21) - simplecov! - simplecov-cobertura (~> 2.1.0) - sinatra (~> 2) - warning (~> 1) - webmock (>= 3.10.0) - yard (~> 0.9) - -BUNDLED WITH - 2.3.26 diff --git a/gemfiles/ruby_2.6_sinatra_3.gemfile b/gemfiles/ruby_2.6_sinatra_3.gemfile deleted file mode 100644 index 79d0b596b29..00000000000 --- a/gemfiles/ruby_2.6_sinatra_3.gemfile +++ /dev/null @@ -1,46 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", "~> 2.4.0" -gem "benchmark-ips", "~> 2.8" -gem "benchmark-memory", "< 0.2" -gem "builder" -gem "climate_control", "~> 0.2.0" -gem "concurrent-ruby" -gem "extlz4", "~> 0.3", ">= 0.3.3" -gem "json-schema", "< 3" -gem "memory_profiler", "~> 0.9" -gem "os", "~> 1.1" -gem "pimpmychangelog", ">= 0.1.2" -gem "pry" -gem "pry-byebug" -gem "pry-stack_explorer" -gem "rake", ">= 10.5" -gem "rake-compiler", "~> 1.1", ">= 1.1.1" -gem "redcarpet", "~> 3.4" -gem "rspec", "~> 3.12" -gem "rspec-collection_matchers", "~> 1.1" -gem "rspec-wait", "~> 0" -gem "rspec_junit_formatter", ">= 0.5.1" -gem "rspec_n", "~> 1.3" -gem "simplecov", git: "https://github.com/DataDog/simplecov", ref: "3bb6b7ee58bf4b1954ca205f50dd44d6f41c57db" -gem "simplecov-cobertura", "~> 2.1.0" -gem "warning", "~> 1" -gem "webmock", ">= 3.10.0" -gem "yard", "~> 0.9" -gem "rubocop", "~> 1.50.0", require: false -gem "rubocop-packaging", "~> 0.5.2", require: false -gem "rubocop-performance", "~> 1.9", require: false -gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false -gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" -gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1", "< 3.19.2"] -gem "sinatra", "~> 3" -gem "rack-contrib" -gem "rack-test" - -group :check do - -end - -gemspec path: "../" diff --git a/gemfiles/ruby_2.6_sinatra_3.gemfile.lock b/gemfiles/ruby_2.6_sinatra_3.gemfile.lock deleted file mode 100644 index ac20f4e0caa..00000000000 --- a/gemfiles/ruby_2.6_sinatra_3.gemfile.lock +++ /dev/null @@ -1,213 +0,0 @@ -GIT - remote: https://github.com/DataDog/simplecov - revision: 3bb6b7ee58bf4b1954ca205f50dd44d6f41c57db - ref: 3bb6b7ee58bf4b1954ca205f50dd44d6f41c57db - specs: - simplecov (0.21.2) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - -PATH - remote: .. - specs: - datadog (2.0.0.beta2) - debase-ruby_core_source (= 3.3.1) - libdatadog (~> 7.0.0.1.0) - libddwaf (~> 1.14.0.0.0) - msgpack - -GEM - remote: https://rubygems.org/ - specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - appraisal (2.4.1) - bundler - rake - thor (>= 0.14.0) - ast (2.4.2) - base64 (0.2.0) - benchmark-ips (2.13.0) - benchmark-memory (0.1.2) - memory_profiler (~> 0.9) - bigdecimal (3.1.7) - binding_of_caller (1.0.1) - debug_inspector (>= 1.2.0) - builder (3.2.4) - byebug (11.1.3) - climate_control (0.2.0) - coderay (1.1.3) - colorize (0.8.1) - concurrent-ruby (1.2.3) - crack (1.0.0) - bigdecimal - rexml - cri (2.15.11) - debase-ruby_core_source (3.3.1) - debug_inspector (1.2.0) - diff-lcs (1.5.1) - docile (1.4.0) - dogstatsd-ruby (5.6.1) - extlz4 (0.3.4) - ffi (1.16.3) - google-protobuf (3.19.1) - google-protobuf (3.19.1-x86_64-linux) - hashdiff (1.1.0) - json (2.7.2) - json-schema (2.8.1) - addressable (>= 2.4) - libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) - libddwaf (1.14.0.0.0-aarch64-linux) - ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) - memory_profiler (0.9.14) - method_source (1.1.0) - msgpack (1.7.2) - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - os (1.1.4) - parallel (1.24.0) - parser (3.3.1.0) - ast (~> 2.4.1) - racc - pimpmychangelog (0.1.3) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.8.0) - byebug (~> 11.0) - pry (~> 0.10) - pry-stack_explorer (0.6.1) - binding_of_caller (~> 1.0) - pry (~> 0.13) - public_suffix (5.0.5) - racc (1.7.3) - rack (2.2.9) - rack-contrib (2.4.0) - rack (< 4) - rack-protection (3.2.0) - base64 (>= 0.1.0) - rack (~> 2.2, >= 2.2.4) - rack-test (2.1.0) - rack (>= 1.3) - rainbow (3.1.1) - rake (13.2.1) - rake-compiler (1.2.7) - rake - redcarpet (3.6.0) - regexp_parser (2.9.0) - rexml (3.2.6) - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-collection_matchers (1.2.1) - rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.13.0) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.1) - rspec-wait (0.0.10) - rspec (>= 3.0) - rspec_junit_formatter (0.6.0) - rspec-core (>= 2, < 4, != 2.12.0) - rspec_n (1.4.0) - colorize (~> 0.8.0) - cri (~> 2.15.3) - rubocop (1.50.2) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.2.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.18.0) - rubocop (~> 1.41) - rubocop-packaging (0.5.2) - rubocop (>= 1.33, < 2.0) - rubocop-performance (1.17.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rspec (2.20.0) - rubocop (~> 1.33) - rubocop-capybara (~> 2.17) - ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - simplecov-cobertura (2.1.0) - rexml - simplecov (~> 0.19) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - sinatra (3.2.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.2.0) - tilt (~> 2.0) - thor (1.3.1) - tilt (2.3.0) - unicode-display_width (2.5.0) - warning (1.3.0) - webmock (3.23.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - yard (0.9.36) - -PLATFORMS - aarch64-linux - x86_64-linux - -DEPENDENCIES - appraisal (~> 2.4.0) - benchmark-ips (~> 2.8) - benchmark-memory (< 0.2) - builder - climate_control (~> 0.2.0) - concurrent-ruby - datadog! - dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - extlz4 (~> 0.3, >= 0.3.3) - google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) - json-schema (< 3) - memory_profiler (~> 0.9) - os (~> 1.1) - pimpmychangelog (>= 0.1.2) - pry - pry-byebug - pry-stack_explorer - rack-contrib - rack-test - rake (>= 10.5) - rake-compiler (~> 1.1, >= 1.1.1) - redcarpet (~> 3.4) - rspec (~> 3.12) - rspec-collection_matchers (~> 1.1) - rspec-wait (~> 0) - rspec_junit_formatter (>= 0.5.1) - rspec_n (~> 1.3) - rubocop (~> 1.50.0) - rubocop-packaging (~> 0.5.2) - rubocop-performance (~> 1.9) - rubocop-rspec (~> 2.20, < 2.21) - simplecov! - simplecov-cobertura (~> 2.1.0) - sinatra (~> 3) - warning (~> 1) - webmock (>= 3.10.0) - yard (~> 0.9) - -BUNDLED WITH - 2.3.26 diff --git a/gemfiles/ruby_2.7_sinatra_2.gemfile.lock b/gemfiles/ruby_2.7_sinatra_2.gemfile.lock index 70e037578b2..40a05b97331 100644 --- a/gemfiles/ruby_2.7_sinatra_2.gemfile.lock +++ b/gemfiles/ruby_2.7_sinatra_2.gemfile.lock @@ -51,17 +51,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -166,7 +162,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_2.7_sinatra_3.gemfile.lock b/gemfiles/ruby_2.7_sinatra_3.gemfile.lock index 94c99558370..17e22b81913 100644 --- a/gemfiles/ruby_2.7_sinatra_3.gemfile.lock +++ b/gemfiles/ruby_2.7_sinatra_3.gemfile.lock @@ -52,17 +52,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -168,7 +164,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_3.0_sinatra_2.gemfile.lock b/gemfiles/ruby_3.0_sinatra_2.gemfile.lock index b9171135608..f660d17e05e 100644 --- a/gemfiles/ruby_3.0_sinatra_2.gemfile.lock +++ b/gemfiles/ruby_3.0_sinatra_2.gemfile.lock @@ -51,17 +51,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -167,7 +163,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_3.0_sinatra_3.gemfile.lock b/gemfiles/ruby_3.0_sinatra_3.gemfile.lock index d5bc12ab731..2963965a0c8 100644 --- a/gemfiles/ruby_3.0_sinatra_3.gemfile.lock +++ b/gemfiles/ruby_3.0_sinatra_3.gemfile.lock @@ -52,17 +52,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -169,7 +165,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_3.0_sinatra_4.gemfile.lock b/gemfiles/ruby_3.0_sinatra_4.gemfile.lock index 2885d0e82a8..80f92154bf3 100644 --- a/gemfiles/ruby_3.0_sinatra_4.gemfile.lock +++ b/gemfiles/ruby_3.0_sinatra_4.gemfile.lock @@ -52,17 +52,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -172,7 +168,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_3.1_sinatra_2.gemfile.lock b/gemfiles/ruby_3.1_sinatra_2.gemfile.lock index b9171135608..f660d17e05e 100644 --- a/gemfiles/ruby_3.1_sinatra_2.gemfile.lock +++ b/gemfiles/ruby_3.1_sinatra_2.gemfile.lock @@ -51,17 +51,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -167,7 +163,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_3.1_sinatra_3.gemfile.lock b/gemfiles/ruby_3.1_sinatra_3.gemfile.lock index d5bc12ab731..2963965a0c8 100644 --- a/gemfiles/ruby_3.1_sinatra_3.gemfile.lock +++ b/gemfiles/ruby_3.1_sinatra_3.gemfile.lock @@ -52,17 +52,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -169,7 +165,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_3.1_sinatra_4.gemfile.lock b/gemfiles/ruby_3.1_sinatra_4.gemfile.lock index 2885d0e82a8..80f92154bf3 100644 --- a/gemfiles/ruby_3.1_sinatra_4.gemfile.lock +++ b/gemfiles/ruby_3.1_sinatra_4.gemfile.lock @@ -52,17 +52,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -172,7 +168,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_3.2_sinatra_2.gemfile.lock b/gemfiles/ruby_3.2_sinatra_2.gemfile.lock index cb4244b607c..0b06613b5b8 100644 --- a/gemfiles/ruby_3.2_sinatra_2.gemfile.lock +++ b/gemfiles/ruby_3.2_sinatra_2.gemfile.lock @@ -50,17 +50,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -163,7 +159,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_3.2_sinatra_3.gemfile.lock b/gemfiles/ruby_3.2_sinatra_3.gemfile.lock index 088daaca5bc..99943810388 100644 --- a/gemfiles/ruby_3.2_sinatra_3.gemfile.lock +++ b/gemfiles/ruby_3.2_sinatra_3.gemfile.lock @@ -51,17 +51,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -165,7 +161,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_3.2_sinatra_4.gemfile.lock b/gemfiles/ruby_3.2_sinatra_4.gemfile.lock index 423dbf101b3..ac84ea23fca 100644 --- a/gemfiles/ruby_3.2_sinatra_4.gemfile.lock +++ b/gemfiles/ruby_3.2_sinatra_4.gemfile.lock @@ -51,17 +51,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -168,7 +164,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_3.3_sinatra_2.gemfile.lock b/gemfiles/ruby_3.3_sinatra_2.gemfile.lock index cb4244b607c..0b06613b5b8 100644 --- a/gemfiles/ruby_3.3_sinatra_2.gemfile.lock +++ b/gemfiles/ruby_3.3_sinatra_2.gemfile.lock @@ -50,17 +50,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -163,7 +159,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_3.3_sinatra_3.gemfile.lock b/gemfiles/ruby_3.3_sinatra_3.gemfile.lock index 088daaca5bc..99943810388 100644 --- a/gemfiles/ruby_3.3_sinatra_3.gemfile.lock +++ b/gemfiles/ruby_3.3_sinatra_3.gemfile.lock @@ -51,17 +51,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -165,7 +161,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/gemfiles/ruby_3.3_sinatra_4.gemfile.lock b/gemfiles/ruby_3.3_sinatra_4.gemfile.lock index 423dbf101b3..ac84ea23fca 100644 --- a/gemfiles/ruby_3.3_sinatra_4.gemfile.lock +++ b/gemfiles/ruby_3.3_sinatra_4.gemfile.lock @@ -51,17 +51,13 @@ GEM extlz4 (0.3.4) ffi (1.16.3) google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-x86_64-linux) hashdiff (1.1.0) json (2.7.2) json-schema (2.8.1) addressable (>= 2.4) libdatadog (7.0.0.1.0-aarch64-linux) - libdatadog (7.0.0.1.0-x86_64-linux) libddwaf (1.14.0.0.0-aarch64-linux) ffi (~> 1.0) - libddwaf (1.14.0.0.0-x86_64-linux) - ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.1.0) msgpack (1.7.2) @@ -168,7 +164,6 @@ GEM PLATFORMS aarch64-linux - x86_64-linux DEPENDENCIES appraisal (~> 2.4.0) diff --git a/lib/datadog/opentelemetry/sdk/span_processor.rb b/lib/datadog/opentelemetry/sdk/span_processor.rb index 5b50a38b07c..f4c09b6f9fc 100644 --- a/lib/datadog/opentelemetry/sdk/span_processor.rb +++ b/lib/datadog/opentelemetry/sdk/span_processor.rb @@ -92,10 +92,10 @@ def start_datadog_span(span) unless span.links.nil? datadog_span.links = span.links.map do |link| Datadog::Tracing::SpanLink.new( - digest: Datadog::Tracing::TraceDigest.new( + Datadog::Tracing::TraceDigest.new( trace_id: link.span_context.hex_trace_id.to_i(16), span_id: link.span_context.hex_span_id.to_i(16), - trace_flags: (link.span_context.trace_flags&.sampled? ? 1 : 0), + trace_sampling_priority: (link.span_context.trace_flags&.sampled? ? 1 : 0), trace_state: link.span_context.tracestate&.to_s, span_remote: link.span_context.remote?, ), diff --git a/lib/datadog/tracing/span_operation.rb b/lib/datadog/tracing/span_operation.rb index 18e869d16b7..cb3edde7862 100644 --- a/lib/datadog/tracing/span_operation.rb +++ b/lib/datadog/tracing/span_operation.rb @@ -259,8 +259,7 @@ def finished? def duration return @duration_end - @duration_start if @duration_start && @duration_end - - @end_time - @start_time if @start_time && @end_time + return @end_time - @start_time if @start_time && @end_time end def set_error(e) diff --git a/spec/datadog/opentelemetry_spec.rb b/spec/datadog/opentelemetry_spec.rb index 623d5893cc2..54ced07cf46 100644 --- a/spec/datadog/opentelemetry_spec.rb +++ b/spec/datadog/opentelemetry_spec.rb @@ -352,9 +352,9 @@ expect(span.links[0].attributes).to eq({ 'key' => 'val', '1' => true }) expect(span.links[1].trace_id).to eq(1234534) - expect(span.links[1].span_id).to eq(67890) - expect(span.links[1].trace_flags).to eq(10) - expect(span.links[1].trace_state).to eq(sc2.tracestate.to_s) + expect(span.links[1].span_id).to eq(10) + expect(span.links[1].trace_flags).to eq(1) + expect(span.links[1].trace_state).to eq('otel=blahxd') expect(span.links[1].attributes).to eq({ 'key2' => true, 'list' => [1, 2] }) end end diff --git a/spec/datadog/tracing/span_operation_spec.rb b/spec/datadog/tracing/span_operation_spec.rb index eb2f47da1c0..a8de6c79873 100644 --- a/spec/datadog/tracing/span_operation_spec.rb +++ b/spec/datadog/tracing/span_operation_spec.rb @@ -242,7 +242,7 @@ context 'that is an Array' do let(:span_links) do [Datadog::Tracing::SpanLink.new( - digest: Datadog::Tracing::TraceDigest.new(trace_id: 1, span_id: 2), + Datadog::Tracing::TraceDigest.new(trace_id: 1, span_id: 2), attributes: { "link.name": 'moon' } )] end