diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2bda71652b5..7634bfae358 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,6 +5,17 @@ for guidance on how to set up your development environment, run the test suite, write new integrations, and more. --> +**2.0 Upgrade Guide notes** + + **What does this PR do?** diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index e5176be0639..8369411a4ad 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -170,6 +170,9 @@ jobs: - library: ruby app: rails70 scenario: APPSEC_AUTO_EVENTS_EXTENDED + - library: ruby + app: rails70 + scenario: APPSEC_API_SECURITY - library: ruby app: rack scenario: APPSEC_RULES_MONITORING_WITH_ERRORS diff --git a/.gitlab/benchmarks.yml b/.gitlab/benchmarks.yml index 67a8f47e95a..388c51609c2 100644 --- a/.gitlab/benchmarks.yml +++ b/.gitlab/benchmarks.yml @@ -128,16 +128,6 @@ candidate-tracer-appsec-with-api-security: DD_EXPERIMENTAL_API_SECURITY_ENABLED: "true" DD_API_SECURITY_REQUEST_SAMPLE_RATE: "1.0" -candidate-tracer-appsec-with-api-security-without-response-body: - extends: .benchmarks - variables: - DD_BENCHMARKS_CONFIGURATION: "tracing-and-appsec-with-api-security-without-response-body" - DD_PROFILING_ENABLED: "false" - DD_APPSEC_ENABLED: "true" - DD_EXPERIMENTAL_API_SECURITY_ENABLED: "true" - DD_API_SECURITY_REQUEST_SAMPLE_RATE: "1.0" - DD_API_SECURITY_PARSE_RESPONSE_BODY: "false" - # ----------------------------------------------------- # Microbenchmarks that report to statsd # ----------------------------------------------------- diff --git a/CHANGELOG.md b/CHANGELOG.md index 46257d9dbab..d43f2c49931 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,44 @@ ## [Unreleased] +## [1.16.2] - 2023-11-10 + +This release reverts a change to appsec response body parsing that was introduced in [1.16.0 ](https://github.com/DataDog/dd-trace-rb/releases/tag/v1.16.0) that may cause memory leaks. + +### Fixed +* Appsec: [Revert parse response body fix introduced in 1.16.0](https://github.com/DataDog/dd-trace-rb/pull/3153) ([#3252][]) + +## [1.16.1] - 2023-11-08 + +### Fixed + +* Tracing: Fix `concurrent-ruby` future propagation without `active_trace` ([#3242][]) +* Tracing: Fix host injection error handling ([#3240][]) + +## [1.16.0] - 2023-11-03 + +**This release includes a security change for the Tracing Redis integration:** + +Currently, the Datadog Agent removes command arguments from the resource name. However there are cases, like Redis compressed keys, where this obfuscation cannot correctly remove command arguments. To safeguard that situation, the resource name set by the tracer will only be the command (e.g. `SET`) with no arguments. To retain the previous behavior and keep arguments in the span resource, with the potential risk of some command arguments not being fully obfuscated, set ``DD_REDIS_COMMAND_ARGS=true`` or set the option `c.instrument :redis, command_args: true`. + +### Added + +* Tracing: Propagate trace through `Concurrent::Promises.future` ([#1522][]) +* Core: Name `Datadog::Core::Remote::Worker` thread ([#3207][]) + +### Changed + +* Tracing: Redis - Omit command arguments from span.resource by default ([#3235][]) +* Ci-app: Bump `datadog-ci` dependency from 0.2.0 to 0.3.0 ([#3223][]) + +### Fixed + +* Appsec: ASM parse response body ([#3153][]) +* Appsec: ASM make sure to append content type and length information ([#3204][]) +* Appsec: Make sure function that checks content-type header value accepts nil content-type header value ([#3234][]) +* Profiling: Shut down profiler if any components failed ([#3197][]) +* Tracing: Fix `ActiveSupport` instrumentation of custom cache stores ([#3206][]) + ## [1.15.0] - 2023-10-09 ### Highlights @@ -2595,7 +2633,11 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1 Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1 -[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v1.15.0...master + +[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v1.16.2...master +[1.16.2]: https://github.com/DataDog/dd-trace-rb/compare/v1.16.1...v1.16.2 +[1.16.1]: https://github.com/DataDog/dd-trace-rb/compare/v1.16.0...v1.16.1 +[1.16.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.15.0...v1.16.0 [1.15.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.14.0...v1.15.0 [1.14.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.13.1...1.14.0 [1.13.1]: https://github.com/DataDog/dd-trace-rb/compare/v1.13.0...1.13.1 @@ -3333,6 +3375,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1 [#1509]: https://github.com/DataDog/dd-trace-rb/issues/1509 [#1510]: https://github.com/DataDog/dd-trace-rb/issues/1510 [#1511]: https://github.com/DataDog/dd-trace-rb/issues/1511 +[#1522]: https://github.com/DataDog/dd-trace-rb/issues/1522 [#1523]: https://github.com/DataDog/dd-trace-rb/issues/1523 [#1524]: https://github.com/DataDog/dd-trace-rb/issues/1524 [#1529]: https://github.com/DataDog/dd-trace-rb/issues/1529 @@ -3781,6 +3824,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1 [#3148]: https://github.com/DataDog/dd-trace-rb/issues/3148 [#3150]: https://github.com/DataDog/dd-trace-rb/issues/3150 [#3152]: https://github.com/DataDog/dd-trace-rb/issues/3152 +[#3153]: https://github.com/DataDog/dd-trace-rb/issues/3153 [#3158]: https://github.com/DataDog/dd-trace-rb/issues/3158 [#3162]: https://github.com/DataDog/dd-trace-rb/issues/3162 [#3163]: https://github.com/DataDog/dd-trace-rb/issues/3163 @@ -3796,6 +3840,16 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1 [#3188]: https://github.com/DataDog/dd-trace-rb/issues/3188 [#3189]: https://github.com/DataDog/dd-trace-rb/issues/3189 [#3190]: https://github.com/DataDog/dd-trace-rb/issues/3190 +[#3197]: https://github.com/DataDog/dd-trace-rb/issues/3197 +[#3204]: https://github.com/DataDog/dd-trace-rb/issues/3204 +[#3206]: https://github.com/DataDog/dd-trace-rb/issues/3206 +[#3207]: https://github.com/DataDog/dd-trace-rb/issues/3207 +[#3223]: https://github.com/DataDog/dd-trace-rb/issues/3223 +[#3234]: https://github.com/DataDog/dd-trace-rb/issues/3234 +[#3235]: https://github.com/DataDog/dd-trace-rb/issues/3235 +[#3240]: https://github.com/DataDog/dd-trace-rb/issues/3240 +[#3242]: https://github.com/DataDog/dd-trace-rb/issues/3242 +[#3252]: https://github.com/DataDog/dd-trace-rb/issues/3252 [@AdrianLC]: https://github.com/AdrianLC [@Azure7111]: https://github.com/Azure7111 [@BabyGroot]: https://github.com/BabyGroot @@ -3947,4 +4001,4 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1 [@y-yagi]: https://github.com/y-yagi [@yujideveloper]: https://github.com/yujideveloper [@yukimurasawa]: https://github.com/yukimurasawa -[@zachmccormick]: https://github.com/zachmccormick +[@zachmccormick]: https://github.com/zachmccormick \ No newline at end of file diff --git a/Rakefile b/Rakefile index 4d1c3f282d4..3d45ad1d22b 100644 --- a/Rakefile +++ b/Rakefile @@ -65,8 +65,8 @@ TEST_METADATA = { 'relational_db' => '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby' }, 'elasticsearch' => { - 'http' => '✅ 2.1 / ✅ 2.2 / ❌ 2.3 / ❌ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby', - 'contrib-old' => '❌ 2.1 / ❌ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby' + 'elasticsearch-7' => '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby', + 'elasticsearch-8' => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby' }, 'ethon' => { 'http' => '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby' @@ -602,58 +602,42 @@ namespace :changelog do end end -native_exts = [] - -native_exts << Rake::ExtensionTask.new("ddtrace_profiling_native_extension.#{RUBY_VERSION}_#{RUBY_PLATFORM}") do |ext| - ext.ext_dir = 'ext/ddtrace_profiling_native_extension' -end - -native_exts << Rake::ExtensionTask.new("ddtrace_profiling_loader.#{RUBY_VERSION}_#{RUBY_PLATFORM}") do |ext| - ext.ext_dir = 'ext/ddtrace_profiling_loader' -end - -NATIVE_CLEAN = ::Rake::FileList['ext/**/*.o', 'ext/**/*.bundle'] -namespace :native_dev do - def generate_ext_makefile(ext) - cmd = ext.make_makefile_cmd(Dir.pwd, ext.ext_dir, "#{ext.ext_dir}/#{ext.config_script}", nil) - puts cmd - chdir ext.ext_dir do - sh(*cmd) - end - end +NATIVE_EXTS = [ + Rake::ExtensionTask.new("ddtrace_profiling_native_extension.#{RUBY_VERSION}_#{RUBY_PLATFORM}") do |ext| + ext.ext_dir = 'ext/ddtrace_profiling_native_extension' + end, - def generate_ext_compile_commands(ext) - chdir ext.ext_dir do - sh('make clean; bear -- make; make clean') - end + Rake::ExtensionTask.new("ddtrace_profiling_loader.#{RUBY_VERSION}_#{RUBY_PLATFORM}") do |ext| + ext.ext_dir = 'ext/ddtrace_profiling_loader' end +].freeze - compile_commands_tasks = native_exts.map do |ext| - makefile_task = file "#{ext.ext_dir}/Makefile" do - generate_ext_makefile(ext) - end - - NATIVE_CLEAN << makefile_task.name - NATIVE_CLEAN << "#{ext.ext_dir}/extconf.h" - NATIVE_CLEAN << "#{ext.ext_dir}/mkmf.log" - - compile_commands_task = file "#{ext.ext_dir}/compile_commands.json" => makefile_task do - generate_ext_compile_commands(ext) +NATIVE_CLEAN = ::Rake::FileList[] +namespace :native_dev do + compile_commands_tasks = NATIVE_EXTS.map do |ext| + tmp_dir_dd_native_dev = "#{ext.tmp_dir}/dd_native_dev" + directory tmp_dir_dd_native_dev + NATIVE_CLEAN << tmp_dir_dd_native_dev + + compile_commands_task = file "#{ext.ext_dir}/compile_commands.json" => [tmp_dir_dd_native_dev] do |t| + puts "Generating #{t.name}" + root_dir = Dir.pwd + cmd = ext.make_makefile_cmd(root_dir, tmp_dir_dd_native_dev, "#{ext.ext_dir}/#{ext.config_script}", nil) + abs_ext_dir = (Pathname.new(root_dir) + ext.ext_dir).realpath + chdir tmp_dir_dd_native_dev do + sh(*cmd) + sh('make clean; bear -- make; make clean') + cp('compile_commands.json', "#{abs_ext_dir}/compile_commands.json") + end end NATIVE_CLEAN << compile_commands_task.name + compile_commands_task end desc 'Setup dev environment for native extensions.' - task setup: compile_commands_tasks do - puts 'Setting up native dev env' - end - - desc 'Remove files generated for dev setup.' - task :clean do - Rake::Cleaner.cleanup_files(NATIVE_CLEAN) - end + task setup: compile_commands_tasks CLEAN.concat(NATIVE_CLEAN) end diff --git a/appraisal/jruby-9.2.rb b/appraisal/jruby-9.2.rb index 83704a9005b..12c51a96aa3 100644 --- a/appraisal/jruby-9.2.rb +++ b/appraisal/jruby-9.2.rb @@ -173,7 +173,6 @@ end appraise 'http' do - gem 'elasticsearch' # Workaround bundle of JRuby/ethon issues: # * ethon 0.15.0 is incompatible with most JRuby 9.2 versions (fixed in 9.2.20.0), # see https://github.com/typhoeus/ethon/issues/205 @@ -198,6 +197,12 @@ end end +[7, 8].each do |n| + appraise "elasticsearch-#{n}" do + gem 'elasticsearch', "~> #{n}" + end +end + appraise 'relational_db' do gem 'activerecord', '~> 5' gem 'delayed_job' @@ -265,7 +270,6 @@ appraise 'contrib-old' do gem 'dalli', '< 3.0.0' - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 gem 'faraday', '0.17' gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 diff --git a/appraisal/jruby-9.3.rb b/appraisal/jruby-9.3.rb index d99670f0d44..a74fdbd22f0 100644 --- a/appraisal/jruby-9.3.rb +++ b/appraisal/jruby-9.3.rb @@ -153,7 +153,6 @@ end appraise 'http' do - gem 'elasticsearch' gem 'ethon' gem 'excon' gem 'faraday' @@ -170,6 +169,12 @@ end end +[7, 8].each do |n| + appraise "elasticsearch-#{n}" do + gem 'elasticsearch', "~> #{n}" + end +end + appraise 'relational_db' do gem 'activerecord', '~> 6.0.0' gem 'delayed_job' @@ -236,7 +241,6 @@ appraise 'contrib-old' do gem 'dalli', '< 3.0.0' - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 gem 'faraday', '0.17' gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 diff --git a/appraisal/jruby-9.4.rb b/appraisal/jruby-9.4.rb index 0f0393f18fc..0b61d4dbf14 100644 --- a/appraisal/jruby-9.4.rb +++ b/appraisal/jruby-9.4.rb @@ -59,7 +59,6 @@ end appraise 'http' do - gem 'elasticsearch' gem 'ethon' gem 'excon' gem 'faraday' @@ -76,6 +75,12 @@ end end +[7, 8].each do |n| + appraise "elasticsearch-#{n}" do + gem 'elasticsearch', "~> #{n}" + end +end + appraise 'relational_db' do gem 'activerecord', '~> 7' gem 'delayed_job' @@ -141,7 +146,6 @@ appraise 'contrib-old' do gem 'dalli', '< 3.0.0' - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 diff --git a/appraisal/ruby-2.1.rb b/appraisal/ruby-2.1.rb index eab0c602007..7df301e1353 100644 --- a/appraisal/ruby-2.1.rb +++ b/appraisal/ruby-2.1.rb @@ -68,7 +68,6 @@ end appraise 'http' do - gem 'elasticsearch' gem 'faraday' gem 'multipart-post', '~> 2.1.1' # Compatible with faraday 0.x gem 'ethon' @@ -79,6 +78,11 @@ gem 'typhoeus' end +appraise 'elasticsearch-7' do + gem 'elasticsearch', '~> 7' + gem 'multipart-post', '~> 2.1.1' # Compatible with faraday 0.x +end + appraise 'relational_db' do gem 'activerecord', '3.2.22.5' gem 'activerecord-mysql-adapter' diff --git a/appraisal/ruby-2.2.rb b/appraisal/ruby-2.2.rb index dc44c6f80b6..f4f450f6d76 100644 --- a/appraisal/ruby-2.2.rb +++ b/appraisal/ruby-2.2.rb @@ -130,7 +130,6 @@ end appraise 'http' do - gem 'elasticsearch' gem 'ethon' gem 'excon' gem 'faraday' @@ -141,6 +140,11 @@ gem 'typhoeus' end +appraise 'elasticsearch-7' do + gem 'elasticsearch', '~> 7' + gem 'multipart-post', '~> 2.1.1' # Compatible with faraday 0.x +end + appraise 'relational_db' do gem 'activerecord', '~> 5' gem 'delayed_job' diff --git a/appraisal/ruby-2.3.rb b/appraisal/ruby-2.3.rb index 8153b157795..620c01bb913 100644 --- a/appraisal/ruby-2.3.rb +++ b/appraisal/ruby-2.3.rb @@ -150,6 +150,10 @@ gem 'typhoeus' end +appraise 'elasticsearch-7' do + gem 'elasticsearch', '~> 7' +end + appraise 'relational_db' do gem 'activerecord', '~> 5' gem 'delayed_job' @@ -220,7 +224,6 @@ end appraise 'contrib-old' do - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 gem 'faraday', '0.17' gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 end diff --git a/appraisal/ruby-2.4.rb b/appraisal/ruby-2.4.rb index bbaafeff2d6..f011946739f 100644 --- a/appraisal/ruby-2.4.rb +++ b/appraisal/ruby-2.4.rb @@ -81,6 +81,10 @@ gem 'opensearch-ruby', '~> 2' end +appraise 'elasticsearch-7' do + gem 'elasticsearch', '~> 7' +end + appraise 'relational_db' do gem 'activerecord', '~> 5' gem 'delayed_job' @@ -156,7 +160,6 @@ end appraise 'contrib-old' do - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 gem 'faraday', '0.17' gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 diff --git a/appraisal/ruby-2.5.rb b/appraisal/ruby-2.5.rb index 362774f811c..3969799f4d3 100644 --- a/appraisal/ruby-2.5.rb +++ b/appraisal/ruby-2.5.rb @@ -156,7 +156,6 @@ end appraise 'http' do - gem 'elasticsearch' gem 'ethon' gem 'excon' gem 'faraday' @@ -173,6 +172,12 @@ end end +[7, 8].each do |n| + appraise "elasticsearch-#{n}" do + gem 'elasticsearch', "~> #{n}" + end +end + appraise 'relational_db' do gem 'activerecord', '~> 5' gem 'delayed_job' @@ -240,7 +245,6 @@ appraise 'contrib-old' do gem 'dalli', '< 3.0.0' - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 gem 'faraday', '0.17' gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 diff --git a/appraisal/ruby-2.6.rb b/appraisal/ruby-2.6.rb index 8778eb68359..4612de80712 100644 --- a/appraisal/ruby-2.6.rb +++ b/appraisal/ruby-2.6.rb @@ -153,7 +153,6 @@ end appraise 'http' do - gem 'elasticsearch' gem 'ethon' gem 'excon' gem 'faraday' @@ -170,6 +169,12 @@ end end +[7, 8].each do |n| + appraise "elasticsearch-#{n}" do + gem 'elasticsearch', "~> #{n}" + end +end + appraise 'relational_db' do gem 'activerecord', '~> 6.0.0' gem 'delayed_job' @@ -241,7 +246,6 @@ appraise 'contrib-old' do gem 'dalli', '< 3.0.0' - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 gem 'faraday', '0.17' gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 diff --git a/appraisal/ruby-2.7.rb b/appraisal/ruby-2.7.rb index 599e16e2484..c4e1d39e1a5 100644 --- a/appraisal/ruby-2.7.rb +++ b/appraisal/ruby-2.7.rb @@ -153,7 +153,6 @@ end appraise 'http' do - gem 'elasticsearch' gem 'ethon' gem 'excon' gem 'faraday' @@ -170,6 +169,12 @@ end end +[7, 8].each do |n| + appraise "elasticsearch-#{n}" do + gem 'elasticsearch', "~> #{n}" + end +end + appraise 'relational_db' do gem 'activerecord', '~> 6.1.0' gem 'delayed_job' @@ -240,7 +245,6 @@ appraise 'contrib-old' do gem 'dalli', '< 3.0.0' - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 gem 'faraday', '0.17' gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 diff --git a/appraisal/ruby-3.0.rb b/appraisal/ruby-3.0.rb index a3e75718bb8..ef3903a77a3 100644 --- a/appraisal/ruby-3.0.rb +++ b/appraisal/ruby-3.0.rb @@ -57,7 +57,6 @@ end appraise 'http' do - gem 'elasticsearch' gem 'ethon' gem 'excon' gem 'faraday' @@ -74,6 +73,12 @@ end end +[7, 8].each do |n| + appraise "elasticsearch-#{n}" do + gem 'elasticsearch', "~> #{n}" + end +end + appraise 'relational_db' do gem 'activerecord', '~> 7' gem 'delayed_job' @@ -144,7 +149,6 @@ appraise 'contrib-old' do gem 'dalli', '< 3.0.0' - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 gem 'qless', '0.12.0' diff --git a/appraisal/ruby-3.1.rb b/appraisal/ruby-3.1.rb index a3e75718bb8..ef3903a77a3 100644 --- a/appraisal/ruby-3.1.rb +++ b/appraisal/ruby-3.1.rb @@ -57,7 +57,6 @@ end appraise 'http' do - gem 'elasticsearch' gem 'ethon' gem 'excon' gem 'faraday' @@ -74,6 +73,12 @@ end end +[7, 8].each do |n| + appraise "elasticsearch-#{n}" do + gem 'elasticsearch', "~> #{n}" + end +end + appraise 'relational_db' do gem 'activerecord', '~> 7' gem 'delayed_job' @@ -144,7 +149,6 @@ appraise 'contrib-old' do gem 'dalli', '< 3.0.0' - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 gem 'qless', '0.12.0' diff --git a/appraisal/ruby-3.2.rb b/appraisal/ruby-3.2.rb index a3e75718bb8..ef3903a77a3 100644 --- a/appraisal/ruby-3.2.rb +++ b/appraisal/ruby-3.2.rb @@ -57,7 +57,6 @@ end appraise 'http' do - gem 'elasticsearch' gem 'ethon' gem 'excon' gem 'faraday' @@ -74,6 +73,12 @@ end end +[7, 8].each do |n| + appraise "elasticsearch-#{n}" do + gem 'elasticsearch', "~> #{n}" + end +end + appraise 'relational_db' do gem 'activerecord', '~> 7' gem 'delayed_job' @@ -144,7 +149,6 @@ appraise 'contrib-old' do gem 'dalli', '< 3.0.0' - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 gem 'qless', '0.12.0' diff --git a/appraisal/ruby-3.3.rb b/appraisal/ruby-3.3.rb index 7bde618873f..6cca55fd17c 100644 --- a/appraisal/ruby-3.3.rb +++ b/appraisal/ruby-3.3.rb @@ -57,7 +57,6 @@ end appraise 'http' do - gem 'elasticsearch' gem 'ethon' gem 'excon' gem 'faraday' @@ -74,6 +73,12 @@ end end +[7, 8].each do |n| + appraise "elasticsearch-#{n}" do + gem 'elasticsearch', "~> #{n}" + end +end + appraise 'relational_db' do gem 'activerecord', '~> 7' gem 'delayed_job' @@ -146,7 +151,6 @@ appraise 'contrib-old' do gem 'dalli', '< 3.0.0' - gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0 gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0 gem 'qless', '0.12.0' diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md index 3e0dfcb07f0..34e8960de38 100644 --- a/docs/GettingStarted.md +++ b/docs/GettingStarted.md @@ -1641,7 +1641,7 @@ redis.set 'foo', 'bar' |----------------|-------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------| | `service_name` | `DD_TRACE_REDIS_SERVICE_NAME` | Name of application running the `redis` instrumentation. May be overridden by `global_default_service_name`. [See *Additional Configuration* for more details](#additional-configuration) | `redis` | | `peer_service` | `DD_TRACE_REDIS_PEER_SERVICE` | Name of external service the application connects to | `nil` | -| `command_args` | `DD_REDIS_COMMAND_ARGS` | Show the command arguments (e.g. `key` in `GET key`) as resource name and tag | true | +| `command_args` | `DD_REDIS_COMMAND_ARGS` | Show the command arguments (for example, `key` in `GET key`) as resource name and tag. If `false`, only the command name is shown (for example, `GET`). | false | **Configuring trace settings per instance** @@ -2064,8 +2064,9 @@ For example, if `tracing.sampling.default_rate` is configured by [Remote Configu | `tracing.analytics.enabled` | `DD_TRACE_ANALYTICS_ENABLED` | `nil` | Enables or disables trace analytics. See [Sampling](#sampling) for more details. | | `tracing.contrib.peer_service_mapping` | `DD_TRACE_PEER_SERVICE_MAPPING` | `nil` | Defines remapping of `peer.service` tag across all instrumentation. Provide a list of `old_value1:new_value1, old_value2:new_value2, ...` | | `tracing.contrib.global_default_service_name.enabled` | `DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED` | `false` | Changes the default value for `service_name` to the application service name across all instrumentation | -| `tracing.distributed_tracing.propagation_extract_style` | `DD_TRACE_PROPAGATION_STYLE_EXTRACT` | `['Datadog','b3multi','b3']` | Distributed tracing propagation formats to extract. Overrides `DD_TRACE_PROPAGATION_STYLE`. See [Distributed Tracing](#distributed-tracing) for more details. | -| `tracing.distributed_tracing.propagation_inject_style` | `DD_TRACE_PROPAGATION_STYLE_INJECT` | `['Datadog']` | Distributed tracing propagation formats to inject. Overrides `DD_TRACE_PROPAGATION_STYLE`. See [Distributed Tracing](#distributed-tracing) for more details. | +| `tracing.distributed_tracing.propagation_extract_first` | `DD_TRACE_PROPAGATION_EXTRACT_FIRST` | `false` | Exit immediately on the first valid propagation format detected. See [Distributed Tracing](#distributed-tracing) for more details. | +| `tracing.distributed_tracing.propagation_extract_style` | `DD_TRACE_PROPAGATION_STYLE_EXTRACT` | `['Datadog','tracecontext']` | Distributed tracing propagation formats to extract. Overrides `DD_TRACE_PROPAGATION_STYLE`. See [Distributed Tracing](#distributed-tracing) for more details. | +| `tracing.distributed_tracing.propagation_inject_style` | `DD_TRACE_PROPAGATION_STYLE_INJECT` | `['Datadog','tracecontext']` | Distributed tracing propagation formats to inject. Overrides `DD_TRACE_PROPAGATION_STYLE`. See [Distributed Tracing](#distributed-tracing) for more details. | | `tracing.distributed_tracing.propagation_style` | `DD_TRACE_PROPAGATION_STYLE` | `nil` | Distributed tracing propagation formats to extract and inject. See [Distributed Tracing](#distributed-tracing) for more details. | | `tracing.enabled` | `DD_TRACE_ENABLED` | `true` | Enables or disables tracing. If set to `false` instrumentation will still run, but no traces are sent to the trace agent. | | `tracing.header_tags` | `DD_TRACE_HEADER_TAGS` | `nil` | Record HTTP headers as span tags. See [Applying header tags to root spans][header tags] for more information. | @@ -2340,10 +2341,10 @@ Service C: Tracing supports the following distributed trace formats: - - `Datadog`: **Default** + - `Datadog` + - `tracecontext`: [W3C Trace Context](https://www.w3.org/TR/trace-context/) - `b3multi`: [B3 multiple-headers](https://github.com/openzipkin/b3-propagation#multiple-headers) - `b3`: [B3 single-header](https://github.com/openzipkin/b3-propagation#single-header) - - `tracecontext`: [W3C Trace Context](https://www.w3.org/TR/trace-context/) - `none`: No-op. You can enable/disable the use of these formats via `Datadog.configure`: diff --git a/ext/.gitignore b/ext/.gitignore index 24f9a0f4df4..2738a1a1137 100644 --- a/ext/.gitignore +++ b/ext/.gitignore @@ -1,4 +1,2 @@ -*/Makefile -*/extconf.h */compile_commands.json */.cache diff --git a/gemfiles/jruby_9.2.21.0_sinatra.gemfile.lock b/gemfiles/jruby_9.2.21.0_sinatra.gemfile.lock index f26acc303e8..60fdb5025e3 100644 --- a/gemfiles/jruby_9.2.21.0_sinatra.gemfile.lock +++ b/gemfiles/jruby_9.2.21.0_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.15.0) + ddtrace (1.16.2) datadog-ci (~> 0.2.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_activesupport.gemfile.lock b/gemfiles/jruby_9.2_activesupport.gemfile.lock index 113dc030579..106505030c0 100644 --- a/gemfiles/jruby_9.2_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.2_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_aws.gemfile.lock b/gemfiles/jruby_9.2_aws.gemfile.lock index cf19a386ea4..83fbd3e5110 100644 --- a/gemfiles/jruby_9.2_aws.gemfile.lock +++ b/gemfiles/jruby_9.2_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_contrib.gemfile.lock b/gemfiles/jruby_9.2_contrib.gemfile.lock index ce712481529..26efff2d0a8 100644 --- a/gemfiles/jruby_9.2_contrib.gemfile.lock +++ b/gemfiles/jruby_9.2_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_contrib_old.gemfile b/gemfiles/jruby_9.2_contrib_old.gemfile index 1efcb9548c6..bdec31c2bd3 100644 --- a/gemfiles/jruby_9.2_contrib_old.gemfile +++ b/gemfiles/jruby_9.2_contrib_old.gemfile @@ -28,7 +28,6 @@ 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 "dalli", "< 3.0.0" -gem "elasticsearch", "< 8.0.0" gem "faraday", "0.17" gem "graphql", "~> 1.12.0", "< 2.0" gem "presto-client", ">= 0.5.14" diff --git a/gemfiles/jruby_9.2_contrib_old.gemfile.lock b/gemfiles/jruby_9.2_contrib_old.gemfile.lock index 48b001ccfe0..e0dcbcd650c 100644 --- a/gemfiles/jruby_9.2_contrib_old.gemfile.lock +++ b/gemfiles/jruby_9.2_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -44,14 +44,6 @@ GEM diff-lcs (1.5.0) docile (1.4.0) dogstatsd-ruby (5.5.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json faraday (0.17.0) multipart-post (>= 1.2, < 3) faraday_middleware (0.12.2) @@ -67,7 +59,6 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) msgpack (1.6.0-java) - multi_json (1.15.0) multipart-post (2.2.3) os (1.1.4) pimpmychangelog (0.1.3) @@ -142,7 +133,6 @@ DEPENDENCIES dalli (< 3.0.0) ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch (< 8.0.0) faraday (= 0.17) graphql (~> 1.12.0, < 2.0) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_core_old.gemfile.lock b/gemfiles/jruby_9.2_core_old.gemfile.lock index 48ae75fd942..af9904e8a21 100644 --- a/gemfiles/jruby_9.2_core_old.gemfile.lock +++ b/gemfiles/jruby_9.2_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_elasticsearch_7.gemfile b/gemfiles/jruby_9.2_elasticsearch_7.gemfile new file mode 100644 index 00000000000..d715edc744a --- /dev/null +++ b/gemfiles/jruby_9.2_elasticsearch_7.gemfile @@ -0,0 +1,36 @@ +# 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 "json-schema", "< 3" +gem "memory_profiler", "~> 0.9" +gem "os", "~> 1.1" +gem "pimpmychangelog", ">= 0.1.2" +gem "pry" +gem "pry-debugger-jruby" +gem "rake", ">= 10.5" +gem "rake-compiler", "~> 1.1", ">= 1.1.1" +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 "elasticsearch", "~> 7" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..54bbd1ad32d --- /dev/null +++ b/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock @@ -0,0 +1,176 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + builder (3.2.4) + climate_control (0.2.0) + coderay (1.1.3) + colorize (0.8.1) + concurrent-ruby (1.2.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elasticsearch (7.17.9) + elasticsearch-api (= 7.17.9) + elasticsearch-transport (= 7.17.9) + elasticsearch-api (7.17.9) + multi_json + elasticsearch-transport (7.17.9) + faraday (~> 1) + multi_json + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.16.3-java) + hashdiff (1.0.1) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0) + libddwaf (1.14.0.0.0-java) + ffi (~> 1.0) + memory_profiler (0.9.14) + method_source (1.0.0) + msgpack (1.7.2-java) + multi_json (1.15.0) + multipart-post (2.3.0) + os (1.1.4) + pimpmychangelog (0.1.3) + pry (0.14.2-java) + coderay (~> 1.1) + method_source (~> 1.0) + spoon (~> 0.0) + pry-debugger-jruby (2.1.1-java) + pry (>= 0.13, < 0.15) + ruby-debug-base (>= 0.10.4, < 0.12) + public_suffix (4.0.7) + rake (13.0.6) + rake-compiler (1.2.5) + rake + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + 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) + ruby-debug-base (0.11.0-java) + 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) + spoon (0.0.6) + ffi + thor (1.2.2) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.34) + +PLATFORMS + universal-java-1.8 + +DEPENDENCIES + appraisal (~> 2.4.0) + benchmark-ips (~> 2.8) + benchmark-memory (< 0.2) + builder + climate_control (~> 0.2.0) + concurrent-ruby + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + json-schema (< 3) + memory_profiler (~> 0.9) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-debugger-jruby + rake (>= 10.5) + rake-compiler (~> 1.1, >= 1.1.1) + 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) + warning (~> 1) + webmock (>= 3.10.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/jruby_9.2_elasticsearch_8.gemfile b/gemfiles/jruby_9.2_elasticsearch_8.gemfile new file mode 100644 index 00000000000..2eeadcb5e81 --- /dev/null +++ b/gemfiles/jruby_9.2_elasticsearch_8.gemfile @@ -0,0 +1,36 @@ +# 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 "json-schema", "< 3" +gem "memory_profiler", "~> 0.9" +gem "os", "~> 1.1" +gem "pimpmychangelog", ">= 0.1.2" +gem "pry" +gem "pry-debugger-jruby" +gem "rake", ">= 10.5" +gem "rake-compiler", "~> 1.1", ">= 1.1.1" +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 "elasticsearch", "~> 8" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock new file mode 100644 index 00000000000..28cbc920720 --- /dev/null +++ b/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock @@ -0,0 +1,176 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + builder (3.2.4) + climate_control (0.2.0) + coderay (1.1.3) + colorize (0.8.1) + concurrent-ruby (1.2.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elastic-transport (8.3.0) + faraday (< 3) + multi_json + elasticsearch (8.10.0) + elastic-transport (~> 8) + elasticsearch-api (= 8.10.0) + elasticsearch-api (8.10.0) + multi_json + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.16.3-java) + hashdiff (1.0.1) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0) + libddwaf (1.14.0.0.0-java) + ffi (~> 1.0) + memory_profiler (0.9.14) + method_source (1.0.0) + msgpack (1.7.2-java) + multi_json (1.15.0) + multipart-post (2.3.0) + os (1.1.4) + pimpmychangelog (0.1.3) + pry (0.14.2-java) + coderay (~> 1.1) + method_source (~> 1.0) + spoon (~> 0.0) + pry-debugger-jruby (2.1.1-java) + pry (>= 0.13, < 0.15) + ruby-debug-base (>= 0.10.4, < 0.12) + public_suffix (4.0.7) + rake (13.0.6) + rake-compiler (1.2.5) + rake + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + 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) + ruby-debug-base (0.11.0-java) + 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) + spoon (0.0.6) + ffi + thor (1.2.2) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.34) + +PLATFORMS + universal-java-1.8 + +DEPENDENCIES + appraisal (~> 2.4.0) + benchmark-ips (~> 2.8) + benchmark-memory (< 0.2) + builder + climate_control (~> 0.2.0) + concurrent-ruby + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 8) + json-schema (< 3) + memory_profiler (~> 0.9) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-debugger-jruby + rake (>= 10.5) + rake-compiler (~> 1.1, >= 1.1.1) + 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) + warning (~> 1) + webmock (>= 3.10.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/jruby_9.2_hanami_1.gemfile.lock b/gemfiles/jruby_9.2_hanami_1.gemfile.lock index 025bf2963df..04c0cb3e12a 100644 --- a/gemfiles/jruby_9.2_hanami_1.gemfile.lock +++ b/gemfiles/jruby_9.2_hanami_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_http.gemfile b/gemfiles/jruby_9.2_http.gemfile index c55d1e6545e..76bb6f60969 100644 --- a/gemfiles/jruby_9.2_http.gemfile +++ b/gemfiles/jruby_9.2_http.gemfile @@ -27,7 +27,6 @@ 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 "elasticsearch" gem "ethon", "< 0.15.0" gem "excon" gem "faraday" diff --git a/gemfiles/jruby_9.2_http.gemfile.lock b/gemfiles/jruby_9.2_http.gemfile.lock index 8d62ced731e..daeaa043bdd 100644 --- a/gemfiles/jruby_9.2_http.gemfile.lock +++ b/gemfiles/jruby_9.2_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -45,14 +45,6 @@ GEM dogstatsd-ruby (5.6.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elastic-transport (8.2.3) - faraday (< 3) - multi_json - elasticsearch (8.9.0) - elastic-transport (~> 8) - elasticsearch-api (= 8.9.0) - elasticsearch-api (8.9.0) - multi_json ethon (0.14.0) ffi (>= 1.15.0) excon (0.102.0) @@ -107,7 +99,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) msgpack (1.7.2-java) - multi_json (1.15.0) multipart-post (2.3.0) netrc (0.11.0) os (1.1.4) @@ -183,7 +174,6 @@ DEPENDENCIES concurrent-ruby ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch ethon (< 0.15.0) excon faraday diff --git a/gemfiles/jruby_9.2_opensearch_2.gemfile.lock b/gemfiles/jruby_9.2_opensearch_2.gemfile.lock index 950e59e69ac..9207d367358 100644 --- a/gemfiles/jruby_9.2_opensearch_2.gemfile.lock +++ b/gemfiles/jruby_9.2_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_opensearch_3.gemfile.lock b/gemfiles/jruby_9.2_opensearch_3.gemfile.lock index be564c1c3f8..7933282e08a 100644 --- a/gemfiles/jruby_9.2_opensearch_3.gemfile.lock +++ b/gemfiles/jruby_9.2_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_opentracing.gemfile.lock b/gemfiles/jruby_9.2_opentracing.gemfile.lock index 6781f7f54a3..4950c5c1351 100644 --- a/gemfiles/jruby_9.2_opentracing.gemfile.lock +++ b/gemfiles/jruby_9.2_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rack_1.gemfile.lock b/gemfiles/jruby_9.2_rack_1.gemfile.lock index 5090ff9f6ff..6083b64bce2 100644 --- a/gemfiles/jruby_9.2_rack_1.gemfile.lock +++ b/gemfiles/jruby_9.2_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rack_2.gemfile.lock b/gemfiles/jruby_9.2_rack_2.gemfile.lock index fa70dc6cecd..26bcf90d8c6 100644 --- a/gemfiles/jruby_9.2_rack_2.gemfile.lock +++ b/gemfiles/jruby_9.2_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rack_3.gemfile.lock b/gemfiles/jruby_9.2_rack_3.gemfile.lock index 5815728a60c..2886971e239 100644 --- a/gemfiles/jruby_9.2_rack_3.gemfile.lock +++ b/gemfiles/jruby_9.2_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock index 04a0d3ebe17..55601850ee8 100644 --- a/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock index 28ed3d50765..ac02b6da5dc 100644 --- a/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock +++ b/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock index a89d34cd289..68c9822a63b 100644 --- a/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock index 1a2f004bdae..79ce72e93ea 100644 --- a/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock index 281e2498ca5..63d9a6754f2 100644 --- a/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock index 7885610d598..59465768b71 100644 --- a/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock index 4b71076f2c3..d60ae21ea11 100644 --- a/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock index 4eb010e442c..12270f07328 100644 --- a/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock +++ b/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock index 32de986fe7e..00dbf7c47a5 100644 --- a/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock index 5a01459b7ff..656e9df4d36 100644 --- a/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock index da6c4843cdc..66741fa7576 100644 --- a/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails6_mysql2.gemfile.lock b/gemfiles/jruby_9.2_rails6_mysql2.gemfile.lock index bb61989074e..5972f0cc4fc 100644 --- a/gemfiles/jruby_9.2_rails6_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.2_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails6_postgres.gemfile.lock b/gemfiles/jruby_9.2_rails6_postgres.gemfile.lock index 508c25db1a9..15f95723784 100644 --- a/gemfiles/jruby_9.2_rails6_postgres.gemfile.lock +++ b/gemfiles/jruby_9.2_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails6_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2_rails6_postgres_redis.gemfile.lock index 18dd64757ec..7c3ca92e124 100644 --- a/gemfiles/jruby_9.2_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.2_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2_rails6_postgres_redis_activesupport.gemfile.lock index a90e3d72285..d51a7376613 100644 --- a/gemfiles/jruby_9.2_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.2_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2_rails6_postgres_sidekiq.gemfile.lock index f4311c2f894..69728b11036 100644 --- a/gemfiles/jruby_9.2_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.2_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_rails6_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2_rails6_semantic_logger.gemfile.lock index 01f4cbee67b..a40acc87ed4 100644 --- a/gemfiles/jruby_9.2_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.2_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_redis_3.gemfile.lock b/gemfiles/jruby_9.2_redis_3.gemfile.lock index e2fc0ad26d2..3122bdcdee7 100644 --- a/gemfiles/jruby_9.2_redis_3.gemfile.lock +++ b/gemfiles/jruby_9.2_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_redis_4.gemfile.lock b/gemfiles/jruby_9.2_redis_4.gemfile.lock index a8c5c98493f..dbd754d717a 100644 --- a/gemfiles/jruby_9.2_redis_4.gemfile.lock +++ b/gemfiles/jruby_9.2_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_redis_5.gemfile.lock b/gemfiles/jruby_9.2_redis_5.gemfile.lock index f13471884aa..081859f9b8c 100644 --- a/gemfiles/jruby_9.2_redis_5.gemfile.lock +++ b/gemfiles/jruby_9.2_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_relational_db.gemfile.lock b/gemfiles/jruby_9.2_relational_db.gemfile.lock index 6a6d9f76e92..d03757d55c2 100644 --- a/gemfiles/jruby_9.2_relational_db.gemfile.lock +++ b/gemfiles/jruby_9.2_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.2_resque2_redis3.gemfile.lock index 72dc7a02e5f..273122254c8 100644 --- a/gemfiles/jruby_9.2_resque2_redis3.gemfile.lock +++ b/gemfiles/jruby_9.2_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.2_resque2_redis4.gemfile.lock index 0b12403a405..af3beca73eb 100644 --- a/gemfiles/jruby_9.2_resque2_redis4.gemfile.lock +++ b/gemfiles/jruby_9.2_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.2_sinatra.gemfile.lock b/gemfiles/jruby_9.2_sinatra.gemfile.lock index 842f7aa1a75..fc373248fdb 100644 --- a/gemfiles/jruby_9.2_sinatra.gemfile.lock +++ b/gemfiles/jruby_9.2_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_activesupport.gemfile.lock b/gemfiles/jruby_9.3_activesupport.gemfile.lock index 41ba7172ad6..b4fd4c529b5 100644 --- a/gemfiles/jruby_9.3_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.3_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_aws.gemfile.lock b/gemfiles/jruby_9.3_aws.gemfile.lock index e851e650867..58419f0a2e2 100644 --- a/gemfiles/jruby_9.3_aws.gemfile.lock +++ b/gemfiles/jruby_9.3_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_contrib.gemfile.lock b/gemfiles/jruby_9.3_contrib.gemfile.lock index 5dc0238f190..8ba9ec75646 100644 --- a/gemfiles/jruby_9.3_contrib.gemfile.lock +++ b/gemfiles/jruby_9.3_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_contrib_old.gemfile b/gemfiles/jruby_9.3_contrib_old.gemfile index 8bc63806da2..e0c6effe184 100644 --- a/gemfiles/jruby_9.3_contrib_old.gemfile +++ b/gemfiles/jruby_9.3_contrib_old.gemfile @@ -32,7 +32,6 @@ 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 "dalli", "< 3.0.0" -gem "elasticsearch", "< 8.0.0" gem "faraday", "0.17" gem "graphql", "~> 1.12.0", "< 2.0" gem "presto-client", ">= 0.5.14" diff --git a/gemfiles/jruby_9.3_contrib_old.gemfile.lock b/gemfiles/jruby_9.3_contrib_old.gemfile.lock index 52460ef6fc3..0f77ad90343 100644 --- a/gemfiles/jruby_9.3_contrib_old.gemfile.lock +++ b/gemfiles/jruby_9.3_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -45,14 +45,6 @@ GEM diff-lcs (1.5.0) docile (1.4.0) dogstatsd-ruby (5.6.1) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json faraday (0.17.0) multipart-post (>= 1.2, < 3) faraday_middleware (0.12.2) @@ -69,7 +61,6 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) msgpack (1.6.0-java) - multi_json (1.15.0) multipart-post (2.2.3) os (1.1.4) parallel (1.23.0) @@ -175,7 +166,6 @@ DEPENDENCIES dalli (< 3.0.0) ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch (< 8.0.0) faraday (= 0.17) graphql (~> 1.12.0, < 2.0) json-schema (< 3) diff --git a/gemfiles/jruby_9.3_core_old.gemfile.lock b/gemfiles/jruby_9.3_core_old.gemfile.lock index e3211405291..eeb182caa4b 100644 --- a/gemfiles/jruby_9.3_core_old.gemfile.lock +++ b/gemfiles/jruby_9.3_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_elasticsearch_7.gemfile b/gemfiles/jruby_9.3_elasticsearch_7.gemfile new file mode 100644 index 00000000000..65391bd2bed --- /dev/null +++ b/gemfiles/jruby_9.3_elasticsearch_7.gemfile @@ -0,0 +1,40 @@ +# 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 "json-schema", "< 3" +gem "memory_profiler", "~> 0.9" +gem "os", "~> 1.1" +gem "pimpmychangelog", ">= 0.1.2" +gem "pry" +gem "pry-debugger-jruby" +gem "rake", ">= 10.5" +gem "rake-compiler", "~> 1.1", ">= 1.1.1" +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 "elasticsearch", "~> 7" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/jruby_9.3_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.3_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..61be7f0c79e --- /dev/null +++ b/gemfiles/jruby_9.3_elasticsearch_7.gemfile.lock @@ -0,0 +1,213 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + builder (3.2.4) + climate_control (0.2.0) + coderay (1.1.3) + colorize (0.8.1) + concurrent-ruby (1.2.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elasticsearch (7.17.9) + elasticsearch-api (= 7.17.9) + elasticsearch-transport (= 7.17.9) + elasticsearch-api (7.17.9) + multi_json + elasticsearch-transport (7.17.9) + faraday (~> 1) + multi_json + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.16.3-java) + hashdiff (1.0.1) + json (2.6.3-java) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0) + libddwaf (1.14.0.0.0-java) + ffi (~> 1.0) + memory_profiler (0.9.14) + method_source (1.0.0) + msgpack (1.7.2-java) + multi_json (1.15.0) + multipart-post (2.3.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2-java) + coderay (~> 1.1) + method_source (~> 1.0) + spoon (~> 0.0) + pry-debugger-jruby (2.1.1-java) + pry (>= 0.13, < 0.15) + ruby-debug-base (>= 0.10.4, < 0.12) + public_suffix (5.0.3) + racc (1.7.1-java) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + 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.29.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-debug-base (0.11.0-java) + 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) + spoon (0.0.6) + ffi + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.34) + +PLATFORMS + universal-java-11 + +DEPENDENCIES + appraisal (~> 2.4.0) + benchmark-ips (~> 2.8) + benchmark-memory (< 0.2) + builder + climate_control (~> 0.2.0) + concurrent-ruby + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + json-schema (< 3) + memory_profiler (~> 0.9) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-debugger-jruby + rake (>= 10.5) + rake-compiler (~> 1.1, >= 1.1.1) + 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) + warning (~> 1) + webmock (>= 3.10.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/jruby_9.3_elasticsearch_8.gemfile b/gemfiles/jruby_9.3_elasticsearch_8.gemfile new file mode 100644 index 00000000000..51718161862 --- /dev/null +++ b/gemfiles/jruby_9.3_elasticsearch_8.gemfile @@ -0,0 +1,40 @@ +# 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 "json-schema", "< 3" +gem "memory_profiler", "~> 0.9" +gem "os", "~> 1.1" +gem "pimpmychangelog", ">= 0.1.2" +gem "pry" +gem "pry-debugger-jruby" +gem "rake", ">= 10.5" +gem "rake-compiler", "~> 1.1", ">= 1.1.1" +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 "elasticsearch", "~> 8" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/jruby_9.3_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.3_elasticsearch_8.gemfile.lock new file mode 100644 index 00000000000..fb181fdf88c --- /dev/null +++ b/gemfiles/jruby_9.3_elasticsearch_8.gemfile.lock @@ -0,0 +1,195 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.1.1) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + builder (3.2.4) + climate_control (0.2.0) + coderay (1.1.3) + colorize (0.8.1) + concurrent-ruby (1.2.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elastic-transport (8.3.0) + faraday (< 3) + multi_json + elasticsearch (8.10.0) + elastic-transport (~> 8) + elasticsearch-api (= 8.10.0) + elasticsearch-api (8.10.0) + multi_json + faraday (2.7.11) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.16.3-java) + hashdiff (1.0.1) + json (2.6.3-java) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0) + libddwaf (1.14.0.0.0-java) + ffi (~> 1.0) + memory_profiler (0.9.14) + method_source (1.0.0) + msgpack (1.7.2-java) + multi_json (1.15.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2-java) + coderay (~> 1.1) + method_source (~> 1.0) + spoon (~> 0.0) + pry-debugger-jruby (2.1.1-java) + pry (>= 0.13, < 0.15) + ruby-debug-base (>= 0.10.4, < 0.12) + public_suffix (5.0.3) + racc (1.7.1-java) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + 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.29.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-debug-base (0.11.0-java) + 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) + spoon (0.0.6) + ffi + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.34) + +PLATFORMS + universal-java-11 + +DEPENDENCIES + appraisal (~> 2.4.0) + benchmark-ips (~> 2.8) + benchmark-memory (< 0.2) + builder + climate_control (~> 0.2.0) + concurrent-ruby + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 8) + json-schema (< 3) + memory_profiler (~> 0.9) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-debugger-jruby + rake (>= 10.5) + rake-compiler (~> 1.1, >= 1.1.1) + 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) + warning (~> 1) + webmock (>= 3.10.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/jruby_9.3_hanami_1.gemfile.lock b/gemfiles/jruby_9.3_hanami_1.gemfile.lock index bf0e4e4e6fd..b5459f9d441 100644 --- a/gemfiles/jruby_9.3_hanami_1.gemfile.lock +++ b/gemfiles/jruby_9.3_hanami_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_http.gemfile b/gemfiles/jruby_9.3_http.gemfile index 5d4dde4fd4c..1a687b026b1 100644 --- a/gemfiles/jruby_9.3_http.gemfile +++ b/gemfiles/jruby_9.3_http.gemfile @@ -31,7 +31,6 @@ 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 "elasticsearch" gem "ethon" gem "excon" gem "faraday" diff --git a/gemfiles/jruby_9.3_http.gemfile.lock b/gemfiles/jruby_9.3_http.gemfile.lock index dc89a9b4b73..81b6556967a 100644 --- a/gemfiles/jruby_9.3_http.gemfile.lock +++ b/gemfiles/jruby_9.3_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -46,14 +46,6 @@ GEM dogstatsd-ruby (5.6.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elastic-transport (8.2.3) - faraday (< 3) - multi_json - elasticsearch (8.9.0) - elastic-transport (~> 8) - elasticsearch-api (= 8.9.0) - elasticsearch-api (8.9.0) - multi_json ethon (0.16.0) ffi (>= 1.15.0) excon (0.102.0) @@ -90,7 +82,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) msgpack (1.7.2-java) - multi_json (1.15.0) netrc (0.11.0) os (1.1.4) parallel (1.23.0) @@ -196,7 +187,6 @@ DEPENDENCIES concurrent-ruby ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch ethon excon faraday diff --git a/gemfiles/jruby_9.3_opensearch_2.gemfile.lock b/gemfiles/jruby_9.3_opensearch_2.gemfile.lock index 6ae9d682c44..43177490e3e 100644 --- a/gemfiles/jruby_9.3_opensearch_2.gemfile.lock +++ b/gemfiles/jruby_9.3_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_opensearch_3.gemfile.lock b/gemfiles/jruby_9.3_opensearch_3.gemfile.lock index 8961213f55d..9e0f8ed4848 100644 --- a/gemfiles/jruby_9.3_opensearch_3.gemfile.lock +++ b/gemfiles/jruby_9.3_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_opentracing.gemfile.lock b/gemfiles/jruby_9.3_opentracing.gemfile.lock index d9167497f92..5a3379f6fde 100644 --- a/gemfiles/jruby_9.3_opentracing.gemfile.lock +++ b/gemfiles/jruby_9.3_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rack_1.gemfile.lock b/gemfiles/jruby_9.3_rack_1.gemfile.lock index a37af726e80..55ba12545d8 100644 --- a/gemfiles/jruby_9.3_rack_1.gemfile.lock +++ b/gemfiles/jruby_9.3_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rack_2.gemfile.lock b/gemfiles/jruby_9.3_rack_2.gemfile.lock index 37f833205d7..d22faf03535 100644 --- a/gemfiles/jruby_9.3_rack_2.gemfile.lock +++ b/gemfiles/jruby_9.3_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rack_3.gemfile.lock b/gemfiles/jruby_9.3_rack_3.gemfile.lock index 9d9cd22e21b..6e163a3ff70 100644 --- a/gemfiles/jruby_9.3_rack_3.gemfile.lock +++ b/gemfiles/jruby_9.3_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.3_rails5_mysql2.gemfile.lock index 13dfef5b47b..aa08b4c56fa 100644 --- a/gemfiles/jruby_9.3_rails5_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.3_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.3_rails5_postgres.gemfile.lock index 450b7a88145..9eb27dd380d 100644 --- a/gemfiles/jruby_9.3_rails5_postgres.gemfile.lock +++ b/gemfiles/jruby_9.3_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3_rails5_postgres_redis.gemfile.lock index 3f20f1d6cd7..b5c5c874f17 100644 --- a/gemfiles/jruby_9.3_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.3_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.3_rails5_postgres_redis_activesupport.gemfile.lock index aaf2c0d0c5a..8c69b447102 100644 --- a/gemfiles/jruby_9.3_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.3_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3_rails5_postgres_sidekiq.gemfile.lock index bd0722e5bca..796b5115f73 100644 --- a/gemfiles/jruby_9.3_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.3_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3_rails5_semantic_logger.gemfile.lock index 94b7c1b2337..68fd79cc7ff 100644 --- a/gemfiles/jruby_9.3_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.3_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.3_rails61_mysql2.gemfile.lock index 1a344bc05dc..7d82df6c61e 100644 --- a/gemfiles/jruby_9.3_rails61_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.3_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.3_rails61_postgres.gemfile.lock index e64eee048df..46e4bf54d41 100644 --- a/gemfiles/jruby_9.3_rails61_postgres.gemfile.lock +++ b/gemfiles/jruby_9.3_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3_rails61_postgres_redis.gemfile.lock index 984a802b1a3..39a76ee7bd8 100644 --- a/gemfiles/jruby_9.3_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.3_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3_rails61_postgres_sidekiq.gemfile.lock index 8e61ca64587..78155e0e1d7 100644 --- a/gemfiles/jruby_9.3_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.3_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3_rails61_semantic_logger.gemfile.lock index db71ac5aebe..df46f5c2dcc 100644 --- a/gemfiles/jruby_9.3_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.3_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails6_mysql2.gemfile.lock b/gemfiles/jruby_9.3_rails6_mysql2.gemfile.lock index 520f2ac8134..362c9b9739d 100644 --- a/gemfiles/jruby_9.3_rails6_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.3_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails6_postgres.gemfile.lock b/gemfiles/jruby_9.3_rails6_postgres.gemfile.lock index 7f683e33a76..bccaf808bb8 100644 --- a/gemfiles/jruby_9.3_rails6_postgres.gemfile.lock +++ b/gemfiles/jruby_9.3_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails6_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3_rails6_postgres_redis.gemfile.lock index 71655cdee10..c9b1752d3c7 100644 --- a/gemfiles/jruby_9.3_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.3_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.3_rails6_postgres_redis_activesupport.gemfile.lock index 53795a7cd1c..7b9502fe4e6 100644 --- a/gemfiles/jruby_9.3_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.3_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3_rails6_postgres_sidekiq.gemfile.lock index 9e0082ea428..48f1b8aa660 100644 --- a/gemfiles/jruby_9.3_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.3_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_rails6_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3_rails6_semantic_logger.gemfile.lock index fa72163b9f8..89b3e856880 100644 --- a/gemfiles/jruby_9.3_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.3_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_redis_3.gemfile.lock b/gemfiles/jruby_9.3_redis_3.gemfile.lock index 489b9faf4fe..b76ddaff41b 100644 --- a/gemfiles/jruby_9.3_redis_3.gemfile.lock +++ b/gemfiles/jruby_9.3_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_redis_4.gemfile.lock b/gemfiles/jruby_9.3_redis_4.gemfile.lock index b8669fb964c..52ef6136b34 100644 --- a/gemfiles/jruby_9.3_redis_4.gemfile.lock +++ b/gemfiles/jruby_9.3_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_redis_5.gemfile.lock b/gemfiles/jruby_9.3_redis_5.gemfile.lock index c7fede89549..cde384404b7 100644 --- a/gemfiles/jruby_9.3_redis_5.gemfile.lock +++ b/gemfiles/jruby_9.3_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_relational_db.gemfile.lock b/gemfiles/jruby_9.3_relational_db.gemfile.lock index c7cfda817ad..7b44e5a6b5a 100644 --- a/gemfiles/jruby_9.3_relational_db.gemfile.lock +++ b/gemfiles/jruby_9.3_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.3_resque2_redis3.gemfile.lock index eef364b71b7..70bcced8f12 100644 --- a/gemfiles/jruby_9.3_resque2_redis3.gemfile.lock +++ b/gemfiles/jruby_9.3_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.3_resque2_redis4.gemfile.lock index 683c5476eed..8cc6d0165c3 100644 --- a/gemfiles/jruby_9.3_resque2_redis4.gemfile.lock +++ b/gemfiles/jruby_9.3_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.3_sinatra.gemfile.lock b/gemfiles/jruby_9.3_sinatra.gemfile.lock index e4bb64c93e2..04591d89a43 100644 --- a/gemfiles/jruby_9.3_sinatra.gemfile.lock +++ b/gemfiles/jruby_9.3_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_activesupport.gemfile.lock b/gemfiles/jruby_9.4_activesupport.gemfile.lock index a9eeec6f327..10ad9fa07a8 100644 --- a/gemfiles/jruby_9.4_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.4_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_aws.gemfile.lock b/gemfiles/jruby_9.4_aws.gemfile.lock index e95b6311ffc..fce1fcb5940 100644 --- a/gemfiles/jruby_9.4_aws.gemfile.lock +++ b/gemfiles/jruby_9.4_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_contrib.gemfile.lock b/gemfiles/jruby_9.4_contrib.gemfile.lock index f96311de9c3..c5c4a18fdc9 100644 --- a/gemfiles/jruby_9.4_contrib.gemfile.lock +++ b/gemfiles/jruby_9.4_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_contrib_old.gemfile b/gemfiles/jruby_9.4_contrib_old.gemfile index eab6f1ffc8e..894875789fb 100644 --- a/gemfiles/jruby_9.4_contrib_old.gemfile +++ b/gemfiles/jruby_9.4_contrib_old.gemfile @@ -33,7 +33,6 @@ 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 "dalli", "< 3.0.0" -gem "elasticsearch", "< 8.0.0" gem "graphql", "~> 1.12.0", "< 2.0" gem "presto-client", ">= 0.5.14" gem "qless", "0.10.0" diff --git a/gemfiles/jruby_9.4_contrib_old.gemfile.lock b/gemfiles/jruby_9.4_contrib_old.gemfile.lock index 0caa4f31400..47095419427 100644 --- a/gemfiles/jruby_9.4_contrib_old.gemfile.lock +++ b/gemfiles/jruby_9.4_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -45,14 +45,6 @@ GEM diff-lcs (1.5.0) docile (1.4.0) dogstatsd-ruby (5.5.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json faraday (0.17.6) multipart-post (>= 1.2, < 3) faraday_middleware (0.12.2) @@ -69,7 +61,6 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) msgpack (1.6.0-java) - multi_json (1.15.0) multipart-post (2.2.3) os (1.1.4) parallel (1.23.0) @@ -175,7 +166,6 @@ DEPENDENCIES dalli (< 3.0.0) ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch (< 8.0.0) graphql (~> 1.12.0, < 2.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_core_old.gemfile.lock b/gemfiles/jruby_9.4_core_old.gemfile.lock index 1d2640b51e8..ced811711dc 100644 --- a/gemfiles/jruby_9.4_core_old.gemfile.lock +++ b/gemfiles/jruby_9.4_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_elasticsearch_7.gemfile b/gemfiles/jruby_9.4_elasticsearch_7.gemfile new file mode 100644 index 00000000000..412aa5a301c --- /dev/null +++ b/gemfiles/jruby_9.4_elasticsearch_7.gemfile @@ -0,0 +1,41 @@ +# 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 "json-schema", "< 3" +gem "memory_profiler", "~> 0.9" +gem "os", "~> 1.1" +gem "pimpmychangelog", ">= 0.1.2" +gem "pry" +gem "pry-debugger-jruby" +gem "rake", ">= 10.5" +gem "rake-compiler", "~> 1.1", ">= 1.1.1" +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 "webrick", ">= 1.7.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 "elasticsearch", "~> 7" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..63778b2cc65 --- /dev/null +++ b/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock @@ -0,0 +1,215 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + builder (3.2.4) + climate_control (0.2.0) + coderay (1.1.3) + colorize (0.8.1) + concurrent-ruby (1.2.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elasticsearch (7.17.9) + elasticsearch-api (= 7.17.9) + elasticsearch-transport (= 7.17.9) + elasticsearch-api (7.17.9) + multi_json + elasticsearch-transport (7.17.9) + faraday (~> 1) + multi_json + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.16.3-java) + hashdiff (1.0.1) + json (2.6.3-java) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0) + libddwaf (1.14.0.0.0-java) + ffi (~> 1.0) + memory_profiler (0.9.14) + method_source (1.0.0) + msgpack (1.7.2-java) + multi_json (1.15.0) + multipart-post (2.3.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2-java) + coderay (~> 1.1) + method_source (~> 1.0) + spoon (~> 0.0) + pry-debugger-jruby (2.1.1-java) + pry (>= 0.13, < 0.15) + ruby-debug-base (>= 0.10.4, < 0.12) + public_suffix (5.0.3) + racc (1.7.1-java) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_n (1.5.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.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.19.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-debug-base (0.11.0-java) + 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) + spoon (0.0.6) + ffi + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) + yard (0.9.34) + +PLATFORMS + universal-java-11 + +DEPENDENCIES + appraisal (~> 2.4.0) + benchmark-ips (~> 2.8) + benchmark-memory (< 0.2) + builder + climate_control (~> 0.2.0) + concurrent-ruby + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + json-schema (< 3) + memory_profiler (~> 0.9) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-debugger-jruby + rake (>= 10.5) + rake-compiler (~> 1.1, >= 1.1.1) + 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) + warning (~> 1) + webmock (>= 3.10.0) + webrick (>= 1.7.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/jruby_9.4_elasticsearch_8.gemfile b/gemfiles/jruby_9.4_elasticsearch_8.gemfile new file mode 100644 index 00000000000..33c16be9974 --- /dev/null +++ b/gemfiles/jruby_9.4_elasticsearch_8.gemfile @@ -0,0 +1,41 @@ +# 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 "json-schema", "< 3" +gem "memory_profiler", "~> 0.9" +gem "os", "~> 1.1" +gem "pimpmychangelog", ">= 0.1.2" +gem "pry" +gem "pry-debugger-jruby" +gem "rake", ">= 10.5" +gem "rake-compiler", "~> 1.1", ">= 1.1.1" +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 "webrick", ">= 1.7.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 "elasticsearch", "~> 8" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock new file mode 100644 index 00000000000..03c439a79ed --- /dev/null +++ b/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock @@ -0,0 +1,197 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.1.1) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + builder (3.2.4) + climate_control (0.2.0) + coderay (1.1.3) + colorize (0.8.1) + concurrent-ruby (1.2.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elastic-transport (8.3.0) + faraday (< 3) + multi_json + elasticsearch (8.10.0) + elastic-transport (~> 8) + elasticsearch-api (= 8.10.0) + elasticsearch-api (8.10.0) + multi_json + faraday (2.7.11) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.16.3-java) + hashdiff (1.0.1) + json (2.6.3-java) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0) + libddwaf (1.14.0.0.0-java) + ffi (~> 1.0) + memory_profiler (0.9.14) + method_source (1.0.0) + msgpack (1.7.2-java) + multi_json (1.15.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2-java) + coderay (~> 1.1) + method_source (~> 1.0) + spoon (~> 0.0) + pry-debugger-jruby (2.1.1-java) + pry (>= 0.13, < 0.15) + ruby-debug-base (>= 0.10.4, < 0.12) + public_suffix (5.0.3) + racc (1.7.1-java) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_n (1.5.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.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.19.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-debug-base (0.11.0-java) + 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) + spoon (0.0.6) + ffi + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) + yard (0.9.34) + +PLATFORMS + universal-java-11 + +DEPENDENCIES + appraisal (~> 2.4.0) + benchmark-ips (~> 2.8) + benchmark-memory (< 0.2) + builder + climate_control (~> 0.2.0) + concurrent-ruby + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 8) + json-schema (< 3) + memory_profiler (~> 0.9) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-debugger-jruby + rake (>= 10.5) + rake-compiler (~> 1.1, >= 1.1.1) + 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) + warning (~> 1) + webmock (>= 3.10.0) + webrick (>= 1.7.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/jruby_9.4_http.gemfile b/gemfiles/jruby_9.4_http.gemfile index 0ba1d40cb0c..001d873a45b 100644 --- a/gemfiles/jruby_9.4_http.gemfile +++ b/gemfiles/jruby_9.4_http.gemfile @@ -32,7 +32,6 @@ 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 "elasticsearch" gem "ethon" gem "excon" gem "faraday" diff --git a/gemfiles/jruby_9.4_http.gemfile.lock b/gemfiles/jruby_9.4_http.gemfile.lock index abadf28b49b..8cff0ed0d8d 100644 --- a/gemfiles/jruby_9.4_http.gemfile.lock +++ b/gemfiles/jruby_9.4_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -46,14 +46,6 @@ GEM dogstatsd-ruby (5.6.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elastic-transport (8.2.3) - faraday (< 3) - multi_json - elasticsearch (8.9.0) - elastic-transport (~> 8) - elasticsearch-api (= 8.9.0) - elasticsearch-api (8.9.0) - multi_json ethon (0.16.0) ffi (>= 1.15.0) excon (0.102.0) @@ -90,7 +82,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) msgpack (1.7.2-java) - multi_json (1.15.0) netrc (0.11.0) os (1.1.4) parallel (1.23.0) @@ -197,7 +188,6 @@ DEPENDENCIES concurrent-ruby ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch ethon excon faraday diff --git a/gemfiles/jruby_9.4_opensearch_2.gemfile.lock b/gemfiles/jruby_9.4_opensearch_2.gemfile.lock index da014f6951a..b4ec74aa38a 100644 --- a/gemfiles/jruby_9.4_opensearch_2.gemfile.lock +++ b/gemfiles/jruby_9.4_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_opensearch_3.gemfile.lock b/gemfiles/jruby_9.4_opensearch_3.gemfile.lock index 713dd5965ea..8df338aa7d1 100644 --- a/gemfiles/jruby_9.4_opensearch_3.gemfile.lock +++ b/gemfiles/jruby_9.4_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_opentracing.gemfile.lock b/gemfiles/jruby_9.4_opentracing.gemfile.lock index c310a0c86cb..15ced4da162 100644 --- a/gemfiles/jruby_9.4_opentracing.gemfile.lock +++ b/gemfiles/jruby_9.4_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_rack_1.gemfile.lock b/gemfiles/jruby_9.4_rack_1.gemfile.lock index 2f5846132f4..8efe6fa1b22 100644 --- a/gemfiles/jruby_9.4_rack_1.gemfile.lock +++ b/gemfiles/jruby_9.4_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_rack_2.gemfile.lock b/gemfiles/jruby_9.4_rack_2.gemfile.lock index 3ddf08e9ad7..f65f3ce03a7 100644 --- a/gemfiles/jruby_9.4_rack_2.gemfile.lock +++ b/gemfiles/jruby_9.4_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_rack_3.gemfile.lock b/gemfiles/jruby_9.4_rack_3.gemfile.lock index 421df88f1a7..25b6f0f77d2 100644 --- a/gemfiles/jruby_9.4_rack_3.gemfile.lock +++ b/gemfiles/jruby_9.4_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock index 7197aa35785..e9a3755d9f6 100644 --- a/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.4_rails61_postgres.gemfile.lock index a31f35f637c..93f9f26ce39 100644 --- a/gemfiles/jruby_9.4_rails61_postgres.gemfile.lock +++ b/gemfiles/jruby_9.4_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.4_rails61_postgres_redis.gemfile.lock index 16c9afcec90..418aac30440 100644 --- a/gemfiles/jruby_9.4_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.4_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.4_rails61_postgres_sidekiq.gemfile.lock index 31c563bbb0e..a087b446a4d 100644 --- a/gemfiles/jruby_9.4_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.4_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.4_rails61_semantic_logger.gemfile.lock index 28b90f34e83..58dd11fa45a 100644 --- a/gemfiles/jruby_9.4_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.4_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_redis_3.gemfile.lock b/gemfiles/jruby_9.4_redis_3.gemfile.lock index 6a2141982e2..28743a91540 100644 --- a/gemfiles/jruby_9.4_redis_3.gemfile.lock +++ b/gemfiles/jruby_9.4_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_redis_4.gemfile.lock b/gemfiles/jruby_9.4_redis_4.gemfile.lock index 90d24442293..832a433e163 100644 --- a/gemfiles/jruby_9.4_redis_4.gemfile.lock +++ b/gemfiles/jruby_9.4_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_redis_5.gemfile.lock b/gemfiles/jruby_9.4_redis_5.gemfile.lock index 1f7d2df9dac..0903fa5b25f 100644 --- a/gemfiles/jruby_9.4_redis_5.gemfile.lock +++ b/gemfiles/jruby_9.4_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_relational_db.gemfile.lock b/gemfiles/jruby_9.4_relational_db.gemfile.lock index ed875508ee2..07749bae84c 100644 --- a/gemfiles/jruby_9.4_relational_db.gemfile.lock +++ b/gemfiles/jruby_9.4_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.4_resque2_redis3.gemfile.lock index bdc4104fe6b..92a7771c3ec 100644 --- a/gemfiles/jruby_9.4_resque2_redis3.gemfile.lock +++ b/gemfiles/jruby_9.4_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.4_resque2_redis4.gemfile.lock index 65a3e411b9f..48c10e87157 100644 --- a/gemfiles/jruby_9.4_resque2_redis4.gemfile.lock +++ b/gemfiles/jruby_9.4_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/jruby_9.4_sinatra.gemfile.lock b/gemfiles/jruby_9.4_sinatra.gemfile.lock index d4d1e8798f3..615718b0b60 100644 --- a/gemfiles/jruby_9.4_sinatra.gemfile.lock +++ b/gemfiles/jruby_9.4_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_activesupport.gemfile.lock b/gemfiles/ruby_2.1_activesupport.gemfile.lock index 99454194080..094eb3de6bd 100644 --- a/gemfiles/ruby_2.1_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.1_activesupport.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_aws.gemfile.lock b/gemfiles/ruby_2.1_aws.gemfile.lock index 05ad862b7ba..0271db56d76 100644 --- a/gemfiles/ruby_2.1_aws.gemfile.lock +++ b/gemfiles/ruby_2.1_aws.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_contrib.gemfile.lock b/gemfiles/ruby_2.1_contrib.gemfile.lock index c06011610b2..b66a2ad6348 100644 --- a/gemfiles/ruby_2.1_contrib.gemfile.lock +++ b/gemfiles/ruby_2.1_contrib.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_core_old.gemfile.lock b/gemfiles/ruby_2.1_core_old.gemfile.lock index 45bbb704020..d0f46235efc 100644 --- a/gemfiles/ruby_2.1_core_old.gemfile.lock +++ b/gemfiles/ruby_2.1_core_old.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_elasticsearch_7.gemfile b/gemfiles/ruby_2.1_elasticsearch_7.gemfile new file mode 100644 index 00000000000..5faa4ef71c7 --- /dev/null +++ b/gemfiles/ruby_2.1_elasticsearch_7.gemfile @@ -0,0 +1,43 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal", "~> 2.2.0" +gem "benchmark-ips", "~> 2.8" +gem "benchmark-memory", "< 0.2" +gem "builder" +gem "climate_control", "~> 0.2.0" +gem "concurrent-ruby", "< 1.1.10" +gem "extlz4", "~> 0.3", ">= 0.3.3" +gem "json", "< 2.6" +gem "json-schema", "< 3" +gem "memory_profiler", "= 0.9.12" +gem "os", "~> 1.1" +gem "pimpmychangelog", ">= 0.1.2" +gem "pry" +gem "pry-nav" +gem "rake", "~> 12.3" +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.4.1" +gem "simplecov", "~> 0.17" +gem "simplecov-html", "~> 0.10.2" +gem "webmock", ">= 3.10.0" +gem "rexml", "< 3.2.5" +gem "yard", ["~> 0.9", "< 0.9.27"] +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.8.0"] +gem "docile", "~> 1.3.5" +gem "ffi", "~> 1.12.2" +gem "msgpack", "~> 1.3.3" +gem "elasticsearch", "~> 7" +gem "multipart-post", "~> 2.1.1" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_2.1_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.1_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..121bc91a0bd --- /dev/null +++ b/gemfiles/ruby_2.1_elasticsearch_7.gemfile.lock @@ -0,0 +1,147 @@ +PATH + remote: .. + specs: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + builder (3.2.4) + climate_control (0.2.0) + coderay (1.1.3) + concurrent-ruby (1.1.9) + crack (0.4.5) + rexml + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + diff-lcs (1.5.0) + docile (1.3.5) + dogstatsd-ruby (5.6.1) + elasticsearch (7.5.0) + elasticsearch-api (= 7.5.0) + elasticsearch-transport (= 7.5.0) + elasticsearch-api (7.5.0) + multi_json + elasticsearch-transport (7.5.0) + faraday (>= 0.14, < 1) + multi_json + extlz4 (0.3.4) + faraday (0.17.6) + multipart-post (>= 1.2, < 3) + ffi (1.12.2) + google-protobuf (3.6.1) + google-protobuf (3.6.1-x86_64-linux) + hashdiff (1.0.1) + json (2.5.1) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0) + libddwaf (1.14.0.0.0) + ffi (~> 1.0) + memory_profiler (0.9.12) + method_source (1.0.0) + msgpack (1.3.3) + multi_json (1.15.0) + multipart-post (2.1.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) + public_suffix (3.1.1) + rake (12.3.3) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + rexml (3.2.4) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.4.1) + rspec-core (>= 2, < 4, != 2.12.0) + simplecov (0.17.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + thor (1.2.2) + webmock (3.16.2) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.26) + +PLATFORMS + aarch64-linux + ruby + x86_64-linux + +DEPENDENCIES + appraisal (~> 2.2.0) + benchmark-ips (~> 2.8) + benchmark-memory (< 0.2) + builder + climate_control (~> 0.2.0) + concurrent-ruby (< 1.1.10) + ddtrace! + docile (~> 1.3.5) + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + extlz4 (~> 0.3, >= 0.3.3) + ffi (~> 1.12.2) + google-protobuf (~> 3.0, < 3.8.0, != 3.7.1, != 3.7.0) + json (< 2.6) + json-schema (< 3) + memory_profiler (= 0.9.12) + msgpack (~> 1.3.3) + multipart-post (~> 2.1.1) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-nav + rake (~> 12.3) + rake-compiler (~> 1.1, >= 1.1.1) + redcarpet (~> 3.4) + rexml (< 3.2.5) + rspec (~> 3.12) + rspec-collection_matchers (~> 1.1) + rspec-wait (~> 0) + rspec_junit_formatter (<= 0.4.1) + simplecov (~> 0.17) + simplecov-html (~> 0.10.2) + webmock (>= 3.10.0) + yard (~> 0.9, < 0.9.27) + +BUNDLED WITH + 1.17.3 diff --git a/gemfiles/ruby_2.1_http.gemfile b/gemfiles/ruby_2.1_http.gemfile index 9e1d2c9bfa6..6c26ba4e229 100644 --- a/gemfiles/ruby_2.1_http.gemfile +++ b/gemfiles/ruby_2.1_http.gemfile @@ -33,7 +33,6 @@ gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1", "< 3.8.0"] gem "docile", "~> 1.3.5" gem "ffi", "~> 1.12.2" gem "msgpack", "~> 1.3.3" -gem "elasticsearch" gem "faraday" gem "multipart-post", "~> 2.1.1" gem "ethon" diff --git a/gemfiles/ruby_2.1_http.gemfile.lock b/gemfiles/ruby_2.1_http.gemfile.lock index 4e814fcd444..cbfcd56cfc1 100644 --- a/gemfiles/ruby_2.1_http.gemfile.lock +++ b/gemfiles/ruby_2.1_http.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -33,14 +33,6 @@ GEM dogstatsd-ruby (5.6.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json ethon (0.12.0) ffi (>= 1.3.0) excon (0.102.0) @@ -74,7 +66,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) msgpack (1.3.3) - multi_json (1.15.0) multipart-post (2.1.1) netrc (0.11.0) os (1.1.4) @@ -145,7 +136,6 @@ DEPENDENCIES ddtrace! docile (~> 1.3.5) dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch ethon excon extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_2.1_opentracing.gemfile.lock b/gemfiles/ruby_2.1_opentracing.gemfile.lock index 9d3220af6db..3647b9b0aaa 100644 --- a/gemfiles/ruby_2.1_opentracing.gemfile.lock +++ b/gemfiles/ruby_2.1_opentracing.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_rack_1.gemfile.lock b/gemfiles/ruby_2.1_rack_1.gemfile.lock index 33ea3ac21e7..fe88873b198 100644 --- a/gemfiles/ruby_2.1_rack_1.gemfile.lock +++ b/gemfiles/ruby_2.1_rack_1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_rails32_mysql2.gemfile.lock b/gemfiles/ruby_2.1_rails32_mysql2.gemfile.lock index dcff872f987..cac5ad0f000 100644 --- a/gemfiles/ruby_2.1_rails32_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.1_rails32_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_rails32_postgres.gemfile.lock b/gemfiles/ruby_2.1_rails32_postgres.gemfile.lock index f2915644980..af11dd4d2fa 100644 --- a/gemfiles/ruby_2.1_rails32_postgres.gemfile.lock +++ b/gemfiles/ruby_2.1_rails32_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_rails32_postgres_redis.gemfile.lock b/gemfiles/ruby_2.1_rails32_postgres_redis.gemfile.lock index 377c122d792..5ed43401cf7 100644 --- a/gemfiles/ruby_2.1_rails32_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.1_rails32_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_rails32_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.1_rails32_postgres_sidekiq.gemfile.lock index c6cfe956874..90cc131682a 100644 --- a/gemfiles/ruby_2.1_rails32_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.1_rails32_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_rails4_mysql2.gemfile.lock b/gemfiles/ruby_2.1_rails4_mysql2.gemfile.lock index 284db06c0e8..6a5e9b17dba 100644 --- a/gemfiles/ruby_2.1_rails4_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.1_rails4_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_rails4_postgres.gemfile.lock b/gemfiles/ruby_2.1_rails4_postgres.gemfile.lock index 1d0c8b4e23c..519a29a478b 100644 --- a/gemfiles/ruby_2.1_rails4_postgres.gemfile.lock +++ b/gemfiles/ruby_2.1_rails4_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_rails4_postgres_redis.gemfile.lock b/gemfiles/ruby_2.1_rails4_postgres_redis.gemfile.lock index b4343ab27f5..185cb36bdf9 100644 --- a/gemfiles/ruby_2.1_rails4_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.1_rails4_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_rails4_semantic_logger.gemfile.lock b/gemfiles/ruby_2.1_rails4_semantic_logger.gemfile.lock index 2e59be30882..0725268cf28 100644 --- a/gemfiles/ruby_2.1_rails4_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.1_rails4_semantic_logger.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_redis_3.gemfile.lock b/gemfiles/ruby_2.1_redis_3.gemfile.lock index c49660fcb3c..9ed00971ccb 100644 --- a/gemfiles/ruby_2.1_redis_3.gemfile.lock +++ b/gemfiles/ruby_2.1_redis_3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_relational_db.gemfile.lock b/gemfiles/ruby_2.1_relational_db.gemfile.lock index 71758d8da63..2b0253afca8 100644 --- a/gemfiles/ruby_2.1_relational_db.gemfile.lock +++ b/gemfiles/ruby_2.1_relational_db.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.1_sinatra.gemfile.lock b/gemfiles/ruby_2.1_sinatra.gemfile.lock index d0f60b38d72..840594a2509 100644 --- a/gemfiles/ruby_2.1_sinatra.gemfile.lock +++ b/gemfiles/ruby_2.1_sinatra.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_activesupport.gemfile.lock b/gemfiles/ruby_2.2_activesupport.gemfile.lock index 3c2314e3675..1562df05526 100644 --- a/gemfiles/ruby_2.2_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.2_activesupport.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_aws.gemfile.lock b/gemfiles/ruby_2.2_aws.gemfile.lock index 2c08d4b0648..5371ae7afaa 100644 --- a/gemfiles/ruby_2.2_aws.gemfile.lock +++ b/gemfiles/ruby_2.2_aws.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_contrib.gemfile.lock b/gemfiles/ruby_2.2_contrib.gemfile.lock index 2b032080bd2..02ed852e272 100644 --- a/gemfiles/ruby_2.2_contrib.gemfile.lock +++ b/gemfiles/ruby_2.2_contrib.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_core_old.gemfile.lock b/gemfiles/ruby_2.2_core_old.gemfile.lock index 46d5439b15e..33f90b57aca 100644 --- a/gemfiles/ruby_2.2_core_old.gemfile.lock +++ b/gemfiles/ruby_2.2_core_old.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_elasticsearch_7.gemfile b/gemfiles/ruby_2.2_elasticsearch_7.gemfile new file mode 100644 index 00000000000..e5bbab79086 --- /dev/null +++ b/gemfiles/ruby_2.2_elasticsearch_7.gemfile @@ -0,0 +1,43 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal", "~> 2.2.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", "< 2.6" +gem "json-schema", "< 3" +gem "memory_profiler", "= 0.9.12" +gem "os", "~> 1.1" +gem "pimpmychangelog", ">= 0.1.2" +gem "pry" +gem "pry-nav" +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.4.1" +gem "simplecov", "~> 0.17" +gem "simplecov-html", "~> 0.10.2" +gem "webmock", ">= 3.10.0" +gem "rexml", "< 3.2.5" +gem "yard", ["~> 0.9", "< 0.9.27"] +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.8.0"] +gem "docile", "~> 1.3.5" +gem "ffi", "~> 1.12.2" +gem "msgpack", "~> 1.3.3" +gem "elasticsearch", "~> 7" +gem "multipart-post", "~> 2.1.1" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_2.2_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.2_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..f86f16f9d77 --- /dev/null +++ b/gemfiles/ruby_2.2_elasticsearch_7.gemfile.lock @@ -0,0 +1,147 @@ +PATH + remote: .. + specs: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + builder (3.2.4) + climate_control (0.2.0) + coderay (1.1.3) + concurrent-ruby (1.1.10) + crack (0.4.5) + rexml + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + diff-lcs (1.5.0) + docile (1.3.5) + dogstatsd-ruby (5.6.1) + elasticsearch (7.5.0) + elasticsearch-api (= 7.5.0) + elasticsearch-transport (= 7.5.0) + elasticsearch-api (7.5.0) + multi_json + elasticsearch-transport (7.5.0) + faraday (>= 0.14, < 1) + multi_json + extlz4 (0.3.4) + faraday (0.17.6) + multipart-post (>= 1.2, < 3) + ffi (1.12.2) + google-protobuf (3.6.1) + google-protobuf (3.6.1-x86_64-linux) + hashdiff (1.0.1) + json (2.5.1) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0) + libddwaf (1.14.0.0.0) + ffi (~> 1.0) + memory_profiler (0.9.12) + method_source (1.0.0) + msgpack (1.3.3) + multi_json (1.15.0) + multipart-post (2.1.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) + public_suffix (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + rexml (3.2.4) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.4.1) + rspec-core (>= 2, < 4, != 2.12.0) + simplecov (0.17.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + thor (1.2.2) + webmock (3.16.2) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.26) + +PLATFORMS + aarch64-linux + ruby + x86_64-linux + +DEPENDENCIES + appraisal (~> 2.2.0) + benchmark-ips (~> 2.8) + benchmark-memory (< 0.2) + builder + climate_control (~> 0.2.0) + concurrent-ruby + ddtrace! + docile (~> 1.3.5) + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + extlz4 (~> 0.3, >= 0.3.3) + ffi (~> 1.12.2) + google-protobuf (~> 3.0, < 3.8.0, != 3.7.1, != 3.7.0) + json (< 2.6) + json-schema (< 3) + memory_profiler (= 0.9.12) + msgpack (~> 1.3.3) + multipart-post (~> 2.1.1) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-nav + rake (>= 10.5) + rake-compiler (~> 1.1, >= 1.1.1) + redcarpet (~> 3.4) + rexml (< 3.2.5) + rspec (~> 3.12) + rspec-collection_matchers (~> 1.1) + rspec-wait (~> 0) + rspec_junit_formatter (<= 0.4.1) + simplecov (~> 0.17) + simplecov-html (~> 0.10.2) + webmock (>= 3.10.0) + yard (~> 0.9, < 0.9.27) + +BUNDLED WITH + 1.17.3 diff --git a/gemfiles/ruby_2.2_http.gemfile b/gemfiles/ruby_2.2_http.gemfile index 65c8ec5bec0..47b0687fcae 100644 --- a/gemfiles/ruby_2.2_http.gemfile +++ b/gemfiles/ruby_2.2_http.gemfile @@ -33,7 +33,6 @@ gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1", "< 3.8.0"] gem "docile", "~> 1.3.5" gem "ffi", "~> 1.12.2" gem "msgpack", "~> 1.3.3" -gem "elasticsearch" gem "ethon" gem "excon" gem "faraday" diff --git a/gemfiles/ruby_2.2_http.gemfile.lock b/gemfiles/ruby_2.2_http.gemfile.lock index 9891c9ce364..d54e3b7db9b 100644 --- a/gemfiles/ruby_2.2_http.gemfile.lock +++ b/gemfiles/ruby_2.2_http.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -33,14 +33,6 @@ GEM dogstatsd-ruby (5.6.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json ethon (0.12.0) ffi (>= 1.3.0) excon (0.102.0) @@ -74,7 +66,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) msgpack (1.3.3) - multi_json (1.15.0) multipart-post (2.1.1) netrc (0.11.0) os (1.1.4) @@ -145,7 +136,6 @@ DEPENDENCIES ddtrace! docile (~> 1.3.5) dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch ethon excon extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_2.2_opentracing.gemfile.lock b/gemfiles/ruby_2.2_opentracing.gemfile.lock index 28b28f8ad36..547daea98bc 100644 --- a/gemfiles/ruby_2.2_opentracing.gemfile.lock +++ b/gemfiles/ruby_2.2_opentracing.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rack_1.gemfile.lock b/gemfiles/ruby_2.2_rack_1.gemfile.lock index 7a726aad566..2418feb5af8 100644 --- a/gemfiles/ruby_2.2_rack_1.gemfile.lock +++ b/gemfiles/ruby_2.2_rack_1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails32_mysql2.gemfile.lock b/gemfiles/ruby_2.2_rails32_mysql2.gemfile.lock index 8f46cd20bb9..50d1479b100 100644 --- a/gemfiles/ruby_2.2_rails32_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.2_rails32_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails32_postgres.gemfile.lock b/gemfiles/ruby_2.2_rails32_postgres.gemfile.lock index 5f12b08350e..26d8fb42176 100644 --- a/gemfiles/ruby_2.2_rails32_postgres.gemfile.lock +++ b/gemfiles/ruby_2.2_rails32_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails32_postgres_redis.gemfile.lock b/gemfiles/ruby_2.2_rails32_postgres_redis.gemfile.lock index d0f7b528ef0..01573fb50bf 100644 --- a/gemfiles/ruby_2.2_rails32_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.2_rails32_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails32_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.2_rails32_postgres_sidekiq.gemfile.lock index 9b96d87bd6e..dc4e0dba478 100644 --- a/gemfiles/ruby_2.2_rails32_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.2_rails32_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails4_mysql2.gemfile.lock b/gemfiles/ruby_2.2_rails4_mysql2.gemfile.lock index 1951d23737c..3c4071a20ee 100644 --- a/gemfiles/ruby_2.2_rails4_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.2_rails4_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails4_postgres.gemfile.lock b/gemfiles/ruby_2.2_rails4_postgres.gemfile.lock index 92e98a8e448..a0722443bad 100644 --- a/gemfiles/ruby_2.2_rails4_postgres.gemfile.lock +++ b/gemfiles/ruby_2.2_rails4_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails4_postgres_redis.gemfile.lock b/gemfiles/ruby_2.2_rails4_postgres_redis.gemfile.lock index 04927b5e5ae..3026b7bf2f0 100644 --- a/gemfiles/ruby_2.2_rails4_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.2_rails4_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails4_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.2_rails4_postgres_sidekiq.gemfile.lock index 98860228109..9ff80b8cedf 100644 --- a/gemfiles/ruby_2.2_rails4_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.2_rails4_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails4_semantic_logger.gemfile.lock b/gemfiles/ruby_2.2_rails4_semantic_logger.gemfile.lock index a07fc0e6d3e..2e21b6d0ad5 100644 --- a/gemfiles/ruby_2.2_rails4_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.2_rails4_semantic_logger.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.2_rails5_mysql2.gemfile.lock index e636e0905bc..7e60eb74d3f 100644 --- a/gemfiles/ruby_2.2_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.2_rails5_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.2_rails5_postgres.gemfile.lock index a6066d03c77..50368a40c40 100644 --- a/gemfiles/ruby_2.2_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.2_rails5_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.2_rails5_postgres_redis.gemfile.lock index b685f35b981..2c7338d1f63 100644 --- a/gemfiles/ruby_2.2_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.2_rails5_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.2_rails5_postgres_redis_activesupport.gemfile.lock index 75609b7923e..b309acd3fe7 100644 --- a/gemfiles/ruby_2.2_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.2_rails5_postgres_redis_activesupport.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.2_rails5_postgres_sidekiq.gemfile.lock index 804ebb214b7..0f5e599a6b4 100644 --- a/gemfiles/ruby_2.2_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.2_rails5_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.2_rails5_semantic_logger.gemfile.lock index 4121a813647..f316d02bbe0 100644 --- a/gemfiles/ruby_2.2_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.2_rails5_semantic_logger.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_redis_3.gemfile.lock b/gemfiles/ruby_2.2_redis_3.gemfile.lock index 659acb479a6..91629760099 100644 --- a/gemfiles/ruby_2.2_redis_3.gemfile.lock +++ b/gemfiles/ruby_2.2_redis_3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_relational_db.gemfile.lock b/gemfiles/ruby_2.2_relational_db.gemfile.lock index 12f6cd3c558..3f7374461ab 100644 --- a/gemfiles/ruby_2.2_relational_db.gemfile.lock +++ b/gemfiles/ruby_2.2_relational_db.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.2_sinatra.gemfile.lock b/gemfiles/ruby_2.2_sinatra.gemfile.lock index 84a92f6dd6a..a0d63f9b121 100644 --- a/gemfiles/ruby_2.2_sinatra.gemfile.lock +++ b/gemfiles/ruby_2.2_sinatra.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_activerecord_3.gemfile.lock b/gemfiles/ruby_2.3_activerecord_3.gemfile.lock index c1d3f7ba8ce..85434708ced 100644 --- a/gemfiles/ruby_2.3_activerecord_3.gemfile.lock +++ b/gemfiles/ruby_2.3_activerecord_3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_activesupport.gemfile.lock b/gemfiles/ruby_2.3_activesupport.gemfile.lock index 1d22e673a2e..96e78ba9ca6 100644 --- a/gemfiles/ruby_2.3_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.3_activesupport.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_aws.gemfile.lock b/gemfiles/ruby_2.3_aws.gemfile.lock index b940d51822c..bc67cede754 100644 --- a/gemfiles/ruby_2.3_aws.gemfile.lock +++ b/gemfiles/ruby_2.3_aws.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_contrib.gemfile.lock b/gemfiles/ruby_2.3_contrib.gemfile.lock index dd82633e924..c3af123d1cd 100644 --- a/gemfiles/ruby_2.3_contrib.gemfile.lock +++ b/gemfiles/ruby_2.3_contrib.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_contrib_old.gemfile b/gemfiles/ruby_2.3_contrib_old.gemfile index 6f2795c18c2..60e308c2add 100644 --- a/gemfiles/ruby_2.3_contrib_old.gemfile +++ b/gemfiles/ruby_2.3_contrib_old.gemfile @@ -30,7 +30,6 @@ 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 "docile", "~> 1.3.5" gem "msgpack", "~> 1.3.3" -gem "elasticsearch", "< 8.0.0" gem "faraday", "0.17" gem "presto-client", ">= 0.5.14" diff --git a/gemfiles/ruby_2.3_contrib_old.gemfile.lock b/gemfiles/ruby_2.3_contrib_old.gemfile.lock index 2618032c54f..770e5c9461e 100644 --- a/gemfiles/ruby_2.3_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.3_contrib_old.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -31,14 +31,6 @@ GEM diff-lcs (1.5.0) docile (1.3.5) dogstatsd-ruby (5.5.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json extlz4 (0.3.3) faraday (0.17.0) multipart-post (>= 1.2, < 3) @@ -57,7 +49,6 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) msgpack (1.3.3) - multi_json (1.15.0) multipart-post (2.3.0) os (1.1.4) pimpmychangelog (0.1.3) @@ -123,7 +114,6 @@ DEPENDENCIES ddtrace! docile (~> 1.3.5) dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch (< 8.0.0) extlz4 (~> 0.3, >= 0.3.3) faraday (= 0.17) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.3_core_old.gemfile.lock b/gemfiles/ruby_2.3_core_old.gemfile.lock index d20ec4677db..65f173ec503 100644 --- a/gemfiles/ruby_2.3_core_old.gemfile.lock +++ b/gemfiles/ruby_2.3_core_old.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_elasticsearch_7.gemfile b/gemfiles/ruby_2.3_elasticsearch_7.gemfile new file mode 100644 index 00000000000..b1d2c1577dc --- /dev/null +++ b/gemfiles/ruby_2.3_elasticsearch_7.gemfile @@ -0,0 +1,39 @@ +# 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 "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 "simplecov", "~> 0.17" +gem "simplecov-html", "~> 0.10.2" +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 "docile", "~> 1.3.5" +gem "msgpack", "~> 1.3.3" +gem "elasticsearch", "~> 7" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_2.3_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.3_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..119dc489157 --- /dev/null +++ b/gemfiles/ruby_2.3_elasticsearch_7.gemfile.lock @@ -0,0 +1,143 @@ +PATH + remote: .. + specs: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + builder (3.2.4) + climate_control (0.2.0) + coderay (1.1.3) + concurrent-ruby (1.2.2) + crack (0.4.5) + rexml + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + diff-lcs (1.5.0) + docile (1.3.5) + dogstatsd-ruby (5.6.1) + elasticsearch (7.5.0) + elasticsearch-api (= 7.5.0) + elasticsearch-transport (= 7.5.0) + elasticsearch-api (7.5.0) + multi_json + elasticsearch-transport (7.5.0) + faraday (>= 0.14, < 1) + multi_json + extlz4 (0.3.4) + faraday (0.17.6) + multipart-post (>= 1.2, < 3) + ffi (1.15.5) + google-protobuf (3.19.1) + google-protobuf (3.19.1-x86_64-linux) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0) + libddwaf (1.14.0.0.0) + ffi (~> 1.0) + memory_profiler (0.9.14) + method_source (1.0.0) + msgpack (1.3.3) + multi_json (1.15.0) + multipart-post (2.3.0) + 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) + public_suffix (4.0.7) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + simplecov (0.17.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + thor (1.2.2) + webmock (3.18.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.34) + +PLATFORMS + aarch64-linux + ruby + x86_64-linux + +DEPENDENCIES + appraisal (~> 2.4.0) + benchmark-ips (~> 2.8) + benchmark-memory (< 0.2) + builder + climate_control (~> 0.2.0) + concurrent-ruby + ddtrace! + docile (~> 1.3.5) + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + 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) + msgpack (~> 1.3.3) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-nav + 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) + simplecov (~> 0.17) + simplecov-html (~> 0.10.2) + webmock (>= 3.10.0) + yard (~> 0.9) + +BUNDLED WITH + 1.17.3 diff --git a/gemfiles/ruby_2.3_hanami_1.gemfile.lock b/gemfiles/ruby_2.3_hanami_1.gemfile.lock index 70175903f25..5dd4f9c2bd6 100644 --- a/gemfiles/ruby_2.3_hanami_1.gemfile.lock +++ b/gemfiles/ruby_2.3_hanami_1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_http.gemfile.lock b/gemfiles/ruby_2.3_http.gemfile.lock index cb9fc98da46..8907385dcbf 100644 --- a/gemfiles/ruby_2.3_http.gemfile.lock +++ b/gemfiles/ruby_2.3_http.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_opentracing.gemfile.lock b/gemfiles/ruby_2.3_opentracing.gemfile.lock index 3d67bb886d3..605299f922e 100644 --- a/gemfiles/ruby_2.3_opentracing.gemfile.lock +++ b/gemfiles/ruby_2.3_opentracing.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rack_1.gemfile.lock b/gemfiles/ruby_2.3_rack_1.gemfile.lock index 83b24e2d8bb..3f7c3a15dd6 100644 --- a/gemfiles/ruby_2.3_rack_1.gemfile.lock +++ b/gemfiles/ruby_2.3_rack_1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rack_2.gemfile.lock b/gemfiles/ruby_2.3_rack_2.gemfile.lock index 0d2531c4eb1..9cee88ac1fa 100644 --- a/gemfiles/ruby_2.3_rack_2.gemfile.lock +++ b/gemfiles/ruby_2.3_rack_2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails32_mysql2.gemfile.lock b/gemfiles/ruby_2.3_rails32_mysql2.gemfile.lock index 1642798476b..d2299fa7cd6 100644 --- a/gemfiles/ruby_2.3_rails32_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.3_rails32_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails32_postgres.gemfile.lock b/gemfiles/ruby_2.3_rails32_postgres.gemfile.lock index 822148a92c2..0f2c0547d92 100644 --- a/gemfiles/ruby_2.3_rails32_postgres.gemfile.lock +++ b/gemfiles/ruby_2.3_rails32_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails32_postgres_redis.gemfile.lock b/gemfiles/ruby_2.3_rails32_postgres_redis.gemfile.lock index 9b68db12c7f..864e2271e60 100644 --- a/gemfiles/ruby_2.3_rails32_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.3_rails32_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails32_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.3_rails32_postgres_sidekiq.gemfile.lock index 5e8d19520d5..42ebbb1496e 100644 --- a/gemfiles/ruby_2.3_rails32_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.3_rails32_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails4_mysql2.gemfile.lock b/gemfiles/ruby_2.3_rails4_mysql2.gemfile.lock index c2064fe6e17..fd23a00b9a1 100644 --- a/gemfiles/ruby_2.3_rails4_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.3_rails4_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails4_postgres.gemfile.lock b/gemfiles/ruby_2.3_rails4_postgres.gemfile.lock index 8fd798624ae..ae2453a4f1b 100644 --- a/gemfiles/ruby_2.3_rails4_postgres.gemfile.lock +++ b/gemfiles/ruby_2.3_rails4_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails4_postgres_redis.gemfile.lock b/gemfiles/ruby_2.3_rails4_postgres_redis.gemfile.lock index 57cc88f5e8b..fa0bab24d94 100644 --- a/gemfiles/ruby_2.3_rails4_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.3_rails4_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails4_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.3_rails4_postgres_sidekiq.gemfile.lock index 37ba600b7e6..83aa47a21f2 100644 --- a/gemfiles/ruby_2.3_rails4_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.3_rails4_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails4_semantic_logger.gemfile.lock b/gemfiles/ruby_2.3_rails4_semantic_logger.gemfile.lock index ca8fd2ea3eb..24cf67748ad 100644 --- a/gemfiles/ruby_2.3_rails4_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.3_rails4_semantic_logger.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.3_rails5_mysql2.gemfile.lock index 585e0a1c3f1..095b627a3b6 100644 --- a/gemfiles/ruby_2.3_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.3_rails5_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.3_rails5_postgres.gemfile.lock index 3ae40c38b8a..3d72902a7ae 100644 --- a/gemfiles/ruby_2.3_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.3_rails5_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.3_rails5_postgres_redis.gemfile.lock index e5110e15f3d..b0f718d4d21 100644 --- a/gemfiles/ruby_2.3_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.3_rails5_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.3_rails5_postgres_redis_activesupport.gemfile.lock index e325fee2e73..e0c7c69f372 100644 --- a/gemfiles/ruby_2.3_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.3_rails5_postgres_redis_activesupport.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.3_rails5_postgres_sidekiq.gemfile.lock index 462571bb538..48fb2ced91f 100644 --- a/gemfiles/ruby_2.3_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.3_rails5_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.3_rails5_semantic_logger.gemfile.lock index 5adbe9ec7d8..fe33325f616 100644 --- a/gemfiles/ruby_2.3_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.3_rails5_semantic_logger.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_redis_3.gemfile.lock b/gemfiles/ruby_2.3_redis_3.gemfile.lock index 08e019940a0..57eb092262d 100644 --- a/gemfiles/ruby_2.3_redis_3.gemfile.lock +++ b/gemfiles/ruby_2.3_redis_3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_relational_db.gemfile.lock b/gemfiles/ruby_2.3_relational_db.gemfile.lock index c9a1e646cc2..85005a3e9c1 100644 --- a/gemfiles/ruby_2.3_relational_db.gemfile.lock +++ b/gemfiles/ruby_2.3_relational_db.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.3_resque2_redis3.gemfile.lock index 4e8bc506e97..ca5e3f06155 100644 --- a/gemfiles/ruby_2.3_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.3_resque2_redis3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.3_resque2_redis4.gemfile.lock index 0edcd3adc8c..e7f5e5d4f7d 100644 --- a/gemfiles/ruby_2.3_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.3_resque2_redis4.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.3_sinatra.gemfile.lock b/gemfiles/ruby_2.3_sinatra.gemfile.lock index 4833cae9dad..6403c7f031e 100644 --- a/gemfiles/ruby_2.3_sinatra.gemfile.lock +++ b/gemfiles/ruby_2.3_sinatra.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_activerecord_4.gemfile.lock b/gemfiles/ruby_2.4_activerecord_4.gemfile.lock index 0e45ef14e9b..cb0c7469df0 100644 --- a/gemfiles/ruby_2.4_activerecord_4.gemfile.lock +++ b/gemfiles/ruby_2.4_activerecord_4.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_activesupport.gemfile.lock b/gemfiles/ruby_2.4_activesupport.gemfile.lock index 9a5f10940eb..ffe11b75a41 100644 --- a/gemfiles/ruby_2.4_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.4_activesupport.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_aws.gemfile.lock b/gemfiles/ruby_2.4_aws.gemfile.lock index 72d8377c037..7b2f94b3720 100644 --- a/gemfiles/ruby_2.4_aws.gemfile.lock +++ b/gemfiles/ruby_2.4_aws.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_contrib.gemfile.lock b/gemfiles/ruby_2.4_contrib.gemfile.lock index 0bd2200163b..d4d898a1434 100644 --- a/gemfiles/ruby_2.4_contrib.gemfile.lock +++ b/gemfiles/ruby_2.4_contrib.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_contrib_old.gemfile b/gemfiles/ruby_2.4_contrib_old.gemfile index 12c68624ee5..7c8a1c3d7dd 100644 --- a/gemfiles/ruby_2.4_contrib_old.gemfile +++ b/gemfiles/ruby_2.4_contrib_old.gemfile @@ -30,7 +30,6 @@ 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 "docile", "~> 1.3.5" -gem "elasticsearch", "< 8.0.0" gem "faraday", "0.17" gem "graphql", "~> 1.12.0", "< 2.0" gem "presto-client", ">= 0.5.14" diff --git a/gemfiles/ruby_2.4_contrib_old.gemfile.lock b/gemfiles/ruby_2.4_contrib_old.gemfile.lock index 4fc19c6f841..93e4c4b4ea8 100644 --- a/gemfiles/ruby_2.4_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.4_contrib_old.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -33,14 +33,6 @@ GEM diff-lcs (1.5.0) docile (1.3.5) dogstatsd-ruby (5.5.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json extlz4 (0.3.3) faraday (0.17.0) multipart-post (>= 1.2, < 3) @@ -62,7 +54,6 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) msgpack (1.6.0) - multi_json (1.15.0) multipart-post (2.3.0) os (1.1.4) pimpmychangelog (0.1.3) @@ -130,7 +121,6 @@ DEPENDENCIES ddtrace! docile (~> 1.3.5) dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch (< 8.0.0) extlz4 (~> 0.3, >= 0.3.3) faraday (= 0.17) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.4_core_old.gemfile.lock b/gemfiles/ruby_2.4_core_old.gemfile.lock index 3259dae9bba..cccd1231af0 100644 --- a/gemfiles/ruby_2.4_core_old.gemfile.lock +++ b/gemfiles/ruby_2.4_core_old.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_elasticsearch_7.gemfile b/gemfiles/ruby_2.4_elasticsearch_7.gemfile new file mode 100644 index 00000000000..81b51873603 --- /dev/null +++ b/gemfiles/ruby_2.4_elasticsearch_7.gemfile @@ -0,0 +1,39 @@ +# 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 "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 "ruby-prof", "~> 1.4" +gem "simplecov", "~> 0.17" +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 "docile", "~> 1.3.5" +gem "elasticsearch", "~> 7" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_2.4_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.4_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..1ef434d1384 --- /dev/null +++ b/gemfiles/ruby_2.4_elasticsearch_7.gemfile.lock @@ -0,0 +1,171 @@ +PATH + remote: .. + specs: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + builder (3.2.4) + climate_control (0.2.0) + coderay (1.1.3) + colorize (0.8.1) + concurrent-ruby (1.2.2) + crack (0.4.5) + rexml + cri (2.15.10) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + diff-lcs (1.5.0) + docile (1.3.5) + dogstatsd-ruby (5.6.1) + elasticsearch (7.17.9) + elasticsearch-api (= 7.17.9) + elasticsearch-transport (= 7.17.9) + elasticsearch-api (7.17.9) + multi_json + elasticsearch-transport (7.17.9) + faraday (~> 1) + multi_json + extlz4 (0.3.4) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.15.5) + google-protobuf (3.19.1) + google-protobuf (3.19.1-x86_64-linux) + hashdiff (1.0.1) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.6.1) + multi_json (1.15.0) + multipart-post (2.3.0) + 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) + public_suffix (4.0.7) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + 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) + ruby-prof (1.4.2) + ruby2_keywords (0.0.5) + simplecov (0.18.5) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov-html (0.12.3) + thor (1.2.2) + webmock (3.18.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.34) + +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 + ddtrace! + docile (~> 1.3.5) + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + 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 + 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) + ruby-prof (~> 1.4) + simplecov (~> 0.17) + webmock (>= 3.10.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_2.4_hanami_1.gemfile.lock b/gemfiles/ruby_2.4_hanami_1.gemfile.lock index 70e386ddcea..7fe1d50d719 100644 --- a/gemfiles/ruby_2.4_hanami_1.gemfile.lock +++ b/gemfiles/ruby_2.4_hanami_1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_http.gemfile.lock b/gemfiles/ruby_2.4_http.gemfile.lock index e3220227e29..895f29445f3 100644 --- a/gemfiles/ruby_2.4_http.gemfile.lock +++ b/gemfiles/ruby_2.4_http.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_opensearch_2.gemfile.lock b/gemfiles/ruby_2.4_opensearch_2.gemfile.lock index bf031d45145..140d5e715cf 100644 --- a/gemfiles/ruby_2.4_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_2.4_opensearch_2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_opentracing.gemfile.lock b/gemfiles/ruby_2.4_opentracing.gemfile.lock index 002d4ca1faa..bc1b57cf683 100644 --- a/gemfiles/ruby_2.4_opentracing.gemfile.lock +++ b/gemfiles/ruby_2.4_opentracing.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_rack_1.gemfile.lock b/gemfiles/ruby_2.4_rack_1.gemfile.lock index f713206eb1d..27232ec049a 100644 --- a/gemfiles/ruby_2.4_rack_1.gemfile.lock +++ b/gemfiles/ruby_2.4_rack_1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_rack_2.gemfile.lock b/gemfiles/ruby_2.4_rack_2.gemfile.lock index c3f1e1e3564..f3cac306503 100644 --- a/gemfiles/ruby_2.4_rack_2.gemfile.lock +++ b/gemfiles/ruby_2.4_rack_2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_rack_3.gemfile.lock b/gemfiles/ruby_2.4_rack_3.gemfile.lock index d4357096539..0624131f76e 100644 --- a/gemfiles/ruby_2.4_rack_3.gemfile.lock +++ b/gemfiles/ruby_2.4_rack_3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.4_rails5_mysql2.gemfile.lock index 2410c65efe5..d05646b2698 100644 --- a/gemfiles/ruby_2.4_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.4_rails5_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.4_rails5_postgres.gemfile.lock index d43083a3d9f..f0851952108 100644 --- a/gemfiles/ruby_2.4_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.4_rails5_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.4_rails5_postgres_redis.gemfile.lock index 28da3e3ea55..e5ed00ad561 100644 --- a/gemfiles/ruby_2.4_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.4_rails5_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.4_rails5_postgres_redis_activesupport.gemfile.lock index 0116d4628c4..d74b2987f0e 100644 --- a/gemfiles/ruby_2.4_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.4_rails5_postgres_redis_activesupport.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.4_rails5_postgres_sidekiq.gemfile.lock index ccca19b7a35..a2797ceac8b 100644 --- a/gemfiles/ruby_2.4_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.4_rails5_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.4_rails5_semantic_logger.gemfile.lock index 61963b70fd7..58d115f686a 100644 --- a/gemfiles/ruby_2.4_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.4_rails5_semantic_logger.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_redis_3.gemfile.lock b/gemfiles/ruby_2.4_redis_3.gemfile.lock index db770552ab2..c347085f108 100644 --- a/gemfiles/ruby_2.4_redis_3.gemfile.lock +++ b/gemfiles/ruby_2.4_redis_3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_redis_4.gemfile.lock b/gemfiles/ruby_2.4_redis_4.gemfile.lock index 1c688ce18b5..602d437c4e2 100644 --- a/gemfiles/ruby_2.4_redis_4.gemfile.lock +++ b/gemfiles/ruby_2.4_redis_4.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_relational_db.gemfile.lock b/gemfiles/ruby_2.4_relational_db.gemfile.lock index ad5630bc860..6f070d4d68f 100644 --- a/gemfiles/ruby_2.4_relational_db.gemfile.lock +++ b/gemfiles/ruby_2.4_relational_db.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.4_resque2_redis3.gemfile.lock index 577103d4bb8..1e585ff5252 100644 --- a/gemfiles/ruby_2.4_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.4_resque2_redis3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.4_resque2_redis4.gemfile.lock index 77fe731887f..9f7cc535293 100644 --- a/gemfiles/ruby_2.4_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.4_resque2_redis4.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.4_sinatra.gemfile.lock b/gemfiles/ruby_2.4_sinatra.gemfile.lock index a8356ba9833..022b79f54e0 100644 --- a/gemfiles/ruby_2.4_sinatra.gemfile.lock +++ b/gemfiles/ruby_2.4_sinatra.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_activesupport.gemfile.lock b/gemfiles/ruby_2.5_activesupport.gemfile.lock index c9a3dfda5b2..6cbbf476953 100644 --- a/gemfiles/ruby_2.5_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.5_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_aws.gemfile.lock b/gemfiles/ruby_2.5_aws.gemfile.lock index 291cd19097d..4dd93025828 100644 --- a/gemfiles/ruby_2.5_aws.gemfile.lock +++ b/gemfiles/ruby_2.5_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_contrib.gemfile.lock b/gemfiles/ruby_2.5_contrib.gemfile.lock index 5bfcca6b5cd..7d3fe25c862 100644 --- a/gemfiles/ruby_2.5_contrib.gemfile.lock +++ b/gemfiles/ruby_2.5_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_contrib_old.gemfile b/gemfiles/ruby_2.5_contrib_old.gemfile index 33854c43829..702deffae5f 100644 --- a/gemfiles/ruby_2.5_contrib_old.gemfile +++ b/gemfiles/ruby_2.5_contrib_old.gemfile @@ -33,7 +33,6 @@ 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 "dalli", "< 3.0.0" -gem "elasticsearch", "< 8.0.0" gem "faraday", "0.17" gem "graphql", "~> 1.12.0", "< 2.0" gem "presto-client", ">= 0.5.14" diff --git a/gemfiles/ruby_2.5_contrib_old.gemfile.lock b/gemfiles/ruby_2.5_contrib_old.gemfile.lock index c3b2a9dfc40..ab8b46caae2 100644 --- a/gemfiles/ruby_2.5_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.5_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -51,14 +51,6 @@ GEM diff-lcs (1.5.0) docile (1.4.0) dogstatsd-ruby (5.5.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json eventmachine (1.2.7) extlz4 (0.3.3) faraday (0.17.0) @@ -86,7 +78,6 @@ GEM avl_tree (~> 1.2.0) hitimes (~> 1.1) msgpack (1.6.0) - multi_json (1.15.0) multipart-post (2.3.0) mustermann (1.1.2) ruby2_keywords (~> 0.0.1) @@ -192,7 +183,6 @@ DEPENDENCIES dalli (< 3.0.0) ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch (< 8.0.0) extlz4 (~> 0.3, >= 0.3.3) faraday (= 0.17) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_core_old.gemfile.lock b/gemfiles/ruby_2.5_core_old.gemfile.lock index 02fe3f74077..57b788fa76b 100644 --- a/gemfiles/ruby_2.5_core_old.gemfile.lock +++ b/gemfiles/ruby_2.5_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_elasticsearch_7.gemfile b/gemfiles/ruby_2.5_elasticsearch_7.gemfile new file mode 100644 index 00000000000..0194c98f0b8 --- /dev/null +++ b/gemfiles/ruby_2.5_elasticsearch_7.gemfile @@ -0,0 +1,41 @@ +# 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 "ruby-prof", "~> 1.4" +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 "elasticsearch", "~> 7" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_2.5_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.5_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..acb2d0083f2 --- /dev/null +++ b/gemfiles/ruby_2.5_elasticsearch_7.gemfile.lock @@ -0,0 +1,191 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + 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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elasticsearch (7.17.9) + elasticsearch-api (= 7.17.9) + elasticsearch-transport (= 7.17.9) + elasticsearch-api (7.17.9) + multi_json + elasticsearch-transport (7.17.9) + faraday (~> 1) + multi_json + extlz4 (0.3.4) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.16.3) + google-protobuf (3.19.1) + google-protobuf (3.19.1-x86_64-linux) + hashdiff (1.0.1) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + multipart-post (2.3.0) + 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) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + 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) + ruby-prof (1.4.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) + thor (1.2.2) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + 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 + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_2.5_elasticsearch_8.gemfile b/gemfiles/ruby_2.5_elasticsearch_8.gemfile new file mode 100644 index 00000000000..1e5dae2c370 --- /dev/null +++ b/gemfiles/ruby_2.5_elasticsearch_8.gemfile @@ -0,0 +1,41 @@ +# 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 "ruby-prof", "~> 1.4" +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 "elasticsearch", "~> 8" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_2.5_elasticsearch_8.gemfile.lock b/gemfiles/ruby_2.5_elasticsearch_8.gemfile.lock new file mode 100644 index 00000000000..282df89323e --- /dev/null +++ b/gemfiles/ruby_2.5_elasticsearch_8.gemfile.lock @@ -0,0 +1,191 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + 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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elastic-transport (8.3.0) + faraday (< 3) + multi_json + elasticsearch (8.10.0) + elastic-transport (~> 8) + elasticsearch-api (= 8.10.0) + elasticsearch-api (8.10.0) + multi_json + extlz4 (0.3.4) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.16.3) + google-protobuf (3.19.1) + google-protobuf (3.19.1-x86_64-linux) + hashdiff (1.0.1) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + multipart-post (2.3.0) + 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) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + 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) + ruby-prof (1.4.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) + thor (1.2.2) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 8) + 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 + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_2.5_hanami_1.gemfile.lock b/gemfiles/ruby_2.5_hanami_1.gemfile.lock index c80417fa9d6..f5e79973018 100644 --- a/gemfiles/ruby_2.5_hanami_1.gemfile.lock +++ b/gemfiles/ruby_2.5_hanami_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_http.gemfile b/gemfiles/ruby_2.5_http.gemfile index b0b383e1150..ba8afe9423e 100644 --- a/gemfiles/ruby_2.5_http.gemfile +++ b/gemfiles/ruby_2.5_http.gemfile @@ -32,7 +32,6 @@ 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 "elasticsearch" gem "ethon" gem "excon" gem "faraday" diff --git a/gemfiles/ruby_2.5_http.gemfile.lock b/gemfiles/ruby_2.5_http.gemfile.lock index 83e3ecdd36b..eef02364087 100644 --- a/gemfiles/ruby_2.5_http.gemfile.lock +++ b/gemfiles/ruby_2.5_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -48,14 +48,6 @@ GEM dogstatsd-ruby (5.6.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elastic-transport (8.2.3) - faraday (< 3) - multi_json - elasticsearch (8.9.0) - elastic-transport (~> 8) - elasticsearch-api (= 8.9.0) - elasticsearch-api (8.9.0) - multi_json ethon (0.16.0) ffi (>= 1.15.0) excon (0.102.0) @@ -117,7 +109,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) msgpack (1.7.2) - multi_json (1.15.0) multipart-post (2.3.0) netrc (0.11.0) os (1.1.4) @@ -196,7 +187,6 @@ DEPENDENCIES concurrent-ruby ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch ethon excon extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_2.5_opensearch_2.gemfile.lock b/gemfiles/ruby_2.5_opensearch_2.gemfile.lock index 61ec99f4660..4624ca03cdf 100644 --- a/gemfiles/ruby_2.5_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_2.5_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_opensearch_3.gemfile.lock b/gemfiles/ruby_2.5_opensearch_3.gemfile.lock index 751f16a3ba5..1538e44e7d1 100644 --- a/gemfiles/ruby_2.5_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_2.5_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_opentracing.gemfile.lock b/gemfiles/ruby_2.5_opentracing.gemfile.lock index 1966374545e..a4104508684 100644 --- a/gemfiles/ruby_2.5_opentracing.gemfile.lock +++ b/gemfiles/ruby_2.5_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rack_1.gemfile.lock b/gemfiles/ruby_2.5_rack_1.gemfile.lock index c3832b4a26e..b8b436e586b 100644 --- a/gemfiles/ruby_2.5_rack_1.gemfile.lock +++ b/gemfiles/ruby_2.5_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rack_2.gemfile.lock b/gemfiles/ruby_2.5_rack_2.gemfile.lock index 88e280db9e4..4bc526c000d 100644 --- a/gemfiles/ruby_2.5_rack_2.gemfile.lock +++ b/gemfiles/ruby_2.5_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rack_3.gemfile.lock b/gemfiles/ruby_2.5_rack_3.gemfile.lock index a026408aba8..787d4be2bc4 100644 --- a/gemfiles/ruby_2.5_rack_3.gemfile.lock +++ b/gemfiles/ruby_2.5_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.5_rails5_mysql2.gemfile.lock index e46a52d99eb..8191cbd825f 100644 --- a/gemfiles/ruby_2.5_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.5_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.5_rails5_postgres.gemfile.lock index 8a011977b11..c04e755a8e0 100644 --- a/gemfiles/ruby_2.5_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.5_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5_rails5_postgres_redis.gemfile.lock index db7fcd5e138..5db437f1f0d 100644 --- a/gemfiles/ruby_2.5_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.5_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.5_rails5_postgres_redis_activesupport.gemfile.lock index 3a57c139fbb..92a30260985 100644 --- a/gemfiles/ruby_2.5_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.5_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5_rails5_postgres_sidekiq.gemfile.lock index 61ed367edba..211ea39f49d 100644 --- a/gemfiles/ruby_2.5_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.5_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5_rails5_semantic_logger.gemfile.lock index 142d33ac806..12e8a1efb8b 100644 --- a/gemfiles/ruby_2.5_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.5_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.5_rails61_mysql2.gemfile.lock index b5d8bc09cbf..d30924b3d20 100644 --- a/gemfiles/ruby_2.5_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.5_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.5_rails61_postgres.gemfile.lock index 55405b111e1..24c947638ab 100644 --- a/gemfiles/ruby_2.5_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_2.5_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5_rails61_postgres_redis.gemfile.lock index d8a37cc48fb..9b5bcafeeeb 100644 --- a/gemfiles/ruby_2.5_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.5_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5_rails61_postgres_sidekiq.gemfile.lock index 6b3db34717c..0e63539d6da 100644 --- a/gemfiles/ruby_2.5_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.5_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5_rails61_semantic_logger.gemfile.lock index 9c7979b7be2..e5c602cf089 100644 --- a/gemfiles/ruby_2.5_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.5_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.5_rails6_mysql2.gemfile.lock index 762dda30149..e57bd72a758 100644 --- a/gemfiles/ruby_2.5_rails6_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.5_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.5_rails6_postgres.gemfile.lock index 1e5496af57a..385bb577892 100644 --- a/gemfiles/ruby_2.5_rails6_postgres.gemfile.lock +++ b/gemfiles/ruby_2.5_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5_rails6_postgres_redis.gemfile.lock index c386d8c0c75..05cd8922ebe 100644 --- a/gemfiles/ruby_2.5_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.5_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.5_rails6_postgres_redis_activesupport.gemfile.lock index 8852593f516..c01e228f099 100644 --- a/gemfiles/ruby_2.5_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.5_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5_rails6_postgres_sidekiq.gemfile.lock index d645b395d2d..7721a80db86 100644 --- a/gemfiles/ruby_2.5_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.5_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5_rails6_semantic_logger.gemfile.lock index c61ae61faef..4eb2974d43d 100644 --- a/gemfiles/ruby_2.5_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.5_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_redis_3.gemfile.lock b/gemfiles/ruby_2.5_redis_3.gemfile.lock index ec38fc05e15..66c99ea38f5 100644 --- a/gemfiles/ruby_2.5_redis_3.gemfile.lock +++ b/gemfiles/ruby_2.5_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_redis_4.gemfile.lock b/gemfiles/ruby_2.5_redis_4.gemfile.lock index 14b58df1e62..62d8d7f7498 100644 --- a/gemfiles/ruby_2.5_redis_4.gemfile.lock +++ b/gemfiles/ruby_2.5_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_redis_5.gemfile.lock b/gemfiles/ruby_2.5_redis_5.gemfile.lock index 2e56e50c8c4..fa147fd4ce0 100644 --- a/gemfiles/ruby_2.5_redis_5.gemfile.lock +++ b/gemfiles/ruby_2.5_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_relational_db.gemfile.lock b/gemfiles/ruby_2.5_relational_db.gemfile.lock index d48d2d0bded..4ac34e6ceb3 100644 --- a/gemfiles/ruby_2.5_relational_db.gemfile.lock +++ b/gemfiles/ruby_2.5_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.5_resque2_redis3.gemfile.lock index 30e673448bd..b5e19475f81 100644 --- a/gemfiles/ruby_2.5_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.5_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.5_resque2_redis4.gemfile.lock index a5a68b930c0..5b172991769 100644 --- a/gemfiles/ruby_2.5_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.5_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.5_sinatra.gemfile.lock b/gemfiles/ruby_2.5_sinatra.gemfile.lock index 8372973ce7b..fed8ccfab0b 100644 --- a/gemfiles/ruby_2.5_sinatra.gemfile.lock +++ b/gemfiles/ruby_2.5_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_activesupport.gemfile.lock b/gemfiles/ruby_2.6_activesupport.gemfile.lock index 4dceec07f4b..6de6030bc91 100644 --- a/gemfiles/ruby_2.6_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.6_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_aws.gemfile.lock b/gemfiles/ruby_2.6_aws.gemfile.lock index 8506c8094ba..72dc65ab84f 100644 --- a/gemfiles/ruby_2.6_aws.gemfile.lock +++ b/gemfiles/ruby_2.6_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_contrib.gemfile.lock b/gemfiles/ruby_2.6_contrib.gemfile.lock index 6985588cd66..e67eae300c0 100644 --- a/gemfiles/ruby_2.6_contrib.gemfile.lock +++ b/gemfiles/ruby_2.6_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_contrib_old.gemfile b/gemfiles/ruby_2.6_contrib_old.gemfile index e27e83e8fa9..991ccee5bf5 100644 --- a/gemfiles/ruby_2.6_contrib_old.gemfile +++ b/gemfiles/ruby_2.6_contrib_old.gemfile @@ -37,7 +37,6 @@ 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 "dalli", "< 3.0.0" -gem "elasticsearch", "< 8.0.0" gem "faraday", "0.17" gem "graphql", "~> 1.12.0", "< 2.0" gem "presto-client", ">= 0.5.14" diff --git a/gemfiles/ruby_2.6_contrib_old.gemfile.lock b/gemfiles/ruby_2.6_contrib_old.gemfile.lock index a982b6f5f92..2e6b844dcf8 100644 --- a/gemfiles/ruby_2.6_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.6_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -53,14 +53,6 @@ GEM diff-lcs (1.5.0) docile (1.4.0) dogstatsd-ruby (5.5.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json eventmachine (1.2.7) extlz4 (0.3.3) faraday (0.17.0) @@ -89,7 +81,6 @@ GEM avl_tree (~> 1.2.0) hitimes (~> 1.1) msgpack (1.6.0) - multi_json (1.15.0) multipart-post (2.3.0) mustermann (1.1.2) ruby2_keywords (~> 0.0.1) @@ -225,7 +216,6 @@ DEPENDENCIES dalli (< 3.0.0) ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch (< 8.0.0) extlz4 (~> 0.3, >= 0.3.3) faraday (= 0.17) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_core_old.gemfile.lock b/gemfiles/ruby_2.6_core_old.gemfile.lock index 4ffc9a93d19..9b0b70e7f15 100644 --- a/gemfiles/ruby_2.6_core_old.gemfile.lock +++ b/gemfiles/ruby_2.6_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_elasticsearch_7.gemfile b/gemfiles/ruby_2.6_elasticsearch_7.gemfile new file mode 100644 index 00000000000..a91cacf88dc --- /dev/null +++ b/gemfiles/ruby_2.6_elasticsearch_7.gemfile @@ -0,0 +1,45 @@ +# 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 "ruby-prof", "~> 1.4" +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 "elasticsearch", "~> 7" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_2.6_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.6_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..ea109406b70 --- /dev/null +++ b/gemfiles/ruby_2.6_elasticsearch_7.gemfile.lock @@ -0,0 +1,230 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) + 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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elasticsearch (7.17.9) + elasticsearch-api (= 7.17.9) + elasticsearch-transport (= 7.17.9) + elasticsearch-api (7.17.9) + multi_json + elasticsearch-transport (7.17.9) + faraday (~> 1) + multi_json + extlz4 (0.3.4) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.16.3) + google-protobuf (3.19.1) + google-protobuf (3.19.1-x86_64-linux) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + multipart-post (2.3.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + 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.3) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + 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.29.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-prof (1.4.3) + 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) + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + 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 + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_2.6_elasticsearch_8.gemfile b/gemfiles/ruby_2.6_elasticsearch_8.gemfile new file mode 100644 index 00000000000..5989143aea5 --- /dev/null +++ b/gemfiles/ruby_2.6_elasticsearch_8.gemfile @@ -0,0 +1,45 @@ +# 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 "ruby-prof", "~> 1.4" +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 "elasticsearch", "~> 8" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_2.6_elasticsearch_8.gemfile.lock b/gemfiles/ruby_2.6_elasticsearch_8.gemfile.lock new file mode 100644 index 00000000000..6bce4b7c4f6 --- /dev/null +++ b/gemfiles/ruby_2.6_elasticsearch_8.gemfile.lock @@ -0,0 +1,212 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.1.1) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) + 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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elastic-transport (8.3.0) + faraday (< 3) + multi_json + elasticsearch (8.10.0) + elastic-transport (~> 8) + elasticsearch-api (= 8.10.0) + elasticsearch-api (8.10.0) + multi_json + extlz4 (0.3.4) + faraday (2.7.11) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.16.3) + google-protobuf (3.19.1) + google-protobuf (3.19.1-x86_64-linux) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + 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.3) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + 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.29.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-prof (1.4.3) + 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) + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 8) + 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 + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_2.6_hanami_1.gemfile.lock b/gemfiles/ruby_2.6_hanami_1.gemfile.lock index 1f64de9b10a..4c19854af0f 100644 --- a/gemfiles/ruby_2.6_hanami_1.gemfile.lock +++ b/gemfiles/ruby_2.6_hanami_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_http.gemfile b/gemfiles/ruby_2.6_http.gemfile index 381f5c82e97..65d6a55d060 100644 --- a/gemfiles/ruby_2.6_http.gemfile +++ b/gemfiles/ruby_2.6_http.gemfile @@ -36,7 +36,6 @@ 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 "elasticsearch" gem "ethon" gem "excon" gem "faraday" diff --git a/gemfiles/ruby_2.6_http.gemfile.lock b/gemfiles/ruby_2.6_http.gemfile.lock index 2b1937d1e2c..063e4f7b9f4 100644 --- a/gemfiles/ruby_2.6_http.gemfile.lock +++ b/gemfiles/ruby_2.6_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -50,14 +50,6 @@ GEM dogstatsd-ruby (5.6.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elastic-transport (8.2.3) - faraday (< 3) - multi_json - elasticsearch (8.9.0) - elastic-transport (~> 8) - elasticsearch-api (= 8.9.0) - elasticsearch-api (8.9.0) - multi_json ethon (0.16.0) ffi (>= 1.15.0) excon (0.102.0) @@ -101,7 +93,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) msgpack (1.7.2) - multi_json (1.15.0) netrc (0.11.0) os (1.1.4) parallel (1.23.0) @@ -211,7 +202,6 @@ DEPENDENCIES concurrent-ruby ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch ethon excon extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_2.6_opensearch_2.gemfile.lock b/gemfiles/ruby_2.6_opensearch_2.gemfile.lock index a32d753f1f8..9560e6afd39 100644 --- a/gemfiles/ruby_2.6_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_2.6_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_opensearch_3.gemfile.lock b/gemfiles/ruby_2.6_opensearch_3.gemfile.lock index e236cc864c1..15eeea680fc 100644 --- a/gemfiles/ruby_2.6_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_2.6_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_opentelemetry.gemfile.lock b/gemfiles/ruby_2.6_opentelemetry.gemfile.lock index 57fd9f449bf..44974323905 100755 --- a/gemfiles/ruby_2.6_opentelemetry.gemfile.lock +++ b/gemfiles/ruby_2.6_opentelemetry.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_opentracing.gemfile.lock b/gemfiles/ruby_2.6_opentracing.gemfile.lock index 5b7056fdf8a..70191ee19df 100644 --- a/gemfiles/ruby_2.6_opentracing.gemfile.lock +++ b/gemfiles/ruby_2.6_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rack_1.gemfile.lock b/gemfiles/ruby_2.6_rack_1.gemfile.lock index b89362db2ee..4470725afe2 100644 --- a/gemfiles/ruby_2.6_rack_1.gemfile.lock +++ b/gemfiles/ruby_2.6_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rack_2.gemfile.lock b/gemfiles/ruby_2.6_rack_2.gemfile.lock index 4fdbc236e4c..b439e49d1f0 100644 --- a/gemfiles/ruby_2.6_rack_2.gemfile.lock +++ b/gemfiles/ruby_2.6_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rack_3.gemfile.lock b/gemfiles/ruby_2.6_rack_3.gemfile.lock index 641f5369203..7f807d59a0b 100644 --- a/gemfiles/ruby_2.6_rack_3.gemfile.lock +++ b/gemfiles/ruby_2.6_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.6_rails5_mysql2.gemfile.lock index 895f04467b7..fcbe9aca072 100644 --- a/gemfiles/ruby_2.6_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.6_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.6_rails5_postgres.gemfile.lock index c58a6c341f7..5a71410f30a 100644 --- a/gemfiles/ruby_2.6_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.6_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6_rails5_postgres_redis.gemfile.lock index 8cbe926044d..38e03802c61 100644 --- a/gemfiles/ruby_2.6_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.6_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.6_rails5_postgres_redis_activesupport.gemfile.lock index 60d9a5ff30d..2421e32b475 100644 --- a/gemfiles/ruby_2.6_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.6_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6_rails5_postgres_sidekiq.gemfile.lock index 9c8ee7b70e7..30850250a8e 100644 --- a/gemfiles/ruby_2.6_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.6_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6_rails5_semantic_logger.gemfile.lock index ba4d55c194b..cef3440e85b 100644 --- a/gemfiles/ruby_2.6_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.6_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.6_rails61_mysql2.gemfile.lock index 13a242c58f5..ee2cec82721 100644 --- a/gemfiles/ruby_2.6_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.6_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.6_rails61_postgres.gemfile.lock index e64bd18e5fa..5989898c229 100644 --- a/gemfiles/ruby_2.6_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_2.6_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6_rails61_postgres_redis.gemfile.lock index e14043a5041..a0523903d18 100644 --- a/gemfiles/ruby_2.6_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.6_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6_rails61_postgres_sidekiq.gemfile.lock index 1dcb55f05fa..b052888a19f 100644 --- a/gemfiles/ruby_2.6_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.6_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6_rails61_semantic_logger.gemfile.lock index ecc2b1b074a..de48c574a60 100644 --- a/gemfiles/ruby_2.6_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.6_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.6_rails6_mysql2.gemfile.lock index 71702564ca9..dd4473772e2 100644 --- a/gemfiles/ruby_2.6_rails6_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.6_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.6_rails6_postgres.gemfile.lock index b1d1c2b0cb3..0da4073b36a 100644 --- a/gemfiles/ruby_2.6_rails6_postgres.gemfile.lock +++ b/gemfiles/ruby_2.6_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6_rails6_postgres_redis.gemfile.lock index d4c174b2421..183a3ccbfd6 100644 --- a/gemfiles/ruby_2.6_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.6_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.6_rails6_postgres_redis_activesupport.gemfile.lock index fec1f39eee8..abc6fbc93d2 100644 --- a/gemfiles/ruby_2.6_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.6_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6_rails6_postgres_sidekiq.gemfile.lock index a0876013a36..889b51cf4b2 100644 --- a/gemfiles/ruby_2.6_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.6_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6_rails6_semantic_logger.gemfile.lock index eddd8c84450..331495e928d 100644 --- a/gemfiles/ruby_2.6_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.6_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_redis_3.gemfile.lock b/gemfiles/ruby_2.6_redis_3.gemfile.lock index 75eb8e9e39d..c9b938fdb7c 100644 --- a/gemfiles/ruby_2.6_redis_3.gemfile.lock +++ b/gemfiles/ruby_2.6_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_redis_4.gemfile.lock b/gemfiles/ruby_2.6_redis_4.gemfile.lock index 69443cb4754..33e3d36a4d5 100644 --- a/gemfiles/ruby_2.6_redis_4.gemfile.lock +++ b/gemfiles/ruby_2.6_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_redis_5.gemfile.lock b/gemfiles/ruby_2.6_redis_5.gemfile.lock index d3ed60f4d47..66c5b77416c 100644 --- a/gemfiles/ruby_2.6_redis_5.gemfile.lock +++ b/gemfiles/ruby_2.6_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_relational_db.gemfile.lock b/gemfiles/ruby_2.6_relational_db.gemfile.lock index 1a17a256853..ae0dce851cc 100644 --- a/gemfiles/ruby_2.6_relational_db.gemfile.lock +++ b/gemfiles/ruby_2.6_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.6_resque2_redis3.gemfile.lock index 03355efcac4..b33fcab2f78 100644 --- a/gemfiles/ruby_2.6_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.6_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.6_resque2_redis4.gemfile.lock index ff4589b5986..c1ba2187288 100644 --- a/gemfiles/ruby_2.6_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.6_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.6_sinatra.gemfile.lock b/gemfiles/ruby_2.6_sinatra.gemfile.lock index 5485dfba754..4fd98104aa5 100644 --- a/gemfiles/ruby_2.6_sinatra.gemfile.lock +++ b/gemfiles/ruby_2.6_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7.6_sinatra.gemfile.lock b/gemfiles/ruby_2.7.6_sinatra.gemfile.lock index 266f0683e82..f56e06edc13 100644 --- a/gemfiles/ruby_2.7.6_sinatra.gemfile.lock +++ b/gemfiles/ruby_2.7.6_sinatra.gemfile.lock @@ -12,7 +12,7 @@ GIT PATH remote: .. specs: - ddtrace (1.15.0) + ddtrace (1.16.2) datadog-ci (~> 0.2.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_activesupport.gemfile.lock b/gemfiles/ruby_2.7_activesupport.gemfile.lock index 545136c5704..96ea87f050c 100644 --- a/gemfiles/ruby_2.7_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.7_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_aws.gemfile.lock b/gemfiles/ruby_2.7_aws.gemfile.lock index 197b65bdb46..0150116fc2d 100644 --- a/gemfiles/ruby_2.7_aws.gemfile.lock +++ b/gemfiles/ruby_2.7_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_contrib.gemfile.lock b/gemfiles/ruby_2.7_contrib.gemfile.lock index 78eb8f54755..0c7fc2ada80 100644 --- a/gemfiles/ruby_2.7_contrib.gemfile.lock +++ b/gemfiles/ruby_2.7_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_contrib_old.gemfile b/gemfiles/ruby_2.7_contrib_old.gemfile index 34d3c91fc38..64098c640ff 100644 --- a/gemfiles/ruby_2.7_contrib_old.gemfile +++ b/gemfiles/ruby_2.7_contrib_old.gemfile @@ -37,7 +37,6 @@ 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"] gem "dalli", "< 3.0.0" -gem "elasticsearch", "< 8.0.0" gem "faraday", "0.17" gem "graphql", "~> 1.12.0", "< 2.0" gem "presto-client", ">= 0.5.14" diff --git a/gemfiles/ruby_2.7_contrib_old.gemfile.lock b/gemfiles/ruby_2.7_contrib_old.gemfile.lock index 21e599fcf33..5ee157ebbeb 100644 --- a/gemfiles/ruby_2.7_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.7_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -53,14 +53,6 @@ GEM diff-lcs (1.5.0) docile (1.4.0) dogstatsd-ruby (5.5.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json eventmachine (1.2.7) extlz4 (0.3.3) faraday (0.17.0) @@ -89,7 +81,6 @@ GEM avl_tree (~> 1.2.0) hitimes (~> 1.1) msgpack (1.6.0) - multi_json (1.15.0) multipart-post (2.3.0) mustermann (1.1.2) ruby2_keywords (~> 0.0.1) @@ -225,7 +216,6 @@ DEPENDENCIES dalli (< 3.0.0) ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch (< 8.0.0) extlz4 (~> 0.3, >= 0.3.3) faraday (= 0.17) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_core_old.gemfile.lock b/gemfiles/ruby_2.7_core_old.gemfile.lock index 2d75a7a2f68..611f3b0ff7e 100644 --- a/gemfiles/ruby_2.7_core_old.gemfile.lock +++ b/gemfiles/ruby_2.7_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_elasticsearch_7.gemfile b/gemfiles/ruby_2.7_elasticsearch_7.gemfile new file mode 100644 index 00000000000..f184c8806a9 --- /dev/null +++ b/gemfiles/ruby_2.7_elasticsearch_7.gemfile @@ -0,0 +1,45 @@ +# 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 "ruby-prof", "~> 1.4" +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"] +gem "elasticsearch", "~> 7" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_2.7_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.7_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..0f4e0dacccd --- /dev/null +++ b/gemfiles/ruby_2.7_elasticsearch_7.gemfile.lock @@ -0,0 +1,230 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) + 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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elasticsearch (7.17.9) + elasticsearch-api (= 7.17.9) + elasticsearch-transport (= 7.17.9) + elasticsearch-api (7.17.9) + multi_json + elasticsearch-transport (7.17.9) + faraday (~> 1) + multi_json + extlz4 (0.3.4) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.16.3) + google-protobuf (3.24.4-aarch64-linux) + google-protobuf (3.24.4-x86_64-linux) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + multipart-post (2.3.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.10.1) + byebug (~> 11.0) + pry (>= 0.13, < 0.15) + pry-stack_explorer (0.6.1) + binding_of_caller (~> 1.0) + pry (~> 0.13) + public_suffix (5.0.3) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_n (1.5.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.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.19.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-prof (1.6.3) + 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) + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + extlz4 (~> 0.3, >= 0.3.3) + google-protobuf (~> 3.0, != 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 + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_2.7_elasticsearch_8.gemfile b/gemfiles/ruby_2.7_elasticsearch_8.gemfile new file mode 100644 index 00000000000..fc9466f5abd --- /dev/null +++ b/gemfiles/ruby_2.7_elasticsearch_8.gemfile @@ -0,0 +1,45 @@ +# 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 "ruby-prof", "~> 1.4" +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"] +gem "elasticsearch", "~> 8" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_2.7_elasticsearch_8.gemfile.lock b/gemfiles/ruby_2.7_elasticsearch_8.gemfile.lock new file mode 100644 index 00000000000..b850de6efb8 --- /dev/null +++ b/gemfiles/ruby_2.7_elasticsearch_8.gemfile.lock @@ -0,0 +1,212 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.1.1) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) + 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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elastic-transport (8.3.0) + faraday (< 3) + multi_json + elasticsearch (8.10.0) + elastic-transport (~> 8) + elasticsearch-api (= 8.10.0) + elasticsearch-api (8.10.0) + multi_json + extlz4 (0.3.4) + faraday (2.7.11) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.16.3) + google-protobuf (3.24.4-aarch64-linux) + google-protobuf (3.24.4-x86_64-linux) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.10.1) + byebug (~> 11.0) + pry (>= 0.13, < 0.15) + pry-stack_explorer (0.6.1) + binding_of_caller (~> 1.0) + pry (~> 0.13) + public_suffix (5.0.3) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_n (1.5.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.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.19.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-prof (1.6.3) + 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) + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 8) + extlz4 (~> 0.3, >= 0.3.3) + google-protobuf (~> 3.0, != 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 + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_2.7_hanami_1.gemfile.lock b/gemfiles/ruby_2.7_hanami_1.gemfile.lock index 972f5bdb727..f270ec16d43 100644 --- a/gemfiles/ruby_2.7_hanami_1.gemfile.lock +++ b/gemfiles/ruby_2.7_hanami_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_http.gemfile b/gemfiles/ruby_2.7_http.gemfile index 6ffc1be09db..abcc5a022e9 100644 --- a/gemfiles/ruby_2.7_http.gemfile +++ b/gemfiles/ruby_2.7_http.gemfile @@ -36,7 +36,6 @@ 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"] -gem "elasticsearch" gem "ethon" gem "excon" gem "faraday" diff --git a/gemfiles/ruby_2.7_http.gemfile.lock b/gemfiles/ruby_2.7_http.gemfile.lock index 779ae3a45e1..9abf10907c6 100644 --- a/gemfiles/ruby_2.7_http.gemfile.lock +++ b/gemfiles/ruby_2.7_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -50,14 +50,6 @@ GEM dogstatsd-ruby (5.6.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elastic-transport (8.2.3) - faraday (< 3) - multi_json - elasticsearch (8.9.0) - elastic-transport (~> 8) - elasticsearch-api (= 8.9.0) - elasticsearch-api (8.9.0) - multi_json ethon (0.16.0) ffi (>= 1.15.0) excon (0.102.0) @@ -101,7 +93,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) msgpack (1.7.2) - multi_json (1.15.0) netrc (0.11.0) os (1.1.4) parallel (1.23.0) @@ -211,7 +202,6 @@ DEPENDENCIES concurrent-ruby ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch ethon excon extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_2.7_opensearch_2.gemfile.lock b/gemfiles/ruby_2.7_opensearch_2.gemfile.lock index bcd9ae8c061..a1061a2b42f 100644 --- a/gemfiles/ruby_2.7_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_2.7_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_opensearch_3.gemfile.lock b/gemfiles/ruby_2.7_opensearch_3.gemfile.lock index 4dd561e8757..a53c5316f2c 100644 --- a/gemfiles/ruby_2.7_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_2.7_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_opentelemetry.gemfile.lock b/gemfiles/ruby_2.7_opentelemetry.gemfile.lock index 5c104c5bc3a..8040d428d2a 100755 --- a/gemfiles/ruby_2.7_opentelemetry.gemfile.lock +++ b/gemfiles/ruby_2.7_opentelemetry.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_opentracing.gemfile.lock b/gemfiles/ruby_2.7_opentracing.gemfile.lock index 9921baebcce..b46fbf08477 100644 --- a/gemfiles/ruby_2.7_opentracing.gemfile.lock +++ b/gemfiles/ruby_2.7_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rack_1.gemfile.lock b/gemfiles/ruby_2.7_rack_1.gemfile.lock index ac988aff163..ff0edf4cb20 100644 --- a/gemfiles/ruby_2.7_rack_1.gemfile.lock +++ b/gemfiles/ruby_2.7_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rack_2.gemfile.lock b/gemfiles/ruby_2.7_rack_2.gemfile.lock index 9e1d1744601..4ba4c31ff62 100644 --- a/gemfiles/ruby_2.7_rack_2.gemfile.lock +++ b/gemfiles/ruby_2.7_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rack_3.gemfile.lock b/gemfiles/ruby_2.7_rack_3.gemfile.lock index e9348911041..9483a9a0172 100644 --- a/gemfiles/ruby_2.7_rack_3.gemfile.lock +++ b/gemfiles/ruby_2.7_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.7_rails5_mysql2.gemfile.lock index 9c9569d3ec0..f1c70d48f0b 100644 --- a/gemfiles/ruby_2.7_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.7_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.7_rails5_postgres.gemfile.lock index d78b2d414d6..ede91d46e54 100644 --- a/gemfiles/ruby_2.7_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.7_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7_rails5_postgres_redis.gemfile.lock index d721a7e1b51..69ef0c4a136 100644 --- a/gemfiles/ruby_2.7_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.7_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.7_rails5_postgres_redis_activesupport.gemfile.lock index 45018f80aab..6ddb11aaa77 100644 --- a/gemfiles/ruby_2.7_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.7_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7_rails5_postgres_sidekiq.gemfile.lock index 335adf9eaf0..0780a021dce 100644 --- a/gemfiles/ruby_2.7_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.7_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7_rails5_semantic_logger.gemfile.lock index b7dc6ad6e2d..ebd292ff596 100644 --- a/gemfiles/ruby_2.7_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.7_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.7_rails61_mysql2.gemfile.lock index bdc486006e2..a3f6c94d324 100644 --- a/gemfiles/ruby_2.7_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.7_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.7_rails61_postgres.gemfile.lock index 17824a143dc..80b67a7120d 100644 --- a/gemfiles/ruby_2.7_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_2.7_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7_rails61_postgres_redis.gemfile.lock index 37d20804bb5..1dfefd249f2 100644 --- a/gemfiles/ruby_2.7_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.7_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7_rails61_postgres_sidekiq.gemfile.lock index d9a4bf02dea..1443efa4f0a 100644 --- a/gemfiles/ruby_2.7_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.7_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7_rails61_semantic_logger.gemfile.lock index 0dcc4eb3cd0..9d267deb8fa 100644 --- a/gemfiles/ruby_2.7_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.7_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.7_rails6_mysql2.gemfile.lock index 683c94da96a..9b3a3c534f3 100644 --- a/gemfiles/ruby_2.7_rails6_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.7_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.7_rails6_postgres.gemfile.lock index 77526b79402..2806ff001a1 100644 --- a/gemfiles/ruby_2.7_rails6_postgres.gemfile.lock +++ b/gemfiles/ruby_2.7_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7_rails6_postgres_redis.gemfile.lock index 526e38fcb13..4769fb9dccd 100644 --- a/gemfiles/ruby_2.7_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.7_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.7_rails6_postgres_redis_activesupport.gemfile.lock index a65c5421819..ae9b175543f 100644 --- a/gemfiles/ruby_2.7_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.7_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7_rails6_postgres_sidekiq.gemfile.lock index 36e6206da31..6a876bfc9bf 100644 --- a/gemfiles/ruby_2.7_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.7_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7_rails6_semantic_logger.gemfile.lock index f56eac189e7..865a00c4117 100644 --- a/gemfiles/ruby_2.7_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.7_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_redis_3.gemfile.lock b/gemfiles/ruby_2.7_redis_3.gemfile.lock index 0c8575380fb..ef268d2ff26 100644 --- a/gemfiles/ruby_2.7_redis_3.gemfile.lock +++ b/gemfiles/ruby_2.7_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_redis_4.gemfile.lock b/gemfiles/ruby_2.7_redis_4.gemfile.lock index 8dec55e8d1b..4e96f1f3f1c 100644 --- a/gemfiles/ruby_2.7_redis_4.gemfile.lock +++ b/gemfiles/ruby_2.7_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_redis_5.gemfile.lock b/gemfiles/ruby_2.7_redis_5.gemfile.lock index 7d97cfd9772..b99eb28238a 100644 --- a/gemfiles/ruby_2.7_redis_5.gemfile.lock +++ b/gemfiles/ruby_2.7_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_relational_db.gemfile.lock b/gemfiles/ruby_2.7_relational_db.gemfile.lock index e2a73d1f15c..75b70c8a3b0 100644 --- a/gemfiles/ruby_2.7_relational_db.gemfile.lock +++ b/gemfiles/ruby_2.7_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.7_resque2_redis3.gemfile.lock index f597db54596..2c50d6c0319 100644 --- a/gemfiles/ruby_2.7_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.7_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.7_resque2_redis4.gemfile.lock index b9d2b2d429e..b3f038bc794 100644 --- a/gemfiles/ruby_2.7_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.7_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_2.7_sinatra.gemfile.lock b/gemfiles/ruby_2.7_sinatra.gemfile.lock index cc715db56db..3548c524fb2 100644 --- a/gemfiles/ruby_2.7_sinatra.gemfile.lock +++ b/gemfiles/ruby_2.7_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_activesupport.gemfile.lock b/gemfiles/ruby_3.0_activesupport.gemfile.lock index 532a605fc2a..d175cdb197a 100644 --- a/gemfiles/ruby_3.0_activesupport.gemfile.lock +++ b/gemfiles/ruby_3.0_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_aws.gemfile.lock b/gemfiles/ruby_3.0_aws.gemfile.lock index eab457708f7..47e15d0a1db 100644 --- a/gemfiles/ruby_3.0_aws.gemfile.lock +++ b/gemfiles/ruby_3.0_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_contrib.gemfile.lock b/gemfiles/ruby_3.0_contrib.gemfile.lock index 9cb16fc4ca1..5281367044a 100644 --- a/gemfiles/ruby_3.0_contrib.gemfile.lock +++ b/gemfiles/ruby_3.0_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_contrib_old.gemfile b/gemfiles/ruby_3.0_contrib_old.gemfile index 4468c4628b6..fc62cfca9f6 100644 --- a/gemfiles/ruby_3.0_contrib_old.gemfile +++ b/gemfiles/ruby_3.0_contrib_old.gemfile @@ -38,7 +38,6 @@ 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"] gem "dalli", "< 3.0.0" -gem "elasticsearch", "< 8.0.0" gem "graphql", "~> 1.12.0", "< 2.0" gem "presto-client", ">= 0.5.14" gem "qless", "0.12.0" diff --git a/gemfiles/ruby_3.0_contrib_old.gemfile.lock b/gemfiles/ruby_3.0_contrib_old.gemfile.lock index 8f467a3f21d..6ec17ed9d2d 100644 --- a/gemfiles/ruby_3.0_contrib_old.gemfile.lock +++ b/gemfiles/ruby_3.0_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -53,14 +53,6 @@ GEM diff-lcs (1.5.0) docile (1.4.0) dogstatsd-ruby (5.5.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json eventmachine (1.2.7) extlz4 (0.3.3) faraday (0.17.6) @@ -89,7 +81,6 @@ GEM avl_tree (~> 1.2.0) hitimes (~> 1.1) msgpack (1.6.0) - multi_json (1.15.0) multipart-post (2.3.0) mustermann (1.1.2) ruby2_keywords (~> 0.0.1) @@ -225,7 +216,6 @@ DEPENDENCIES dalli (< 3.0.0) ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch (< 8.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) graphql (~> 1.12.0, < 2.0) diff --git a/gemfiles/ruby_3.0_core_old.gemfile.lock b/gemfiles/ruby_3.0_core_old.gemfile.lock index 3b9a8e7321c..762d38d05c6 100644 --- a/gemfiles/ruby_3.0_core_old.gemfile.lock +++ b/gemfiles/ruby_3.0_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_elasticsearch_7.gemfile b/gemfiles/ruby_3.0_elasticsearch_7.gemfile new file mode 100644 index 00000000000..56f47942f07 --- /dev/null +++ b/gemfiles/ruby_3.0_elasticsearch_7.gemfile @@ -0,0 +1,46 @@ +# 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 "ruby-prof", "~> 1.4" +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 "webrick", ">= 1.7.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"] +gem "elasticsearch", "~> 7" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..d1c9830b622 --- /dev/null +++ b/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock @@ -0,0 +1,232 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) + 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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elasticsearch (7.17.9) + elasticsearch-api (= 7.17.9) + elasticsearch-transport (= 7.17.9) + elasticsearch-api (7.17.9) + multi_json + elasticsearch-transport (7.17.9) + faraday (~> 1) + multi_json + extlz4 (0.3.4) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.16.3) + google-protobuf (3.24.4-aarch64-linux) + google-protobuf (3.24.4-x86_64-linux) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + multipart-post (2.3.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.10.1) + byebug (~> 11.0) + pry (>= 0.13, < 0.15) + pry-stack_explorer (0.6.1) + binding_of_caller (~> 1.0) + pry (~> 0.13) + public_suffix (5.0.3) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_n (1.5.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.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.19.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-prof (1.6.3) + 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) + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + extlz4 (~> 0.3, >= 0.3.3) + google-protobuf (~> 3.0, != 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 + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + webrick (>= 1.7.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_3.0_elasticsearch_8.gemfile b/gemfiles/ruby_3.0_elasticsearch_8.gemfile new file mode 100644 index 00000000000..1365913a37f --- /dev/null +++ b/gemfiles/ruby_3.0_elasticsearch_8.gemfile @@ -0,0 +1,46 @@ +# 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 "ruby-prof", "~> 1.4" +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 "webrick", ">= 1.7.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"] +gem "elasticsearch", "~> 8" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock new file mode 100644 index 00000000000..85781e9aa26 --- /dev/null +++ b/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock @@ -0,0 +1,214 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.1.1) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) + 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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elastic-transport (8.3.0) + faraday (< 3) + multi_json + elasticsearch (8.10.0) + elastic-transport (~> 8) + elasticsearch-api (= 8.10.0) + elasticsearch-api (8.10.0) + multi_json + extlz4 (0.3.4) + faraday (2.7.11) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.16.3) + google-protobuf (3.24.4-aarch64-linux) + google-protobuf (3.24.4-x86_64-linux) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.10.1) + byebug (~> 11.0) + pry (>= 0.13, < 0.15) + pry-stack_explorer (0.6.1) + binding_of_caller (~> 1.0) + pry (~> 0.13) + public_suffix (5.0.3) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_n (1.5.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.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.19.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-prof (1.6.3) + 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) + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 8) + extlz4 (~> 0.3, >= 0.3.3) + google-protobuf (~> 3.0, != 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 + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + webrick (>= 1.7.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_3.0_http.gemfile b/gemfiles/ruby_3.0_http.gemfile index 684c43286bf..34641ae3dd5 100644 --- a/gemfiles/ruby_3.0_http.gemfile +++ b/gemfiles/ruby_3.0_http.gemfile @@ -37,7 +37,6 @@ 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"] -gem "elasticsearch" gem "ethon" gem "excon" gem "faraday" diff --git a/gemfiles/ruby_3.0_http.gemfile.lock b/gemfiles/ruby_3.0_http.gemfile.lock index b904dc8d569..f6410f89d16 100644 --- a/gemfiles/ruby_3.0_http.gemfile.lock +++ b/gemfiles/ruby_3.0_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -50,14 +50,6 @@ GEM dogstatsd-ruby (5.6.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elastic-transport (8.2.3) - faraday (< 3) - multi_json - elasticsearch (8.9.0) - elastic-transport (~> 8) - elasticsearch-api (= 8.9.0) - elasticsearch-api (8.9.0) - multi_json ethon (0.16.0) ffi (>= 1.15.0) excon (0.102.0) @@ -101,7 +93,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) msgpack (1.7.2) - multi_json (1.15.0) netrc (0.11.0) os (1.1.4) parallel (1.23.0) @@ -212,7 +203,6 @@ DEPENDENCIES concurrent-ruby ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch ethon excon extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_3.0_opensearch_2.gemfile.lock b/gemfiles/ruby_3.0_opensearch_2.gemfile.lock index d6688ae2746..8ec6a5c66a4 100644 --- a/gemfiles/ruby_3.0_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_3.0_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_opensearch_3.gemfile.lock b/gemfiles/ruby_3.0_opensearch_3.gemfile.lock index a2ce058298c..b01403c6950 100644 --- a/gemfiles/ruby_3.0_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_3.0_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_opentelemetry.gemfile.lock b/gemfiles/ruby_3.0_opentelemetry.gemfile.lock index 1d6091184ca..ceef0d3d0ef 100755 --- a/gemfiles/ruby_3.0_opentelemetry.gemfile.lock +++ b/gemfiles/ruby_3.0_opentelemetry.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_opentracing.gemfile.lock b/gemfiles/ruby_3.0_opentracing.gemfile.lock index 963c2e23cbe..1c03270f928 100644 --- a/gemfiles/ruby_3.0_opentracing.gemfile.lock +++ b/gemfiles/ruby_3.0_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_rack_1.gemfile.lock b/gemfiles/ruby_3.0_rack_1.gemfile.lock index c286df73628..a7a4a750205 100644 --- a/gemfiles/ruby_3.0_rack_1.gemfile.lock +++ b/gemfiles/ruby_3.0_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_rack_2.gemfile.lock b/gemfiles/ruby_3.0_rack_2.gemfile.lock index 3b2e5f16cbb..fc330491c17 100644 --- a/gemfiles/ruby_3.0_rack_2.gemfile.lock +++ b/gemfiles/ruby_3.0_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_rack_3.gemfile.lock b/gemfiles/ruby_3.0_rack_3.gemfile.lock index e8db450c647..c95e6048845 100644 --- a/gemfiles/ruby_3.0_rack_3.gemfile.lock +++ b/gemfiles/ruby_3.0_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.0_rails61_mysql2.gemfile.lock index 806282a3e4e..891a8b4a676 100644 --- a/gemfiles/ruby_3.0_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.0_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.0_rails61_postgres.gemfile.lock index 5ae201d7b63..c71b43efb5a 100644 --- a/gemfiles/ruby_3.0_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.0_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.0_rails61_postgres_redis.gemfile.lock index a3c87c5c106..04acf6b322d 100644 --- a/gemfiles/ruby_3.0_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.0_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.0_rails61_postgres_sidekiq.gemfile.lock index 071511f5760..7bc1d504ec5 100644 --- a/gemfiles/ruby_3.0_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.0_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.0_rails61_semantic_logger.gemfile.lock index 786fd4edbc5..f31678528a6 100644 --- a/gemfiles/ruby_3.0_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.0_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_redis_3.gemfile.lock b/gemfiles/ruby_3.0_redis_3.gemfile.lock index 34b4687f19b..88bc14fe915 100644 --- a/gemfiles/ruby_3.0_redis_3.gemfile.lock +++ b/gemfiles/ruby_3.0_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_redis_4.gemfile.lock b/gemfiles/ruby_3.0_redis_4.gemfile.lock index b5f16cdfb4a..b9376baa70d 100644 --- a/gemfiles/ruby_3.0_redis_4.gemfile.lock +++ b/gemfiles/ruby_3.0_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_redis_5.gemfile.lock b/gemfiles/ruby_3.0_redis_5.gemfile.lock index fe33ef2a8d3..e62a8dbdbcd 100644 --- a/gemfiles/ruby_3.0_redis_5.gemfile.lock +++ b/gemfiles/ruby_3.0_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_relational_db.gemfile.lock b/gemfiles/ruby_3.0_relational_db.gemfile.lock index 6e70709dccf..89bfb567925 100644 --- a/gemfiles/ruby_3.0_relational_db.gemfile.lock +++ b/gemfiles/ruby_3.0_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.0_resque2_redis3.gemfile.lock index 44693d7b023..42a1bcec0a4 100644 --- a/gemfiles/ruby_3.0_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_3.0_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.0_resque2_redis4.gemfile.lock index a4a5f51681b..5f1685587bb 100644 --- a/gemfiles/ruby_3.0_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_3.0_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.0_sinatra.gemfile.lock b/gemfiles/ruby_3.0_sinatra.gemfile.lock index e889dd09361..5997c965b04 100644 --- a/gemfiles/ruby_3.0_sinatra.gemfile.lock +++ b/gemfiles/ruby_3.0_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_activesupport.gemfile.lock b/gemfiles/ruby_3.1_activesupport.gemfile.lock index 532a605fc2a..d175cdb197a 100644 --- a/gemfiles/ruby_3.1_activesupport.gemfile.lock +++ b/gemfiles/ruby_3.1_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_aws.gemfile.lock b/gemfiles/ruby_3.1_aws.gemfile.lock index eab457708f7..47e15d0a1db 100644 --- a/gemfiles/ruby_3.1_aws.gemfile.lock +++ b/gemfiles/ruby_3.1_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_contrib.gemfile.lock b/gemfiles/ruby_3.1_contrib.gemfile.lock index 9cb16fc4ca1..5281367044a 100644 --- a/gemfiles/ruby_3.1_contrib.gemfile.lock +++ b/gemfiles/ruby_3.1_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_contrib_old.gemfile b/gemfiles/ruby_3.1_contrib_old.gemfile index 4468c4628b6..fc62cfca9f6 100644 --- a/gemfiles/ruby_3.1_contrib_old.gemfile +++ b/gemfiles/ruby_3.1_contrib_old.gemfile @@ -38,7 +38,6 @@ 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"] gem "dalli", "< 3.0.0" -gem "elasticsearch", "< 8.0.0" gem "graphql", "~> 1.12.0", "< 2.0" gem "presto-client", ">= 0.5.14" gem "qless", "0.12.0" diff --git a/gemfiles/ruby_3.1_contrib_old.gemfile.lock b/gemfiles/ruby_3.1_contrib_old.gemfile.lock index 8f467a3f21d..6ec17ed9d2d 100644 --- a/gemfiles/ruby_3.1_contrib_old.gemfile.lock +++ b/gemfiles/ruby_3.1_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -53,14 +53,6 @@ GEM diff-lcs (1.5.0) docile (1.4.0) dogstatsd-ruby (5.5.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json eventmachine (1.2.7) extlz4 (0.3.3) faraday (0.17.6) @@ -89,7 +81,6 @@ GEM avl_tree (~> 1.2.0) hitimes (~> 1.1) msgpack (1.6.0) - multi_json (1.15.0) multipart-post (2.3.0) mustermann (1.1.2) ruby2_keywords (~> 0.0.1) @@ -225,7 +216,6 @@ DEPENDENCIES dalli (< 3.0.0) ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch (< 8.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) graphql (~> 1.12.0, < 2.0) diff --git a/gemfiles/ruby_3.1_core_old.gemfile.lock b/gemfiles/ruby_3.1_core_old.gemfile.lock index 3b9a8e7321c..762d38d05c6 100644 --- a/gemfiles/ruby_3.1_core_old.gemfile.lock +++ b/gemfiles/ruby_3.1_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_elasticsearch_7.gemfile b/gemfiles/ruby_3.1_elasticsearch_7.gemfile new file mode 100644 index 00000000000..56f47942f07 --- /dev/null +++ b/gemfiles/ruby_3.1_elasticsearch_7.gemfile @@ -0,0 +1,46 @@ +# 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 "ruby-prof", "~> 1.4" +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 "webrick", ">= 1.7.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"] +gem "elasticsearch", "~> 7" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..d1c9830b622 --- /dev/null +++ b/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock @@ -0,0 +1,232 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) + 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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elasticsearch (7.17.9) + elasticsearch-api (= 7.17.9) + elasticsearch-transport (= 7.17.9) + elasticsearch-api (7.17.9) + multi_json + elasticsearch-transport (7.17.9) + faraday (~> 1) + multi_json + extlz4 (0.3.4) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.16.3) + google-protobuf (3.24.4-aarch64-linux) + google-protobuf (3.24.4-x86_64-linux) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + multipart-post (2.3.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.10.1) + byebug (~> 11.0) + pry (>= 0.13, < 0.15) + pry-stack_explorer (0.6.1) + binding_of_caller (~> 1.0) + pry (~> 0.13) + public_suffix (5.0.3) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_n (1.5.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.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.19.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-prof (1.6.3) + 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) + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + extlz4 (~> 0.3, >= 0.3.3) + google-protobuf (~> 3.0, != 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 + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + webrick (>= 1.7.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_3.1_elasticsearch_8.gemfile b/gemfiles/ruby_3.1_elasticsearch_8.gemfile new file mode 100644 index 00000000000..1365913a37f --- /dev/null +++ b/gemfiles/ruby_3.1_elasticsearch_8.gemfile @@ -0,0 +1,46 @@ +# 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 "ruby-prof", "~> 1.4" +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 "webrick", ">= 1.7.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"] +gem "elasticsearch", "~> 8" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_3.1_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.1_elasticsearch_8.gemfile.lock new file mode 100644 index 00000000000..85781e9aa26 --- /dev/null +++ b/gemfiles/ruby_3.1_elasticsearch_8.gemfile.lock @@ -0,0 +1,214 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.1.1) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) + 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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elastic-transport (8.3.0) + faraday (< 3) + multi_json + elasticsearch (8.10.0) + elastic-transport (~> 8) + elasticsearch-api (= 8.10.0) + elasticsearch-api (8.10.0) + multi_json + extlz4 (0.3.4) + faraday (2.7.11) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.16.3) + google-protobuf (3.24.4-aarch64-linux) + google-protobuf (3.24.4-x86_64-linux) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.10.1) + byebug (~> 11.0) + pry (>= 0.13, < 0.15) + pry-stack_explorer (0.6.1) + binding_of_caller (~> 1.0) + pry (~> 0.13) + public_suffix (5.0.3) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_n (1.5.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.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.19.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-prof (1.6.3) + 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) + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 8) + extlz4 (~> 0.3, >= 0.3.3) + google-protobuf (~> 3.0, != 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 + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + webrick (>= 1.7.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_3.1_http.gemfile b/gemfiles/ruby_3.1_http.gemfile index 684c43286bf..34641ae3dd5 100644 --- a/gemfiles/ruby_3.1_http.gemfile +++ b/gemfiles/ruby_3.1_http.gemfile @@ -37,7 +37,6 @@ 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"] -gem "elasticsearch" gem "ethon" gem "excon" gem "faraday" diff --git a/gemfiles/ruby_3.1_http.gemfile.lock b/gemfiles/ruby_3.1_http.gemfile.lock index b904dc8d569..f6410f89d16 100644 --- a/gemfiles/ruby_3.1_http.gemfile.lock +++ b/gemfiles/ruby_3.1_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -50,14 +50,6 @@ GEM dogstatsd-ruby (5.6.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elastic-transport (8.2.3) - faraday (< 3) - multi_json - elasticsearch (8.9.0) - elastic-transport (~> 8) - elasticsearch-api (= 8.9.0) - elasticsearch-api (8.9.0) - multi_json ethon (0.16.0) ffi (>= 1.15.0) excon (0.102.0) @@ -101,7 +93,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) msgpack (1.7.2) - multi_json (1.15.0) netrc (0.11.0) os (1.1.4) parallel (1.23.0) @@ -212,7 +203,6 @@ DEPENDENCIES concurrent-ruby ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch ethon excon extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_3.1_opensearch_2.gemfile.lock b/gemfiles/ruby_3.1_opensearch_2.gemfile.lock index d6688ae2746..8ec6a5c66a4 100644 --- a/gemfiles/ruby_3.1_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_3.1_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_opensearch_3.gemfile.lock b/gemfiles/ruby_3.1_opensearch_3.gemfile.lock index a2ce058298c..b01403c6950 100644 --- a/gemfiles/ruby_3.1_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_3.1_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_opentelemetry.gemfile.lock b/gemfiles/ruby_3.1_opentelemetry.gemfile.lock index ce9b2e724f1..66da04dc97f 100644 --- a/gemfiles/ruby_3.1_opentelemetry.gemfile.lock +++ b/gemfiles/ruby_3.1_opentelemetry.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_opentracing.gemfile.lock b/gemfiles/ruby_3.1_opentracing.gemfile.lock index 963c2e23cbe..1c03270f928 100644 --- a/gemfiles/ruby_3.1_opentracing.gemfile.lock +++ b/gemfiles/ruby_3.1_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_rack_1.gemfile.lock b/gemfiles/ruby_3.1_rack_1.gemfile.lock index c286df73628..a7a4a750205 100644 --- a/gemfiles/ruby_3.1_rack_1.gemfile.lock +++ b/gemfiles/ruby_3.1_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_rack_2.gemfile.lock b/gemfiles/ruby_3.1_rack_2.gemfile.lock index 3b2e5f16cbb..fc330491c17 100644 --- a/gemfiles/ruby_3.1_rack_2.gemfile.lock +++ b/gemfiles/ruby_3.1_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_rack_3.gemfile.lock b/gemfiles/ruby_3.1_rack_3.gemfile.lock index e8db450c647..c95e6048845 100644 --- a/gemfiles/ruby_3.1_rack_3.gemfile.lock +++ b/gemfiles/ruby_3.1_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.1_rails61_mysql2.gemfile.lock index 806282a3e4e..891a8b4a676 100644 --- a/gemfiles/ruby_3.1_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.1_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.1_rails61_postgres.gemfile.lock index 5ae201d7b63..c71b43efb5a 100644 --- a/gemfiles/ruby_3.1_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.1_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.1_rails61_postgres_redis.gemfile.lock index a3c87c5c106..04acf6b322d 100644 --- a/gemfiles/ruby_3.1_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.1_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.1_rails61_postgres_sidekiq.gemfile.lock index 071511f5760..7bc1d504ec5 100644 --- a/gemfiles/ruby_3.1_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.1_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.1_rails61_semantic_logger.gemfile.lock index 786fd4edbc5..f31678528a6 100644 --- a/gemfiles/ruby_3.1_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.1_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_redis_3.gemfile.lock b/gemfiles/ruby_3.1_redis_3.gemfile.lock index 34b4687f19b..88bc14fe915 100644 --- a/gemfiles/ruby_3.1_redis_3.gemfile.lock +++ b/gemfiles/ruby_3.1_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_redis_4.gemfile.lock b/gemfiles/ruby_3.1_redis_4.gemfile.lock index b5f16cdfb4a..b9376baa70d 100644 --- a/gemfiles/ruby_3.1_redis_4.gemfile.lock +++ b/gemfiles/ruby_3.1_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_redis_5.gemfile.lock b/gemfiles/ruby_3.1_redis_5.gemfile.lock index fe33ef2a8d3..e62a8dbdbcd 100644 --- a/gemfiles/ruby_3.1_redis_5.gemfile.lock +++ b/gemfiles/ruby_3.1_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_relational_db.gemfile.lock b/gemfiles/ruby_3.1_relational_db.gemfile.lock index 6e70709dccf..89bfb567925 100644 --- a/gemfiles/ruby_3.1_relational_db.gemfile.lock +++ b/gemfiles/ruby_3.1_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.1_resque2_redis3.gemfile.lock index 44693d7b023..42a1bcec0a4 100644 --- a/gemfiles/ruby_3.1_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_3.1_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.1_resque2_redis4.gemfile.lock index a4a5f51681b..5f1685587bb 100644 --- a/gemfiles/ruby_3.1_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_3.1_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.1_sinatra.gemfile.lock b/gemfiles/ruby_3.1_sinatra.gemfile.lock index e889dd09361..5997c965b04 100644 --- a/gemfiles/ruby_3.1_sinatra.gemfile.lock +++ b/gemfiles/ruby_3.1_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_activesupport.gemfile.lock b/gemfiles/ruby_3.2_activesupport.gemfile.lock index 1c20648eb2b..6fb5e380ac3 100644 --- a/gemfiles/ruby_3.2_activesupport.gemfile.lock +++ b/gemfiles/ruby_3.2_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_aws.gemfile.lock b/gemfiles/ruby_3.2_aws.gemfile.lock index 2beca5ad694..832fe462228 100644 --- a/gemfiles/ruby_3.2_aws.gemfile.lock +++ b/gemfiles/ruby_3.2_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_contrib.gemfile.lock b/gemfiles/ruby_3.2_contrib.gemfile.lock index 8f31ef7af60..71d7c74ca89 100644 --- a/gemfiles/ruby_3.2_contrib.gemfile.lock +++ b/gemfiles/ruby_3.2_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_contrib_old.gemfile b/gemfiles/ruby_3.2_contrib_old.gemfile index 38226350d1f..deed88c8051 100644 --- a/gemfiles/ruby_3.2_contrib_old.gemfile +++ b/gemfiles/ruby_3.2_contrib_old.gemfile @@ -37,7 +37,6 @@ 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"] gem "dalli", "< 3.0.0" -gem "elasticsearch", "< 8.0.0" gem "graphql", "~> 1.12.0", "< 2.0" gem "presto-client", ">= 0.5.14" gem "qless", "0.12.0" diff --git a/gemfiles/ruby_3.2_contrib_old.gemfile.lock b/gemfiles/ruby_3.2_contrib_old.gemfile.lock index 79fca5a2b90..ab8c72149db 100644 --- a/gemfiles/ruby_3.2_contrib_old.gemfile.lock +++ b/gemfiles/ruby_3.2_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -52,14 +52,6 @@ GEM diff-lcs (1.5.0) docile (1.4.0) dogstatsd-ruby (5.5.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json eventmachine (1.2.7) extlz4 (0.3.3) faraday (0.17.6) @@ -88,7 +80,6 @@ GEM avl_tree (~> 1.2.0) hitimes (~> 1.1) msgpack (1.6.0) - multi_json (1.15.0) multipart-post (2.3.0) mustermann (1.1.2) ruby2_keywords (~> 0.0.1) @@ -221,7 +212,6 @@ DEPENDENCIES dalli (< 3.0.0) ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch (< 8.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) graphql (~> 1.12.0, < 2.0) diff --git a/gemfiles/ruby_3.2_core_old.gemfile.lock b/gemfiles/ruby_3.2_core_old.gemfile.lock index 8f071262f49..c0f5ca241c0 100644 --- a/gemfiles/ruby_3.2_core_old.gemfile.lock +++ b/gemfiles/ruby_3.2_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_elasticsearch_7.gemfile b/gemfiles/ruby_3.2_elasticsearch_7.gemfile new file mode 100644 index 00000000000..be52bb9612e --- /dev/null +++ b/gemfiles/ruby_3.2_elasticsearch_7.gemfile @@ -0,0 +1,45 @@ +# 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-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 "ruby-prof", "~> 1.4" +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 "webrick", ">= 1.7.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"] +gem "elasticsearch", "~> 7" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_3.2_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.2_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..ee6761e4c62 --- /dev/null +++ b/gemfiles/ruby_3.2_elasticsearch_7.gemfile.lock @@ -0,0 +1,227 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + binding_of_caller (1.0.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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elasticsearch (7.17.9) + elasticsearch-api (= 7.17.9) + elasticsearch-transport (= 7.17.9) + elasticsearch-api (7.17.9) + multi_json + elasticsearch-transport (7.17.9) + faraday (~> 1) + multi_json + extlz4 (0.3.4) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.16.3) + google-protobuf (3.24.4-aarch64-linux) + google-protobuf (3.24.4-x86_64-linux) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + multipart-post (2.3.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-stack_explorer (0.6.1) + binding_of_caller (~> 1.0) + pry (~> 0.13) + public_suffix (5.0.3) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_n (1.5.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.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.19.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-prof (1.6.3) + 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) + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + extlz4 (~> 0.3, >= 0.3.3) + google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) + json-schema (< 3) + memory_profiler (~> 0.9) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-stack_explorer + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + webrick (>= 1.7.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_3.2_elasticsearch_8.gemfile b/gemfiles/ruby_3.2_elasticsearch_8.gemfile new file mode 100644 index 00000000000..96d0f252ace --- /dev/null +++ b/gemfiles/ruby_3.2_elasticsearch_8.gemfile @@ -0,0 +1,45 @@ +# 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-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 "ruby-prof", "~> 1.4" +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 "webrick", ">= 1.7.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"] +gem "elasticsearch", "~> 8" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_3.2_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.2_elasticsearch_8.gemfile.lock new file mode 100644 index 00000000000..f0442b023db --- /dev/null +++ b/gemfiles/ruby_3.2_elasticsearch_8.gemfile.lock @@ -0,0 +1,209 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.1.1) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + binding_of_caller (1.0.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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elastic-transport (8.3.0) + faraday (< 3) + multi_json + elasticsearch (8.10.0) + elastic-transport (~> 8) + elasticsearch-api (= 8.10.0) + elasticsearch-api (8.10.0) + multi_json + extlz4 (0.3.4) + faraday (2.7.11) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.16.3) + google-protobuf (3.24.4-aarch64-linux) + google-protobuf (3.24.4-x86_64-linux) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-stack_explorer (0.6.1) + binding_of_caller (~> 1.0) + pry (~> 0.13) + public_suffix (5.0.3) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_n (1.5.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.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.19.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-prof (1.6.3) + 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) + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 8) + extlz4 (~> 0.3, >= 0.3.3) + google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) + json-schema (< 3) + memory_profiler (~> 0.9) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-stack_explorer + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + webrick (>= 1.7.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_3.2_http.gemfile b/gemfiles/ruby_3.2_http.gemfile index 2a983f09eff..6c99a7fa190 100644 --- a/gemfiles/ruby_3.2_http.gemfile +++ b/gemfiles/ruby_3.2_http.gemfile @@ -36,7 +36,6 @@ 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"] -gem "elasticsearch" gem "ethon" gem "excon" gem "faraday" diff --git a/gemfiles/ruby_3.2_http.gemfile.lock b/gemfiles/ruby_3.2_http.gemfile.lock index 2e862c59a2c..a20d3160e36 100644 --- a/gemfiles/ruby_3.2_http.gemfile.lock +++ b/gemfiles/ruby_3.2_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -49,14 +49,6 @@ GEM dogstatsd-ruby (5.6.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elastic-transport (8.2.3) - faraday (< 3) - multi_json - elasticsearch (8.9.0) - elastic-transport (~> 8) - elasticsearch-api (= 8.9.0) - elasticsearch-api (8.9.0) - multi_json ethon (0.16.0) ffi (>= 1.15.0) excon (0.102.0) @@ -100,7 +92,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) msgpack (1.7.2) - multi_json (1.15.0) netrc (0.11.0) os (1.1.4) parallel (1.23.0) @@ -208,7 +199,6 @@ DEPENDENCIES concurrent-ruby ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch ethon excon extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_3.2_opensearch_2.gemfile.lock b/gemfiles/ruby_3.2_opensearch_2.gemfile.lock index a154d6d81a8..ea4c674c039 100644 --- a/gemfiles/ruby_3.2_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_3.2_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_opensearch_3.gemfile.lock b/gemfiles/ruby_3.2_opensearch_3.gemfile.lock index 736f9939c86..736123352b3 100644 --- a/gemfiles/ruby_3.2_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_3.2_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_opentelemetry.gemfile.lock b/gemfiles/ruby_3.2_opentelemetry.gemfile.lock index 0ad80c4886e..4360a2d3916 100644 --- a/gemfiles/ruby_3.2_opentelemetry.gemfile.lock +++ b/gemfiles/ruby_3.2_opentelemetry.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_opentracing.gemfile.lock b/gemfiles/ruby_3.2_opentracing.gemfile.lock index 882588ddf6f..5cd832677bc 100644 --- a/gemfiles/ruby_3.2_opentracing.gemfile.lock +++ b/gemfiles/ruby_3.2_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_rack_1.gemfile.lock b/gemfiles/ruby_3.2_rack_1.gemfile.lock index 3c5de09ce5f..16d59368bc5 100644 --- a/gemfiles/ruby_3.2_rack_1.gemfile.lock +++ b/gemfiles/ruby_3.2_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_rack_2.gemfile.lock b/gemfiles/ruby_3.2_rack_2.gemfile.lock index 08880e5a519..8d6956d732d 100644 --- a/gemfiles/ruby_3.2_rack_2.gemfile.lock +++ b/gemfiles/ruby_3.2_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_rack_3.gemfile.lock b/gemfiles/ruby_3.2_rack_3.gemfile.lock index 82d11ea4adb..ee85d90685b 100644 --- a/gemfiles/ruby_3.2_rack_3.gemfile.lock +++ b/gemfiles/ruby_3.2_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.2_rails61_mysql2.gemfile.lock index 32f872756df..97933b1e446 100644 --- a/gemfiles/ruby_3.2_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.2_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.2_rails61_postgres.gemfile.lock index d10ba5eab56..4d908b4ee65 100644 --- a/gemfiles/ruby_3.2_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.2_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.2_rails61_postgres_redis.gemfile.lock index 40c50240caf..43f8cfc17dc 100644 --- a/gemfiles/ruby_3.2_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.2_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.2_rails61_postgres_sidekiq.gemfile.lock index 8d5e2987610..a6d0eae5d40 100644 --- a/gemfiles/ruby_3.2_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.2_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.2_rails61_semantic_logger.gemfile.lock index 7d365d84960..aa75eed16b6 100644 --- a/gemfiles/ruby_3.2_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.2_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_redis_3.gemfile.lock b/gemfiles/ruby_3.2_redis_3.gemfile.lock index 0de094d8684..24e94604523 100644 --- a/gemfiles/ruby_3.2_redis_3.gemfile.lock +++ b/gemfiles/ruby_3.2_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_redis_4.gemfile.lock b/gemfiles/ruby_3.2_redis_4.gemfile.lock index 96d577cf4b5..d69e8861b3f 100644 --- a/gemfiles/ruby_3.2_redis_4.gemfile.lock +++ b/gemfiles/ruby_3.2_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_redis_5.gemfile.lock b/gemfiles/ruby_3.2_redis_5.gemfile.lock index d19fca40eae..d5fc5248187 100644 --- a/gemfiles/ruby_3.2_redis_5.gemfile.lock +++ b/gemfiles/ruby_3.2_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_relational_db.gemfile.lock b/gemfiles/ruby_3.2_relational_db.gemfile.lock index c3599c871c7..5f8180be434 100644 --- a/gemfiles/ruby_3.2_relational_db.gemfile.lock +++ b/gemfiles/ruby_3.2_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.2_resque2_redis3.gemfile.lock index 8ec45510cfc..7456e171d60 100644 --- a/gemfiles/ruby_3.2_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_3.2_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.2_resque2_redis4.gemfile.lock index 387f3b7ae02..f2f5726b82d 100644 --- a/gemfiles/ruby_3.2_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_3.2_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.2_sinatra.gemfile.lock b/gemfiles/ruby_3.2_sinatra.gemfile.lock index 9b3c6770b12..469fafddb57 100644 --- a/gemfiles/ruby_3.2_sinatra.gemfile.lock +++ b/gemfiles/ruby_3.2_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_activesupport.gemfile.lock b/gemfiles/ruby_3.3_activesupport.gemfile.lock index 56b9a4501fa..27f56c2fba5 100644 --- a/gemfiles/ruby_3.3_activesupport.gemfile.lock +++ b/gemfiles/ruby_3.3_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_aws.gemfile.lock b/gemfiles/ruby_3.3_aws.gemfile.lock index 41338e52e8f..f8c6ddabf9c 100644 --- a/gemfiles/ruby_3.3_aws.gemfile.lock +++ b/gemfiles/ruby_3.3_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_contrib.gemfile.lock b/gemfiles/ruby_3.3_contrib.gemfile.lock index bff8fc3eee9..7ac2a9e9b2d 100644 --- a/gemfiles/ruby_3.3_contrib.gemfile.lock +++ b/gemfiles/ruby_3.3_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_contrib_old.gemfile b/gemfiles/ruby_3.3_contrib_old.gemfile index 14565fcce94..2ea504e4d86 100644 --- a/gemfiles/ruby_3.3_contrib_old.gemfile +++ b/gemfiles/ruby_3.3_contrib_old.gemfile @@ -37,7 +37,6 @@ 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"] gem "dalli", "< 3.0.0" -gem "elasticsearch", "< 8.0.0" gem "graphql", "~> 1.12.0", "< 2.0" gem "presto-client", ">= 0.5.14" gem "qless", "0.12.0" diff --git a/gemfiles/ruby_3.3_contrib_old.gemfile.lock b/gemfiles/ruby_3.3_contrib_old.gemfile.lock index 46fc9591f89..8c78aadef2a 100644 --- a/gemfiles/ruby_3.3_contrib_old.gemfile.lock +++ b/gemfiles/ruby_3.3_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -52,14 +52,6 @@ GEM diff-lcs (1.5.0) docile (1.4.0) dogstatsd-ruby (5.5.0) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) - multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) - multi_json eventmachine (1.2.7) extlz4 (0.3.3) faraday (0.17.6) @@ -87,7 +79,6 @@ GEM avl_tree (~> 1.2.0) hitimes (~> 1.1) msgpack (1.7.0) - multi_json (1.15.0) multipart-post (2.3.0) mustermann (1.1.2) ruby2_keywords (~> 0.0.1) @@ -220,7 +211,6 @@ DEPENDENCIES dalli (< 3.0.0) ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch (< 8.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) graphql (~> 1.12.0, < 2.0) diff --git a/gemfiles/ruby_3.3_core_old.gemfile.lock b/gemfiles/ruby_3.3_core_old.gemfile.lock index ac735870776..ccdb2ba0fd0 100644 --- a/gemfiles/ruby_3.3_core_old.gemfile.lock +++ b/gemfiles/ruby_3.3_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_elasticsearch_7.gemfile b/gemfiles/ruby_3.3_elasticsearch_7.gemfile new file mode 100644 index 00000000000..be52bb9612e --- /dev/null +++ b/gemfiles/ruby_3.3_elasticsearch_7.gemfile @@ -0,0 +1,45 @@ +# 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-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 "ruby-prof", "~> 1.4" +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 "webrick", ">= 1.7.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"] +gem "elasticsearch", "~> 7" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock new file mode 100644 index 00000000000..5b6c98bb8c6 --- /dev/null +++ b/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock @@ -0,0 +1,226 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + binding_of_caller (1.0.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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elasticsearch (7.17.9) + elasticsearch-api (= 7.17.9) + elasticsearch-transport (= 7.17.9) + elasticsearch-api (7.17.9) + multi_json + elasticsearch-transport (7.17.9) + faraday (~> 1) + multi_json + extlz4 (0.3.4) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.16.3) + google-protobuf (3.24.4) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + multipart-post (2.3.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-stack_explorer (0.6.1) + binding_of_caller (~> 1.0) + pry (~> 0.13) + public_suffix (5.0.3) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_n (1.5.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.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.19.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-prof (1.6.3) + 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) + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 7) + extlz4 (~> 0.3, >= 0.3.3) + google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) + json-schema (< 3) + memory_profiler (~> 0.9) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-stack_explorer + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + webrick (>= 1.7.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_3.3_elasticsearch_8.gemfile b/gemfiles/ruby_3.3_elasticsearch_8.gemfile new file mode 100644 index 00000000000..96d0f252ace --- /dev/null +++ b/gemfiles/ruby_3.3_elasticsearch_8.gemfile @@ -0,0 +1,45 @@ +# 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-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 "ruby-prof", "~> 1.4" +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 "webrick", ">= 1.7.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"] +gem "elasticsearch", "~> 8" + +group :check do + +end + +gemspec path: "../" diff --git a/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock new file mode 100644 index 00000000000..e88013fcc4e --- /dev/null +++ b/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock @@ -0,0 +1,208 @@ +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: + ddtrace (1.16.2) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.1.1) + benchmark-ips (2.12.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) + binding_of_caller (1.0.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.2) + crack (0.4.5) + rexml + cri (2.15.11) + datadog-ci (0.3.0) + msgpack + debase-ruby_core_source (3.2.2) + debug_inspector (1.1.0) + diff-lcs (1.5.0) + docile (1.4.0) + dogstatsd-ruby (5.6.1) + elastic-transport (8.3.0) + faraday (< 3) + multi_json + elasticsearch (8.10.0) + elastic-transport (~> 8) + elasticsearch-api (= 8.10.0) + elasticsearch-api (8.10.0) + multi_json + extlz4 (0.3.4) + faraday (2.7.11) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.16.3) + google-protobuf (3.24.4) + hashdiff (1.0.1) + json (2.6.3) + json-schema (2.8.1) + addressable (>= 2.4) + libdatadog (5.0.0.1.0-aarch64-linux) + libdatadog (5.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.0.0) + msgpack (1.7.2) + multi_json (1.15.0) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pimpmychangelog (0.1.3) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-stack_explorer (0.6.1) + binding_of_caller (~> 1.0) + pry (~> 0.13) + public_suffix (5.0.3) + racc (1.7.1) + rainbow (3.1.1) + rake (13.0.6) + rake-compiler (1.2.5) + rake + redcarpet (3.6.0) + regexp_parser (2.8.2) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-collection_matchers (1.2.1) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec-wait (0.0.9) + rspec (>= 3, < 4) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_n (1.5.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.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.19.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-prof (1.6.3) + 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) + thor (1.2.2) + unicode-display_width (2.5.0) + warning (1.3.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) + yard (0.9.34) + +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 + ddtrace! + dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) + elasticsearch (~> 8) + extlz4 (~> 0.3, >= 0.3.3) + google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) + json-schema (< 3) + memory_profiler (~> 0.9) + os (~> 1.1) + pimpmychangelog (>= 0.1.2) + pry + pry-stack_explorer + 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) + ruby-prof (~> 1.4) + simplecov! + simplecov-cobertura (~> 2.1.0) + warning (~> 1) + webmock (>= 3.10.0) + webrick (>= 1.7.0) + yard (~> 0.9) + +BUNDLED WITH + 2.3.26 diff --git a/gemfiles/ruby_3.3_http.gemfile b/gemfiles/ruby_3.3_http.gemfile index 2a983f09eff..6c99a7fa190 100644 --- a/gemfiles/ruby_3.3_http.gemfile +++ b/gemfiles/ruby_3.3_http.gemfile @@ -36,7 +36,6 @@ 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"] -gem "elasticsearch" gem "ethon" gem "excon" gem "faraday" diff --git a/gemfiles/ruby_3.3_http.gemfile.lock b/gemfiles/ruby_3.3_http.gemfile.lock index 2b605395fa7..8283fcaacaf 100644 --- a/gemfiles/ruby_3.3_http.gemfile.lock +++ b/gemfiles/ruby_3.3_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) @@ -49,14 +49,6 @@ GEM dogstatsd-ruby (5.6.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elastic-transport (8.2.3) - faraday (< 3) - multi_json - elasticsearch (8.9.0) - elastic-transport (~> 8) - elasticsearch-api (= 8.9.0) - elasticsearch-api (8.9.0) - multi_json ethon (0.16.0) ffi (>= 1.15.0) excon (0.102.0) @@ -99,7 +91,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) msgpack (1.7.2) - multi_json (1.15.0) netrc (0.11.0) os (1.1.4) parallel (1.23.0) @@ -207,7 +198,6 @@ DEPENDENCIES concurrent-ruby ddtrace! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) - elasticsearch ethon excon extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_3.3_opensearch_2.gemfile.lock b/gemfiles/ruby_3.3_opensearch_2.gemfile.lock index 7f9c5693494..a0ff4a36169 100644 --- a/gemfiles/ruby_3.3_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_3.3_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_opensearch_3.gemfile.lock b/gemfiles/ruby_3.3_opensearch_3.gemfile.lock index 77634b3701c..5dbbe14197d 100644 --- a/gemfiles/ruby_3.3_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_3.3_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_opentelemetry.gemfile.lock b/gemfiles/ruby_3.3_opentelemetry.gemfile.lock index b36cf53fe2f..d950f782aca 100644 --- a/gemfiles/ruby_3.3_opentelemetry.gemfile.lock +++ b/gemfiles/ruby_3.3_opentelemetry.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_opentracing.gemfile.lock b/gemfiles/ruby_3.3_opentracing.gemfile.lock index abdf17ea6ae..9e397c5d879 100644 --- a/gemfiles/ruby_3.3_opentracing.gemfile.lock +++ b/gemfiles/ruby_3.3_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_rack_1.gemfile.lock b/gemfiles/ruby_3.3_rack_1.gemfile.lock index 12bc6dcd713..19acb8c27e8 100644 --- a/gemfiles/ruby_3.3_rack_1.gemfile.lock +++ b/gemfiles/ruby_3.3_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_rack_2.gemfile.lock b/gemfiles/ruby_3.3_rack_2.gemfile.lock index 40d31ffed89..dc9f1d9a946 100644 --- a/gemfiles/ruby_3.3_rack_2.gemfile.lock +++ b/gemfiles/ruby_3.3_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_rack_3.gemfile.lock b/gemfiles/ruby_3.3_rack_3.gemfile.lock index 35998ff19b8..12acc9738df 100644 --- a/gemfiles/ruby_3.3_rack_3.gemfile.lock +++ b/gemfiles/ruby_3.3_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock index 930631f6a21..8eabfb7e4d5 100644 --- a/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock index 1412e64e08f..f2961004910 100644 --- a/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock index ff77e2eee37..53ace417031 100644 --- a/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock index 9995f27e3c9..15a5f9c826e 100644 --- a/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock index ed30d3738b6..6ab749b7213 100644 --- a/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_redis_3.gemfile.lock b/gemfiles/ruby_3.3_redis_3.gemfile.lock index 4ee4547a908..b25a173ef84 100644 --- a/gemfiles/ruby_3.3_redis_3.gemfile.lock +++ b/gemfiles/ruby_3.3_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_redis_4.gemfile.lock b/gemfiles/ruby_3.3_redis_4.gemfile.lock index 6c389cbdeeb..e04b714e3c6 100644 --- a/gemfiles/ruby_3.3_redis_4.gemfile.lock +++ b/gemfiles/ruby_3.3_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_redis_5.gemfile.lock b/gemfiles/ruby_3.3_redis_5.gemfile.lock index a4a806d256a..ac25d0a82af 100644 --- a/gemfiles/ruby_3.3_redis_5.gemfile.lock +++ b/gemfiles/ruby_3.3_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_relational_db.gemfile.lock b/gemfiles/ruby_3.3_relational_db.gemfile.lock index f8ff4712ddd..d06f96c74b0 100644 --- a/gemfiles/ruby_3.3_relational_db.gemfile.lock +++ b/gemfiles/ruby_3.3_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock index 56e864084b7..6c9c665db31 100644 --- a/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock index 14265fc826e..647d8c796e8 100644 --- a/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/gemfiles/ruby_3.3_sinatra.gemfile.lock b/gemfiles/ruby_3.3_sinatra.gemfile.lock index cbce4291c7e..164449accdd 100644 --- a/gemfiles/ruby_3.3_sinatra.gemfile.lock +++ b/gemfiles/ruby_3.3_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.alpha1) + ddtrace (1.16.2) datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) diff --git a/lib-injection/host_inject.rb b/lib-injection/host_inject.rb index c029459817c..7b567bfc857 100644 --- a/lib-injection/host_inject.rb +++ b/lib-injection/host_inject.rb @@ -113,5 +113,5 @@ def debug_log(msg) end end rescue Exception => e - warn "[ddtrace] #{failure_prefix} #{e.class.name} #{e.message}\nBacktrace: #{e.backtrace.join("\n")}\n#{support_message}" + warn "[ddtrace] Injection failed: #{e.class.name} #{e.message}\nBacktrace: #{e.backtrace.join("\n")}\n#{support_message}" end diff --git a/lib/datadog/appsec/configuration/settings.rb b/lib/datadog/appsec/configuration/settings.rb index d814f60f4b8..77ef0940ca8 100644 --- a/lib/datadog/appsec/configuration/settings.rb +++ b/lib/datadog/appsec/configuration/settings.rb @@ -188,12 +188,6 @@ def self.add_settings!(base) end end end - - option :parse_response_body do |o| - o.type :bool - o.env 'DD_API_SECURITY_PARSE_RESPONSE_BODY' - o.default true - end end end end diff --git a/lib/datadog/appsec/contrib/rack/gateway/request.rb b/lib/datadog/appsec/contrib/rack/gateway/request.rb index 86513a697a2..b0b57a99087 100644 --- a/lib/datadog/appsec/contrib/rack/gateway/request.rb +++ b/lib/datadog/appsec/contrib/rack/gateway/request.rb @@ -40,9 +40,13 @@ def method end def headers - request.env.each_with_object({}) do |(k, v), h| - h[k.gsub(/^HTTP_/, '').downcase.tr('_', '-')] = v if k =~ /^HTTP_/ + result = request.env.each_with_object({}) do |(k, v), h| + h[k.gsub(/^HTTP_/, '').downcase!.tr('_', '-')] = v if k =~ /^HTTP_/ end + + result['content-type'] = request.content_type if request.content_type + result['content-length'] = request.content_length if request.content_length + result end def body diff --git a/lib/datadog/appsec/contrib/rack/gateway/response.rb b/lib/datadog/appsec/contrib/rack/gateway/response.rb index 889153181ff..32b311bd919 100644 --- a/lib/datadog/appsec/contrib/rack/gateway/response.rb +++ b/lib/datadog/appsec/contrib/rack/gateway/response.rb @@ -19,55 +19,9 @@ def initialize(body, status, headers, scope:) @scope = scope end - def parsed_body - return unless Datadog.configuration.appsec.parse_response_body - - unless body.instance_of?(Array) - Datadog.logger.debug do - "Response body type unsupported: #{body.class}" - end - return - end - - return unless json_content_type? - - result = ''.dup - all_body_parts_are_string = true - - body.each do |body_part| - if body_part.is_a?(String) - result.concat(body_part) - else - all_body_parts_are_string = false - break - end - end - - return unless all_body_parts_are_string - - begin - JSON.parse(result) - rescue JSON::ParserError => e - Datadog.logger.debug { "Failed to parse response body. Error #{e.class}. Message #{e.message}" } - nil - end - end - def response @response ||= ::Rack::Response.new(body, status, headers) end - - private - - VALID_JSON_TYPES = [ - 'application/json', - 'text/json' - ].freeze - - def json_content_type? - content_type = headers['content-type'] - VALID_JSON_TYPES.any? { |valid_type| content_type.include?(valid_type) } - end end end end diff --git a/lib/datadog/appsec/contrib/rack/reactive/response.rb b/lib/datadog/appsec/contrib/rack/reactive/response.rb index fedfcfae438..794f130d97d 100644 --- a/lib/datadog/appsec/contrib/rack/reactive/response.rb +++ b/lib/datadog/appsec/contrib/rack/reactive/response.rb @@ -10,7 +10,6 @@ module Response ADDRESSES = [ 'response.status', 'response.headers', - 'response.body', ].freeze private_constant :ADDRESSES @@ -18,7 +17,6 @@ def self.publish(op, gateway_response) catch(:block) do op.publish('response.status', gateway_response.status) op.publish('response.headers', gateway_response.headers) - op.publish('response.body', gateway_response.parsed_body) nil end @@ -31,7 +29,6 @@ def self.subscribe(op, waf_context) response_status = values[0] response_headers = values[1] response_headers_no_cookies = response_headers.dup.tap { |h| h.delete('set-cookie') } - response_body = values[2] waf_args = { 'server.response.status' => response_status.to_s, @@ -39,8 +36,6 @@ def self.subscribe(op, waf_context) 'server.response.headers.no_cookies' => response_headers_no_cookies, } - waf_args['server.response.body'] = response_body if response_body - waf_timeout = Datadog.configuration.appsec.waf_timeout result = waf_context.run(waf_args, waf_timeout) diff --git a/lib/datadog/appsec/contrib/rack/request_middleware.rb b/lib/datadog/appsec/contrib/rack/request_middleware.rb index e1214a26d47..f835cb2883b 100644 --- a/lib/datadog/appsec/contrib/rack/request_middleware.rb +++ b/lib/datadog/appsec/contrib/rack/request_middleware.rb @@ -66,16 +66,6 @@ def call(env) request_return = AppSec::Response.negotiate(env, blocked_event.last[:actions]).to_rack if blocked_event end - if request_return[2].respond_to?(:to_ary) - # Following the Rack specification. The response body should only call :each once. - # Calling :to_ary returns an array with identical content as the produced when calling :each - # replacing request_return[2] with that new value allow us to safely operate on the response body. - # On Gateway::Response#parsed_body we might iterate over the reposne body using :each - # https://github.com/rack/rack/blob/main/SPEC.rdoc#enumerable-body- - consumed_body = request_return[2].to_ary - request_return[2] = consumed_body if consumed_body - end - gateway_response = Gateway::Response.new( request_return[2], request_return[0], diff --git a/lib/datadog/core/configuration/settings.rb b/lib/datadog/core/configuration/settings.rb index fb055de40ed..981996997f2 100644 --- a/lib/datadog/core/configuration/settings.rb +++ b/lib/datadog/core/configuration/settings.rb @@ -330,7 +330,7 @@ def initialize(*_) # Caveat 3 (severe): # Ruby 3.2.0 to 3.2.2 have a bug in the newobj tracepoint (https://bugs.ruby-lang.org/issues/19482, # https://github.com/ruby/ruby/pull/7464) so that's an extra reason why it's not safe on those Rubies. - # This bug is fixed on Ruby versions 3.2.2 and 3.3.0. + # This bug is fixed on Ruby versions 3.2.3 and 3.3.0. # # @default `true` on Ruby 2.x and 3.1.4+, 3.2.3+ and 3.3.0+; `false` for Ruby 3.0 and unpatched Rubies. option :allocation_counting_enabled do |o| diff --git a/lib/datadog/tracing/configuration/ext.rb b/lib/datadog/tracing/configuration/ext.rb index 6435899df6f..3ff0b40c60f 100644 --- a/lib/datadog/tracing/configuration/ext.rb +++ b/lib/datadog/tracing/configuration/ext.rb @@ -62,6 +62,9 @@ module Distributed # @see https://opentelemetry.io/docs/concepts/sdk-configuration/general-sdk-configuration/#get_otel__propagators PROPAGATION_STYLE_NONE = 'none' + # Strictly stop at the first successfully serialized style. + EXTRACT_FIRST = 'DD_TRACE_PROPAGATION_EXTRACT_FIRST' + ENV_X_DATADOG_TAGS_MAX_LENGTH = 'DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH' end diff --git a/lib/datadog/tracing/configuration/settings.rb b/lib/datadog/tracing/configuration/settings.rb index e5c67e731f6..602396be55e 100644 --- a/lib/datadog/tracing/configuration/settings.rb +++ b/lib/datadog/tracing/configuration/settings.rb @@ -61,8 +61,7 @@ def self.extended(base) o.default( [ Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG, - Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_MULTI_HEADER, - Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_SINGLE_HEADER, + Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT, ] ) o.after_set do |styles| @@ -93,7 +92,10 @@ def self.extended(base) o.deprecated_env Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_INJECT_OLD o.env Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_INJECT # DEV-2.0: Change default value to `tracecontext, Datadog`. - o.default [Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG] + o.default [ + Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG, + Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT, + ] o.after_set do |styles| # Modernize B3 options # DEV-2.0: Can be removed with the removal of deprecated B3 constants. @@ -142,6 +144,17 @@ def self.extended(base) set_option(:propagation_inject_style, styles) end end + + # Strictly stop at the first successfully serialized style. + # This prevents the tracer from enriching the extracted context with information from + # other valid propagations styles present in the request. + # @default `DD_TRACE_PROPAGATION_EXTRACT_FIRST` environment variable, otherwise `false`. + # @return [Boolean] + option :propagation_extract_first do |o| + o.env Tracing::Configuration::Ext::Distributed::EXTRACT_FIRST + o.default false + o.type :bool + end end # Enable trace collection and span generation. diff --git a/lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb b/lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb index a0b1ba04c3b..e80baca6cf0 100644 --- a/lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb +++ b/lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb @@ -6,7 +6,7 @@ module Datadog module Tracing module Contrib module ConcurrentRuby - # wraps existing executor to carry over trace context + # Wraps existing executor to carry over trace context class ContextCompositeExecutorService include Concurrent::ExecutorService @@ -16,20 +16,20 @@ def initialize(composited_executor) @composited_executor = composited_executor end - # post method runs the task within composited executor - in a different thread + # post method runs the task within composited executor - in a different thread. The original arguments are + # captured to be propagated to the composited executor post method def post(*args, &task) - tracer = Tracing.send(:tracer) - parent_context = tracer.provider.context - - @composited_executor.post(*args) do - begin - original_context = tracer.provider.context - tracer.provider.context = parent_context - yield - ensure - # Restore context in case the current thread gets reused - tracer.provider.context = original_context - end + digest = Tracing.active_trace && Tracing.active_trace.to_digest + executor = @composited_executor.is_a?(Symbol) ? Concurrent.executor(@composited_executor) : @composited_executor + + # Pass the original arguments to the composited executor, which + # pushes them (possibly transformed) as block args + executor.post(*args) do |*block_args| + Tracing.continue_trace!(digest) + + # Pass the executor-provided block args as they should have been + # originally passed without composition, see ChainPromise#on_resolvable + yield(*block_args) end end diff --git a/lib/datadog/tracing/contrib/concurrent_ruby/future_patch.rb b/lib/datadog/tracing/contrib/concurrent_ruby/future_patch.rb index 39f00de89df..2079a52eab6 100644 --- a/lib/datadog/tracing/contrib/concurrent_ruby/future_patch.rb +++ b/lib/datadog/tracing/contrib/concurrent_ruby/future_patch.rb @@ -8,17 +8,10 @@ module Contrib module ConcurrentRuby # This patches the Future - to wrap executor service using ContextCompositeExecutorService module FuturePatch - def self.included(base) - base.class_eval do - alias_method :ns_initialize_without_datadog, :ns_initialize - remove_method(:ns_initialize) + def ns_initialize(value, opts) + super(value, opts) - def ns_initialize(value, opts) - ns_initialize_without_datadog(value, opts) - - @executor = ContextCompositeExecutorService.new(@executor) - end - end + @executor = ContextCompositeExecutorService.new(@executor) end end end diff --git a/lib/datadog/tracing/contrib/concurrent_ruby/integration.rb b/lib/datadog/tracing/contrib/concurrent_ruby/integration.rb index f4df4233dab..c98353f5178 100644 --- a/lib/datadog/tracing/contrib/concurrent_ruby/integration.rb +++ b/lib/datadog/tracing/contrib/concurrent_ruby/integration.rb @@ -20,7 +20,8 @@ def self.version end def self.loaded? - !defined?(::Concurrent::Future).nil? + # Concurrent::Future is deprecated in favour of Concurrent::Promises::Future + !defined?(::Concurrent::Promises::Future).nil? || !defined?(::Concurrent::Future).nil? end def self.compatible? diff --git a/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb b/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb index 65ec34e80f0..bbc8e4ff018 100644 --- a/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb +++ b/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb @@ -19,11 +19,18 @@ def target_version def patch require_relative 'future_patch' patch_future + require_relative 'promises_future_patch' + patch_promises_future end # Propagate tracing context in Concurrent::Future def patch_future - ::Concurrent::Future.include(FuturePatch) + ::Concurrent::Future.prepend(FuturePatch) if defined?(::Concurrent::Future) + end + + # Propagate tracing context in Concurrent::Promises::Future + def patch_promises_future + ::Concurrent::Promises.singleton_class.prepend(PromisesFuturePatch) if defined?(::Concurrent::Promises::Future) end end end diff --git a/lib/datadog/tracing/contrib/concurrent_ruby/promises_future_patch.rb b/lib/datadog/tracing/contrib/concurrent_ruby/promises_future_patch.rb new file mode 100644 index 00000000000..5c0a299f821 --- /dev/null +++ b/lib/datadog/tracing/contrib/concurrent_ruby/promises_future_patch.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +require_relative 'context_composite_executor_service' + +module Datadog + module Tracing + module Contrib + module ConcurrentRuby + # This patches the Future - to wrap executor service using ContextCompositeExecutorService + module PromisesFuturePatch + def future_on(default_executor, *args, &task) + unless default_executor.is_a?(ContextCompositeExecutorService) + default_executor = ContextCompositeExecutorService.new(default_executor) + end + + super(default_executor, *args, &task) + end + end + end + end + end +end diff --git a/lib/datadog/tracing/contrib/redis/configuration/settings.rb b/lib/datadog/tracing/contrib/redis/configuration/settings.rb index f05e7643a3b..ecea0b5e359 100644 --- a/lib/datadog/tracing/contrib/redis/configuration/settings.rb +++ b/lib/datadog/tracing/contrib/redis/configuration/settings.rb @@ -32,7 +32,7 @@ class Settings < Contrib::Configuration::Settings option :command_args do |o| o.type :bool o.env Ext::ENV_COMMAND_ARGS - o.default true + o.default false end option :service_name do |o| diff --git a/lib/datadog/tracing/contrib/redis/instrumentation.rb b/lib/datadog/tracing/contrib/redis/instrumentation.rb index 6b8e8d4a018..712ce8754d6 100644 --- a/lib/datadog/tracing/contrib/redis/instrumentation.rb +++ b/lib/datadog/tracing/contrib/redis/instrumentation.rb @@ -3,6 +3,7 @@ require_relative 'ext' require_relative 'quantize' require_relative 'tags' +require_relative 'trace_middleware' module Datadog module Tracing @@ -17,31 +18,11 @@ def self.included(base) # InstanceMethods - implementing instrumentation module InstanceMethods def call(*args, &block) - show_command_args = command_args? - - Tracing.trace(Contrib::Redis::Ext::SPAN_COMMAND) do |span| - span.service = service_name - span.span_type = Contrib::Redis::Ext::TYPE - span.resource = get_command(args, show_command_args) - Contrib::Redis::Tags.set_common_tags(self, span, show_command_args) - - super - end + TraceMiddleware.call(self, args[0], service_name, command_args?) { super } end def call_pipeline(*args, &block) - show_command_args = command_args? - - Tracing.trace(Contrib::Redis::Ext::SPAN_COMMAND) do |span| - span.service = service_name - span.span_type = Contrib::Redis::Ext::TYPE - commands = get_pipeline_commands(args, show_command_args) - span.resource = commands.any? ? commands.join("\n") : '(none)' - span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, commands.length - Contrib::Redis::Tags.set_common_tags(self, span, show_command_args) - - super - end + TraceMiddleware.call_pipelined(self, args[0].commands, service_name, command_args?) { super } end private @@ -59,22 +40,6 @@ def service_name datadog_configuration[:service_name] end - def get_command(args, show_command_args) - if show_command_args - Contrib::Redis::Quantize.format_command_args(*args) - else - Contrib::Redis::Quantize.get_verb(*args) - end - end - - def get_pipeline_commands(args, show_command_args) - if show_command_args - args[0].commands.map { |c| Contrib::Redis::Quantize.format_command_args(c) } - else - args[0].commands.map { |c| Contrib::Redis::Quantize.get_verb(c) } - end - end - def datadog_configuration Datadog.configuration.tracing[:redis, options] end diff --git a/lib/datadog/tracing/contrib/redis/tags.rb b/lib/datadog/tracing/contrib/redis/tags.rb index bfd0002b79f..6e8feb49029 100644 --- a/lib/datadog/tracing/contrib/redis/tags.rb +++ b/lib/datadog/tracing/contrib/redis/tags.rb @@ -12,7 +12,7 @@ module Redis # Tags handles generic common tags assignment. module Tags class << self - def set_common_tags(client, span, show_command_args) + def set_common_tags(client, span, raw_command) if datadog_configuration[:peer_service] span.set_tag( Tracing::Metadata::Ext::TAG_PEER_SERVICE, @@ -42,7 +42,7 @@ def set_common_tags(client, span, show_command_args) span.set_tag Ext::TAG_DATABASE_INDEX, client.db.to_s span.set_tag Ext::TAG_DB, client.db - span.set_tag Ext::TAG_RAW_COMMAND, span.resource if show_command_args + span.set_tag Ext::TAG_RAW_COMMAND, raw_command Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES) end diff --git a/lib/datadog/tracing/contrib/redis/trace_middleware.rb b/lib/datadog/tracing/contrib/redis/trace_middleware.rb index d569e12dd89..77aa6abf351 100644 --- a/lib/datadog/tracing/contrib/redis/trace_middleware.rb +++ b/lib/datadog/tracing/contrib/redis/trace_middleware.rb @@ -9,55 +9,68 @@ module Contrib module Redis # Instrumentation for Redis 5+ module TraceMiddleware - def call(commands, redis_config) - Tracing.trace(Contrib::Redis::Ext::SPAN_COMMAND) do |span| - datadog_configuration = resolve(redis_config) - resource = get_command(commands, datadog_configuration[:command_args]) + # Instruments {RedisClient::ConnectionMixin#call}. + def call(command, redis_config) + config = resolve(redis_config) + TraceMiddleware.call(redis_config, command, config[:service_name], config[:command_args]) { super } + end + + # Instruments {RedisClient::ConnectionMixin#call_pipelined}. + def call_pipelined(commands, redis_config) + config = resolve(redis_config) + TraceMiddleware.call_pipelined(redis_config, commands, config[:service_name], config[:command_args]) { super } + end - span.service = datadog_configuration[:service_name] - span.span_type = Contrib::Redis::Ext::TYPE - span.resource = resource + class << self + def call(client, command, service_name, command_args) + Tracing.trace(Redis::Ext::SPAN_COMMAND, type: Redis::Ext::TYPE, service: service_name) do |span| + raw_command = get_command(command, true) + span.resource = command_args ? raw_command : get_command(command, false) - Contrib::Redis::Tags.set_common_tags(redis_config, span, datadog_configuration[:command_args]) + Contrib::Redis::Tags.set_common_tags(client, span, raw_command) - super + yield + end end - end - def call_pipelined(commands, redis_config) - Tracing.trace(Contrib::Redis::Ext::SPAN_COMMAND) do |span| - datadog_configuration = resolve(redis_config) - pipelined_commands = get_pipeline_commands(commands, datadog_configuration[:command_args]) + def call_pipelined(client, commands, service_name, command_args) + Tracing.trace(Redis::Ext::SPAN_COMMAND, type: Redis::Ext::TYPE, service: service_name) do |span| + raw_command = get_pipeline_commands(commands, true) + span.resource = command_args ? raw_command : get_pipeline_commands(commands, false) - span.service = datadog_configuration[:service_name] - span.span_type = Contrib::Redis::Ext::TYPE - span.resource = pipelined_commands.join("\n") - span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, pipelined_commands.length + span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, commands.length - Contrib::Redis::Tags.set_common_tags(redis_config, span, datadog_configuration[:command_args]) + Contrib::Redis::Tags.set_common_tags(client, span, raw_command) - super + yield + end end - end - private + private - def get_command(commands, boolean) - if boolean - Contrib::Redis::Quantize.format_command_args(commands) - else - Contrib::Redis::Quantize.get_verb(commands) + # Quantizes a single Redis command + def get_command(command, command_args) + if command_args + Contrib::Redis::Quantize.format_command_args(command) + else + Contrib::Redis::Quantize.get_verb(command) + end end - end - def get_pipeline_commands(commands, boolean) - if boolean - commands.map { |c| Contrib::Redis::Quantize.format_command_args(c) } - else - commands.map { |c| Contrib::Redis::Quantize.get_verb(c) } + # Quantizes a multi-command Redis pipeline execution + def get_pipeline_commands(commands, command_args) + list = if command_args + commands.map { |c| Contrib::Redis::Quantize.format_command_args(c) } + else + commands.map { |c| Contrib::Redis::Quantize.get_verb(c) } + end + + list.empty? ? '(none)' : list.join("\n") end end + private + def resolve(redis_config) custom = redis_config.custom[:datadog] || {} diff --git a/lib/datadog/tracing/distributed/propagation.rb b/lib/datadog/tracing/distributed/propagation.rb index fab3d9b804b..1e007417b2d 100644 --- a/lib/datadog/tracing/distributed/propagation.rb +++ b/lib/datadog/tracing/distributed/propagation.rb @@ -83,19 +83,40 @@ def extract(data) extracted_trace_digest = nil - ::Datadog.configuration.tracing.distributed_tracing.propagation_extract_style.each do |style| + config = ::Datadog.configuration.tracing.distributed_tracing + + config.propagation_extract_style.each do |style| propagator = @propagation_styles[style] next if propagator.nil? begin - extracted_trace_digest = propagator.extract(data) + if extracted_trace_digest + # Return if we are only inspecting the first valid style. + next if config.propagation_extract_first + + # Continue parsing styles to find the W3C `tracestate` header, if present. + # `tracestate` must always be propagated, as it might contain pass-through data that we don't control. + # @see https://www.w3.org/TR/2021/REC-trace-context-1-20211123/#mutating-the-tracestate-field + next if style != Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT + + if (tracecontext_digest = propagator.extract(data)) + # Only parse if it represent the same trace as the successfully extracted one + next unless tracecontext_digest.trace_id == extracted_trace_digest.trace_id + + # Preserve the `tracestate` + extracted_trace_digest = extracted_trace_digest.merge( + trace_state: tracecontext_digest.trace_state, + trace_state_unknown_fields: tracecontext_digest.trace_state_unknown_fields + ) + end + else + extracted_trace_digest = propagator.extract(data) + end rescue => e ::Datadog.logger.error( "Error extracting distributed trace data. Cause: #{e} Location: #{Array(e.backtrace).first}" ) end - - break if extracted_trace_digest end extracted_trace_digest diff --git a/lib/datadog/tracing/trace_digest.rb b/lib/datadog/tracing/trace_digest.rb index 0af23964fa8..4fc8371d95e 100644 --- a/lib/datadog/tracing/trace_digest.rb +++ b/lib/datadog/tracing/trace_digest.rb @@ -141,6 +141,37 @@ def initialize( freeze end + + # Creates a copy of this object, modifying the provided fields. + # @param field_value_pairs [Hash] the fields to be overwritten + # @return [TraceDigest] returns a copy of this object with the `field_value_pairs` modified + def merge(field_value_pairs) + # DEV: Because we want to sometimes freeze the values provided to `TraceDigest`, it's best + # DEV: to let `#initialize` decide how to handle each field, instead of duplicating that logic here. + TraceDigest.new( + **{ + span_id: span_id, + span_name: span_name, + span_resource: span_resource, + span_service: span_service, + span_type: span_type, + trace_distributed_tags: trace_distributed_tags, + trace_hostname: trace_hostname, + trace_id: trace_id, + trace_name: trace_name, + trace_origin: trace_origin, + trace_process_id: trace_process_id, + trace_resource: trace_resource, + trace_runtime_id: trace_runtime_id, + trace_sampling_priority: trace_sampling_priority, + trace_service: trace_service, + trace_distributed_id: trace_distributed_id, + trace_flags: trace_flags, + trace_state: trace_state, + trace_state_unknown_fields: trace_state_unknown_fields, + }.merge!(field_value_pairs) + ) + end end end end diff --git a/lib/ddtrace/version.rb b/lib/ddtrace/version.rb index 6059ea8ff97..b1b5b8d40ae 100644 --- a/lib/ddtrace/version.rb +++ b/lib/ddtrace/version.rb @@ -2,10 +2,10 @@ module DDTrace module VERSION - MAJOR = 2 - MINOR = 0 - PATCH = 0 - PRE = 'alpha1' + MAJOR = 1 + MINOR = 16 + PATCH = 2 + PRE = nil BUILD = nil # PRE and BUILD above are modified for dev gems during gem build GHA workflow diff --git a/sig/datadog/tracing/contrib/concurrent_ruby/promises_future_patch.rbs b/sig/datadog/tracing/contrib/concurrent_ruby/promises_future_patch.rbs new file mode 100644 index 00000000000..e62dbfa5515 --- /dev/null +++ b/sig/datadog/tracing/contrib/concurrent_ruby/promises_future_patch.rbs @@ -0,0 +1,9 @@ +module Datadog + module Tracing + module Contrib + module ConcurrentRuby + def future_on: (untyped default_executor, untyped args, untyped task) -> untyped + end + end + end +end diff --git a/spec/datadog/appsec/configuration/settings_spec.rb b/spec/datadog/appsec/configuration/settings_spec.rb index 5f691d56101..39c1fd42cb2 100644 --- a/spec/datadog/appsec/configuration/settings_spec.rb +++ b/spec/datadog/appsec/configuration/settings_spec.rb @@ -711,43 +711,5 @@ def patcher end end end - - describe 'parse_response_body' do - subject(:enabled) { settings.appsec.parse_response_body } - - context 'when DD_API_SECURITY_PARSE_RESPONSE_BODY' do - around do |example| - ClimateControl.modify('DD_API_SECURITY_PARSE_RESPONSE_BODY' => api_security_parse_response_body) do - example.run - end - end - - context 'is not defined' do - let(:api_security_parse_response_body) { nil } - - it { is_expected.to eq true } - end - - context 'is defined' do - let(:api_security_parse_response_body) { 'true' } - - it { is_expected.to eq(true) } - end - end - end - - context 'parse_response_body=' do - subject(:set_parse_response_body) { settings.appsec.parse_response_body = parse_response_body } - - [true, false].each do |value| - context "when given #{value}" do - let(:parse_response_body) { value } - - before { set_parse_response_body } - - it { expect(settings.appsec.parse_response_body).to eq(value) } - end - end - end end end diff --git a/spec/datadog/appsec/contrib/rack/gateway/request_spec.rb b/spec/datadog/appsec/contrib/rack/gateway/request_spec.rb index 495ef2fbb0b..ddc1918d06c 100644 --- a/spec/datadog/appsec/contrib/rack/gateway/request_spec.rb +++ b/spec/datadog/appsec/contrib/rack/gateway/request_spec.rb @@ -10,7 +10,7 @@ Rack::MockRequest.env_for( 'http://example.com:8080/?a=foo&a=bar&b=baz', { - 'REQUEST_METHOD' => 'GET', 'REMOTE_ADDR' => '10.10.10.10', 'HTTP_CONTENT_TYPE' => 'text/html', + 'REQUEST_METHOD' => 'GET', 'REMOTE_ADDR' => '10.10.10.10', 'CONTENT_TYPE' => 'text/html', 'HTTP_COOKIE' => 'foo=bar', 'HTTP_USER_AGENT' => 'WebKit' } ) @@ -24,8 +24,13 @@ end describe '#headers' do - it 'returns the header information and strip the HTTP_ prefix' do - expected_headers = { 'content-type' => 'text/html', 'cookie' => 'foo=bar', 'user-agent' => 'WebKit' } + it 'returns the header information. Strip the HTTP_ prefix and append content-type and content-length information' do + expected_headers = { + 'content-type' => 'text/html', + 'cookie' => 'foo=bar', + 'user-agent' => 'WebKit', + 'content-length' => '0' + } expect(request.headers).to eq(expected_headers) end end diff --git a/spec/datadog/appsec/contrib/rack/gateway/response_spec.rb b/spec/datadog/appsec/contrib/rack/gateway/response_spec.rb index f1a7732d130..dc87c31be9d 100644 --- a/spec/datadog/appsec/contrib/rack/gateway/response_spec.rb +++ b/spec/datadog/appsec/contrib/rack/gateway/response_spec.rb @@ -8,12 +8,13 @@ RSpec.describe Datadog::AppSec::Contrib::Rack::Gateway::Response do let(:body) { ['Ok'] } let(:content_type) { 'text/html' } + let(:headers) { { 'Content-Type' => content_type } } let(:response) do described_class.new( body, 200, - { 'Content-Type' => content_type }, + headers, scope: instance_double(Datadog::AppSec::Scope) ) end @@ -41,80 +42,4 @@ expect(response.response).to be_a(Rack::Response) end end - - describe '#parsed_body' do - context 'json response' do - let(:content_type) { 'application/json' } - - context 'when parse_response_body is disable' do - around do |example| - ClimateControl.modify('DD_API_SECURITY_PARSE_RESPONSE_BODY' => 'false') do - example.run - end - end - - it 'returns a nil' do - expect(response.parsed_body).to be_nil - end - end - - context 'when parse_response_body is enabled' do - context 'all body parts are strings' do - let(:body) { ['{ "f', 'oo":', ' "ba', 'r" }'] } - - it 'returns a hash object' do - expect(response.parsed_body).to eq({ 'foo' => 'bar' }) - end - end - - context 'not all body parts are strings' do - let(:body_proc) { proc { ' "ba' } } - let(:body) { ['{ "f', 'oo":', body_proc, 'r" }'] } - - it 'returns nil' do - expect(response.parsed_body).to be_nil - end - end - - context 'fail to parse response body' do - let(:body) { [''] } - - it 'returns nil' do - expect(response.parsed_body).to be_nil - end - end - end - - context 'non supported response type' do - let(:content_type) { 'text/xml' } - - it 'returns nil' do - expect(response.parsed_body).to be_nil - end - end - - context 'with a body that is not an Array' do - let(:body) { proc { ' "ba' } } - - it 'returns nil' do - expect(response.parsed_body).to be_nil - end - end - - context 'with a body that inherits from Array' do - let(:my_body_class) do - Class.new(Array) do - end - end - - let(:body) do - my_body_class.new - end - - it 'returns nil' do - expect(response.parsed_body).to be_nil - end - end - end - end end diff --git a/spec/datadog/appsec/contrib/rack/reactive/request_spec.rb b/spec/datadog/appsec/contrib/rack/reactive/request_spec.rb index 257a242b35d..efd8da9d81e 100644 --- a/spec/datadog/appsec/contrib/rack/reactive/request_spec.rb +++ b/spec/datadog/appsec/contrib/rack/reactive/request_spec.rb @@ -12,19 +12,34 @@ Datadog::AppSec::Contrib::Rack::Gateway::Request.new( Rack::MockRequest.env_for( 'http://example.com:8080/?a=foo', - { 'REQUEST_METHOD' => 'GET', 'REMOTE_ADDR' => '10.10.10.10', 'HTTP_CONTENT_TYPE' => 'text/html' } + { + 'REQUEST_METHOD' => 'GET', + 'REMOTE_ADDR' => '10.10.10.10', + 'CONTENT_TYPE' => 'text/html', + 'HTTP_USER_AGENT' => 'foo', + 'HTTP_COOKIE' => 'foo=bar' + } ) ) end + let(:expected_headers_with_cookies) do + { 'content-length' => '0', 'content-type' => 'text/html', 'user-agent' => 'foo', 'cookie' => 'foo=bar' } + end + + let(:expected_headers_without_cookies) do + { 'content-length' => '0', 'content-type' => 'text/html', 'user-agent' => 'foo' } + end + describe '.publish' do it 'propagates request attributes to the operation' do expect(operation).to receive(:publish).with('server.request.method', 'GET') expect(operation).to receive(:publish).with('request.query', { 'a' => ['foo'] }) - expect(operation).to receive(:publish).with('request.headers', { 'content-type' => 'text/html' }) + expect(operation).to receive(:publish).with('request.headers', expected_headers_with_cookies) expect(operation).to receive(:publish).with('request.uri.raw', '/?a=foo') - expect(operation).to receive(:publish).with('request.cookies', {}) + expect(operation).to receive(:publish).with('request.cookies', { 'foo' => 'bar' }) expect(operation).to receive(:publish).with('request.client_ip', '10.10.10.10') + described_class.publish(operation, request) end end @@ -52,11 +67,11 @@ expect(operation).to receive(:subscribe).and_call_original expected_waf_arguments = { - 'server.request.cookies' => {}, + 'server.request.cookies' => { 'foo' => 'bar' }, 'server.request.query' => { 'a' => ['foo'] }, 'server.request.uri.raw' => '/?a=foo', - 'server.request.headers' => { 'content-type' => 'text/html' }, - 'server.request.headers.no_cookies' => { 'content-type' => 'text/html' }, + 'server.request.headers' => expected_headers_with_cookies, + 'server.request.headers.no_cookies' => expected_headers_without_cookies, 'http.client_ip' => '10.10.10.10', 'server.request.method' => 'GET', } diff --git a/spec/datadog/appsec/contrib/rack/reactive/response_spec.rb b/spec/datadog/appsec/contrib/rack/reactive/response_spec.rb index 84bce918ef8..036fdbd1543 100644 --- a/spec/datadog/appsec/contrib/rack/reactive/response_spec.rb +++ b/spec/datadog/appsec/contrib/rack/reactive/response_spec.rb @@ -29,56 +29,8 @@ 'response.headers', headers, ) - expect(operation).to receive(:publish).with( - 'response.body', - nil, - ) - described_class.publish(operation, response) end - - context 'JSON response' do - let(:headers) { { 'content-type' => 'application/json', 'set-cookie' => 'foo' } } - let(:body) { ['{"a":"b"}'] } - - context 'when parsed_response_body is enabled' do - it 'propagates response attributes to the operation' do - expect(operation).to receive(:publish).with('response.status', 200) - expect(operation).to receive(:publish).with( - 'response.headers', - headers, - ) - expect(operation).to receive(:publish).with( - 'response.body', - { 'a' => 'b' }, - ) - - described_class.publish(operation, response) - end - end - - context 'when parsed_response_body is disabled' do - around do |example| - ClimateControl.modify('DD_API_SECURITY_PARSE_RESPONSE_BODY' => 'false') do - example.run - end - end - - it 'propagates response attributes to the operation' do - expect(operation).to receive(:publish).with('response.status', 200) - expect(operation).to receive(:publish).with( - 'response.headers', - headers, - ) - expect(operation).to receive(:publish).with( - 'response.body', - nil, - ) - - described_class.publish(operation, response) - end - end - end end describe '.subscribe' do @@ -87,7 +39,6 @@ expect(operation).to receive(:subscribe).with( 'response.status', 'response.headers', - 'response.body' ).and_call_original expect(processor_context).to_not receive(:run) described_class.subscribe(operation, processor_context) @@ -125,100 +76,6 @@ expect(result).to be_nil end end - - context 'JSON response' do - let(:headers) { { 'content-type' => 'application/json', 'set-cookie' => 'foo' } } - let(:body) { ['{"a":"b"}'] } - - context 'when parsed_response_body is enabled' do - context 'all addresses have been published' do - let(:expected_waf_arguments) do - { - 'server.response.status' => '200', - 'server.response.headers' => { - 'content-type' => 'application/json', - 'set-cookie' => 'foo', - }, - 'server.response.headers.no_cookies' => { - 'content-type' => 'application/json', - }, - 'server.response.body' => { 'a' => 'b' }, - } - end - - it 'does call the waf context with the right arguments' do - expect(processor_context).to receive(:run).with( - expected_waf_arguments, - Datadog.configuration.appsec.waf_timeout - ).and_return(waf_result) - described_class.subscribe(operation, processor_context) - result = described_class.publish(operation, response) - expect(result).to be_nil - end - end - - context 'when unparsable response body' do - # since the body is not all string values we bail out in Datadog::AppSec::Contrib::Rack::Gateway::Response - let(:body) do - [proc {}] - end - - let(:expected_waf_arguments) do - { - 'server.response.status' => '200', - 'server.response.headers' => { - 'content-type' => 'application/json', - 'set-cookie' => 'foo', - }, - 'server.response.headers.no_cookies' => { - 'content-type' => 'application/json', - } - } - end - - it 'does call the waf context with the right arguments' do - expect(processor_context).to receive(:run).with( - expected_waf_arguments, - Datadog.configuration.appsec.waf_timeout - ).and_return(waf_result) - described_class.subscribe(operation, processor_context) - result = described_class.publish(operation, response) - expect(result).to be_nil - end - end - end - - context 'when parsed_response_body is disabled' do - around do |example| - ClimateControl.modify('DD_API_SECURITY_PARSE_RESPONSE_BODY' => 'false') do - example.run - end - end - - let(:expected_waf_arguments) do - { - 'server.response.status' => '200', - 'server.response.headers' => { - 'content-type' => 'application/json', - 'set-cookie' => 'foo', - }, - 'server.response.headers.no_cookies' => { - 'content-type' => 'application/json', - }, - } - end - - it 'does call the waf context with the right arguments' do - expect(processor_context).to receive(:run).with( - expected_waf_arguments, - Datadog.configuration.appsec.waf_timeout - ).and_return(waf_result) - described_class.subscribe(operation, processor_context) - result = described_class.publish(operation, response) - expect(result).to be_nil - end - end - end end context 'waf result is a match' do diff --git a/spec/datadog/appsec/event_spec.rb b/spec/datadog/appsec/event_spec.rb index e79ecfbde1e..9db09d90c49 100644 --- a/spec/datadog/appsec/event_spec.rb +++ b/spec/datadog/appsec/event_spec.rb @@ -2,217 +2,311 @@ require 'datadog/appsec/event' RSpec.describe Datadog::AppSec::Event do - context 'self' do - describe '#record' do - before do - # prevent rate limiter to bias tests - Datadog::AppSec::RateLimiter.reset!(:traces) - end + context 'ALLOWED_REQUEST_HEADERS' do + it 'store the correct values' do + expect(described_class::ALLOWED_REQUEST_HEADERS).to eq( + [ + 'x-forwarded-for', + 'x-client-ip', + 'x-real-ip', + 'x-forwarded', + 'x-cluster-client-ip', + 'forwarded-for', + 'forwarded', + 'via', + 'true-client-ip', + 'content-length', + 'content-type', + 'content-encoding', + 'content-language', + 'host', + 'user-agent', + 'accept', + 'accept-encoding', + 'accept-language' + ] + ) + end + end - let(:options) { {} } - let(:trace_op) { Datadog::Tracing::TraceOperation.new(**options) } - let(:trace) { trace_op.flush! } + context 'ALLOWED_RESPONSE_HEADERS' do + it 'store the correct values' do + expect(described_class::ALLOWED_RESPONSE_HEADERS).to eq( + [ + 'content-length', + 'content-type', + 'content-encoding', + 'content-language' + ] + ) + end + end - let(:rack_request) do - dbl = double + describe '.record' do + before do + # prevent rate limiter to bias tests + Datadog::AppSec::RateLimiter.reset!(:traces) + end - allow(dbl).to receive(:host).and_return('example.com') - allow(dbl).to receive(:user_agent).and_return('Ruby/0.0') - allow(dbl).to receive(:remote_addr).and_return('127.0.0.1') + let(:options) { {} } + let(:trace_op) { Datadog::Tracing::TraceOperation.new(**options) } + let(:trace) { trace_op.flush! } - allow(dbl).to receive(:headers).and_return [ - ['user-agent', 'Ruby/0.0'], - ['SERVER_NAME', 'example.com'], - ['REMOTE_ADDR', '127.0.0.1'] - ] + let(:rack_request_headers) do + { + 'user-agent' => 'Ruby/0.0', + 'SERVER_NAME' => 'example.com', + 'REMOTE_ADDR' => '127.0.0.1', + } + end - dbl - end + let(:rack_response_headers) do + { + 'content-type' => 'text/html' + } + end - let(:rack_response) do - dbl = double + let(:rack_request) do + dbl = double - allow(dbl).to receive(:headers).and_return([]) + allow(dbl).to receive(:host).and_return('example.com') + allow(dbl).to receive(:user_agent).and_return('Ruby/0.0') + allow(dbl).to receive(:remote_addr).and_return('127.0.0.1') - dbl - end + allow(dbl).to receive(:headers).and_return(rack_request_headers) - let(:waf_result) do - dbl = double + dbl + end - allow(dbl).to receive(:events).and_return([]) - allow(dbl).to receive(:derivatives).and_return(derivatives) + let(:rack_response) do + dbl = double - dbl - end + allow(dbl).to receive(:headers).and_return(rack_response_headers) - let(:event_count) { 1 } - let(:derivatives) { {} } + dbl + end - let(:events) do - Array.new(event_count) do - { - trace: trace_op, - span: nil, # backfilled later - request: rack_request, - response: rack_response, - waf_result: waf_result, - } - end - end + let(:waf_events) do + [1, { a: :b }] + end - context 'with one event' do - let(:trace) do - trace_op.measure('request') do |span| - events.each { |e| e[:span] = span } + let(:waf_result) do + dbl = double - 10.times do |i| - trace_op.measure("span #{i}") {} - end + allow(dbl).to receive(:events).and_return(waf_events) + allow(dbl).to receive(:derivatives).and_return(derivatives) - described_class.record(span, *events) + dbl + end + + let(:event_count) { 1 } + let(:derivatives) { {} } + + let(:events) do + Array.new(event_count) do + { + trace: trace_op, + span: nil, # backfilled later + request: rack_request, + response: rack_response, + waf_result: waf_result, + } + end + end + + context 'with one event' do + let(:trace) do + trace_op.measure('request') do |span| + events.each { |e| e[:span] = span } + + 10.times do |i| + trace_op.measure("span #{i}") {} end - trace_op.flush! + described_class.record(span, *events) end - let(:top_level_span) do - trace.spans.find { |s| s.metrics['_dd.top_level'] && s.metrics['_dd.top_level'] > 0.0 } - end + trace_op.flush! + end - let(:other_spans) do - trace.spans - [top_level_span] - end + let(:top_level_span) do + trace.spans.find { |s| s.metrics['_dd.top_level'] && s.metrics['_dd.top_level'] > 0.0 } + end + + let(:other_spans) do + trace.spans - [top_level_span] + end - it 'records an event on the top level span' do - expect(top_level_span.meta).to eq( - '_dd.appsec.json' => '{"triggers":[]}', - 'http.host' => 'example.com', - 'http.useragent' => 'Ruby/0.0', - 'http.request.headers.user-agent' => 'Ruby/0.0', - 'network.client.ip' => '127.0.0.1', - '_dd.origin' => 'appsec', - ) + context 'request headers' do + context 'allowed headers' do + it 'records allowed headers' do + expect(top_level_span.meta).to include('http.request.headers.user-agent' => 'Ruby/0.0') + end end - it 'records nothing on other spans' do - other_spans.each do |other_span| - expect(other_span.meta).to be_empty + context 'discard not allowed headers' do + let(:rack_request_headers) do + { + 'not-supported-header' => 'foo', + } + end + + it 'does not records allowed headers' do + expect(top_level_span.meta).to_not include('http.request.headers.not-supported-header') end end + end - it 'marks the trace to be kept' do - expect(trace.sampling_priority).to eq Datadog::Tracing::Sampling::Ext::Priority::USER_KEEP + context 'response headers' do + context 'allowed headers' do + it 'records allowed headers' do + expect(top_level_span.meta).to include('http.response.headers.content-type' => 'text/html') + end end - context 'waf_result derivatives' do - let(:derivatives) do + context 'discard not allowed headers' do + let(:rack_response_headers) do { - '_dd.appsec.s.req.headers' => [{ 'host' => [8], 'version' => [8] }] + 'not-supported-header' => 'foo', } end - context 'JSON payload' do - it 'uses JSON string when do not exceeds MIN_SCHEMA_SIZE_FOR_COMPRESSION' do - stub_const('Datadog::AppSec::Event::MIN_SCHEMA_SIZE_FOR_COMPRESSION', 3000) - meta = top_level_span.meta - - expect(meta['_dd.appsec.s.req.headers']).to eq('[{"host":[8],"version":[8]}]') - end + it 'does not records allowed headers' do + expect(top_level_span.meta).to_not include('http.response.headers.not-supported-header') end + end + end - context 'Compressed payload' do - it 'uses compressed value when JSON string is bigger than MIN_SCHEMA_SIZE_FOR_COMPRESSION' do - result = "H4sIAOYoHGUAA4aphwAAAA=\n" - stub_const('Datadog::AppSec::Event::MIN_SCHEMA_SIZE_FOR_COMPRESSION', 1) - expect(described_class).to receive(:compressed_and_base64_encoded).and_return(result) + context 'http information' do + it 'records http information' do + expect(top_level_span.meta).to include('http.host' => 'example.com') + expect(top_level_span.meta).to include('http.useragent' => 'Ruby/0.0') + expect(top_level_span.meta).to include('network.client.ip' => '127.0.0.1') + end + end - meta = top_level_span.meta + it 'records an event on the top level span' do + expect(top_level_span.meta).to include('_dd.appsec.json' => '{"triggers":[1,{"a":"b"}]}') + expect(top_level_span.meta).to include('_dd.origin' => 'appsec') + end - expect(meta['_dd.appsec.s.req.headers']).to eq(result) - end - end + it 'records nothing on other spans' do + other_spans.each do |other_span| + expect(other_span.meta).to be_empty + end + end + + it 'marks the trace to be kept' do + expect(trace.sampling_priority).to eq Datadog::Tracing::Sampling::Ext::Priority::USER_KEEP + end - context 'derivative values exceed Event::MAX_ENCODED_SCHEMA_SIZE value' do - it 'do not add derivative key to meta' do - stub_const('Datadog::AppSec::Event::MAX_ENCODED_SCHEMA_SIZE', 1) - meta = top_level_span.meta + context 'waf_result derivatives' do + let(:derivatives) do + { + '_dd.appsec.s.req.headers' => [{ 'host' => [8], 'version' => [8] }] + } + end - expect(meta['_dd.appsec.s.req.headers']).to be_nil - end + context 'JSON payload' do + it 'uses JSON string when do not exceeds MIN_SCHEMA_SIZE_FOR_COMPRESSION' do + stub_const('Datadog::AppSec::Event::MIN_SCHEMA_SIZE_FOR_COMPRESSION', 3000) + meta = top_level_span.meta + + expect(meta['_dd.appsec.s.req.headers']).to eq('[{"host":[8],"version":[8]}]') end end - end - context 'with no event' do - let(:event_count) { 0 } + context 'Compressed payload' do + it 'uses compressed value when JSON string is bigger than MIN_SCHEMA_SIZE_FOR_COMPRESSION' do + result = "H4sIAOYoHGUAA4aphwAAAA=\n" + stub_const('Datadog::AppSec::Event::MIN_SCHEMA_SIZE_FOR_COMPRESSION', 1) + expect(described_class).to receive(:compressed_and_base64_encoded).and_return(result) - let(:trace) do - trace_op.measure('request') do |span| - events.each { |e| e[:span] = span } + meta = top_level_span.meta - described_class.record(span, *events) + expect(meta['_dd.appsec.s.req.headers']).to eq(result) end - - trace_op.flush! end - it 'does not mark the trace to be kept' do - expect(trace.sampling_priority).to eq nil + context 'derivative values exceed Event::MAX_ENCODED_SCHEMA_SIZE value' do + it 'do not add derivative key to meta' do + stub_const('Datadog::AppSec::Event::MAX_ENCODED_SCHEMA_SIZE', 1) + meta = top_level_span.meta + + expect(meta['_dd.appsec.s.req.headers']).to be_nil + end end + end + end + + context 'with no event' do + let(:event_count) { 0 } - it 'does not attempt to record in the trace' do - expect(described_class).to_not receive(:record_via_span) + let(:trace) do + trace_op.measure('request') do |span| + events.each { |e| e[:span] = span } - expect(trace).to_not be nil + described_class.record(span, *events) end - it 'does not call the rate limiter' do - expect(Datadog::AppSec::RateLimiter).to_not receive(:limit) + trace_op.flush! + end - expect(trace).to_not be nil - end + it 'does not mark the trace to be kept' do + expect(trace.sampling_priority).to eq nil end - context 'with no span' do - let(:event_count) { 1 } + it 'does not attempt to record in the trace' do + expect(described_class).to_not receive(:record_via_span) - it 'does not attempt to record in the trace' do - expect(described_class).to_not receive(:record_via_span) + expect(trace).to_not be nil + end - described_class.record(nil, events) - end + it 'does not call the rate limiter' do + expect(Datadog::AppSec::RateLimiter).to_not receive(:limit) - it 'does not call the rate limiter' do - expect(Datadog::AppSec::RateLimiter).to_not receive(:limit) + expect(trace).to_not be nil + end + end - described_class.record(nil, events) - end + context 'with no span' do + let(:event_count) { 1 } + + it 'does not attempt to record in the trace' do + expect(described_class).to_not receive(:record_via_span) + + described_class.record(nil, events) end - context 'with many traces' do - let(:rate_limit) { 100 } - let(:trace_count) { rate_limit * 2 } + it 'does not call the rate limiter' do + expect(Datadog::AppSec::RateLimiter).to_not receive(:limit) - let(:traces) do - Array.new(trace_count) do - trace_op = Datadog::Tracing::TraceOperation.new(**options) + described_class.record(nil, events) + end + end - trace_op.measure('request') do |span| - events.each { |e| e[:span] = span } + context 'with many traces' do + let(:rate_limit) { 100 } + let(:trace_count) { rate_limit * 2 } - described_class.record(span, *events) - end + let(:traces) do + Array.new(trace_count) do + trace_op = Datadog::Tracing::TraceOperation.new(**options) - trace_op.keep! + trace_op.measure('request') do |span| + events.each { |e| e[:span] = span } + + described_class.record(span, *events) end + + trace_op.keep! end + end - it 'rate limits event recording' do - expect(described_class).to receive(:record_via_span).exactly(rate_limit).times.and_call_original + it 'rate limits event recording' do + expect(described_class).to receive(:record_via_span).exactly(rate_limit).times.and_call_original - expect(traces).to have_attributes(count: trace_count) - end + expect(traces).to have_attributes(count: trace_count) end end end diff --git a/spec/datadog/integration_spec.rb b/spec/datadog/integration_spec.rb index e55f550a49d..3169a6e64b2 100644 --- a/spec/datadog/integration_spec.rb +++ b/spec/datadog/integration_spec.rb @@ -36,9 +36,11 @@ def inspect_threads(threads) shutdown - expect(threads.size).to eq(original_threads.size), - "Expected #{original_threads.size} threads (#{original_threads_inspect}), "\ - "got #{threads.size} threads (#{inspect_threads(threads)})" + post_shutdown_new_threads = Thread.list - original_threads + + expect(post_shutdown_new_threads).to be_empty, + "Expected #{original_threads.size} threads but got #{threads.size} threads. "\ + "extra_threads: (#{inspect_threads(post_shutdown_new_threads)})" end end diff --git a/spec/datadog/opentelemetry_spec.rb b/spec/datadog/opentelemetry_spec.rb index 462bf51298e..c3671ea9138 100644 --- a/spec/datadog/opentelemetry_spec.rb +++ b/spec/datadog/opentelemetry_spec.rb @@ -14,6 +14,7 @@ Datadog.configure do |c| c.tracing.writer = writer_ c.tracing.partial_flush.min_spans_threshold = 1 # Ensure tests flush spans quickly + c.tracing.distributed_tracing.propagation_style = ['Datadog'] # Ensure test has consistent propagation configuration end ::OpenTelemetry::SDK.configure do |c| diff --git a/spec/datadog/opentracer/rack_propagator_spec.rb b/spec/datadog/opentracer/rack_propagator_spec.rb index 32b5f88a10c..41df9ac8a6e 100644 --- a/spec/datadog/opentracer/rack_propagator_spec.rb +++ b/spec/datadog/opentracer/rack_propagator_spec.rb @@ -23,6 +23,10 @@ let(:carrier) { instance_double(Datadog::OpenTracer::Carrier) } before do + Datadog.configure do |c| + c.tracing.distributed_tracing.propagation_style = ['Datadog'] + end + # Expect carrier to be set with Datadog trace properties expect(carrier).to receive(:[]=) .with('x-datadog-trace-id', trace_id.to_s) diff --git a/spec/datadog/profiling/tag_builder_spec.rb b/spec/datadog/profiling/tag_builder_spec.rb index 7bd1af59630..44dbfd491ff 100644 --- a/spec/datadog/profiling/tag_builder_spec.rb +++ b/spec/datadog/profiling/tag_builder_spec.rb @@ -11,7 +11,7 @@ 'host' => Datadog::Core::Environment::Socket.hostname, 'language' => 'ruby', 'process_id' => Process.pid.to_s, - 'profiler_version' => start_with('2.'), + 'profiler_version' => start_with('1.'), 'runtime' => 'ruby', 'runtime_engine' => RUBY_ENGINE, 'runtime-id' => Datadog::Core::Environment::Identity.id, diff --git a/spec/datadog/tracing/configuration/settings_spec.rb b/spec/datadog/tracing/configuration/settings_spec.rb index 52d8e102be1..61e656fda54 100644 --- a/spec/datadog/tracing/configuration/settings_spec.rb +++ b/spec/datadog/tracing/configuration/settings_spec.rb @@ -74,12 +74,9 @@ let(:var_value) { nil } it do - is_expected.to eq( - [ - Datadog::Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG, - Datadog::Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_MULTI_HEADER, - Datadog::Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_SINGLE_HEADER - ] + is_expected.to contain_exactly( + Datadog::Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG, + Datadog::Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT ) end end @@ -142,7 +139,12 @@ context 'is not defined' do let(:var_value) { nil } - it { is_expected.to eq([Datadog::Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG]) } + it do + is_expected.to contain_exactly( + Datadog::Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG, + Datadog::Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT + ) + end end context 'is defined' do @@ -214,31 +216,66 @@ def propagation_inject_style it { is_expected.to eq [] } it 'does not change propagation_extract_style' do - expect { propagation_style }.to_not change { propagation_extract_style } - .from(%w[Datadog b3multi b3]) + expect { propagation_style }.to_not change { propagation_extract_style }.from(%w[Datadog tracecontext]) end it 'does not change propagation_inject_style' do - expect { propagation_style }.to_not change { propagation_inject_style }.from(['Datadog']) + expect { propagation_style }.to_not change { propagation_inject_style }.from(%w[Datadog tracecontext]) end end context 'is defined' do - let(:var_value) { 'Datadog,b3' } + let(:var_value) { 'b3multi,b3' } - it { is_expected.to contain_exactly('Datadog', 'b3') } + it { is_expected.to contain_exactly('b3multi', 'b3') } it 'sets propagation_extract_style' do - expect { propagation_style }.to change { propagation_extract_style } - .from(%w[Datadog b3multi b3]).to(%w[Datadog b3]) + expect { propagation_style }.to change { propagation_extract_style }.to(%w[b3multi b3]) end it 'sets propagation_inject_style' do - expect { propagation_style }.to change { propagation_inject_style }.from(['Datadog']).to(%w[Datadog b3]) + expect { propagation_style }.to change { propagation_inject_style }.to(%w[b3multi b3]) end end end end + + describe '#propagation_extract_first' do + subject(:propagation_extract_first) { settings.tracing.distributed_tracing.propagation_extract_first } + + let(:var_value) { nil } + let(:var_name) { 'DD_TRACE_PROPAGATION_EXTRACT_FIRST' } + it { is_expected.to be false } + + context 'when DD_TRACE_PROPAGATION_EXTRACT_FIRST' do + context 'is not defined' do + let(:var_value) { nil } + + it { is_expected.to be false } + end + + context 'is set to true' do + let(:var_value) { 'true' } + + it { is_expected.to be true } + end + + context 'is set to false' do + let(:var_value) { 'false' } + + it { is_expected.to be false } + end + end + + describe '#propagation_extract_first=' do + it 'updates the #propagation_extract_first setting' do + expect { settings.tracing.distributed_tracing.propagation_extract_first = true } + .to change { settings.tracing.distributed_tracing.propagation_extract_first } + .from(false) + .to(true) + end + end + end end describe '#enabled' do diff --git a/spec/datadog/tracing/contrib/concurrent_ruby/integration_spec.rb b/spec/datadog/tracing/contrib/concurrent_ruby/integration_spec.rb index 0ad9415f882..46b81e41cdc 100644 --- a/spec/datadog/tracing/contrib/concurrent_ruby/integration_spec.rb +++ b/spec/datadog/tracing/contrib/concurrent_ruby/integration_spec.rb @@ -22,16 +22,40 @@ describe '.loaded?' do subject(:loaded?) { described_class.loaded? } - context 'when Concurrent::Future is defined' do - before { stub_const('Concurrent::Future', Class.new) } + context 'when no Future is defined' do + before do + hide_const('Concurrent::Future') + hide_const('Concurrent::Promises::Future') + end + + it { is_expected.to be false } + end + + context 'when current Future is defined and deprecated Future is not defined' do + before do + hide_const('Concurrent::Future') + stub_const('Concurrent::Promises::Future', Class.new) + end + + it { is_expected.to be true } + end + + context 'when both Future are defined' do + before do + stub_const('Concurrent::Future', Class.new) + stub_const('Concurrent::Promises::Future', Class.new) + end it { is_expected.to be true } end - context 'when Concurrent::Future is not defined' do - before { hide_const('Concurrent::Future') } + context 'when current Future is not defined and deprecated Future is defined' do + before do + stub_const('Concurrent::Future', Class.new) + hide_const('Concurrent::Promises::Future') + end - it { is_expected.to be false } + it { is_expected.to be true } end end diff --git a/spec/datadog/tracing/contrib/concurrent_ruby/integration_test_spec.rb b/spec/datadog/tracing/contrib/concurrent_ruby/integration_test_spec.rb index 85d7d7ce4a2..d9fe23224d1 100644 --- a/spec/datadog/tracing/contrib/concurrent_ruby/integration_test_spec.rb +++ b/spec/datadog/tracing/contrib/concurrent_ruby/integration_test_spec.rb @@ -1,45 +1,24 @@ -require 'concurrent/future' +require 'concurrent-ruby' # concurrent-ruby is not modular require 'datadog/tracing/contrib/support/spec_helper' require 'ddtrace' require 'spec/support/thread_helpers' RSpec.describe 'ConcurrentRuby integration tests' do - # DEV We save an unmodified copy of Concurrent::Future. - let!(:unmodified_future) { ::Concurrent::Future.dup } let(:configuration_options) { {} } let(:outer_span) { spans.find { |s| s.name == 'outer_span' } } let(:inner_span) { spans.find { |s| s.name == 'inner_span' } } - before(:context) do - # Execute an async future to force the eager creation of internal - # global threads that are never closed. - # - # This allows us to separate internal concurrent-ruby threads - # from ddtrace threads for leak detection. - ThreadHelpers.with_leaky_thread_creation(:concurrent_ruby) do - Concurrent::Future.execute {}.value - end + before do + # stub inheritance chain for instrumentation rollback + stub_const('Concurrent::Promises', ::Concurrent::Promises.dup) + stub_const('Concurrent::Future', ::Concurrent::Future.dup) end - # DEV We then restore Concurrent::Future, a dangerous game. after do - ::Concurrent.send(:remove_const, :Future) - ::Concurrent.const_set('Future', unmodified_future) remove_patch!(:concurrent_ruby) end - subject(:deferred_execution) do - outer_span = tracer.trace('outer_span') - future = Concurrent::Future.new do - tracer.trace('inner_span') {} - end - future.execute - - future.wait - outer_span.finish - end - shared_examples_for 'deferred execution' do before do deferred_execution @@ -58,40 +37,177 @@ end end - describe 'patching' do - subject(:patch) do - Datadog.configure do |c| - c.tracing.instrument :concurrent_ruby + context 'Concurrent::Promises::Future' do + before(:context) do + # Execute an async future to force the eager creation of internal + # global threads that are never closed. + # + # This allows us to separate internal concurrent-ruby threads + # from ddtrace threads for leak detection. We need to create the maximum + # number of threads that will be created concurrently in a test, which in + # this case is 2. + ThreadHelpers.with_leaky_thread_creation(:concurrent_ruby) do + Concurrent::Promises.future do + Concurrent::Promises.future {}.value + end.value end end - it 'adds FuturePatch to Future ancestors' do - expect { patch }.to change { ::Concurrent::Future.ancestors.map(&:to_s) } - .to include('Datadog::Tracing::Contrib::ConcurrentRuby::FuturePatch') + subject(:deferred_execution) do + outer_span = tracer.trace('outer_span') + future = Concurrent::Promises.future do + tracer.trace('inner_span') {} + end + + future.wait + outer_span.finish end - end - context 'when context propagation is disabled' do - it_behaves_like 'deferred execution' + describe 'patching' do + subject(:patch) do + Datadog.configure do |c| + c.tracing.instrument :concurrent_ruby + end + end - it 'inner span should not have parent' do - deferred_execution - expect(inner_span).to be_root_span + it 'adds PromisesFuturePatch to Promises ancestors' do + expect { patch }.to change { ::Concurrent::Promises.singleton_class.ancestors.map(&:to_s) } + .to include('Datadog::Tracing::Contrib::ConcurrentRuby::PromisesFuturePatch') + end + end + + context 'when context propagation is disabled' do + it_behaves_like 'deferred execution' + + it 'inner span should not have parent' do + deferred_execution + expect(inner_span).to be_root_span + end + end + + context 'when context propagation is enabled' do + before do + Datadog.configure do |c| + c.tracing.instrument :concurrent_ruby + end + end + + it_behaves_like 'deferred execution' + + it 'inner span parent should be included in outer span' do + deferred_execution + expect(inner_span.parent_id).to eq(outer_span.span_id) + end + + context 'when there are multiple futures with inner spans that have the same parent' do + let(:second_inner_span) { spans.find { |s| s.name == 'second_inner_span' } } + + subject(:multiple_deferred_executions) do + # use a barrier to ensure both threads are created before continuing + barrier = Concurrent::CyclicBarrier.new(2) + + outer_span = tracer.trace('outer_span') + future_1 = Concurrent::Promises.future do + barrier.wait + tracer.trace('inner_span') do + barrier.wait + end + end + + future_2 = Concurrent::Promises.future do + barrier.wait + tracer.trace('second_inner_span') do + barrier.wait + end + end + + future_1.wait + future_2.wait + outer_span.finish + end + + describe 'it correctly associates to the parent span' do + it 'both inner span parents should be included in same outer span' do + multiple_deferred_executions + + expect(inner_span.parent_id).to eq(outer_span.span_id) + expect(second_inner_span.parent_id).to eq(outer_span.span_id) + end + end + end + + context 'when propagates without an active trace' do + it 'creates a root span' do + future = Concurrent::Promises.future do + tracer.trace('inner_span') {} + end + + future.wait + + expect(inner_span).to be_root_span + end + end end end - context 'when context propagation is enabled' do - before do - Datadog.configure do |c| - c.tracing.instrument :concurrent_ruby + context 'Concurrent::Future (deprecated)' do + before(:context) do + # Execute an async future to force the eager creation of internal + # global threads that are never closed. + # + # This allows us to separate internal concurrent-ruby threads + # from ddtrace threads for leak detection. + ThreadHelpers.with_leaky_thread_creation(:concurrent_ruby) do + Concurrent::Future.execute {}.value end end - it_behaves_like 'deferred execution' + subject(:deferred_execution) do + outer_span = tracer.trace('outer_span') + future = Concurrent::Future.new do + tracer.trace('inner_span') {} + end + future.execute - it 'inner span parent should be included in outer span' do - deferred_execution - expect(inner_span.parent_id).to eq(outer_span.span_id) + future.wait + outer_span.finish + end + + describe 'patching' do + subject(:patch) do + Datadog.configure do |c| + c.tracing.instrument :concurrent_ruby + end + end + + it 'adds FuturePatch to Future ancestors' do + expect { patch }.to change { ::Concurrent::Future.ancestors.map(&:to_s) } + .to include('Datadog::Tracing::Contrib::ConcurrentRuby::FuturePatch') + end + end + + context 'when context propagation is disabled' do + it_behaves_like 'deferred execution' + + it 'inner span should not have parent' do + deferred_execution + expect(inner_span).to be_root_span + end + end + + context 'when context propagation is enabled' do + before do + Datadog.configure do |c| + c.tracing.instrument :concurrent_ruby + end + end + + it_behaves_like 'deferred execution' + + it 'inner span parent should be included in outer span' do + deferred_execution + expect(inner_span.parent_id).to eq(outer_span.span_id) + end end end end diff --git a/spec/datadog/tracing/contrib/elasticsearch/transport_spec.rb b/spec/datadog/tracing/contrib/elasticsearch/transport_spec.rb index 703b428c99d..b461c7b817b 100644 --- a/spec/datadog/tracing/contrib/elasticsearch/transport_spec.rb +++ b/spec/datadog/tracing/contrib/elasticsearch/transport_spec.rb @@ -72,7 +72,15 @@ def call(env) end describe 'the handlers' do - subject(:handlers) { client.transport.connections.first.connection.builder.handlers } + subject(:handlers) do + connections = if client.transport.respond_to? :connections + client.transport.connections + else + client.transport.transport.connections + end + + connections.first.connection.builder.handlers + end it { is_expected.to include(middleware) } end @@ -195,6 +203,9 @@ def call(env) before do skip('Configuration through client object is not possible in Elasticsearch >= 8.0.0') if version_greater_than_8 + Datadog::Tracing::Contrib::Elasticsearch::Patcher::SELF_DEPRECATION_ONLY_ONCE + .send(:reset_ran_once_state_for_tests) + Datadog.configure_onto(client, service_name: 'custom') end diff --git a/spec/datadog/tracing/contrib/rails/redis_cache_spec.rb b/spec/datadog/tracing/contrib/rails/redis_cache_spec.rb index da91a1a1801..8854a0aec23 100644 --- a/spec/datadog/tracing/contrib/rails/redis_cache_spec.rb +++ b/spec/datadog/tracing/contrib/rails/redis_cache_spec.rb @@ -83,7 +83,7 @@ expect(redis.name).to eq('redis.command') expect(redis.span_type).to eq('redis') - expect(redis.resource).to eq('GET custom-key') + expect(redis.resource).to eq('GET') expect(redis.get_tag('redis.raw_command')).to eq('GET custom-key') expect(redis.service).to eq('redis') # the following ensures span will be correctly displayed (parent/child of the same trace) @@ -167,7 +167,7 @@ expect(redis.name).to eq('redis.command') expect(redis.span_type).to eq('redis') - expect(redis.resource).to match(/SET custom-key .*ActiveSupport.*/) + expect(redis.resource).to eq('SET') expect(redis.get_tag('redis.raw_command')).to match(/SET custom-key .*ActiveSupport.*/) expect(redis.service).to eq('redis') # the following ensures span will be correctly displayed (parent/child of the same trace) @@ -196,7 +196,7 @@ expect(del.name).to eq('redis.command') expect(del.span_type).to eq('redis') - expect(del.resource).to eq('DEL custom-key') + expect(del.resource).to eq('DEL') expect(del.get_tag('redis.raw_command')).to eq('DEL custom-key') expect(del.service).to eq('redis') # the following ensures span will be correctly displayed (parent/child of the same trace) diff --git a/spec/datadog/tracing/contrib/redis/instrumentation_spec.rb b/spec/datadog/tracing/contrib/redis/instrumentation_spec.rb index 7276b6c8e81..c4f14ff741a 100644 --- a/spec/datadog/tracing/contrib/redis/instrumentation_spec.rb +++ b/spec/datadog/tracing/contrib/redis/instrumentation_spec.rb @@ -80,7 +80,7 @@ # Select the designated database first expect(select_db_span).to be_a_redis_span.with( - resource: "SELECT #{test_database}", + resource: 'SELECT', service: 'multiplex-service', raw_command: "SELECT #{test_database}", host: test_host, @@ -89,7 +89,7 @@ ) expect(span).to be_a_redis_span.with( - resource: 'SET abc 123', + resource: 'SET', service: 'multiplex-service', raw_command: 'SET abc 123', host: test_host, @@ -130,7 +130,7 @@ # Select the designated database first expect(select_db_span).to be_a_redis_span.with( - resource: "SELECT #{test_database}", + resource: 'SELECT', service: 'multiplex-service', raw_command: "SELECT #{test_database}", host: test_host, @@ -139,7 +139,7 @@ ) expect(span).to be_a_redis_span.with( - resource: 'SET abc 123', + resource: 'SET', service: 'multiplex-service', raw_command: 'SET abc 123', host: test_host, diff --git a/spec/datadog/tracing/contrib/redis/redis_spec.rb b/spec/datadog/tracing/contrib/redis/redis_spec.rb index 45c118d2740..855b308e00b 100644 --- a/spec/datadog/tracing/contrib/redis/redis_spec.rb +++ b/spec/datadog/tracing/contrib/redis/redis_spec.rb @@ -49,22 +49,22 @@ context 'with default settings' do let(:configuration_options) { {} } - it_behaves_like 'redis instrumentation', command_args: true - it_behaves_like 'an authenticated redis instrumentation', command_args: true + it_behaves_like 'redis instrumentation' + it_behaves_like 'an authenticated redis instrumentation' end context 'with service_name as `standard`' do let(:configuration_options) { { service_name: 'standard' } } - it_behaves_like 'redis instrumentation', service_name: 'standard', command_args: true - it_behaves_like 'an authenticated redis instrumentation', service_name: 'standard', command_args: true + it_behaves_like 'redis instrumentation', service_name: 'standard' + it_behaves_like 'an authenticated redis instrumentation', service_name: 'standard' end - context 'with command_args as `false`' do - let(:configuration_options) { { command_args: false } } + context 'with command_args as `true`' do + let(:configuration_options) { { command_args: true } } - it_behaves_like 'redis instrumentation' - it_behaves_like 'an authenticated redis instrumentation' + it_behaves_like 'redis instrumentation', command_args: true + it_behaves_like 'an authenticated redis instrumentation', command_args: true end end @@ -82,23 +82,23 @@ ) end - it_behaves_like 'redis instrumentation', service_name: 'custom', command_args: true - it_behaves_like 'an authenticated redis instrumentation', service_name: 'custom', command_args: true + it_behaves_like 'redis instrumentation', service_name: 'custom' + it_behaves_like 'an authenticated redis instrumentation', service_name: 'custom' end - context 'with command_args as `false`' do + context 'with command_args as `true`' do let(:redis_options) do default_redis_options.merge( custom: { datadog: { - command_args: false + command_args: true } } ) end - it_behaves_like 'redis instrumentation' - it_behaves_like 'an authenticated redis instrumentation' + it_behaves_like 'redis instrumentation', command_args: true + it_behaves_like 'an authenticated redis instrumentation', command_args: true end end end diff --git a/spec/datadog/tracing/contrib/redis/shared_examples.rb b/spec/datadog/tracing/contrib/redis/shared_examples.rb index 92dc528fc92..b66e5f6ebda 100644 --- a/spec/datadog/tracing/contrib/redis/shared_examples.rb +++ b/spec/datadog/tracing/contrib/redis/shared_examples.rb @@ -31,11 +31,10 @@ expect(span.service).to eq(options[:service_name] || 'redis') if options[:command_args] expect(span.resource).to eq('SET FOO bar') - expect(span.get_tag('redis.raw_command')).to eq('SET FOO bar') else expect(span.resource).to eq('SET') - expect(span.get_tag('redis.raw_command')).to be_nil end + expect(span.get_tag('redis.raw_command')).to eq('SET FOO bar') end it_behaves_like 'a redis span with common tags' @@ -58,11 +57,10 @@ if options[:command_args] expect(span.resource).to eq('GET FOO') - expect(span.get_tag('redis.raw_command')).to eq('GET FOO') else expect(span.resource).to eq('GET') - expect(span.get_tag('redis.raw_command')).to be_nil end + expect(span.get_tag('redis.raw_command')).to eq('GET FOO') end it_behaves_like 'a redis span with common tags' @@ -102,11 +100,10 @@ it do if options[:command_args] expect(span.resource).to eq('SET FOO bar') - expect(span.get_tag('redis.raw_command')).to eq('SET FOO bar') else expect(span.resource).to eq('SET') - expect(span.get_tag('redis.raw_command')).to be_nil end + expect(span.get_tag('redis.raw_command')).to eq('SET FOO bar') end end end @@ -147,11 +144,10 @@ expect(span.service).to eq(options[:service_name] || 'redis') if options[:command_args] expect(span.resource).to eq("SET v1 0\nSET v2 0\nINCR v1\nINCR v2\nINCR v2") - expect(span.get_tag('redis.raw_command')).to eq("SET v1 0\nSET v2 0\nINCR v1\nINCR v2\nINCR v2") else expect(span.resource).to eq("SET\nSET\nINCR\nINCR\nINCR") - expect(span.get_tag('redis.raw_command')).to be_nil end + expect(span.get_tag('redis.raw_command')).to eq("SET v1 0\nSET v2 0\nINCR v1\nINCR v2\nINCR v2") end it_behaves_like 'a redis span with common tags' @@ -192,11 +188,7 @@ expect(span.service).to eq(options[:service_name] || 'redis') expect(span.resource).to eq('(none)') - if options[:command_args] - expect(span.get_tag('redis.raw_command')).to eq('(none)') - else - expect(span.get_tag('redis.raw_command')).to be_nil - end + expect(span.get_tag('redis.raw_command')).to eq('(none)') end it_behaves_like 'a redis span with common tags' @@ -233,12 +225,11 @@ if options[:command_args] expect(span.resource).to eq('THIS_IS_NOT_A_REDIS_FUNC THIS_IS_NOT_A_VALID_ARG') - expect(span.get_tag('redis.raw_command')).to eq('THIS_IS_NOT_A_REDIS_FUNC THIS_IS_NOT_A_VALID_ARG') else expect(span.resource).to eq('THIS_IS_NOT_A_REDIS_FUNC') - expect(span.get_tag('redis.raw_command')).to be_nil end + expect(span.get_tag('redis.raw_command')).to eq('THIS_IS_NOT_A_REDIS_FUNC THIS_IS_NOT_A_VALID_ARG') expect(span.status).to eq(1) expect(span.get_tag('error.message')).to match(/ERR unknown command/) expect(span.get_tag('error.type')).to match(/CommandError/) @@ -267,11 +258,10 @@ if options[:command_args] expect(span.resource).to eq("SET K #{'x' * 47}...") - expect(span.get_tag('redis.raw_command')).to eq("SET K #{'x' * 47}...") else expect(span.resource).to eq('SET') - expect(span.get_tag('redis.raw_command')).to be_nil end + expect(span.get_tag('redis.raw_command')).to eq("SET K #{'x' * 47}...") end it_behaves_like 'a redis span with common tags' @@ -299,11 +289,10 @@ expect(span.service).to eq(options[:service_name] || 'redis') if options[:command_args] expect(span.resource).to eq('GET K') - expect(span.get_tag('redis.raw_command')).to eq('GET K') else expect(span.resource).to eq('GET') - expect(span.get_tag('redis.raw_command')).to be_nil end + expect(span.get_tag('redis.raw_command')).to eq('GET K') end it_behaves_like 'a redis span with common tags' @@ -340,11 +329,10 @@ if options[:command_args] expect(span.resource).to eq('AUTH ?') - expect(span.get_tag('redis.raw_command')).to eq('AUTH ?') else expect(span.resource).to eq('AUTH') - expect(span.get_tag('redis.raw_command')).to be_nil end + expect(span.get_tag('redis.raw_command')).to eq('AUTH ?') end end @@ -394,7 +382,7 @@ end end - context 'with redis optins' do + context 'with redis options' do let(:redis) do Redis.new( redis_options.merge( diff --git a/spec/datadog/tracing/distributed/propagation_spec.rb b/spec/datadog/tracing/distributed/propagation_spec.rb index 6158999385b..0a9ddd0a781 100644 --- a/spec/datadog/tracing/distributed/propagation_spec.rb +++ b/spec/datadog/tracing/distributed/propagation_spec.rb @@ -8,14 +8,18 @@ let(:propagation_styles) do { 'Datadog' => Datadog::Tracing::Distributed::Datadog.new(fetcher: fetcher_class), - 'b3multi' => Datadog::Tracing::Distributed::B3Multi.new(fetcher: fetcher_class), - 'b3' => Datadog::Tracing::Distributed::B3Single.new(fetcher: fetcher_class), + 'tracecontext' => Datadog::Tracing::Distributed::TraceContext.new(fetcher: fetcher_class), } end let(:fetcher_class) { Datadog::Tracing::Distributed::Fetcher } let(:prepare_key) { defined?(super) ? super() : proc { |key| key } } + let(:traceparent) do + "00-#{format('%032x', tracecontext_trace_id)}-#{format('%016x', tracecontext_span_id)}-" \ + "#{format('%02x', tracecontext_trace_flags)}" + end + describe '::inject!' do subject(:inject!) { propagator.inject!(trace, data) } let(:data) { {} } @@ -208,27 +212,28 @@ end end - context 'B3 Multi trace id and parent id' do - let(:data) do - { - prepare_key['x-b3-traceid'] => '00ef01', - prepare_key['x-b3-spanid'] => '011ef0' - } - end + context 'tracecontext trace id, parent id, and sampling priority' do + let(:data) { { prepare_key['traceparent'] => traceparent } } + + let(:tracecontext_trace_id) { 0xc0ffee } + let(:tracecontext_span_id) { 0xbee } + let(:tracecontext_trace_flags) { 0x00 } it do expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) - expect(trace_digest.span_id).to eq(73456) - expect(trace_digest.trace_id).to eq(61185) - expect(trace_digest.trace_sampling_priority).to be nil + expect(trace_digest.span_id).to eq(0xbee) + expect(trace_digest.trace_id).to eq(0xc0ffee) + expect(trace_digest.trace_sampling_priority).to eq(0) end + end - context 'and sampling priority' do + context 'datadog, and tracecontext header' do + context 'with trace_id not matching' do let(:data) do { - prepare_key['x-b3-traceid'] => '00ef01', - prepare_key['x-b3-spanid'] => '011ef0', - prepare_key['x-b3-sampled'] => '0' + prepare_key['x-datadog-trace-id'] => '61185', + prepare_key['x-datadog-parent-id'] => '73456', + prepare_key['traceparent'] => '00-11111111111111110000000000000001-000000003ade68b1-01', } end @@ -236,95 +241,86 @@ expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) expect(trace_digest.span_id).to eq(73456) expect(trace_digest.trace_id).to eq(61185) - expect(trace_digest.trace_sampling_priority).to eq(0) + expect(trace_digest.trace_sampling_priority).to be nil end - end - end - context 'B3 Single trace id and parent id' do - let(:data) do - { - prepare_key['b3'] => '00ef01-011ef0' - } - end + context 'and sampling priority' do + let(:data) do + { + prepare_key['x-datadog-trace-id'] => '61185', + prepare_key['x-datadog-parent-id'] => '73456', + prepare_key['x-datadog-sampling-priority'] => '1', + prepare_key['traceparent'] => '00-00000000000000000000000000c0ffee-0000000000000bee-00', + } + end - it do - expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) - expect(trace_digest.span_id).to eq(73456) - expect(trace_digest.trace_id).to eq(61185) - expect(trace_digest.trace_sampling_priority).to be nil - end + it do + expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) + expect(trace_digest.span_id).to eq(73456) + expect(trace_digest.trace_id).to eq(61185) + expect(trace_digest.trace_sampling_priority).to eq(1) + end - context 'and sampling priority' do - let(:data) do - { - prepare_key['b3'] => '00ef01-011ef0-0' - } + context 'with a failing propagator (Datadog)' do + let(:error) { StandardError.new('test_err').tap { |e| e.set_backtrace('caller:1') } } + + before do + allow_any_instance_of(::Datadog::Tracing::Distributed::Datadog).to receive(:extract).and_raise(error) + allow(Datadog.logger).to receive(:error) + end + + it 'does not propagate error to caller' do + trace_digest + expect(Datadog.logger).to have_received(:error).with(/Cause: test_err Location: caller:1/) + end + + it 'extracts values from non-failing propagator (tracecontext)' do + expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) + expect(trace_digest.span_id).to eq(0xbee) + expect(trace_digest.trace_id).to eq(0xc0ffee) + expect(trace_digest.trace_sampling_priority).to eq(0) + end + end end - it do - expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) - expect(trace_digest.span_id).to eq(73456) - expect(trace_digest.trace_id).to eq(61185) - expect(trace_digest.trace_sampling_priority).to eq(0) - end - end - end + context 'and tracestate' do + let(:data) { super().merge(prepare_key['tracestate'] => 'dd=unknown_field;,other=vendor') } - context 'datadog, and b3 header' do - let(:data) do - { - prepare_key['x-datadog-trace-id'] => '61185', - prepare_key['x-datadog-parent-id'] => '73456', - prepare_key['x-b3-traceid'] => '00ef01', - prepare_key['x-b3-spanid'] => '011ef0' - } - end - - it do - expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) - expect(trace_digest.span_id).to eq(73456) - expect(trace_digest.trace_id).to eq(61185) - expect(trace_digest.trace_sampling_priority).to be nil + it 'does not preserve tracestate' do + expect(trace_digest.trace_state).to be nil + expect(trace_digest.trace_state_unknown_fields).to be nil + end + end end - context 'and sampling priority' do + context 'with a matching trace_id' do let(:data) do { prepare_key['x-datadog-trace-id'] => '61185', prepare_key['x-datadog-parent-id'] => '73456', - prepare_key['x-datadog-sampling-priority'] => '1', - prepare_key['x-b3-traceid'] => '00ef01', - prepare_key['x-b3-spanid'] => '011ef0', - prepare_key['x-b3-sampled'] => '0' + prepare_key['traceparent'] => '00-0000000000000000000000000000ef01-0000000000011ef0-01', } end - it do - expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) - expect(trace_digest.span_id).to eq(73456) - expect(trace_digest.trace_id).to eq(61185) - expect(trace_digest.trace_sampling_priority).to eq(1) + it 'does not parse tracecontext sampling priority' do + expect(trace_digest.trace_sampling_priority).to be nil end - context 'with a failing propagator (Datadog)' do - let(:error) { StandardError.new('test_err').tap { |e| e.set_backtrace('caller:1') } } + context 'and tracestate' do + let(:data) { super().merge(prepare_key['tracestate'] => 'dd=unknown_field;,other=vendor') } - before do - allow_any_instance_of(::Datadog::Tracing::Distributed::Datadog).to receive(:extract).and_raise(error) - allow(Datadog.logger).to receive(:error) + it 'preserves tracestate' do + expect(trace_digest.trace_state).to eq('other=vendor') + expect(trace_digest.trace_state_unknown_fields).to eq('unknown_field;') end - it 'does not propagate error to caller' do - trace_digest - expect(Datadog.logger).to have_received(:error).with(/Cause: test_err Location: caller:1/) - end + context 'with propagation_extract_first true' do + before { Datadog.configure { |c| c.tracing.distributed_tracing.propagation_extract_first = true } } - it 'extracts values from non-failing propagator (B3)' do - expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) - expect(trace_digest.span_id).to eq(73456) - expect(trace_digest.trace_id).to eq(61185) - expect(trace_digest.trace_sampling_priority).to eq(0) + it 'does not preserve tracestate' do + expect(trace_digest.trace_state).to be nil + expect(trace_digest.trace_state_unknown_fields).to be nil + end end end end @@ -407,16 +403,18 @@ context 'when conflict across different extractions' do let(:datadog_trace_id) { 0xabcdef } - let(:b3_multi_trace_id) { 0x123456 } - let(:b3_trace_id) { 0xfedcba } - let(:span_id) { 0xfffffff } + let(:tracecontext_trace_id) { 0x123456 } + + let(:datadog_span_id) { 0xfffffff } + let(:tracecontext_span_id) { 0x1111111 } + + let(:tracecontext_trace_flags) { 0x01 } + let(:data) do { prepare_key['x-datadog-trace-id'] => datadog_trace_id.to_s(10), - prepare_key['x-datadog-parent-id'] => span_id.to_s(10), - prepare_key['x-b3-traceid'] => b3_multi_trace_id.to_s(16), - prepare_key['x-b3-spanid'] => span_id.to_s(16), - prepare_key['b3'] => "#{b3_trace_id.to_s(16)}-#{span_id.to_s(16)}" + prepare_key['x-datadog-parent-id'] => datadog_span_id.to_s(10), + prepare_key['traceparent'] => traceparent, } end @@ -424,58 +422,10 @@ Datadog.configuration.reset! end - context "when extraction styles ['Datadog', 'b3multi', 'b3']" do - before do - Datadog.configure do |c| - c.tracing.distributed_tracing.propagation_extract_style = [ - 'Datadog', - 'b3multi', - 'b3', - ] - end - end - - it 'returns trace digest from `Datadog` extraction' do - expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) - expect(trace_digest.trace_id).to eq(datadog_trace_id) - expect(trace_digest.span_id).to eq(0xfffffff) - end - end - - context "when extraction styles ['b3multi', 'b3', 'Datadog']" do - before do - Datadog.configure do |c| - c.tracing.distributed_tracing.propagation_extract_style = [ - 'b3multi', - 'b3', - 'Datadog', - ] - end - end - - it 'returns trace digest from `b3multi` extraction' do - expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) - expect(trace_digest.trace_id).to eq(b3_multi_trace_id) - expect(trace_digest.span_id).to eq(0xfffffff) - end - end - - context "when extraction styles ['b3', 'Datadog', 'b3multi']" do - before do - Datadog.configure do |c| - c.tracing.distributed_tracing.propagation_extract_style = [ - 'b3', - 'Datadog', - 'b3multi', - ] - end - end - - it 'returns trace digest from `b3` extraction' do - expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) - expect(trace_digest.trace_id).to eq(b3_trace_id) - expect(trace_digest.span_id).to eq(0xfffffff) - end + it 'returns trace digest from the first successful extraction' do + expect(trace_digest).to be_a_kind_of(Datadog::Tracing::TraceDigest) + expect(trace_digest.trace_id).to eq(datadog_trace_id) + expect(trace_digest.span_id).to eq(0xfffffff) end end end diff --git a/spec/datadog/tracing/trace_digest_spec.rb b/spec/datadog/tracing/trace_digest_spec.rb index a39b955270d..701467bfe05 100644 --- a/spec/datadog/tracing/trace_digest_spec.rb +++ b/spec/datadog/tracing/trace_digest_spec.rb @@ -175,4 +175,20 @@ end end end + + describe '#merge' do + let(:merge) { trace_digest.merge(args) } + let(:args) { { span_name: 'new span name' } } + let(:options) { { trace_name: 'trace name' } } + + it 'overrides the provided field' do + expect(merge.span_name).to be_a_frozen_copy_of('new span name') + end + + it 'does not modify non provided fields' do + expect(merge.trace_name).to eq('trace name') + end + + it { is_expected.to be_frozen } + end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 985dc8b1eb2..261aec57332 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -82,6 +82,7 @@ config.order = :random config.filter_run focus: true config.run_all_when_everything_filtered = true + config.example_status_persistence_file_path = 'tmp/example_status_persistence' # rspec-wait configuration config.wait_timeout = 5 # default timeout for `wait_for(...)`, in seconds @@ -280,3 +281,11 @@ def initialize(*args, &block) # Helper matchers RSpec::Matchers.define_negated_matcher :not_be, :be + +# The Ruby Timeout class uses a long-lived class-level thread that is never terminated. +# Creating it early here ensures tests that tests that check for leaking threads are not +# triggered by the creation of this thread. +# +# This has to be one once for the lifetime of this process, and was introduced in Ruby 3.1. +# Before 3.1, a thread was created and destroyed on every Timeout#timeout call. +Timeout.ensure_timeout_thread_created if Timeout.respond_to?(:ensure_timeout_thread_created)