From 615a2ce708cb56781718194b9cb2febd20a606f7 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Thu, 2 Jun 2022 18:00:32 -0700 Subject: [PATCH 01/46] [Single Span Sampling] Add single span sampling rule --- lib/datadog/tracing/sampling/span/ext.rb | 24 ++++++ lib/datadog/tracing/sampling/span/rule.rb | 63 +++++++++++++++ .../tracing/sampling/span/rule_spec.rb | 79 +++++++++++++++++++ 3 files changed, 166 insertions(+) create mode 100644 lib/datadog/tracing/sampling/span/ext.rb create mode 100644 lib/datadog/tracing/sampling/span/rule.rb create mode 100644 spec/datadog/tracing/sampling/span/rule_spec.rb diff --git a/lib/datadog/tracing/sampling/span/ext.rb b/lib/datadog/tracing/sampling/span/ext.rb new file mode 100644 index 00000000000..d6236d15587 --- /dev/null +++ b/lib/datadog/tracing/sampling/span/ext.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +module Datadog + module Tracing + module Sampling + module Span + # Checks if a span conforms to a matching criteria. + class Ext + # Sampling decision method used to come to the sampling decision for this span + TAG_MECHANISM = '_dd.span_sampling.mechanism' + # Sampling rate applied to this span + TAG_RULE_RATE = '_dd.span_sampling.rule_rate' + # Effective sampling ratio for the rate limiter configured for this span + # @see Datadog::Tracing::Sampling::TokenBucket#effective_rate + TAG_LIMIT_RATE = '_dd.span_sampling.limit_rate' + + # This span was sampled on account of a Span Sampling Rule + # @see Datadog::Tracing::Sampling::Span::Rule + MECHANISM_SPAN_SAMPLING_RATE = 8 + end + end + end + end +end diff --git a/lib/datadog/tracing/sampling/span/rule.rb b/lib/datadog/tracing/sampling/span/rule.rb new file mode 100644 index 00000000000..549bcb139f6 --- /dev/null +++ b/lib/datadog/tracing/sampling/span/rule.rb @@ -0,0 +1,63 @@ +# frozen_string_literal: true + +require 'datadog/tracing/sampling/span/ext' + +module Datadog + module Tracing + module Sampling + module Span + # Span sampling rule that applies a sampling rate if the span + # matches the provided {Matcher}. + # Additionally, a rate limiter is also applied. + # + # If a span does not conform to the matcher, no changes are made. + class Rule + # Creates a new span sampling rule. + # + # @param [Sampling::Span::Matcher] matcher whether this rule applies to a specific span + # @param [Float] sampling_rate span sampling ratio, between 0.0 (0%) and 1.0 (100%). + # @param [Numeric] rate_limit maximum number of spans sampled per second. Negative numbers mean unlimited spans. + def initialize(matcher, sampling_rate, rate_limit) + @matcher = matcher + @sampling_rate = sampling_rate + @rate_limit = rate_limit + + @sampler = Sampling::RateSampler.new + @sampler.sample_rate = sampling_rate + @rate_limiter = Sampling::TokenBucket.new(rate_limit) + end + + # This method should only be invoked for spans that are part + # of a trace that has been dropped by trace-level sampling. + # Invoking it for other spans will cause incorrect sampling + # metrics to be reported by the Datadog App. + # + # Returns `true` if the provided span is sampled. + # If the span is dropped due to sampling rate or rate limiting, + # it returns `false`. + # + # Returns `nil` if the span did not meet the matching criteria by the + # provided matcher. + # + # This method modifies the `span` if it matches the provided matcher. + # + # @param [Datadog::Tracing::SpanOperation] span_op span to be sampled + # @return [Boolean] should this span be sampled? + # @return [nil] span did not satisfy the matcher, no changes are made to the span + def sample!(span_op) + return nil unless @matcher.match?(span_op) + + if @sampler.sample?(span_op) && @rate_limiter.allow?(1) + span_op.set_metric(Span::Ext::TAG_MECHANISM, Span::Ext::MECHANISM_SPAN_SAMPLING_RATE) + span_op.set_metric(Span::Ext::TAG_RULE_RATE, @sampling_rate) + span_op.set_metric(Span::Ext::TAG_LIMIT_RATE, @rate_limiter.effective_rate) + true + else + false + end + end + end + end + end + end +end diff --git a/spec/datadog/tracing/sampling/span/rule_spec.rb b/spec/datadog/tracing/sampling/span/rule_spec.rb new file mode 100644 index 00000000000..ce62f28d29b --- /dev/null +++ b/spec/datadog/tracing/sampling/span/rule_spec.rb @@ -0,0 +1,79 @@ +require 'datadog/tracing/sampling/span/matcher' +require 'datadog/tracing/sampling/span/rule' + +RSpec.describe Datadog::Tracing::Sampling::Span::Rule do + subject(:rule) { described_class.new(matcher, sampling_rate, rate_limit) } + let(:matcher) { instance_double(Datadog::Tracing::Sampling::Span::Matcher) } + let(:sampling_rate) { 0.0 } + let(:rate_limit) { 0 } + + let(:span_op) { Datadog::Tracing::SpanOperation.new(span_name, service: span_service) } + let(:span_name) { 'operation.name' } + let(:span_service) { '' } + + describe '#sample!' do + subject(:sample!) { rule.sample!(span_op) } + + shared_examples 'does not modify span' do + it { expect { sample! }.to_not(change { span_op.send(:build_span).to_hash }) } + end + + context 'when matching' do + before do + expect(matcher).to receive(:match?).with(span_op).and_return(true) + end + + context 'not sampled' do + let(:sampling_rate) { 0.0 } + + it 'returns false' do + is_expected.to eq(false) + end + + it_behaves_like 'does not modify span' + end + + context 'sampled' do + let(:sampling_rate) { 1.0 } + + context 'rate limited' do + let(:rate_limit) { 0 } + + it 'returns false' do + is_expected.to eq(false) + end + + it_behaves_like 'does not modify span' + end + + context 'not rate limited' do + let(:rate_limit) { 10 } + + it 'returns true' do + is_expected.to eq(true) + end + + it 'sets mechanism, rule rate and rate limit metrics' do + sample! + + expect(span_op.get_metric('_dd.span_sampling.mechanism')).to eq(8) + expect(span_op.get_metric('_dd.span_sampling.rule_rate')).to eq(1.0) + expect(span_op.get_metric('_dd.span_sampling.limit_rate')).to eq(1.0) + end + end + end + end + + context 'when not matching' do + before do + expect(matcher).to receive(:match?).with(span_op).and_return(false) + end + + it 'returns nil' do + is_expected.to be_nil + end + + it_behaves_like 'does not modify span' + end + end +end From 61c7e022d95ec5700736f79c2228adfc7cd27aeb Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 17 Jun 2022 09:29:18 -0700 Subject: [PATCH 02/46] Update max_per_second tag due to RFC change --- lib/datadog/tracing/sampling/span/ext.rb | 7 +++---- lib/datadog/tracing/sampling/span/rule.rb | 2 +- spec/datadog/tracing/sampling/span/rule_spec.rb | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/datadog/tracing/sampling/span/ext.rb b/lib/datadog/tracing/sampling/span/ext.rb index d6236d15587..a1814c1e08d 100644 --- a/lib/datadog/tracing/sampling/span/ext.rb +++ b/lib/datadog/tracing/sampling/span/ext.rb @@ -8,11 +8,10 @@ module Span class Ext # Sampling decision method used to come to the sampling decision for this span TAG_MECHANISM = '_dd.span_sampling.mechanism' - # Sampling rate applied to this span + # Sampling rate applied to this span, if a rule applies TAG_RULE_RATE = '_dd.span_sampling.rule_rate' - # Effective sampling ratio for the rate limiter configured for this span - # @see Datadog::Tracing::Sampling::TokenBucket#effective_rate - TAG_LIMIT_RATE = '_dd.span_sampling.limit_rate' + # Rate limit configured for this span, if a rule applies + TAG_MAX_PER_SECOND = '_dd.span_sampling.max_per_second' # This span was sampled on account of a Span Sampling Rule # @see Datadog::Tracing::Sampling::Span::Rule diff --git a/lib/datadog/tracing/sampling/span/rule.rb b/lib/datadog/tracing/sampling/span/rule.rb index 549bcb139f6..597d18bf6d0 100644 --- a/lib/datadog/tracing/sampling/span/rule.rb +++ b/lib/datadog/tracing/sampling/span/rule.rb @@ -50,7 +50,7 @@ def sample!(span_op) if @sampler.sample?(span_op) && @rate_limiter.allow?(1) span_op.set_metric(Span::Ext::TAG_MECHANISM, Span::Ext::MECHANISM_SPAN_SAMPLING_RATE) span_op.set_metric(Span::Ext::TAG_RULE_RATE, @sampling_rate) - span_op.set_metric(Span::Ext::TAG_LIMIT_RATE, @rate_limiter.effective_rate) + span_op.set_metric(Span::Ext::TAG_MAX_PER_SECOND, @rate_limit) true else false diff --git a/spec/datadog/tracing/sampling/span/rule_spec.rb b/spec/datadog/tracing/sampling/span/rule_spec.rb index ce62f28d29b..4d8441df0c3 100644 --- a/spec/datadog/tracing/sampling/span/rule_spec.rb +++ b/spec/datadog/tracing/sampling/span/rule_spec.rb @@ -47,7 +47,7 @@ end context 'not rate limited' do - let(:rate_limit) { 10 } + let(:rate_limit) { 3 } it 'returns true' do is_expected.to eq(true) @@ -58,7 +58,7 @@ expect(span_op.get_metric('_dd.span_sampling.mechanism')).to eq(8) expect(span_op.get_metric('_dd.span_sampling.rule_rate')).to eq(1.0) - expect(span_op.get_metric('_dd.span_sampling.limit_rate')).to eq(1.0) + expect(span_op.get_metric('_dd.span_sampling.max_per_second')).to eq(3) end end end From 82821e8c3c735b57a8840c81d0dfe98e3c3e7d54 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 17 Jun 2022 13:11:25 -0700 Subject: [PATCH 03/46] Add default values --- lib/datadog/tracing/sampling/span/ext.rb | 6 ++++++ lib/datadog/tracing/sampling/span/rule.rb | 9 ++++++++- spec/datadog/tracing/sampling/span/rule_spec.rb | 15 ++++++++++++++- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/lib/datadog/tracing/sampling/span/ext.rb b/lib/datadog/tracing/sampling/span/ext.rb index a1814c1e08d..c8b416e6232 100644 --- a/lib/datadog/tracing/sampling/span/ext.rb +++ b/lib/datadog/tracing/sampling/span/ext.rb @@ -6,6 +6,12 @@ module Sampling module Span # Checks if a span conforms to a matching criteria. class Ext + # Accept all spans (100% retention). + DEFAULT_SAMPLE_RATE = 1.0 + # Unlimited. + # @see Datadog::Tracing::Sampling::TokenBucket + DEFAULT_MAX_PER_SECOND = -1 + # Sampling decision method used to come to the sampling decision for this span TAG_MECHANISM = '_dd.span_sampling.mechanism' # Sampling rate applied to this span, if a rule applies diff --git a/lib/datadog/tracing/sampling/span/rule.rb b/lib/datadog/tracing/sampling/span/rule.rb index 597d18bf6d0..c3c024cdbc4 100644 --- a/lib/datadog/tracing/sampling/span/rule.rb +++ b/lib/datadog/tracing/sampling/span/rule.rb @@ -12,12 +12,19 @@ module Span # # If a span does not conform to the matcher, no changes are made. class Rule + attr_reader :matcher, :sampling_rate, :rate_limit + # Creates a new span sampling rule. # # @param [Sampling::Span::Matcher] matcher whether this rule applies to a specific span # @param [Float] sampling_rate span sampling ratio, between 0.0 (0%) and 1.0 (100%). # @param [Numeric] rate_limit maximum number of spans sampled per second. Negative numbers mean unlimited spans. - def initialize(matcher, sampling_rate, rate_limit) + def initialize( + matcher, + sampling_rate: Span::Ext::DEFAULT_SAMPLE_RATE, + rate_limit: Span::Ext::DEFAULT_MAX_PER_SECOND + ) + @matcher = matcher @sampling_rate = sampling_rate @rate_limit = rate_limit diff --git a/spec/datadog/tracing/sampling/span/rule_spec.rb b/spec/datadog/tracing/sampling/span/rule_spec.rb index 4d8441df0c3..a9138ceef5b 100644 --- a/spec/datadog/tracing/sampling/span/rule_spec.rb +++ b/spec/datadog/tracing/sampling/span/rule_spec.rb @@ -2,7 +2,7 @@ require 'datadog/tracing/sampling/span/rule' RSpec.describe Datadog::Tracing::Sampling::Span::Rule do - subject(:rule) { described_class.new(matcher, sampling_rate, rate_limit) } + subject(:rule) { described_class.new(matcher, sampling_rate: sampling_rate, rate_limit: rate_limit) } let(:matcher) { instance_double(Datadog::Tracing::Sampling::Span::Matcher) } let(:sampling_rate) { 0.0 } let(:rate_limit) { 0 } @@ -11,6 +11,19 @@ let(:span_name) { 'operation.name' } let(:span_service) { '' } + describe '#initialize' do + subject(:rule) { described_class.new(matcher) } + context 'default values' do + it 'sets sampling rate to 100%' do + expect(rule.sampling_rate).to eq(1.0) + end + + it 'sets rate limit unlimited' do + expect(rule.rate_limit).to eq(-1) + end + end + end + describe '#sample!' do subject(:sample!) { rule.sample!(span_op) } From 8cf2479d65fd6d1637c0ae48081834401c866edb Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 17 Jun 2022 13:15:59 -0700 Subject: [PATCH 04/46] Sample is better than Sampling --- lib/datadog/tracing/sampling/span/rule.rb | 12 ++++++------ spec/datadog/tracing/sampling/span/rule_spec.rb | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/datadog/tracing/sampling/span/rule.rb b/lib/datadog/tracing/sampling/span/rule.rb index c3c024cdbc4..efc2b216a00 100644 --- a/lib/datadog/tracing/sampling/span/rule.rb +++ b/lib/datadog/tracing/sampling/span/rule.rb @@ -12,25 +12,25 @@ module Span # # If a span does not conform to the matcher, no changes are made. class Rule - attr_reader :matcher, :sampling_rate, :rate_limit + attr_reader :matcher, :sample_rate, :rate_limit # Creates a new span sampling rule. # # @param [Sampling::Span::Matcher] matcher whether this rule applies to a specific span - # @param [Float] sampling_rate span sampling ratio, between 0.0 (0%) and 1.0 (100%). + # @param [Float] sample_rate span sampling ratio, between 0.0 (0%) and 1.0 (100%). # @param [Numeric] rate_limit maximum number of spans sampled per second. Negative numbers mean unlimited spans. def initialize( matcher, - sampling_rate: Span::Ext::DEFAULT_SAMPLE_RATE, + sample_rate: Span::Ext::DEFAULT_SAMPLE_RATE, rate_limit: Span::Ext::DEFAULT_MAX_PER_SECOND ) @matcher = matcher - @sampling_rate = sampling_rate + @sample_rate = sample_rate @rate_limit = rate_limit @sampler = Sampling::RateSampler.new - @sampler.sample_rate = sampling_rate + @sampler.sample_rate = sample_rate @rate_limiter = Sampling::TokenBucket.new(rate_limit) end @@ -56,7 +56,7 @@ def sample!(span_op) if @sampler.sample?(span_op) && @rate_limiter.allow?(1) span_op.set_metric(Span::Ext::TAG_MECHANISM, Span::Ext::MECHANISM_SPAN_SAMPLING_RATE) - span_op.set_metric(Span::Ext::TAG_RULE_RATE, @sampling_rate) + span_op.set_metric(Span::Ext::TAG_RULE_RATE, @sample_rate) span_op.set_metric(Span::Ext::TAG_MAX_PER_SECOND, @rate_limit) true else diff --git a/spec/datadog/tracing/sampling/span/rule_spec.rb b/spec/datadog/tracing/sampling/span/rule_spec.rb index a9138ceef5b..fb3672b5125 100644 --- a/spec/datadog/tracing/sampling/span/rule_spec.rb +++ b/spec/datadog/tracing/sampling/span/rule_spec.rb @@ -2,9 +2,9 @@ require 'datadog/tracing/sampling/span/rule' RSpec.describe Datadog::Tracing::Sampling::Span::Rule do - subject(:rule) { described_class.new(matcher, sampling_rate: sampling_rate, rate_limit: rate_limit) } + subject(:rule) { described_class.new(matcher, sample_rate: sample_rate, rate_limit: rate_limit) } let(:matcher) { instance_double(Datadog::Tracing::Sampling::Span::Matcher) } - let(:sampling_rate) { 0.0 } + let(:sample_rate) { 0.0 } let(:rate_limit) { 0 } let(:span_op) { Datadog::Tracing::SpanOperation.new(span_name, service: span_service) } @@ -15,7 +15,7 @@ subject(:rule) { described_class.new(matcher) } context 'default values' do it 'sets sampling rate to 100%' do - expect(rule.sampling_rate).to eq(1.0) + expect(rule.sample_rate).to eq(1.0) end it 'sets rate limit unlimited' do @@ -37,7 +37,7 @@ end context 'not sampled' do - let(:sampling_rate) { 0.0 } + let(:sample_rate) { 0.0 } it 'returns false' do is_expected.to eq(false) @@ -47,7 +47,7 @@ end context 'sampled' do - let(:sampling_rate) { 1.0 } + let(:sample_rate) { 1.0 } context 'rate limited' do let(:rate_limit) { 0 } From 27cd8430af23bed7ba939287e75c8ca9b7b8f07d Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Tue, 28 Jun 2022 14:57:54 -0700 Subject: [PATCH 05/46] Address comments --- lib/datadog/tracing/sampling/rate_sampler.rb | 3 +++ lib/datadog/tracing/sampling/span/ext.rb | 4 ++-- lib/datadog/tracing/sampling/span/rule.rb | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/datadog/tracing/sampling/rate_sampler.rb b/lib/datadog/tracing/sampling/rate_sampler.rb index 5d61e58b084..0c7dfe7126d 100644 --- a/lib/datadog/tracing/sampling/rate_sampler.rb +++ b/lib/datadog/tracing/sampling/rate_sampler.rb @@ -20,6 +20,9 @@ class RateSampler < Sampler # * +sample_rate+: the sample rate as a {Float} between 0.0 and 1.0. 0.0 # means that no trace will be sampled; 1.0 means that all traces will be # sampled. + # + # DEV-2.0: Allow for `sample_rate` zero (drop all) to be allowed. This eases + # DEV-2.0: usage for many consumers of the {RateSampler} class. def initialize(sample_rate = 1.0) super() diff --git a/lib/datadog/tracing/sampling/span/ext.rb b/lib/datadog/tracing/sampling/span/ext.rb index c8b416e6232..8630cc4ef23 100644 --- a/lib/datadog/tracing/sampling/span/ext.rb +++ b/lib/datadog/tracing/sampling/span/ext.rb @@ -4,8 +4,8 @@ module Datadog module Tracing module Sampling module Span - # Checks if a span conforms to a matching criteria. - class Ext + # Single Span Sampling constants. + module Ext # Accept all spans (100% retention). DEFAULT_SAMPLE_RATE = 1.0 # Unlimited. diff --git a/lib/datadog/tracing/sampling/span/rule.rb b/lib/datadog/tracing/sampling/span/rule.rb index efc2b216a00..c152f292f00 100644 --- a/lib/datadog/tracing/sampling/span/rule.rb +++ b/lib/datadog/tracing/sampling/span/rule.rb @@ -30,6 +30,10 @@ def initialize( @rate_limit = rate_limit @sampler = Sampling::RateSampler.new + # Set the sample_rate outside of the initializer to allow for + # zero to be a "drop all". + # The RateSampler initializer enforces non-zero, falling back to 100% sampling + # if zero is provided. @sampler.sample_rate = sample_rate @rate_limiter = Sampling::TokenBucket.new(rate_limit) end From 8f4617e8ef62b0291ba3b061b8d2d6b81496052e Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Thu, 30 Jun 2022 11:54:32 -0700 Subject: [PATCH 06/46] Rename bool/nil to symbols --- lib/datadog/tracing/sampling/span/rule.rb | 10 +++++----- spec/datadog/tracing/sampling/span/rule_spec.rb | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/datadog/tracing/sampling/span/rule.rb b/lib/datadog/tracing/sampling/span/rule.rb index c152f292f00..7fae5517b95 100644 --- a/lib/datadog/tracing/sampling/span/rule.rb +++ b/lib/datadog/tracing/sampling/span/rule.rb @@ -53,18 +53,18 @@ def initialize( # This method modifies the `span` if it matches the provided matcher. # # @param [Datadog::Tracing::SpanOperation] span_op span to be sampled - # @return [Boolean] should this span be sampled? - # @return [nil] span did not satisfy the matcher, no changes are made to the span + # @return [:kept,:rejected] should this span be sampled? + # @return [:not_matched] span did not satisfy the matcher, no changes are made to the span def sample!(span_op) - return nil unless @matcher.match?(span_op) + return :not_matched unless @matcher.match?(span_op) if @sampler.sample?(span_op) && @rate_limiter.allow?(1) span_op.set_metric(Span::Ext::TAG_MECHANISM, Span::Ext::MECHANISM_SPAN_SAMPLING_RATE) span_op.set_metric(Span::Ext::TAG_RULE_RATE, @sample_rate) span_op.set_metric(Span::Ext::TAG_MAX_PER_SECOND, @rate_limit) - true + :kept else - false + :rejected end end end diff --git a/spec/datadog/tracing/sampling/span/rule_spec.rb b/spec/datadog/tracing/sampling/span/rule_spec.rb index fb3672b5125..0489e91f230 100644 --- a/spec/datadog/tracing/sampling/span/rule_spec.rb +++ b/spec/datadog/tracing/sampling/span/rule_spec.rb @@ -39,8 +39,8 @@ context 'not sampled' do let(:sample_rate) { 0.0 } - it 'returns false' do - is_expected.to eq(false) + it 'returns rejected' do + is_expected.to eq(:rejected) end it_behaves_like 'does not modify span' @@ -52,8 +52,8 @@ context 'rate limited' do let(:rate_limit) { 0 } - it 'returns false' do - is_expected.to eq(false) + it 'returns rejected' do + is_expected.to eq(:rejected) end it_behaves_like 'does not modify span' @@ -62,8 +62,8 @@ context 'not rate limited' do let(:rate_limit) { 3 } - it 'returns true' do - is_expected.to eq(true) + it 'returns kept' do + is_expected.to eq(:kept) end it 'sets mechanism, rule rate and rate limit metrics' do @@ -83,7 +83,7 @@ end it 'returns nil' do - is_expected.to be_nil + is_expected.to eq(:not_matched) end it_behaves_like 'does not modify span' From 8645e4cd43429667003f7419e791f0461ad0cfea Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 17 Jun 2022 13:05:59 -0700 Subject: [PATCH 07/46] [Single Span Sampling] Parse user configuration --- lib/datadog/tracing/sampling/rate_limiter.rb | 3 + lib/datadog/tracing/sampling/span/matcher.rb | 9 + lib/datadog/tracing/sampling/span/rule.rb | 8 + .../tracing/sampling/span/rule_parser.rb | 98 +++++++++++ .../tracing/sampling/rate_limiter_spec.rb | 16 ++ .../tracing/sampling/span/rule_parser_spec.rb | 154 ++++++++++++++++++ 6 files changed, 288 insertions(+) create mode 100644 lib/datadog/tracing/sampling/span/rule_parser.rb create mode 100644 spec/datadog/tracing/sampling/span/rule_parser_spec.rb diff --git a/lib/datadog/tracing/sampling/rate_limiter.rb b/lib/datadog/tracing/sampling/rate_limiter.rb index 8f7661c9055..bf76a7e81dc 100644 --- a/lib/datadog/tracing/sampling/rate_limiter.rb +++ b/lib/datadog/tracing/sampling/rate_limiter.rb @@ -39,6 +39,9 @@ class TokenBucket < RateLimiter def initialize(rate, max_tokens = rate) super() + raise ArgumentError, "rate must be a number: #{rate}" unless rate.is_a?(Numeric) + raise ArgumentError, "max_tokens must be a number: #{max_tokens}" unless max_tokens.is_a?(Numeric) + @rate = rate @max_tokens = max_tokens diff --git a/lib/datadog/tracing/sampling/span/matcher.rb b/lib/datadog/tracing/sampling/span/matcher.rb index 1d3d6d95bd9..aa40ec22516 100644 --- a/lib/datadog/tracing/sampling/span/matcher.rb +++ b/lib/datadog/tracing/sampling/span/matcher.rb @@ -6,6 +6,8 @@ module Sampling module Span # Checks if a span conforms to a matching criteria. class Matcher + attr_reader :name, :service + # Pattern that matches any string MATCH_ALL_PATTERN = '*' @@ -54,6 +56,13 @@ def match?(span) end end + def ==(other) + return super unless other.is_a?(Matcher) + + name == other.name && + service == other.service + end + private # @param pattern [String] diff --git a/lib/datadog/tracing/sampling/span/rule.rb b/lib/datadog/tracing/sampling/span/rule.rb index 7fae5517b95..43bf0f44361 100644 --- a/lib/datadog/tracing/sampling/span/rule.rb +++ b/lib/datadog/tracing/sampling/span/rule.rb @@ -67,6 +67,14 @@ def sample!(span_op) :rejected end end + + def ==(other) + return super unless other.is_a?(Rule) + + matcher == other.matcher && + sample_rate == other.sample_rate && + rate_limit == other.rate_limit + end end end end diff --git a/lib/datadog/tracing/sampling/span/rule_parser.rb b/lib/datadog/tracing/sampling/span/rule_parser.rb new file mode 100644 index 00000000000..105949809e9 --- /dev/null +++ b/lib/datadog/tracing/sampling/span/rule_parser.rb @@ -0,0 +1,98 @@ +# frozen_string_literal: true + +require 'json' +require 'datadog/tracing/sampling/span/ext' +require 'datadog/tracing/sampling/span/matcher' +require 'datadog/tracing/sampling/span/rule' + +module Datadog + module Tracing + module Sampling + module Span + # Converts user configuration into {Datadog::Tracing::Sampling::Span::Rule} objects, + # handling any parsing errors. + module RuleParser + class << self + # Parses the provided JSON string containing the Single Span + # Sampling configuration list. + # In case of parsing errors, `nil` is returned. + # + # @param rules [String] the JSON configuration rules to be parsed + # @return [Array] a list of parsed rules + # @return [nil] if parsing failed + def parse_json(rules) + begin + list = JSON.parse(rules) + rescue JSON::ParserError => e + Datadog.logger.warn("Error parsing Span Sampling Rules \"#{e}\" for rules: #{rules}") + return nil + end + + parse_list(list) + end + + # Parses a list of Hashes containing the parsed JSON information + # for Single Span Sampling configuration. + # In case of parsing errors, `nil` is returned. + # + # @param rules [Array] a list of parsed rules + # @return [nil] if parsing failed + def parse_list(rules) + unless rules.is_a?(Array) + # Using JSON terminology for the expected error type + Datadog.logger.warn("Span Sampling Rules are not an array: #{JSON.dump(rules)}") + return nil + end + + parsed = rules.map do |hash| + unless hash.is_a?(Hash) + # Using JSON terminology for the expected error type + Datadog.logger.warn("Span Sampling Rule is not a key-value object: #{JSON.dump(hash)}") + return nil + end + + begin + parse_rule(hash) + rescue => e + Datadog.logger.warn("Cannot parse Span Sampling Rule #{JSON.dump(hash)}: " \ + "#{e.class.name} #{e} at #{Array(e.backtrace).first}") + nil + end + end + + parsed.compact! + parsed + end + + private + + def parse_rule(hash) + matcher_options = {} + if (name_pattern = hash['name']) + matcher_options[:name_pattern] = name_pattern + end + + if (service_pattern = hash['service']) + matcher_options[:service_pattern] = service_pattern + end + + matcher = Matcher.new(**matcher_options) + + rule_options = {} + if (sample_rate = hash['sample_rate']) + rule_options[:sample_rate] = sample_rate + end + + if (max_per_second = hash['max_per_second']) + rule_options[:rate_limit] = max_per_second + end + + Rule.new(matcher, **rule_options) + end + end + end + end + end + end +end diff --git a/spec/datadog/tracing/sampling/rate_limiter_spec.rb b/spec/datadog/tracing/sampling/rate_limiter_spec.rb index 693e25f52ed..f6ea0f6ecd2 100644 --- a/spec/datadog/tracing/sampling/rate_limiter_spec.rb +++ b/spec/datadog/tracing/sampling/rate_limiter_spec.rb @@ -18,6 +18,22 @@ it 'has all tokens available' do expect(bucket.available_tokens).to eq(max_tokens) end + + context 'with invalid rate' do + let(:rate) { :bad } + + it 'raises argument error' do + expect { bucket }.to raise_error(ArgumentError, /bad/) + end + end + + context 'with invalid max_tokens' do + let(:max_tokens) { :bad } + + it 'raises argument error' do + expect { bucket }.to raise_error(ArgumentError, /bad/) + end + end end describe '#allow?' do diff --git a/spec/datadog/tracing/sampling/span/rule_parser_spec.rb b/spec/datadog/tracing/sampling/span/rule_parser_spec.rb new file mode 100644 index 00000000000..e0237fa9b9d --- /dev/null +++ b/spec/datadog/tracing/sampling/span/rule_parser_spec.rb @@ -0,0 +1,154 @@ +require 'datadog/tracing/sampling/span/rule_parser' + +RSpec.describe Datadog::Tracing::Sampling::Span::RuleParser do + describe '.parse_json' do + subject(:parse) { described_class.parse_json(rules_string) } + let(:rules_string) { JSON.dump(json_input) } + let(:json_input) { [] } + + shared_examples 'does not modify span' do + it { expect { sample! }.to_not(change { span_op.send(:build_span).to_hash }) } + end + + context 'invalid JSON' do + let(:rules_string) { '-not-json-' } + + it 'warns and returns nil' do + expect(Datadog.logger).to receive(:warn).with(include(rules_string)) + is_expected.to be(nil) + end + end + + context 'valid JSON' do + context 'not a list' do + let(:json_input) { { not: 'list' } } + + it 'warns and returns nil' do + expect(Datadog.logger).to receive(:warn).with(include(rules_string)) + is_expected.to be(nil) + end + end + + context 'a list' do + context 'without valid rules' do + let(:json_input) { ['not a hash'] } + + it 'warns and returns nil' do + expect(Datadog.logger).to receive(:warn).with(include('not a hash')) + is_expected.to be(nil) + end + end + + context 'with valid rules' do + let(:json_input) { [rule] } + + let(:rule) do + { + name: name, + service: service, + sample_rate: sample_rate, + max_per_second: max_per_second, + } + end + + let(:name) { nil } + let(:service) { nil } + let(:sample_rate) { nil } + let(:max_per_second) { nil } + + context 'and default values' do + it 'delegates defaults to the rule and matcher' do + is_expected.to contain_exactly( + Datadog::Tracing::Sampling::Span::Rule.new(Datadog::Tracing::Sampling::Span::Matcher.new) + ) + end + end + + context 'with name' do + let(:name) { 'name' } + + it 'sets the rule matcher name' do + is_expected.to contain_exactly( + Datadog::Tracing::Sampling::Span::Rule.new( + Datadog::Tracing::Sampling::Span::Matcher.new(name_pattern: name) + ) + ) + end + + context 'with an invalid value' do + let(:name) { { bad: 'name' } } + + it 'warns and returns nil' do + expect(Datadog.logger).to receive(:warn).with(include('{"bad":"name"}') & include('Error')) + is_expected.to be_empty + end + end + end + + context 'with service' do + let(:service) { 'service' } + + it 'sets the rule matcher service' do + is_expected.to contain_exactly( + Datadog::Tracing::Sampling::Span::Rule.new( + Datadog::Tracing::Sampling::Span::Matcher.new(service_pattern: service) + ) + ) + end + + context 'with an invalid value' do + let(:service) { { bad: 'service' } } + + it 'warns and returns nil' do + expect(Datadog.logger).to receive(:warn).with(include('{"bad":"service"}') & include('Error')) + is_expected.to be_empty + end + end + end + + context 'with sample_rate' do + let(:sample_rate) { 1.0 } + + it 'sets the rule matcher service' do + is_expected.to contain_exactly( + Datadog::Tracing::Sampling::Span::Rule.new( + Datadog::Tracing::Sampling::Span::Matcher.new, sample_rate: sample_rate + ) + ) + end + + context 'with an invalid value' do + let(:sample_rate) { { bad: 'sample_rate' } } + + it 'warns and returns nil' do + expect(Datadog.logger).to receive(:warn).with(include('{"bad":"sample_rate"}') & include('Error')) + is_expected.to be_empty + end + end + end + + context 'with max_per_second' do + let(:max_per_second) { 10 } + + it 'sets the rule matcher service' do + is_expected.to contain_exactly( + Datadog::Tracing::Sampling::Span::Rule.new( + Datadog::Tracing::Sampling::Span::Matcher.new, rate_limit: max_per_second + ) + ) + end + + context 'with an invalid value' do + let(:max_per_second) { { bad: 'max_per_second' } } + + it 'warns and returns nil' do + expect(Datadog.logger).to receive(:warn).with(include('{"bad":"max_per_second"}') & include('Error')) + is_expected.to be_empty + end + end + end + end + end + end + end +end From d00ea3aca9932428fb6fa277a7c4ac1caadf90e4 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Thu, 30 Jun 2022 12:14:23 -0700 Subject: [PATCH 08/46] Better error message on json parse error --- lib/datadog/tracing/sampling/span/rule_parser.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/datadog/tracing/sampling/span/rule_parser.rb b/lib/datadog/tracing/sampling/span/rule_parser.rb index 105949809e9..2a6185def00 100644 --- a/lib/datadog/tracing/sampling/span/rule_parser.rb +++ b/lib/datadog/tracing/sampling/span/rule_parser.rb @@ -23,8 +23,9 @@ class << self def parse_json(rules) begin list = JSON.parse(rules) - rescue JSON::ParserError => e - Datadog.logger.warn("Error parsing Span Sampling Rules \"#{e}\" for rules: #{rules}") + rescue => e + Datadog.logger.warn("Error parsing Span Sampling Rules `#{rules}`. "\ + "Cause #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}") return nil end From de3b4a33290fd7c7cc1814a311a824de9caf6bae Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Thu, 30 Jun 2022 12:16:04 -0700 Subject: [PATCH 09/46] Even better error messages --- .../tracing/sampling/span/rule_parser.rb | 10 +++++----- .../tracing/sampling/span/rule_parser_spec.rb | 20 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/datadog/tracing/sampling/span/rule_parser.rb b/lib/datadog/tracing/sampling/span/rule_parser.rb index 2a6185def00..87af3f9ac5c 100644 --- a/lib/datadog/tracing/sampling/span/rule_parser.rb +++ b/lib/datadog/tracing/sampling/span/rule_parser.rb @@ -24,8 +24,8 @@ def parse_json(rules) begin list = JSON.parse(rules) rescue => e - Datadog.logger.warn("Error parsing Span Sampling Rules `#{rules}`. "\ - "Cause #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}") + Datadog.logger.warn("Error parsing Span Sampling Rules `#{rules.inspect}`: "\ + "#{e.class.name} #{e.message} at #{Array(e.backtrace).first}") return nil end @@ -42,21 +42,21 @@ def parse_json(rules) def parse_list(rules) unless rules.is_a?(Array) # Using JSON terminology for the expected error type - Datadog.logger.warn("Span Sampling Rules are not an array: #{JSON.dump(rules)}") + Datadog.logger.warn("Span Sampling Rules are not an array: #{rules.inspect}") return nil end parsed = rules.map do |hash| unless hash.is_a?(Hash) # Using JSON terminology for the expected error type - Datadog.logger.warn("Span Sampling Rule is not a key-value object: #{JSON.dump(hash)}") + Datadog.logger.warn("Span Sampling Rule is not a key-value object: #{hash.inspect}") return nil end begin parse_rule(hash) rescue => e - Datadog.logger.warn("Cannot parse Span Sampling Rule #{JSON.dump(hash)}: " \ + Datadog.logger.warn("Cannot parse Span Sampling Rule #{hash.inspect}: " \ "#{e.class.name} #{e} at #{Array(e.backtrace).first}") nil end diff --git a/spec/datadog/tracing/sampling/span/rule_parser_spec.rb b/spec/datadog/tracing/sampling/span/rule_parser_spec.rb index e0237fa9b9d..a67cc3b1897 100644 --- a/spec/datadog/tracing/sampling/span/rule_parser_spec.rb +++ b/spec/datadog/tracing/sampling/span/rule_parser_spec.rb @@ -21,10 +21,10 @@ context 'valid JSON' do context 'not a list' do - let(:json_input) { { not: 'list' } } + let(:json_input) { { 'not' => 'list' } } it 'warns and returns nil' do - expect(Datadog.logger).to receive(:warn).with(include(rules_string)) + expect(Datadog.logger).to receive(:warn).with(include(json_input.inspect)) is_expected.to be(nil) end end @@ -76,10 +76,10 @@ end context 'with an invalid value' do - let(:name) { { bad: 'name' } } + let(:name) { { 'bad' => 'name' } } it 'warns and returns nil' do - expect(Datadog.logger).to receive(:warn).with(include('{"bad":"name"}') & include('Error')) + expect(Datadog.logger).to receive(:warn).with(include(name.inspect) & include('Error')) is_expected.to be_empty end end @@ -97,10 +97,10 @@ end context 'with an invalid value' do - let(:service) { { bad: 'service' } } + let(:service) { { 'bad' => 'service' } } it 'warns and returns nil' do - expect(Datadog.logger).to receive(:warn).with(include('{"bad":"service"}') & include('Error')) + expect(Datadog.logger).to receive(:warn).with(include(service.inspect) & include('Error')) is_expected.to be_empty end end @@ -118,10 +118,10 @@ end context 'with an invalid value' do - let(:sample_rate) { { bad: 'sample_rate' } } + let(:sample_rate) { { 'bad' => 'sample_rate' } } it 'warns and returns nil' do - expect(Datadog.logger).to receive(:warn).with(include('{"bad":"sample_rate"}') & include('Error')) + expect(Datadog.logger).to receive(:warn).with(include(sample_rate.inspect) & include('Error')) is_expected.to be_empty end end @@ -139,10 +139,10 @@ end context 'with an invalid value' do - let(:max_per_second) { { bad: 'max_per_second' } } + let(:max_per_second) { { 'bad' => 'max_per_second' } } it 'warns and returns nil' do - expect(Datadog.logger).to receive(:warn).with(include('{"bad":"max_per_second"}') & include('Error')) + expect(Datadog.logger).to receive(:warn).with(include(max_per_second.inspect) & include('Error')) is_expected.to be_empty end end From a03ae7f31b4fe62408481b31a9d150a58c822fa3 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Thu, 30 Jun 2022 12:27:36 -0700 Subject: [PATCH 10/46] Remove stable JSON-related comments --- lib/datadog/tracing/sampling/span/rule_parser.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/datadog/tracing/sampling/span/rule_parser.rb b/lib/datadog/tracing/sampling/span/rule_parser.rb index 87af3f9ac5c..d10f6a5747a 100644 --- a/lib/datadog/tracing/sampling/span/rule_parser.rb +++ b/lib/datadog/tracing/sampling/span/rule_parser.rb @@ -41,14 +41,12 @@ def parse_json(rules) # @return [nil] if parsing failed def parse_list(rules) unless rules.is_a?(Array) - # Using JSON terminology for the expected error type Datadog.logger.warn("Span Sampling Rules are not an array: #{rules.inspect}") return nil end parsed = rules.map do |hash| unless hash.is_a?(Hash) - # Using JSON terminology for the expected error type Datadog.logger.warn("Span Sampling Rule is not a key-value object: #{hash.inspect}") return nil end From df907c68c19426a546f1c66225ad13a9ded6e5d5 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Thu, 30 Jun 2022 12:29:59 -0700 Subject: [PATCH 11/46] Return complete parsing error on partial failures --- .rubocop.yml | 3 ++- lib/datadog/tracing/sampling/span/rule_parser.rb | 2 +- spec/datadog/tracing/sampling/span/rule_parser_spec.rb | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 0bbb27fd642..aed7c2e61a9 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -124,8 +124,9 @@ Lint/EmptyClass: # (new in 1.3) Enabled: true Lint/LambdaWithoutLiteralBlock: # (new in 1.8) Enabled: true +# Prevents `return` in an assignment block `var = begin; return; end` block. Lint/NoReturnInBeginEndBlocks: # (new in 1.2) - Enabled: true + Enabled: false Lint/NumberedParameterAssignment: # (new in 1.9) Enabled: true Lint/OrAssignmentToConstant: # (new in 1.9) diff --git a/lib/datadog/tracing/sampling/span/rule_parser.rb b/lib/datadog/tracing/sampling/span/rule_parser.rb index d10f6a5747a..24187f1f617 100644 --- a/lib/datadog/tracing/sampling/span/rule_parser.rb +++ b/lib/datadog/tracing/sampling/span/rule_parser.rb @@ -56,7 +56,7 @@ def parse_list(rules) rescue => e Datadog.logger.warn("Cannot parse Span Sampling Rule #{hash.inspect}: " \ "#{e.class.name} #{e} at #{Array(e.backtrace).first}") - nil + return nil end end diff --git a/spec/datadog/tracing/sampling/span/rule_parser_spec.rb b/spec/datadog/tracing/sampling/span/rule_parser_spec.rb index a67cc3b1897..ca1a692f4ea 100644 --- a/spec/datadog/tracing/sampling/span/rule_parser_spec.rb +++ b/spec/datadog/tracing/sampling/span/rule_parser_spec.rb @@ -80,7 +80,7 @@ it 'warns and returns nil' do expect(Datadog.logger).to receive(:warn).with(include(name.inspect) & include('Error')) - is_expected.to be_empty + is_expected.to be_nil end end end @@ -101,7 +101,7 @@ it 'warns and returns nil' do expect(Datadog.logger).to receive(:warn).with(include(service.inspect) & include('Error')) - is_expected.to be_empty + is_expected.to be_nil end end end @@ -122,7 +122,7 @@ it 'warns and returns nil' do expect(Datadog.logger).to receive(:warn).with(include(sample_rate.inspect) & include('Error')) - is_expected.to be_empty + is_expected.to be_nil end end end @@ -143,7 +143,7 @@ it 'warns and returns nil' do expect(Datadog.logger).to receive(:warn).with(include(max_per_second.inspect) & include('Error')) - is_expected.to be_empty + is_expected.to be_nil end end end From 8dc706f576f8f9bb057ae8a461d59e2f1ca5aee3 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 17 Jun 2022 16:11:10 -0700 Subject: [PATCH 12/46] [Single Span Sampling] Span Sampler --- lib/datadog/tracing/sampling/span/sampler.rb | 45 +++++++++++++ lib/datadog/tracing/tracer.rb | 17 ++++- .../tracing/sampling/span/sampler_spec.rb | 64 +++++++++++++++++++ spec/datadog/tracing/tracer_spec.rb | 37 +++++++++++ 4 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 lib/datadog/tracing/sampling/span/sampler.rb create mode 100644 spec/datadog/tracing/sampling/span/sampler_spec.rb diff --git a/lib/datadog/tracing/sampling/span/sampler.rb b/lib/datadog/tracing/sampling/span/sampler.rb new file mode 100644 index 00000000000..2ff44ae6448 --- /dev/null +++ b/lib/datadog/tracing/sampling/span/sampler.rb @@ -0,0 +1,45 @@ +module Datadog + module Tracing + module Sampling + module Span + # Applies a set of rules to a span. + # This class is used to apply sampling operations to all + # spans in the tracer. + # + # Span sampling is distinct from trace sampling: span + # sampling can keep a span that is part of tracer that was + # rejected by trace sampling. + # + # This class only applies operations to spans that are part + # of traces that were rejected by trace sampling. There's no + # reason to try to sample spans that are already kept by + # the trace sampler. + class Sampler + # Receives sampling rules to apply to individual spans. + # + # @param [Array] rules list of rules to apply to spans + def initialize(rules = []) + @rules = rules + end + + # Applies sampling rules to the span if the trace has been rejected. + # + # If multiple rules match, only the first one is applied. + # + # @param [Datadog::Tracing::TraceOperation] trace_op trace for the provided span + # @param [Datadog::Tracing::SpanOperation] span_op Span to apply sampling rules + # @return [void] + def sample!(trace_op, span_op) + return if trace_op.sampled? + + # Return as soon as one rule returns non-nil + # DEV: `all?{|x|x.nil?}` is faster than `any?{|x|!x.nil?}` + @rules.all? do |rule| + rule.sample!(span_op).nil? + end + end + end + end + end + end +end diff --git a/lib/datadog/tracing/tracer.rb b/lib/datadog/tracing/tracer.rb index 315b10fc7b1..22b8d70ab92 100644 --- a/lib/datadog/tracing/tracer.rb +++ b/lib/datadog/tracing/tracer.rb @@ -11,6 +11,7 @@ require 'datadog/tracing/sampling/all_sampler' require 'datadog/tracing/sampling/rule_sampler' require 'datadog/tracing/sampling/priority_sampler' +require 'datadog/tracing/sampling/span/sampler' require 'datadog/tracing/span_operation' require 'datadog/tracing/trace_digest' require 'datadog/tracing/trace_operation' @@ -28,6 +29,7 @@ class Tracer :trace_flush, :provider, :sampler, + :span_sampler, :tags attr_accessor \ @@ -56,6 +58,7 @@ def initialize( base_sampler: Sampling::AllSampler.new, post_sampler: Sampling::RuleSampler.new ), + span_sampler: Sampling::Span::Sampler.new, tags: {}, writer: Writer.new ) @@ -64,6 +67,7 @@ def initialize( @enabled = enabled @provider = context_provider @sampler = sampler + @span_sampler = span_sampler @tags = tags @writer = writer end @@ -341,7 +345,8 @@ def bind_trace_events!(trace_op) sample_trace(event_trace_op) if event_span_op && event_span_op.parent_id == 0 end - events.span_finished.subscribe do |_event_span, event_trace_op| + events.span_finished.subscribe do |event_span, event_trace_op| + sample_span(event_trace_op, event_span) flush_trace(event_trace_op) end end @@ -461,7 +466,15 @@ def sample_trace(trace_op) begin @sampler.sample!(trace_op) rescue StandardError => e - Datadog.logger.debug { "Failed to sample trace: #{e}" } + Datadog.logger.warn { "Failed to sample trace: #{e}" } + end + end + + def sample_span(trace_op, span) + begin + @span_sampler.sample!(trace_op, span) + rescue StandardError => e + Datadog.logger.warn { "Failed to sample span: #{e.class.name} #{e} at #{Array(e.backtrace).first}" } end end diff --git a/spec/datadog/tracing/sampling/span/sampler_spec.rb b/spec/datadog/tracing/sampling/span/sampler_spec.rb new file mode 100644 index 00000000000..e016aab6b09 --- /dev/null +++ b/spec/datadog/tracing/sampling/span/sampler_spec.rb @@ -0,0 +1,64 @@ +require 'datadog/tracing/sampling/span/matcher' +require 'datadog/tracing/sampling/span/rule' + +require 'datadog/tracing/sampling/span/sampler' + +RSpec.describe Datadog::Tracing::Sampling::Span::Sampler do + subject(:sampler) { described_class.new(rules) } + let(:rules) { [] } + + let(:trace_op) { Datadog::Tracing::TraceOperation.new } + let(:span_op) { Datadog::Tracing::SpanOperation.new('name', service: 'service') } + + describe '#sample!' do + subject(:sample!) { sampler.sample!(trace_op, span_op) } + + shared_examples 'does not modify span' do + it { expect { sample! }.to_not(change { span_op.send(:build_span).to_hash }) } + end + + let(:match_all) { Datadog::Tracing::Sampling::Span::Matcher.new } + context 'no matching rules' do + it_behaves_like 'does not modify span' + end + + context 'with matching rules' do + let(:rules) { [Datadog::Tracing::Sampling::Span::Rule.new(match_all, sample_rate: 1.0, rate_limit: 3)] } + + context 'a kept trace' do + before { trace_op.keep! } + + it_behaves_like 'does not modify span' + end + + context 'a rejected trace' do + before { trace_op.reject! } + + it 'sets mechanism, rule rate and rate limit metrics' do + sample! + + expect(span_op.get_metric('_dd.span_sampling.mechanism')).to eq(8) + expect(span_op.get_metric('_dd.span_sampling.rule_rate')).to eq(1.0) + expect(span_op.get_metric('_dd.span_sampling.max_per_second')).to eq(3) + end + + context 'multiple rules' do + let(:rules) do + [ + Datadog::Tracing::Sampling::Span::Rule.new(match_all, sample_rate: 1.0, rate_limit: 3), + Datadog::Tracing::Sampling::Span::Rule.new(match_all, sample_rate: 0.5, rate_limit: 2), + ] + end + + it 'applies the first matching rule' do + sample! + + expect(span_op.get_metric('_dd.span_sampling.mechanism')).to eq(8) + expect(span_op.get_metric('_dd.span_sampling.rule_rate')).to eq(1.0) + expect(span_op.get_metric('_dd.span_sampling.max_per_second')).to eq(3) + end + end + end + end + end +end diff --git a/spec/datadog/tracing/tracer_spec.rb b/spec/datadog/tracing/tracer_spec.rb index 9711b891126..c7527be26d9 100644 --- a/spec/datadog/tracing/tracer_spec.rb +++ b/spec/datadog/tracing/tracer_spec.rb @@ -509,6 +509,26 @@ end end end + + context 'for span sampling' do + let(:tracer_options) { super().merge(span_sampler: span_sampler) } + let(:span_sampler) { instance_double(Datadog::Tracing::Sampling::Span::Sampler) } + let(:block) do + proc do |span_op, trace_op| + @span_op = span_op + @trace_op = trace_op + end + end + + before do + allow(span_sampler).to receive(:sample!) + end + + it 'invokes the span sampler with the current span and trace operation' do + trace + expect(span_sampler).to have_received(:sample!).with(@trace_op, @span_op.send(:build_span)) + end + end end context 'without a block' do @@ -572,6 +592,23 @@ expect(child.end_time).to be > parent.end_time end end + + context 'for span sampling' do + let(:tracer_options) { super().merge(span_sampler: span_sampler) } + let(:span_sampler) { instance_double(Datadog::Tracing::Sampling::Span::Sampler) } + + before do + allow(span_sampler).to receive(:sample!) + end + + it 'invokes the span sampler with the current span and trace operation' do + span_op = trace + trace_op = tracer.active_trace + span = span_op.finish + + expect(span_sampler).to have_received(:sample!).with(trace_op, span) + end + end end end From 46e05629b91f9da304621281d048fbadbbf141eb Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Thu, 30 Jun 2022 12:52:23 -0700 Subject: [PATCH 13/46] Update result value due to upstream changes --- lib/datadog/tracing/sampling/span/sampler.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/datadog/tracing/sampling/span/sampler.rb b/lib/datadog/tracing/sampling/span/sampler.rb index 2ff44ae6448..b0b097b7645 100644 --- a/lib/datadog/tracing/sampling/span/sampler.rb +++ b/lib/datadog/tracing/sampling/span/sampler.rb @@ -32,11 +32,12 @@ def initialize(rules = []) def sample!(trace_op, span_op) return if trace_op.sampled? - # Return as soon as one rule returns non-nil - # DEV: `all?{|x|x.nil?}` is faster than `any?{|x|!x.nil?}` - @rules.all? do |rule| - rule.sample!(span_op).nil? + # Return as soon as one rule matches + @rules.any? do |rule| + rule.sample!(span_op) != :not_matched end + + nil end end end From b910e41c9078f83ec693d4b458585abe9ecd95b5 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Tue, 5 Jul 2022 15:43:16 -0700 Subject: [PATCH 14/46] Make sure important Tracer errors don't spam output --- lib/datadog/tracing/tracer.rb | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/lib/datadog/tracing/tracer.rb b/lib/datadog/tracing/tracer.rb index 22b8d70ab92..e718c435e43 100644 --- a/lib/datadog/tracing/tracer.rb +++ b/lib/datadog/tracing/tracer.rb @@ -466,28 +466,43 @@ def sample_trace(trace_op) begin @sampler.sample!(trace_op) rescue StandardError => e - Datadog.logger.warn { "Failed to sample trace: #{e}" } + SAMPLE_TRACE_LOG_ONLY_ONCE.run do + Datadog.logger.warn { "Failed to sample trace: #{e.class.name} #{e} at #{Array(e.backtrace).first}" } + end end end + SAMPLE_TRACE_LOG_ONLY_ONCE = Utils::OnlyOnce.new + private_constant :SAMPLE_TRACE_LOG_ONLY_ONCE + def sample_span(trace_op, span) begin @span_sampler.sample!(trace_op, span) rescue StandardError => e - Datadog.logger.warn { "Failed to sample span: #{e.class.name} #{e} at #{Array(e.backtrace).first}" } + SAMPLE_SPAN_LOG_ONLY_ONCE.run do + Datadog.logger.warn { "Failed to sample span: #{e.class.name} #{e} at #{Array(e.backtrace).first}" } + end end end + SAMPLE_SPAN_LOG_ONLY_ONCE = Utils::OnlyOnce.new + private_constant :SAMPLE_SPAN_LOG_ONLY_ONCE + # Flush finished spans from the trace buffer, send them to writer. def flush_trace(trace_op) begin trace = @trace_flush.consume!(trace_op) write(trace) if trace && !trace.empty? rescue StandardError => e - Datadog.logger.debug { "Failed to flush trace: #{e}" } + FLUSH_TRACE_LOG_ONLY_ONCE.run do + Datadog.logger.warn { "Failed to flush trace: #{e.class.name} #{e} at #{Array(e.backtrace).first}" } + end end end + FLUSH_TRACE_LOG_ONLY_ONCE = Utils::OnlyOnce.new + private_constant :FLUSH_TRACE_LOG_ONLY_ONCE + # Send the trace to the writer to enqueue the spans list in the agent # sending queue. def write(trace) From bba9f8d2c48552042b7a8e223f28cc956ec1a306 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Tue, 5 Jul 2022 15:48:35 -0700 Subject: [PATCH 15/46] Fix namespace lookup --- lib/datadog/tracing/tracer.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/datadog/tracing/tracer.rb b/lib/datadog/tracing/tracer.rb index e718c435e43..2fa13cdd73a 100644 --- a/lib/datadog/tracing/tracer.rb +++ b/lib/datadog/tracing/tracer.rb @@ -472,7 +472,7 @@ def sample_trace(trace_op) end end - SAMPLE_TRACE_LOG_ONLY_ONCE = Utils::OnlyOnce.new + SAMPLE_TRACE_LOG_ONLY_ONCE = Core::Utils::OnlyOnce.new private_constant :SAMPLE_TRACE_LOG_ONLY_ONCE def sample_span(trace_op, span) @@ -485,7 +485,7 @@ def sample_span(trace_op, span) end end - SAMPLE_SPAN_LOG_ONLY_ONCE = Utils::OnlyOnce.new + SAMPLE_SPAN_LOG_ONLY_ONCE = Core::Utils::OnlyOnce.new private_constant :SAMPLE_SPAN_LOG_ONLY_ONCE # Flush finished spans from the trace buffer, send them to writer. @@ -500,7 +500,7 @@ def flush_trace(trace_op) end end - FLUSH_TRACE_LOG_ONLY_ONCE = Utils::OnlyOnce.new + FLUSH_TRACE_LOG_ONLY_ONCE = Core::Utils::OnlyOnce.new private_constant :FLUSH_TRACE_LOG_ONLY_ONCE # Send the trace to the writer to enqueue the spans list in the agent From 3b635baae65dd15f4aef09276ffaad8617564180 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Tue, 5 Jul 2022 15:48:49 -0700 Subject: [PATCH 16/46] Simplify test assertion with fewer internal assumptions --- .../tracing/sampling/span/sampler_spec.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/spec/datadog/tracing/sampling/span/sampler_spec.rb b/spec/datadog/tracing/sampling/span/sampler_spec.rb index e016aab6b09..f6cf87ea701 100644 --- a/spec/datadog/tracing/sampling/span/sampler_spec.rb +++ b/spec/datadog/tracing/sampling/span/sampler_spec.rb @@ -17,7 +17,15 @@ it { expect { sample! }.to_not(change { span_op.send(:build_span).to_hash }) } end + shared_examples 'tags span with sampling decision' do + it do + sample! + expect(span_op.get_metric('_dd.span_sampling.mechanism')).to_not be_nil + end + end + let(:match_all) { Datadog::Tracing::Sampling::Span::Matcher.new } + context 'no matching rules' do it_behaves_like 'does not modify span' end @@ -34,13 +42,7 @@ context 'a rejected trace' do before { trace_op.reject! } - it 'sets mechanism, rule rate and rate limit metrics' do - sample! - - expect(span_op.get_metric('_dd.span_sampling.mechanism')).to eq(8) - expect(span_op.get_metric('_dd.span_sampling.rule_rate')).to eq(1.0) - expect(span_op.get_metric('_dd.span_sampling.max_per_second')).to eq(3) - end + it_behaves_like 'tags span with sampling decision' context 'multiple rules' do let(:rules) do @@ -53,7 +55,6 @@ it 'applies the first matching rule' do sample! - expect(span_op.get_metric('_dd.span_sampling.mechanism')).to eq(8) expect(span_op.get_metric('_dd.span_sampling.rule_rate')).to eq(1.0) expect(span_op.get_metric('_dd.span_sampling.max_per_second')).to eq(3) end From c01f95c4f24da3f9e922a8f9b6969680dddc4993 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Tue, 5 Jul 2022 15:52:00 -0700 Subject: [PATCH 17/46] Use public SpanOperation API instead --- spec/datadog/tracing/tracer_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/datadog/tracing/tracer_spec.rb b/spec/datadog/tracing/tracer_spec.rb index c7527be26d9..c13e7666a39 100644 --- a/spec/datadog/tracing/tracer_spec.rb +++ b/spec/datadog/tracing/tracer_spec.rb @@ -526,7 +526,7 @@ it 'invokes the span sampler with the current span and trace operation' do trace - expect(span_sampler).to have_received(:sample!).with(@trace_op, @span_op.send(:build_span)) + expect(span_sampler).to have_received(:sample!).with(@trace_op, @span_op.finish) end end end From eeb2a2b03961882e68f46f16956cbdb598a71629 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Thu, 23 Jun 2022 15:22:56 -0700 Subject: [PATCH 18/46] [Single Span Sampling] Rule configuration settings --- docs/GettingStarted.md | 8 +++ lib/datadog/core/configuration/settings.rb | 42 +++++++++++++++ lib/datadog/tracing/configuration/ext.rb | 6 +++ .../core/configuration/settings_spec.rb | 54 +++++++++++++++++++ 4 files changed, 110 insertions(+) diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md index 81c21472854..cdceb3e8884 100644 --- a/docs/GettingStarted.md +++ b/docs/GettingStarted.md @@ -87,6 +87,7 @@ To contribute, check out the [contribution guidelines][contribution docs] and [d - [Sampling](#sampling) - [Application-side sampling](#application-side-sampling) - [Priority sampling](#priority-sampling) + - [Single Span Sampling](#single-span-sampling) - [Distributed tracing](#distributed-tracing) - [HTTP request queuing](#http-request-queuing) - [Processing pipeline](#processing-pipeline) @@ -2036,6 +2037,7 @@ end | `tracing.sampler` | | `nil` | Advanced usage only. Sets a custom `Datadog::Tracing::Sampling::Sampler` instance. If provided, the tracer will use this sampler to determine sampling behavior. See [Application-side sampling](#application-side-sampling) for details. | | `tracing.sampling.default_rate` | `DD_TRACE_SAMPLE_RATE` | `nil` | Sets the trace sampling rate between `0.0` (0%) and `1.0` (100%). See [Application-side sampling](#application-side-sampling) for details. | | `tracing.sampling.rate_limit` | `DD_TRACE_RATE_LIMIT` | `100` (per second) | Sets a maximum number of traces per second to sample. Set a rate limit to avoid the ingestion volume overages in the case of traffic spikes. | +| `tracing.sampling.span.rules` | `DD_SPAN_SAMPLING_RULES`,`ENV_SPAN_SAMPLING_RULES_FILE` | `nil` | Sets [Single Span Sampling](#single-span-sampling) rules. These rules allow you to keep spans even when their respective traces are dropped. | | `tracing.report_hostname` | `DD_TRACE_REPORT_HOSTNAME` | `false` | Adds hostname tag to traces. | | `tracing.test_mode.enabled` | `DD_TRACE_TEST_MODE_ENABLED` | `false` | Enables or disables test mode, for use of tracing in test suites. | | `tracing.test_mode.trace_flush` | | `nil` | Object that determines trace flushing behavior. | @@ -2180,6 +2182,12 @@ trace.reject! trace.keep! ``` +#### Single Span Sampling + +You can configure sampling rule that allow you keep spans despite their respective traces being dropped by a trace-level sampling rule. + +See (TODO: Insert documentation URL here when published) for the full documentation on Single Span Sampling. + ### Distributed Tracing Distributed tracing allows traces to be propagated across multiple instrumented applications so that a request can be presented as a single trace, rather than a separate trace per service. diff --git a/lib/datadog/core/configuration/settings.rb b/lib/datadog/core/configuration/settings.rb index 9c6a0df5515..efe7577fe4e 100644 --- a/lib/datadog/core/configuration/settings.rb +++ b/lib/datadog/core/configuration/settings.rb @@ -527,6 +527,7 @@ def initialize(*_) option :sampler # Client-side sampling configuration. + # @see https://docs.datadoghq.com/tracing/trace_ingestion/mechanisms/ # @public_api settings :sampling do # Default sampling rate for the tracer. @@ -553,6 +554,47 @@ def initialize(*_) o.default { env_to_float(Tracing::Configuration::Ext::Sampling::ENV_RATE_LIMIT, 100) } o.lazy end + + # Client-side single span sampling configuration. + # @public_api + settings :span do + # Single span sampling rules. + # These rules allow a span to be kept when its encompassing trace is dropped. + # + # The syntax for single span sampling rules can be found here: + # TODO: Insert documentation URL here when published + # + # @default `DD_SPAN_SAMPLING_RULES` environment variable. + # Otherwise, `ENV_SPAN_SAMPLING_RULES_FILE` environment variable. + # Otherwise `nil`. + # @return [String,nil] + option :rules do |o| + o.default do + rules = ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES] + rules_file = ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE] + + if rules + if rules_file + Datadog.logger.warn( + 'Both DD_SPAN_SAMPLING_RULES and DD_SPAN_SAMPLING_RULES_FILE were provided: only ' \ + 'DD_SPAN_SAMPLING_RULES will be used. Please do not provide DD_SPAN_SAMPLING_RULES_FILE when ' \ + 'also providing DD_SPAN_SAMPLING_RULES as their configuration conflicts.' + ) + end + rules + elsif rules_file + begin + File.read(rules_file) + rescue => e + # `File#read` errors have clear and actionable messages, no need to add extra exception info. + Datadog.logger.warn("Cannot read span sampling rules file: #{e.message}") + nil + end + end + end + o.lazy + end + end end # [Continuous Integration Visibility](https://docs.datadoghq.com/continuous_integration/) configuration. diff --git a/lib/datadog/tracing/configuration/ext.rb b/lib/datadog/tracing/configuration/ext.rb index 3682ee3f851..a139b71a122 100644 --- a/lib/datadog/tracing/configuration/ext.rb +++ b/lib/datadog/tracing/configuration/ext.rb @@ -32,6 +32,12 @@ module NET module Sampling ENV_SAMPLE_RATE = 'DD_TRACE_SAMPLE_RATE'.freeze ENV_RATE_LIMIT = 'DD_TRACE_RATE_LIMIT'.freeze + + # @public_api + module Span + ENV_SPAN_SAMPLING_RULES = 'DD_SPAN_SAMPLING_RULES'.freeze + ENV_SPAN_SAMPLING_RULES_FILE = 'DD_SPAN_SAMPLING_RULES_FILE'.freeze + end end # @public_api diff --git a/spec/datadog/core/configuration/settings_spec.rb b/spec/datadog/core/configuration/settings_spec.rb index cd887254db7..4f4cbd3e077 100644 --- a/spec/datadog/core/configuration/settings_spec.rb +++ b/spec/datadog/core/configuration/settings_spec.rb @@ -1208,6 +1208,60 @@ it { is_expected.to eq(0.5) } end end + + describe '#span' do + describe '#rules' do + subject(:rules) { settings.tracing.sampling.span.rules } + + context 'default' do + it { is_expected.to be nil } + end + + context 'when DD_SPAN_SAMPLING_RULES is provided' do + around do |example| + ClimateControl.modify( + Datadog::Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES => '{}' + ) do + example.run + end + end + + it { is_expected.to eq('{}') } + + context 'and DD_SPAN_SAMPLING_RULES_FILE is also provided' do + around do |example| + ClimateControl.modify( + Datadog::Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE => 'path' + ) do + example.run + end + end + + it 'emits a conflict warning and returns DD_SPAN_SAMPLING_RULES' do + expect(Datadog.logger).to receive(:warn).with(include('configuration conflict')) + is_expected.to eq('{}') + end + end + end + + context 'when DD_SPAN_SAMPLING_RULES_FILE is provided' do + around do |example| + Tempfile.open('DD_SPAN_SAMPLING_RULES_FILE') do |f| + f.write('{from:"file"}') + f.flush + + ClimateControl.modify( + Datadog::Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE => f.path + ) do + example.run + end + end + end + + it { is_expected.to eq('{from:"file"}') } + end + end + end end describe '#test_mode' do From f3ff487e44b8975e0ccfcbe81556567894e44153 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Tue, 5 Jul 2022 16:10:50 -0700 Subject: [PATCH 19/46] Better TODO message --- docs/GettingStarted.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md index cdceb3e8884..f14aed32590 100644 --- a/docs/GettingStarted.md +++ b/docs/GettingStarted.md @@ -2186,7 +2186,7 @@ trace.keep! You can configure sampling rule that allow you keep spans despite their respective traces being dropped by a trace-level sampling rule. -See (TODO: Insert documentation URL here when published) for the full documentation on Single Span Sampling. +See (TODO: Insert documentation URL here when published. Search for references of this TODO) for the full documentation on Single Span Sampling. ### Distributed Tracing From 1fc16211cd8f75d6992b2531fc6e274911e1ac94 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Tue, 5 Jul 2022 16:12:09 -0700 Subject: [PATCH 20/46] Remove one setting nesting level --- docs/GettingStarted.md | 2 +- lib/datadog/core/configuration/settings.rb | 64 +++++++++--------- .../core/configuration/settings_spec.rb | 66 +++++++++---------- 3 files changed, 64 insertions(+), 68 deletions(-) diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md index f14aed32590..addde37741a 100644 --- a/docs/GettingStarted.md +++ b/docs/GettingStarted.md @@ -2037,7 +2037,7 @@ end | `tracing.sampler` | | `nil` | Advanced usage only. Sets a custom `Datadog::Tracing::Sampling::Sampler` instance. If provided, the tracer will use this sampler to determine sampling behavior. See [Application-side sampling](#application-side-sampling) for details. | | `tracing.sampling.default_rate` | `DD_TRACE_SAMPLE_RATE` | `nil` | Sets the trace sampling rate between `0.0` (0%) and `1.0` (100%). See [Application-side sampling](#application-side-sampling) for details. | | `tracing.sampling.rate_limit` | `DD_TRACE_RATE_LIMIT` | `100` (per second) | Sets a maximum number of traces per second to sample. Set a rate limit to avoid the ingestion volume overages in the case of traffic spikes. | -| `tracing.sampling.span.rules` | `DD_SPAN_SAMPLING_RULES`,`ENV_SPAN_SAMPLING_RULES_FILE` | `nil` | Sets [Single Span Sampling](#single-span-sampling) rules. These rules allow you to keep spans even when their respective traces are dropped. | +| `tracing.sampling.span_rules` | `DD_SPAN_SAMPLING_RULES`,`ENV_SPAN_SAMPLING_RULES_FILE` | `nil` | Sets [Single Span Sampling](#single-span-sampling) rules. These rules allow you to keep spans even when their respective traces are dropped. | | `tracing.report_hostname` | `DD_TRACE_REPORT_HOSTNAME` | `false` | Adds hostname tag to traces. | | `tracing.test_mode.enabled` | `DD_TRACE_TEST_MODE_ENABLED` | `false` | Enables or disables test mode, for use of tracing in test suites. | | `tracing.test_mode.trace_flush` | | `nil` | Object that determines trace flushing behavior. | diff --git a/lib/datadog/core/configuration/settings.rb b/lib/datadog/core/configuration/settings.rb index efe7577fe4e..5309c88836a 100644 --- a/lib/datadog/core/configuration/settings.rb +++ b/lib/datadog/core/configuration/settings.rb @@ -555,45 +555,42 @@ def initialize(*_) o.lazy end - # Client-side single span sampling configuration. + # Single span sampling rules. + # These rules allow a span to be kept when its encompassing trace is dropped. + # + # The syntax for single span sampling rules can be found here: + # TODO: Insert documentation URL here when published. Search for references of this TODO + # + # @default `DD_SPAN_SAMPLING_RULES` environment variable. + # Otherwise, `ENV_SPAN_SAMPLING_RULES_FILE` environment variable. + # Otherwise `nil`. + # @return [String,nil] # @public_api - settings :span do - # Single span sampling rules. - # These rules allow a span to be kept when its encompassing trace is dropped. - # - # The syntax for single span sampling rules can be found here: - # TODO: Insert documentation URL here when published - # - # @default `DD_SPAN_SAMPLING_RULES` environment variable. - # Otherwise, `ENV_SPAN_SAMPLING_RULES_FILE` environment variable. - # Otherwise `nil`. - # @return [String,nil] - option :rules do |o| - o.default do - rules = ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES] - rules_file = ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE] - - if rules - if rules_file - Datadog.logger.warn( - 'Both DD_SPAN_SAMPLING_RULES and DD_SPAN_SAMPLING_RULES_FILE were provided: only ' \ + option :span_rules do |o| + o.default do + rules = ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES] + rules_file = ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE] + + if rules + if rules_file + Datadog.logger.warn( + 'Both DD_SPAN_SAMPLING_RULES and DD_SPAN_SAMPLING_RULES_FILE were provided: only ' \ 'DD_SPAN_SAMPLING_RULES will be used. Please do not provide DD_SPAN_SAMPLING_RULES_FILE when ' \ 'also providing DD_SPAN_SAMPLING_RULES as their configuration conflicts.' - ) - end - rules - elsif rules_file - begin - File.read(rules_file) - rescue => e - # `File#read` errors have clear and actionable messages, no need to add extra exception info. - Datadog.logger.warn("Cannot read span sampling rules file: #{e.message}") - nil - end + ) + end + rules + elsif rules_file + begin + File.read(rules_file) + rescue => e + # `File#read` errors have clear and actionable messages, no need to add extra exception info. + Datadog.logger.warn("Cannot read span sampling rules file: #{e.message}") + nil end end - o.lazy end + o.lazy end end @@ -659,6 +656,7 @@ def initialize(*_) o.lazy end end + # rubocop:enable Metrics/BlockLength # rubocop:enable Metrics/ClassLength # rubocop:enable Layout/LineLength diff --git a/spec/datadog/core/configuration/settings_spec.rb b/spec/datadog/core/configuration/settings_spec.rb index 4f4cbd3e077..0c8d52a4caf 100644 --- a/spec/datadog/core/configuration/settings_spec.rb +++ b/spec/datadog/core/configuration/settings_spec.rb @@ -1209,57 +1209,55 @@ end end - describe '#span' do - describe '#rules' do - subject(:rules) { settings.tracing.sampling.span.rules } + describe '#span_rules' do + subject(:rules) { settings.tracing.sampling.span_rules } - context 'default' do - it { is_expected.to be nil } + context 'default' do + it { is_expected.to be nil } + end + + context 'when DD_SPAN_SAMPLING_RULES is provided' do + around do |example| + ClimateControl.modify( + Datadog::Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES => '{}' + ) do + example.run + end end - context 'when DD_SPAN_SAMPLING_RULES is provided' do + it { is_expected.to eq('{}') } + + context 'and DD_SPAN_SAMPLING_RULES_FILE is also provided' do around do |example| ClimateControl.modify( - Datadog::Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES => '{}' + Datadog::Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE => 'path' ) do example.run end end - it { is_expected.to eq('{}') } - - context 'and DD_SPAN_SAMPLING_RULES_FILE is also provided' do - around do |example| - ClimateControl.modify( - Datadog::Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE => 'path' - ) do - example.run - end - end - - it 'emits a conflict warning and returns DD_SPAN_SAMPLING_RULES' do - expect(Datadog.logger).to receive(:warn).with(include('configuration conflict')) - is_expected.to eq('{}') - end + it 'emits a conflict warning and returns DD_SPAN_SAMPLING_RULES' do + expect(Datadog.logger).to receive(:warn).with(include('configuration conflict')) + is_expected.to eq('{}') end end + end - context 'when DD_SPAN_SAMPLING_RULES_FILE is provided' do - around do |example| - Tempfile.open('DD_SPAN_SAMPLING_RULES_FILE') do |f| - f.write('{from:"file"}') - f.flush + context 'when DD_SPAN_SAMPLING_RULES_FILE is provided' do + around do |example| + Tempfile.open('DD_SPAN_SAMPLING_RULES_FILE') do |f| + f.write('{from:"file"}') + f.flush - ClimateControl.modify( - Datadog::Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE => f.path - ) do - example.run - end + ClimateControl.modify( + Datadog::Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE => f.path + ) do + example.run end end - - it { is_expected.to eq('{from:"file"}') } end + + it { is_expected.to eq('{from:"file"}') } end end end From c3eea875f2d9b527e688b57e9c5c2db5a673b332 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Tue, 5 Jul 2022 16:13:48 -0700 Subject: [PATCH 21/46] Add value to conflict setting message --- lib/datadog/core/configuration/settings.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/datadog/core/configuration/settings.rb b/lib/datadog/core/configuration/settings.rb index 5309c88836a..2d25c441894 100644 --- a/lib/datadog/core/configuration/settings.rb +++ b/lib/datadog/core/configuration/settings.rb @@ -576,7 +576,8 @@ def initialize(*_) Datadog.logger.warn( 'Both DD_SPAN_SAMPLING_RULES and DD_SPAN_SAMPLING_RULES_FILE were provided: only ' \ 'DD_SPAN_SAMPLING_RULES will be used. Please do not provide DD_SPAN_SAMPLING_RULES_FILE when ' \ - 'also providing DD_SPAN_SAMPLING_RULES as their configuration conflicts.' + 'also providing DD_SPAN_SAMPLING_RULES as their configuration conflicts. ' \ + "DD_SPAN_SAMPLING_RULES_FILE=#{rules_file} DD_SPAN_SAMPLING_RULES=#{rules}" ) end rules From 898709be75b40f1fca9009656caa92233cc72da6 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Tue, 5 Jul 2022 16:15:33 -0700 Subject: [PATCH 22/46] Better file read error message --- lib/datadog/core/configuration/settings.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/datadog/core/configuration/settings.rb b/lib/datadog/core/configuration/settings.rb index 2d25c441894..527445936bc 100644 --- a/lib/datadog/core/configuration/settings.rb +++ b/lib/datadog/core/configuration/settings.rb @@ -586,7 +586,10 @@ def initialize(*_) File.read(rules_file) rescue => e # `File#read` errors have clear and actionable messages, no need to add extra exception info. - Datadog.logger.warn("Cannot read span sampling rules file: #{e.message}") + Datadog.logger.warn( + "Cannot read span sampling rules file `#{rules_file}`: #{e.message}." \ + 'No span sampling rules will be applied.' + ) nil end end From f9260889335790c0695b769d04813b24fdf1a66c Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Wed, 6 Jul 2022 12:18:46 -0700 Subject: [PATCH 23/46] [Single Span Sampling] Consider traces with priority sampling <= 0 as rejected --- lib/datadog/tracing/sampling/span/sampler.rb | 5 +++- lib/datadog/tracing/trace_operation.rb | 16 +++++++++- .../tracing/sampling/span/sampler_spec.rb | 9 ++++++ spec/datadog/tracing/trace_operation_spec.rb | 30 +++++++++++++++++++ 4 files changed, 58 insertions(+), 2 deletions(-) diff --git a/lib/datadog/tracing/sampling/span/sampler.rb b/lib/datadog/tracing/sampling/span/sampler.rb index b0b097b7645..0f789e8678f 100644 --- a/lib/datadog/tracing/sampling/span/sampler.rb +++ b/lib/datadog/tracing/sampling/span/sampler.rb @@ -23,6 +23,9 @@ def initialize(rules = []) end # Applies sampling rules to the span if the trace has been rejected. + # The tracer can be outright rejected, and never reach the transport, + # or be set as rejected by priority sampling. In both cases, the trace + # is considered rejected for Single Span Sampling purposes. # # If multiple rules match, only the first one is applied. # @@ -30,7 +33,7 @@ def initialize(rules = []) # @param [Datadog::Tracing::SpanOperation] span_op Span to apply sampling rules # @return [void] def sample!(trace_op, span_op) - return if trace_op.sampled? + return if trace_op.sampled? && trace_op.priority_sampled? # Return as soon as one rule matches @rules.any? do |rule| diff --git a/lib/datadog/tracing/trace_operation.rb b/lib/datadog/tracing/trace_operation.rb index e6189a40db0..8ff420ecdfe 100644 --- a/lib/datadog/tracing/trace_operation.rb +++ b/lib/datadog/tracing/trace_operation.rb @@ -113,8 +113,22 @@ def finished? @finished == true end + # Will this trace be flushed by the tracer transport? + # This includes cases where the span is kept solely due to priority sampling. + # + # This is not the ultimate Datadog App sampling decision. Downstream systems + # can decide to reject this trace, especially for cases where priority + # sampling is set to AUTO_KEEP. + # + # @return [Boolean] def sampled? - @sampled == true || (!@sampling_priority.nil? && @sampling_priority > 0) + @sampled == true || priority_sampled? + end + + # Has the priority sampling chosen to keep this span? + # @return [Boolean] + def priority_sampled? + !@sampling_priority.nil? && @sampling_priority > 0 end def keep! diff --git a/spec/datadog/tracing/sampling/span/sampler_spec.rb b/spec/datadog/tracing/sampling/span/sampler_spec.rb index f6cf87ea701..1207ecda280 100644 --- a/spec/datadog/tracing/sampling/span/sampler_spec.rb +++ b/spec/datadog/tracing/sampling/span/sampler_spec.rb @@ -60,6 +60,15 @@ end end end + + context 'a trace rejected by priority sampling only' do + before do + trace_op.keep! + trace_op.sampling_priority = Datadog::Tracing::Sampling::Ext::Priority::AUTO_REJECT + end + + it_behaves_like 'tags span with sampling decision' + end end end end diff --git a/spec/datadog/tracing/trace_operation_spec.rb b/spec/datadog/tracing/trace_operation_spec.rb index f188a973673..7c428167e78 100644 --- a/spec/datadog/tracing/trace_operation_spec.rb +++ b/spec/datadog/tracing/trace_operation_spec.rb @@ -724,6 +724,36 @@ end end + describe '#priority_sampled?' do + subject(:priority_sampled?) { trace_op.priority_sampled? } + + it { is_expected.to be false } + + context 'when :sampling_priority is set to' do + let(:options) { { sampling_priority: sampling_priority } } + + context 'AUTO_KEEP' do + let(:sampling_priority) { Datadog::Tracing::Sampling::Ext::Priority::AUTO_KEEP } + it { is_expected.to be true } + end + + context 'AUTO_REJECT' do + let(:sampling_priority) { Datadog::Tracing::Sampling::Ext::Priority::AUTO_REJECT } + it { is_expected.to be false } + end + + context 'USER_KEEP' do + let(:sampling_priority) { Datadog::Tracing::Sampling::Ext::Priority::USER_KEEP } + it { is_expected.to be true } + end + + context 'USER_REJECT' do + let(:sampling_priority) { Datadog::Tracing::Sampling::Ext::Priority::USER_REJECT } + it { is_expected.to be false } + end + end + end + describe '#keep!' do subject(:keep!) { trace_op.keep! } From 5013c3114583ba752c76d05332a2fbfcdf9f0283 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Thu, 7 Jul 2022 18:13:17 -0700 Subject: [PATCH 24/46] Tell agent to trust trace top-level span tagging --- lib/ddtrace/transport/ext.rb | 7 +++++++ lib/ddtrace/transport/http.rb | 3 +++ spec/ddtrace/transport/http_spec.rb | 1 + 3 files changed, 11 insertions(+) diff --git a/lib/ddtrace/transport/ext.rb b/lib/ddtrace/transport/ext.rb index 288e9d92ce4..703997225d6 100644 --- a/lib/ddtrace/transport/ext.rb +++ b/lib/ddtrace/transport/ext.rb @@ -13,6 +13,13 @@ module HTTP HEADER_CONTAINER_ID = 'Datadog-Container-ID'.freeze HEADER_DD_API_KEY = 'DD-API-KEY'.freeze + # Tells agent that `_dd.top_level` metrics have been set by the tracer. + # The agent will not calculate top-level spans but instead trust the tracer tagging. + # + # This prevents partially flushed traces being mistakenly marked as top-level. + # + # Setting this header to any non-empty value enables this feature. + HEADER_CLIENT_COMPUTED_TOP_LEVEL = 'Datadog-Client-Computed-Top-Level'.freeze HEADER_META_LANG = 'Datadog-Meta-Lang'.freeze HEADER_META_LANG_VERSION = 'Datadog-Meta-Lang-Version'.freeze HEADER_META_LANG_INTERPRETER = 'Datadog-Meta-Lang-Interpreter'.freeze diff --git a/lib/ddtrace/transport/http.rb b/lib/ddtrace/transport/http.rb index a7cb8e8cccc..3f160502244 100644 --- a/lib/ddtrace/transport/http.rb +++ b/lib/ddtrace/transport/http.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # typed: true require 'uri' @@ -67,6 +69,7 @@ def default( def default_headers { + Datadog::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_TOP_LEVEL => '1', Datadog::Transport::Ext::HTTP::HEADER_META_LANG => Datadog::Core::Environment::Ext::LANG, Datadog::Transport::Ext::HTTP::HEADER_META_LANG_VERSION => Datadog::Core::Environment::Ext::LANG_VERSION, Datadog::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER => Datadog::Core::Environment::Ext::LANG_INTERPRETER, diff --git a/spec/ddtrace/transport/http_spec.rb b/spec/ddtrace/transport/http_spec.rb index 7ca044b7e62..809a4f20bd0 100644 --- a/spec/ddtrace/transport/http_spec.rb +++ b/spec/ddtrace/transport/http_spec.rb @@ -169,6 +169,7 @@ it do is_expected.to include( + Datadog::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_TOP_LEVEL => '1', Datadog::Transport::Ext::HTTP::HEADER_META_LANG => Datadog::Core::Environment::Ext::LANG, Datadog::Transport::Ext::HTTP::HEADER_META_LANG_VERSION => Datadog::Core::Environment::Ext::LANG_VERSION, Datadog::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER => Datadog::Core::Environment::Ext::LANG_INTERPRETER, From ca91ac883bea79506b184b693d069ac97e89db06 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Wed, 6 Jul 2022 14:38:13 -0700 Subject: [PATCH 25/46] Wire Single Span Sampling --- lib/datadog/core/configuration/components.rb | 8 + lib/datadog/tracing/flush.rb | 3 +- lib/datadog/tracing/metadata/tagging.rb | 7 + .../tracing/sampling/span/rule_parser.rb | 2 + lib/datadog/tracing/sampling/span/sampler.rb | 2 + lib/datadog/tracing/span.rb | 7 + lib/datadog/tracing/trace_operation.rb | 48 ++- lib/datadog/tracing/trace_segment.rb | 1 + spec/datadog/ci/flush_spec.rb | 24 +- .../core/configuration/components_spec.rb | 32 ++ spec/datadog/tracing/flush_spec.rb | 50 +-- spec/datadog/tracing/integration_spec.rb | 236 +++++++++++++- .../tracing/sampling/span/rule_parser_spec.rb | 8 + spec/datadog/tracing/span_spec.rb | 20 ++ spec/datadog/tracing/trace_operation_spec.rb | 296 ++++++++++++------ 15 files changed, 581 insertions(+), 163 deletions(-) diff --git a/lib/datadog/core/configuration/components.rb b/lib/datadog/core/configuration/components.rb index 7fb23802548..63cf238494c 100644 --- a/lib/datadog/core/configuration/components.rb +++ b/lib/datadog/core/configuration/components.rb @@ -10,6 +10,8 @@ require 'datadog/tracing/tracer' require 'datadog/tracing/flush' require 'datadog/tracing/sync_writer' +require 'datadog/tracing/sampling/span/rule_parser' +require 'datadog/tracing/sampling/span/sampler' module Datadog module Core @@ -75,6 +77,7 @@ def build_tracer(settings, agent_settings) enabled: settings.tracing.enabled, trace_flush: trace_flush, sampler: sampler, + span_sampler: build_span_sampler(settings), writer: writer, tags: build_tracer_tags(settings), ) @@ -178,6 +181,11 @@ def writer_update_priority_sampler_rates_callback(sampler) end end + def build_span_sampler(settings) + rules = Tracing::Sampling::Span::RuleParser.parse_json(settings.tracing.sampling.span_rules) + Tracing::Sampling::Span::Sampler.new(rules || []) + end + def build_profiler(settings, agent_settings, tracer) return unless settings.profiling.enabled diff --git a/lib/datadog/tracing/flush.rb b/lib/datadog/tracing/flush.rb index 2be184bccbf..8c580c4fa41 100644 --- a/lib/datadog/tracing/flush.rb +++ b/lib/datadog/tracing/flush.rb @@ -18,7 +18,7 @@ def consume!(trace_op) end def full_flush?(trace_op) - trace_op && trace_op.sampled? && trace_op.finished? + trace_op && trace_op.finished? end protected @@ -56,7 +56,6 @@ def consume!(trace_op) end def partial_flush?(trace_op) - return false unless trace_op.sampled? return true if trace_op.finished? return false if trace_op.finished_span_count < @min_spans_for_partial diff --git a/lib/datadog/tracing/metadata/tagging.rb b/lib/datadog/tracing/metadata/tagging.rb index 90e8a2a33b3..10b1a2edc6b 100644 --- a/lib/datadog/tracing/metadata/tagging.rb +++ b/lib/datadog/tracing/metadata/tagging.rb @@ -65,6 +65,13 @@ def set_tags(tags) tags.each { |k, v| set_tag(k, v) } end + # Returns true if the provided `tag` was set to a non-nil value. False otherwise. + # @param [String] tag the tag or metric to check for presence + # @return [Boolean] + def tag?(tag) + !get_tag(tag).nil? # nil is considered not present, thus we can't use `Hash#has_key?` + end + # This method removes a tag for the given key. def clear_tag(key) meta.delete(key) diff --git a/lib/datadog/tracing/sampling/span/rule_parser.rb b/lib/datadog/tracing/sampling/span/rule_parser.rb index 24187f1f617..7d57c599f4a 100644 --- a/lib/datadog/tracing/sampling/span/rule_parser.rb +++ b/lib/datadog/tracing/sampling/span/rule_parser.rb @@ -21,6 +21,8 @@ class << self # @return [Array] a list of parsed rules # @return [nil] if parsing failed def parse_json(rules) + return nil unless rules + begin list = JSON.parse(rules) rescue => e diff --git a/lib/datadog/tracing/sampling/span/sampler.rb b/lib/datadog/tracing/sampling/span/sampler.rb index 0f789e8678f..693fb3986af 100644 --- a/lib/datadog/tracing/sampling/span/sampler.rb +++ b/lib/datadog/tracing/sampling/span/sampler.rb @@ -15,6 +15,8 @@ module Span # reason to try to sample spans that are already kept by # the trace sampler. class Sampler + attr_reader :rules + # Receives sampling rules to apply to individual spans. # # @param [Array] rules list of rules to apply to spans diff --git a/lib/datadog/tracing/span.rb b/lib/datadog/tracing/span.rb index ef88ff0ac5f..1094ac6d179 100644 --- a/lib/datadog/tracing/span.rb +++ b/lib/datadog/tracing/span.rb @@ -204,6 +204,13 @@ def pretty_print(q) end end + # Single Span Sampling has chosen to keep this span + # regardless of the trace-level sampling decision + # @!visibility private + def single_sampled? + get_metric(Sampling::Span::Ext::TAG_MECHANISM) == Sampling::Span::Ext::MECHANISM_SPAN_SAMPLING_RATE + end + private # Used for serialization diff --git a/lib/datadog/tracing/trace_operation.rb b/lib/datadog/tracing/trace_operation.rb index 8ff420ecdfe..25e8cc4520a 100644 --- a/lib/datadog/tracing/trace_operation.rb +++ b/lib/datadog/tracing/trace_operation.rb @@ -240,15 +240,27 @@ def build_span( end end + # Returns a {TraceSegment} with all finished spans that can be flushed + # at invocation time. All other **finished** spans are discarded. + # + # A span can be flushed if: + # + # 1. The span has finished, and + # 2. Either: + # a. The trace is kept by sampling. + # b. The span is kept by single span sampling. + # + # Unfinished spans are not affected by this method. + # + # @return [TraceSegment] def flush! - finished = finished? - - # Copy out completed spans - spans = @spans.dup - @spans = [] - - # Use them to build a trace - build_trace(spans, !finished) + if sampled? + flush_all_spans! + else + # Only spans where the span-level sampling overrides + # the trace-level sampling can be flushed. + flush_single_sampled_spans_only! + end end # Returns a set of trace headers used for continuing traces. @@ -417,6 +429,26 @@ def set_root_span!(span) @root_span = span end + # Flushes all spans from this trace + def flush_all_spans! + # Copy out completed spans + spans = @spans.dup + @spans = [] + + # Use them to build a trace + build_trace(spans, !finished?) + end + + # Flush single sampled span only, as the trace as a whole was dropped by trace-level sampling + def flush_single_sampled_spans_only! + # Copy out completed, selected spans + spans = @spans.select(&:single_sampled?) + @spans = [] + + # Use them to build a trace + build_trace(spans, true) + end + def build_trace(spans, partial = false) TraceSegment.new( spans, diff --git a/lib/datadog/tracing/trace_segment.rb b/lib/datadog/tracing/trace_segment.rb index 272ecf0bca0..6ef801b9eb8 100644 --- a/lib/datadog/tracing/trace_segment.rb +++ b/lib/datadog/tracing/trace_segment.rb @@ -36,6 +36,7 @@ class TraceSegment # rubocop:disable Metrics/CyclomaticComplexity # rubocop:disable Metrics/PerceivedComplexity + # @param spans [Array] def initialize( spans, agent_sample_rate: nil, diff --git a/spec/datadog/ci/flush_spec.rb b/spec/datadog/ci/flush_spec.rb index dbe24fe28d1..a8df081e07b 100644 --- a/spec/datadog/ci/flush_spec.rb +++ b/spec/datadog/ci/flush_spec.rb @@ -13,14 +13,12 @@ instance_double( Datadog::Tracing::TraceOperation, origin: origin, - sampled?: sampled, finished?: finished, flush!: trace ) end let(:origin) { 'ci-origin' } - let(:sampled) { true } let(:finished) { true } let(:trace) { Datadog::Tracing::TraceSegment.new(spans, origin: origin) } @@ -31,23 +29,15 @@ context 'given a finished trace operation' do let(:finished) { true } - context 'that is not sampled' do - let(:sampled) { false } - it { is_expected.to be nil } - end - - context 'that is sampled' do - let(:sampled) { true } - it { is_expected.to eq(trace) } + it { is_expected.to eq(trace) } - it 'tags every span with the origin' do - is_expected.to eq(trace) + it 'tags every span with the origin' do + is_expected.to eq(trace) - # Expect each span to have an attached origin - trace.spans.each do |span| - expect(span.get_tag(Datadog::Tracing::Metadata::Ext::Distributed::TAG_ORIGIN)) - .to eq(trace.origin) - end + # Expect each span to have an attached origin + trace.spans.each do |span| + expect(span.get_tag(Datadog::Tracing::Metadata::Ext::Distributed::TAG_ORIGIN)) + .to eq(trace.origin) end end end diff --git a/spec/datadog/core/configuration/components_spec.rb b/spec/datadog/core/configuration/components_spec.rb index 628d68e9e64..19d32c41aa9 100644 --- a/spec/datadog/core/configuration/components_spec.rb +++ b/spec/datadog/core/configuration/components_spec.rb @@ -379,6 +379,7 @@ end end end + let(:span_sampler) { be_a(Datadog::Tracing::Sampling::Span::Sampler) } let(:default_options) do { default_service: settings.service, @@ -386,6 +387,7 @@ trace_flush: trace_flush, tags: settings.tags, sampler: sampler, + span_sampler: span_sampler, writer: writer, } end @@ -592,6 +594,36 @@ end end + context 'with sampling.span_rules' do + before { allow(settings.tracing.sampling).to receive(:span_rules).and_return(rules) } + + context 'with rules' do + let(:rules) { '[{"name":"foo"}]' } + + it_behaves_like 'new tracer' do + let(:options) do + { + span_sampler: be_a(Datadog::Tracing::Sampling::Span::Sampler) & have_attributes( + rules: [ + Datadog::Tracing::Sampling::Span::Rule.new( + Datadog::Tracing::Sampling::Span::Matcher.new(name_pattern: 'foo') + ) + ] + ) + } + end + end + end + + context 'without rules' do + let(:rules) { nil } + + it_behaves_like 'new tracer' do + let(:options) { { span_sampler: be_a(Datadog::Tracing::Sampling::Span::Sampler) & have_attributes(rules: []) } } + end + end + end + context 'with :service' do let(:service) { double('service') } diff --git a/spec/datadog/tracing/flush_spec.rb b/spec/datadog/tracing/flush_spec.rb index 7573956132a..760018a2f46 100644 --- a/spec/datadog/tracing/flush_spec.rb +++ b/spec/datadog/tracing/flush_spec.rb @@ -10,13 +10,11 @@ let(:trace_op) do instance_double( Datadog::Tracing::TraceOperation, - sampled?: sampled, finished?: finished, flush!: trace ) end - let(:sampled) { true } let(:finished) { true } let(:trace) { instance_double(Datadog::Tracing::TraceSegment) } end @@ -25,15 +23,7 @@ context 'given a finished trace operation' do let(:finished) { true } - context 'that is not sampled' do - let(:sampled) { false } - it { is_expected.to be nil } - end - - context 'that is sampled' do - let(:sampled) { true } - it { is_expected.to eq(trace) } - end + it { is_expected.to eq(trace) } end end @@ -48,16 +38,7 @@ context 'with partially completed trace operation' do let(:finished) { false } - - context 'that is not sampled' do - let(:sampled) { false } - it { is_expected.to be nil } - end - - context 'that is sampled' do - let(:sampled) { true } - it { is_expected.to be nil } - end + it { is_expected.to be nil } end end end @@ -76,27 +57,18 @@ context 'with partially completed trace operation' do let(:finished) { false } - context 'that is not sampled' do - let(:sampled) { false } - it { is_expected.to be nil } + before do + allow(trace_op).to receive(:finished_span_count).and_return(finished_span_count) end - context 'that is sampled' do - let(:sampled) { true } - - before do - allow(trace_op).to receive(:finished_span_count).and_return(finished_span_count) - end - - context 'containing fewer than the minimum required spans' do - let(:finished_span_count) { min_spans_for_partial - 1 } - it { is_expected.to be nil } - end + context 'containing fewer than the minimum required spans' do + let(:finished_span_count) { min_spans_for_partial - 1 } + it { is_expected.to be nil } + end - context 'containing at least the minimum required spans' do - let(:finished_span_count) { min_spans_for_partial } - it { is_expected.to eq(trace) } - end + context 'containing at least the minimum required spans' do + let(:finished_span_count) { min_spans_for_partial } + it { is_expected.to eq(trace) } end end end diff --git a/spec/datadog/tracing/integration_spec.rb b/spec/datadog/tracing/integration_spec.rb index bc6600e93fc..608c38edf13 100644 --- a/spec/datadog/tracing/integration_spec.rb +++ b/spec/datadog/tracing/integration_spec.rb @@ -31,13 +31,20 @@ shared_examples 'flushed trace' do it do - expect(stats[:traces_flushed]).to eq(1) - expect(stats[:transport].client_error).to eq(0) - expect(stats[:transport].server_error).to eq(0) - expect(stats[:transport].internal_error).to eq(0) + expect(stats).to include(traces_flushed: 1) + expect(stats[:transport]) + .to have_attributes( + client_error: 0, + server_error: 0, + internal_error: 0 + ) end end + shared_examples 'flushed no trace' do + it { expect(stats).to include(traces_flushed: 0) } + end + after { tracer.shutdown! } describe 'agent receives span' do @@ -284,6 +291,227 @@ def agent_receives_span_step3(previous_success) end end + describe 'single span sampling' do + subject(:trace) do + tracer.trace('unrelated.top_level', service: 'other-service') do + tracer.trace('my.op', service: 'my-service') do # This is the span we are interested in + tracer.trace('other.trace', service: 'not-service') {} + end + end + end + + include_context 'agent-based test' + + before do + Datadog.configure do |c| + c.tracing.sampling.span_rules = json_rules if json_rules + c.tracing.sampling.default_rate = trace_sampling_rate if trace_sampling_rate + + # Test setup + c.tracing.sampler = custom_sampler if custom_sampler + c.tracing.priority_sampling = priority_sampling if priority_sampling + end + + # Capture trace segments as they are about to be serialized + allow_any_instance_of(Datadog::Transport::Traces::Transport) + .to receive(:send_traces).and_wrap_original do |function, traces| + trace_segments.concat(traces) + function.call(traces) + end + + trace # Run test subject + tracer.shutdown! # Ensure trace is flushed, so we can read writer statistics + end + + let(:trace_segments) { [] } + + let(:trace_op) { @trace_op } + let(:stats) { tracer.writer.stats } + + let(:custom_sampler) { nil } + let(:priority_sampling) { false } + + let(:trace_sampling_rate) { nil } + let(:json_rules) { JSON.dump(rules) if rules } + let(:rules) { nil } + + let(:spans) do + expect(trace_segments).to have(1).item + trace_segments[0].spans + end + + let(:single_sampled_span) do + single_sampled_spans = spans.select { |s| s.name == 'my.op' } + expect(single_sampled_spans).to have(1).item + single_sampled_spans[0] + end + + after do + Datadog.configuration.tracing.sampling.reset! + end + + shared_examples 'does not modify spans' do + it do + expect(spans).to_not include(have_tag('_dd.span_sampling.mechanism')) + expect(spans).to_not include(have_tag('_dd.span_sampling.rule_rate')) + expect(spans).to_not include(have_tag('_dd.span_sampling.max_per_second')) + end + end + + shared_examples 'set single span sampling tags' do + let(:rule_rate) { 1.0 } + let(:max_per_second) { -1 } + + it do + expect(single_sampled_span.get_metric('_dd.span_sampling.mechanism')).to eq(8) + expect(single_sampled_span.get_metric('_dd.span_sampling.rule_rate')).to eq(rule_rate) + expect(single_sampled_span.get_metric('_dd.span_sampling.max_per_second')).to eq(max_per_second) + end + end + + shared_examples 'flushed complete trace' do |expected_span_count: 3| + it_behaves_like 'flushed trace' + + it 'flushed all spans' do + expect(spans).to have(expected_span_count).items + end + end + + context 'with default settings' do + it_behaves_like 'flushed complete trace' + it_behaves_like 'does not modify spans' + end + + context 'with a kept trace' do + let(:trace_sampling_rate) { 1.0 } + + it_behaves_like 'flushed complete trace' + it_behaves_like 'does not modify spans' + end + + context 'with a dropped trace' do + context 'by priority sampling' do + let(:trace_sampling_rate) { 0.0 } + + context 'with rule matching' do + context 'on name' do + context 'with a dropped span' do + let(:rules) { [{ name: 'my.op', sample_rate: 0.0 }] } + + it_behaves_like 'flushed complete trace' + it_behaves_like 'does not modify spans' + + context 'by rate limiting' do + let(:rules) { [{ name: 'my.op', sample_rate: 1.0, max_per_second: 0 }] } + + it_behaves_like 'flushed complete trace' + it_behaves_like 'does not modify spans' + end + end + + context 'with a kept span' do + let(:rules) { [{ name: 'my.op', sample_rate: 1.0 }] } + + it_behaves_like 'flushed complete trace' + it_behaves_like 'set single span sampling tags' + end + end + + context 'on service' do + context 'with a dropped span' do + let(:rules) { [{ service: 'my-ser*', sample_rate: 0.0 }] } + + it_behaves_like 'flushed complete trace' + it_behaves_like 'does not modify spans' + + context 'by rate limiting' do + let(:rules) { [{ service: 'my-ser*', sample_rate: 1.0, max_per_second: 0 }] } + + it_behaves_like 'flushed complete trace' + it_behaves_like 'does not modify spans' + end + end + + context 'with a kept span' do + let(:rules) { [{ service: 'my-ser*', sample_rate: 1.0 }] } + + it_behaves_like 'flushed complete trace' + it_behaves_like 'set single span sampling tags' + end + end + end + end + + context 'by direct sampling' do + let(:custom_sampler) { no_sampler } + let(:priority_sampling) { false } + + let(:no_sampler) do + Class.new do + def sample!(trace) + trace.reject! + end + end.new + end + + context 'with rule matching' do + context 'on name' do + context 'with a dropped span' do + context 'by sampling rate' do + let(:rules) { [{ name: 'my.op', sample_rate: 0.0 }] } + + it_behaves_like 'flushed no trace' + end + + context 'by rate limiting' do + let(:rules) { [{ name: 'my.op', sample_rate: 1.0, max_per_second: 0 }] } + + it_behaves_like 'flushed no trace' + end + end + + context 'with a kept span' do + let(:rules) { [{ name: 'my.op', sample_rate: 1.0 }] } + + # it_behaves_like 'flushed complete trace', expected_span_count: 1 + it_behaves_like 'set single span sampling tags' + end + end + + context 'on service' do + context 'with a dropped span' do + context 'by sampling rate' do + let(:rules) { [{ service: 'my-ser*', sample_rate: 0.0 }] } + + it_behaves_like 'flushed no trace' + end + + context 'by rate limiting' do + let(:rules) { [{ service: 'my-ser*', sample_rate: 1.0, max_per_second: 0 }] } + + it_behaves_like 'flushed no trace' + end + end + + context 'with a kept span' do + let(:rules) { [{ service: 'my-ser*', sample_rate: 1.0 }] } + + it_behaves_like 'flushed complete trace', expected_span_count: 1 + it_behaves_like 'set single span sampling tags' + end + end + end + end + + context 'ensures correct stats calculation in the agent' do + it 'sets the Datadog-Client-Computed-Top-Level header to a non-empty value' do + expect(WebMock) + .to have_requested(:post, %r{/traces}).with(headers: { 'Datadog-Client-Computed-Top-Level' => /.+/ }) + end + end + end + end + describe 'shutdown' do include_context 'agent-based test' diff --git a/spec/datadog/tracing/sampling/span/rule_parser_spec.rb b/spec/datadog/tracing/sampling/span/rule_parser_spec.rb index ca1a692f4ea..d33ab8eb923 100644 --- a/spec/datadog/tracing/sampling/span/rule_parser_spec.rb +++ b/spec/datadog/tracing/sampling/span/rule_parser_spec.rb @@ -10,6 +10,14 @@ it { expect { sample! }.to_not(change { span_op.send(:build_span).to_hash }) } end + context 'with nil' do + let(:rules_string) { nil } + + it 'returns nil' do + is_expected.to be(nil) + end + end + context 'invalid JSON' do let(:rules_string) { '-not-json-' } diff --git a/spec/datadog/tracing/span_spec.rb b/spec/datadog/tracing/span_spec.rb index c716fdc13e1..5ab42b5784a 100644 --- a/spec/datadog/tracing/span_spec.rb +++ b/spec/datadog/tracing/span_spec.rb @@ -272,4 +272,24 @@ expect { pretty_print }.to output.to_stdout end end + + describe '#single_sampled?' do + subject(:single_sampled) { span.single_sampled? } + + context 'with the single span sampling sampling mechanism tag' do + let(:span_options) { { meta: { '_dd.span_sampling.mechanism' => 8 } } } + + it { is_expected.to eq(true) } + end + + context 'with another span sampling sampling mechanism tag' do + let(:span_options) { { meta: { '_dd.span_sampling.mechanism' => 999 } } } + + it { is_expected.to eq(false) } + end + + context 'without a span sampling sampling mechanism tag' do + it { is_expected.to eq(false) } + end + end end diff --git a/spec/datadog/tracing/trace_operation_spec.rb b/spec/datadog/tracing/trace_operation_spec.rb index 7c428167e78..f1ce0d08b78 100644 --- a/spec/datadog/tracing/trace_operation_spec.rb +++ b/spec/datadog/tracing/trace_operation_spec.rb @@ -911,6 +911,8 @@ end describe '#set_tag' do + include_context 'trace attributes' + it 'sets tag on trace before a measurement' do trace_op.set_tag('foo', 'bar') trace_op.measure('top') {} @@ -1551,120 +1553,226 @@ def span end end - context 'is finished' do - before do - trace_op.measure( - 'grandparent', - service: 'boo', - resource: 'far', - type: 'faz' - ) do + context 'is sampled' do + let(:sampled) { true } + context 'is finished' do + before do trace_op.measure( - 'parent', - service: 'foo', - resource: 'bar', - type: 'baz' + 'grandparent', + service: 'boo', + resource: 'far', + type: 'faz' ) do - # Do something + trace_op.measure( + 'parent', + service: 'foo', + resource: 'bar', + type: 'baz' + ) do + # Do something + end end end - end - it 'flushes a trace with all spans' do - expect(trace_op.finished?).to be true + it 'flushes a trace with all spans' do + expect(trace_op.finished?).to be true - is_expected.to be_a_kind_of(Datadog::Tracing::TraceSegment) - expect(trace.spans).to have(2).items - expect(trace.spans.map(&:name)).to include('parent', 'grandparent') - expect(trace.send(:root_span_id)).to be_a_kind_of(Integer) + is_expected.to be_a_kind_of(Datadog::Tracing::TraceSegment) + expect(trace.spans).to have(2).items + expect(trace.spans.map(&:name)).to include('parent', 'grandparent') + expect(trace.send(:root_span_id)).to be_a_kind_of(Integer) - expect(trace).to have_attributes( - agent_sample_rate: agent_sample_rate, - hostname: hostname, - id: trace_op.id, - lang: Datadog::Core::Environment::Identity.lang, - name: name, - origin: origin, - process_id: Datadog::Core::Environment::Identity.pid, - rate_limiter_rate: rate_limiter_rate, - resource: resource, - rule_sample_rate: rule_sample_rate, - runtime_id: Datadog::Core::Environment::Identity.id, - sample_rate: sample_rate, - sampling_priority: sampling_priority, - service: service - ) + expect(trace).to have_attributes( + agent_sample_rate: agent_sample_rate, + hostname: hostname, + id: trace_op.id, + lang: Datadog::Core::Environment::Identity.lang, + name: name, + origin: origin, + process_id: Datadog::Core::Environment::Identity.pid, + rate_limiter_rate: rate_limiter_rate, + resource: resource, + rule_sample_rate: rule_sample_rate, + runtime_id: Datadog::Core::Environment::Identity.id, + sample_rate: sample_rate, + sampling_priority: sampling_priority, + service: service + ) + end + + it 'does not yield duplicate spans' do + expect(trace_op.flush!.spans).to have(2).items + expect(trace_op.flush!.spans).to have(0).items + end end - it 'does not yield duplicate spans' do - expect(trace_op.flush!.spans).to have(2).items - expect(trace_op.flush!.spans).to have(0).items + context 'is partially finished' do + it 'flushes spans as they finish' do + trace_op.measure('grandparent') do + trace_op.measure('parent') do + # Do something + end + + # Partial flush + flush! + end + + # Verify partial flush + is_expected.to be_a_kind_of(Datadog::Tracing::TraceSegment) + expect(trace.spans).to have(1).items + expect(trace.spans.map(&:name)).to include('parent') + expect(trace.send(:root_span_id)).to be nil + + expect(trace).to have_attributes( + agent_sample_rate: agent_sample_rate, + hostname: hostname, + id: trace_op.id, + lang: Datadog::Core::Environment::Identity.lang, + name: name, + origin: origin, + process_id: Datadog::Core::Environment::Identity.pid, + rate_limiter_rate: rate_limiter_rate, + resource: resource, + rule_sample_rate: rule_sample_rate, + runtime_id: Datadog::Core::Environment::Identity.id, + sample_rate: sample_rate, + sampling_priority: sampling_priority, + service: service + ) + + # There should be finished spans pending + expect(trace_op.finished?).to be true + expect(trace_op.finished_span_count).to eq(1) + + # Verify final flush + final_flush = trace_op.flush! + expect(final_flush.spans).to have(1).items + expect(final_flush.spans.map(&:name)).to include('grandparent') + expect(final_flush.send(:root_span_id)).to be_a_kind_of(Integer) + + expect(final_flush).to have_attributes( + agent_sample_rate: agent_sample_rate, + hostname: hostname, + id: trace_op.id, + lang: Datadog::Core::Environment::Identity.lang, + name: name, + origin: origin, + process_id: Datadog::Core::Environment::Identity.pid, + rate_limiter_rate: rate_limiter_rate, + resource: resource, + rule_sample_rate: rule_sample_rate, + runtime_id: Datadog::Core::Environment::Identity.id, + sample_rate: sample_rate, + sampling_priority: sampling_priority, + service: service + ) + + # Make sure its actually empty + expect(trace_op.flush!.spans).to have(0).items + end end end - context 'is partially finished' do - it 'flushes spans as they finish' do - trace_op.measure('grandparent') do - trace_op.measure('parent') do - # Do something + context 'is not sampled' do + let(:sampled) { false } + let(:sampling_priority) { nil } + + context 'is finished' do + before do + trace_op.measure( + 'grandparent', + service: 'boo', + resource: 'far', + type: 'faz' + ) do + trace_op.measure( + 'parent', + service: 'foo', + resource: 'bar', + type: 'baz', + tags: { '_dd.span_sampling.mechanism' => 8 } + ) do + # Do something + end end + end + + it 'flushes a trace with single sampled spans' do + expect(trace_op.finished?).to be true - # Partial flush - flush! + is_expected.to be_a_kind_of(Datadog::Tracing::TraceSegment) + expect(trace.spans).to have(1).items + expect(trace.spans.map(&:name)).to include('parent') + expect(trace.send(:root_span_id)).to be nil + + expect(trace).to have_attributes( + agent_sample_rate: agent_sample_rate, + hostname: hostname, + id: trace_op.id, + lang: Datadog::Core::Environment::Identity.lang, + name: name, + origin: origin, + process_id: Datadog::Core::Environment::Identity.pid, + rate_limiter_rate: rate_limiter_rate, + resource: resource, + rule_sample_rate: rule_sample_rate, + runtime_id: Datadog::Core::Environment::Identity.id, + sample_rate: sample_rate, + sampling_priority: sampling_priority, + service: service + ) + + # Verify that final flush is empty + expect(trace_op.flush!.spans).to have(0).items end - # Verify partial flush - is_expected.to be_a_kind_of(Datadog::Tracing::TraceSegment) - expect(trace.spans).to have(1).items - expect(trace.spans.map(&:name)).to include('parent') - expect(trace.send(:root_span_id)).to be nil + it 'does not yield duplicate spans' do + expect(trace_op.flush!.spans).to have(1).items + expect(trace_op.flush!.spans).to have(0).items + end + end - expect(trace).to have_attributes( - agent_sample_rate: agent_sample_rate, - hostname: hostname, - id: trace_op.id, - lang: Datadog::Core::Environment::Identity.lang, - name: name, - origin: origin, - process_id: Datadog::Core::Environment::Identity.pid, - rate_limiter_rate: rate_limiter_rate, - resource: resource, - rule_sample_rate: rule_sample_rate, - runtime_id: Datadog::Core::Environment::Identity.id, - sample_rate: sample_rate, - sampling_priority: sampling_priority, - service: service - ) + context 'is partially finished' do + it 'flushes spans as they finish' do + trace_op.measure('grandparent') do + trace_op.measure('parent', tags: { '_dd.span_sampling.mechanism' => 8 }) do + # Do something + end - # There should be finished spans pending - expect(trace_op.finished?).to be true - expect(trace_op.finished_span_count).to eq(1) + # Partial flush + flush! + end - # Verify final flush - final_flush = trace_op.flush! - expect(final_flush.spans).to have(1).items - expect(final_flush.spans.map(&:name)).to include('grandparent') - expect(final_flush.send(:root_span_id)).to be_a_kind_of(Integer) + # Verify partial flush + is_expected.to be_a_kind_of(Datadog::Tracing::TraceSegment) + expect(trace.spans).to have(1).items + expect(trace.spans.map(&:name)).to include('parent') + expect(trace.send(:root_span_id)).to be nil - expect(final_flush).to have_attributes( - agent_sample_rate: agent_sample_rate, - hostname: hostname, - id: trace_op.id, - lang: Datadog::Core::Environment::Identity.lang, - name: name, - origin: origin, - process_id: Datadog::Core::Environment::Identity.pid, - rate_limiter_rate: rate_limiter_rate, - resource: resource, - rule_sample_rate: rule_sample_rate, - runtime_id: Datadog::Core::Environment::Identity.id, - sample_rate: sample_rate, - sampling_priority: sampling_priority, - service: service - ) + expect(trace).to have_attributes( + agent_sample_rate: agent_sample_rate, + hostname: hostname, + id: trace_op.id, + lang: Datadog::Core::Environment::Identity.lang, + name: name, + origin: origin, + process_id: Datadog::Core::Environment::Identity.pid, + rate_limiter_rate: rate_limiter_rate, + resource: resource, + rule_sample_rate: rule_sample_rate, + runtime_id: Datadog::Core::Environment::Identity.id, + sample_rate: sample_rate, + sampling_priority: sampling_priority, + service: service + ) + + # There should be finished spans pending + expect(trace_op.finished?).to be true + expect(trace_op.finished_span_count).to eq(1) - # Make sure its actually empty - expect(trace_op.flush!.spans).to have(0).items + # Verify that final flush is empty + expect(trace_op.flush!.spans).to have(0).items + end end end end @@ -2217,6 +2325,8 @@ def span end describe 'integration tests' do + include_context 'trace attributes' + context 'service_entry attributes' do context 'when service not given' do it do From 239c04678edb9e969f70b46a0c6bf2f9a81a4250 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Mon, 11 Jul 2022 11:03:23 -0700 Subject: [PATCH 26/46] Update lib/datadog/tracing/sampling/span/sampler.rb Co-authored-by: Ivo Anjo --- lib/datadog/tracing/sampling/span/sampler.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/datadog/tracing/sampling/span/sampler.rb b/lib/datadog/tracing/sampling/span/sampler.rb index 0f789e8678f..178a612f479 100644 --- a/lib/datadog/tracing/sampling/span/sampler.rb +++ b/lib/datadog/tracing/sampling/span/sampler.rb @@ -23,7 +23,7 @@ def initialize(rules = []) end # Applies sampling rules to the span if the trace has been rejected. - # The tracer can be outright rejected, and never reach the transport, + # The trace can be outright rejected, and never reach the transport, # or be set as rejected by priority sampling. In both cases, the trace # is considered rejected for Single Span Sampling purposes. # From be1cc3094b996633c23a947980909d3e69051a41 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Wed, 27 Jul 2022 17:00:18 -0700 Subject: [PATCH 27/46] Flush out single span sampling yard docs --- lib/datadog/tracing/sampling/span/sampler.rb | 34 ++++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/lib/datadog/tracing/sampling/span/sampler.rb b/lib/datadog/tracing/sampling/span/sampler.rb index 178a612f479..35cea50524b 100644 --- a/lib/datadog/tracing/sampling/span/sampler.rb +++ b/lib/datadog/tracing/sampling/span/sampler.rb @@ -2,18 +2,30 @@ module Datadog module Tracing module Sampling module Span - # Applies a set of rules to a span. - # This class is used to apply sampling operations to all - # spans in the tracer. + # Applies Single Span Sampling rules to spans. + # When matching the configured rules, a span is ensured to + # be processed Datadog App. In other words, a single sampled span + # will never be dropped by the tracer or Datadog agent. # - # Span sampling is distinct from trace sampling: span - # sampling can keep a span that is part of tracer that was - # rejected by trace sampling. + # All spans in a trace are subject to the single sampling rules, if + # any rules are configured. + # + # Single Span Sampling is distinct from trace-level sampling: + # Single Span Sampling can ensure a span is kept, even if its + # enclosing trace is rejected by trace-level sampling. # # This class only applies operations to spans that are part - # of traces that were rejected by trace sampling. There's no - # reason to try to sample spans that are already kept by - # the trace sampler. + # of traces that was rejected by trace sampling. + # A trace is rejected if either of the following conditions is true: + # * The priority sampling for a trace is set to either {USER_REJECT} or {AUTO_REJECT}. + # * The trace was rejected by internal sampling, thus never flushed. + # + # Single-sampled spans are tagged and the tracer ensures they will + # reach the Datadog App, regardless of their enclosing trace sampling decision. + # + # Single Span Sampling does not inspect spans that are part of a trace + # that has been accepted by trace-level sampling rules: all spans from such + # trace are guaranteed to reach the Datadog App. class Sampler # Receives sampling rules to apply to individual spans. # @@ -22,7 +34,9 @@ def initialize(rules = []) @rules = rules end - # Applies sampling rules to the span if the trace has been rejected. + + # Applies Single Span Sampling rules to the span if the trace has been rejected. + # # The trace can be outright rejected, and never reach the transport, # or be set as rejected by priority sampling. In both cases, the trace # is considered rejected for Single Span Sampling purposes. From 72eba19d5e269a4f44b76771d91976e61b9aed1d Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Wed, 27 Jul 2022 17:21:11 -0700 Subject: [PATCH 28/46] Test Span#tag? --- lib/datadog/tracing/metadata/tagging.rb | 9 +++++++-- spec/datadog/tracing/metadata/tagging_spec.rb | 20 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/lib/datadog/tracing/metadata/tagging.rb b/lib/datadog/tracing/metadata/tagging.rb index 10b1a2edc6b..7d503177193 100644 --- a/lib/datadog/tracing/metadata/tagging.rb +++ b/lib/datadog/tracing/metadata/tagging.rb @@ -65,9 +65,14 @@ def set_tags(tags) tags.each { |k, v| set_tag(k, v) } end - # Returns true if the provided `tag` was set to a non-nil value. False otherwise. + # Returns true if the provided `tag` was set to a non-nil value. + # False otherwise. + # + # DEV: This method enables short-hand assertions on span tags: + # DEV: `expect(spans).to have_tag('http.method')` + # # @param [String] tag the tag or metric to check for presence - # @return [Boolean] + # @return [Boolean] if the tag is present and not nil def tag?(tag) !get_tag(tag).nil? # nil is considered not present, thus we can't use `Hash#has_key?` end diff --git a/spec/datadog/tracing/metadata/tagging_spec.rb b/spec/datadog/tracing/metadata/tagging_spec.rb index 30990ab735e..536f7fe837a 100644 --- a/spec/datadog/tracing/metadata/tagging_spec.rb +++ b/spec/datadog/tracing/metadata/tagging_spec.rb @@ -28,6 +28,26 @@ end end + describe '#tag?' do + subject(:tag?) { test_object.tag?(key) } + let(:key) { 'test_tag' } + let(:value) { 'test_value' } + + context 'when no tag exists' do + it { is_expected.to be false } + end + + context 'when a meta tag exists' do + before { test_object.send(:meta)[key] = value } + it { is_expected.to be true } + end + + context 'when a metric exists' do + before { test_object.send(:metrics)[key] = value } + it { is_expected.to be true } + end + end + describe '#set_tag' do subject(:set_tag) { test_object.set_tag(key, value) } From 558afb15415108dbf81804a9d0722f26aaa2f7a3 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Wed, 27 Jul 2022 17:31:56 -0700 Subject: [PATCH 29/46] Rename span name to make it easy to tell our test subject --- spec/datadog/tracing/integration_spec.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/datadog/tracing/integration_spec.rb b/spec/datadog/tracing/integration_spec.rb index 608c38edf13..d826072b216 100644 --- a/spec/datadog/tracing/integration_spec.rb +++ b/spec/datadog/tracing/integration_spec.rb @@ -294,8 +294,8 @@ def agent_receives_span_step3(previous_success) describe 'single span sampling' do subject(:trace) do tracer.trace('unrelated.top_level', service: 'other-service') do - tracer.trace('my.op', service: 'my-service') do # This is the span we are interested in - tracer.trace('other.trace', service: 'not-service') {} + tracer.trace('single.sampled_span', service: 'my-service') do + tracer.trace('unrelated.child_span', service: 'not-service') {} end end end @@ -341,7 +341,7 @@ def agent_receives_span_step3(previous_success) end let(:single_sampled_span) do - single_sampled_spans = spans.select { |s| s.name == 'my.op' } + single_sampled_spans = spans.select { |s| s.name == 'single.sampled_span' } expect(single_sampled_spans).to have(1).item single_sampled_spans[0] end @@ -396,13 +396,13 @@ def agent_receives_span_step3(previous_success) context 'with rule matching' do context 'on name' do context 'with a dropped span' do - let(:rules) { [{ name: 'my.op', sample_rate: 0.0 }] } + let(:rules) { [{ name: 'single.sampled_span', sample_rate: 0.0 }] } it_behaves_like 'flushed complete trace' it_behaves_like 'does not modify spans' context 'by rate limiting' do - let(:rules) { [{ name: 'my.op', sample_rate: 1.0, max_per_second: 0 }] } + let(:rules) { [{ name: 'single.sampled_span', sample_rate: 1.0, max_per_second: 0 }] } it_behaves_like 'flushed complete trace' it_behaves_like 'does not modify spans' @@ -410,7 +410,7 @@ def agent_receives_span_step3(previous_success) end context 'with a kept span' do - let(:rules) { [{ name: 'my.op', sample_rate: 1.0 }] } + let(:rules) { [{ name: 'single.sampled_span', sample_rate: 1.0 }] } it_behaves_like 'flushed complete trace' it_behaves_like 'set single span sampling tags' @@ -458,20 +458,20 @@ def sample!(trace) context 'on name' do context 'with a dropped span' do context 'by sampling rate' do - let(:rules) { [{ name: 'my.op', sample_rate: 0.0 }] } + let(:rules) { [{ name: 'single.sampled_span', sample_rate: 0.0 }] } it_behaves_like 'flushed no trace' end context 'by rate limiting' do - let(:rules) { [{ name: 'my.op', sample_rate: 1.0, max_per_second: 0 }] } + let(:rules) { [{ name: 'single.sampled_span', sample_rate: 1.0, max_per_second: 0 }] } it_behaves_like 'flushed no trace' end end context 'with a kept span' do - let(:rules) { [{ name: 'my.op', sample_rate: 1.0 }] } + let(:rules) { [{ name: 'single.sampled_span', sample_rate: 1.0 }] } # it_behaves_like 'flushed complete trace', expected_span_count: 1 it_behaves_like 'set single span sampling tags' From 82628a6683f1bb69b6cea89b89b4050fe5c2a3ec Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Wed, 27 Jul 2022 17:34:02 -0700 Subject: [PATCH 30/46] Simplify test --- spec/datadog/tracing/integration_spec.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spec/datadog/tracing/integration_spec.rb b/spec/datadog/tracing/integration_spec.rb index d826072b216..8520cc73857 100644 --- a/spec/datadog/tracing/integration_spec.rb +++ b/spec/datadog/tracing/integration_spec.rb @@ -359,13 +359,10 @@ def agent_receives_span_step3(previous_success) end shared_examples 'set single span sampling tags' do - let(:rule_rate) { 1.0 } - let(:max_per_second) { -1 } - it do expect(single_sampled_span.get_metric('_dd.span_sampling.mechanism')).to eq(8) - expect(single_sampled_span.get_metric('_dd.span_sampling.rule_rate')).to eq(rule_rate) - expect(single_sampled_span.get_metric('_dd.span_sampling.max_per_second')).to eq(max_per_second) + expect(single_sampled_span.get_metric('_dd.span_sampling.rule_rate')).to eq(1.0) + expect(single_sampled_span.get_metric('_dd.span_sampling.max_per_second')).to eq(-1) end end From 601ee9290c74e731bffc6ce5d8db9f9aa2aec93f Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Wed, 27 Jul 2022 17:55:56 -0700 Subject: [PATCH 31/46] Simply integration testing --- spec/datadog/tracing/integration_spec.rb | 94 ++++++------------------ 1 file changed, 22 insertions(+), 72 deletions(-) diff --git a/spec/datadog/tracing/integration_spec.rb b/spec/datadog/tracing/integration_spec.rb index 8520cc73857..356406a681e 100644 --- a/spec/datadog/tracing/integration_spec.rb +++ b/spec/datadog/tracing/integration_spec.rb @@ -391,50 +391,25 @@ def agent_receives_span_step3(previous_success) let(:trace_sampling_rate) { 0.0 } context 'with rule matching' do - context 'on name' do - context 'with a dropped span' do - let(:rules) { [{ name: 'single.sampled_span', sample_rate: 0.0 }] } + context 'with a dropped span' do + let(:rules) { [{ name: 'single.sampled_span', sample_rate: 0.0 }] } - it_behaves_like 'flushed complete trace' - it_behaves_like 'does not modify spans' + it_behaves_like 'flushed complete trace' + it_behaves_like 'does not modify spans' - context 'by rate limiting' do - let(:rules) { [{ name: 'single.sampled_span', sample_rate: 1.0, max_per_second: 0 }] } - - it_behaves_like 'flushed complete trace' - it_behaves_like 'does not modify spans' - end - end - - context 'with a kept span' do - let(:rules) { [{ name: 'single.sampled_span', sample_rate: 1.0 }] } - - it_behaves_like 'flushed complete trace' - it_behaves_like 'set single span sampling tags' - end - end - - context 'on service' do - context 'with a dropped span' do - let(:rules) { [{ service: 'my-ser*', sample_rate: 0.0 }] } + context 'by rate limiting' do + let(:rules) { [{ name: 'single.sampled_span', sample_rate: 1.0, max_per_second: 0 }] } it_behaves_like 'flushed complete trace' it_behaves_like 'does not modify spans' - - context 'by rate limiting' do - let(:rules) { [{ service: 'my-ser*', sample_rate: 1.0, max_per_second: 0 }] } - - it_behaves_like 'flushed complete trace' - it_behaves_like 'does not modify spans' - end end + end - context 'with a kept span' do - let(:rules) { [{ service: 'my-ser*', sample_rate: 1.0 }] } + context 'with a kept span' do + let(:rules) { [{ name: 'single.sampled_span', sample_rate: 1.0 }] } - it_behaves_like 'flushed complete trace' - it_behaves_like 'set single span sampling tags' - end + it_behaves_like 'flushed complete trace' + it_behaves_like 'set single span sampling tags' end end end @@ -452,50 +427,25 @@ def sample!(trace) end context 'with rule matching' do - context 'on name' do - context 'with a dropped span' do - context 'by sampling rate' do - let(:rules) { [{ name: 'single.sampled_span', sample_rate: 0.0 }] } - - it_behaves_like 'flushed no trace' - end - - context 'by rate limiting' do - let(:rules) { [{ name: 'single.sampled_span', sample_rate: 1.0, max_per_second: 0 }] } + context 'with a dropped span' do + context 'by sampling rate' do + let(:rules) { [{ name: 'single.sampled_span', sample_rate: 0.0 }] } - it_behaves_like 'flushed no trace' - end + it_behaves_like 'flushed no trace' end - context 'with a kept span' do - let(:rules) { [{ name: 'single.sampled_span', sample_rate: 1.0 }] } + context 'by rate limiting' do + let(:rules) { [{ name: 'single.sampled_span', sample_rate: 1.0, max_per_second: 0 }] } - # it_behaves_like 'flushed complete trace', expected_span_count: 1 - it_behaves_like 'set single span sampling tags' + it_behaves_like 'flushed no trace' end end - context 'on service' do - context 'with a dropped span' do - context 'by sampling rate' do - let(:rules) { [{ service: 'my-ser*', sample_rate: 0.0 }] } + context 'with a kept span' do + let(:rules) { [{ name: 'single.sampled_span', sample_rate: 1.0 }] } - it_behaves_like 'flushed no trace' - end - - context 'by rate limiting' do - let(:rules) { [{ service: 'my-ser*', sample_rate: 1.0, max_per_second: 0 }] } - - it_behaves_like 'flushed no trace' - end - end - - context 'with a kept span' do - let(:rules) { [{ service: 'my-ser*', sample_rate: 1.0 }] } - - it_behaves_like 'flushed complete trace', expected_span_count: 1 - it_behaves_like 'set single span sampling tags' - end + it_behaves_like 'flushed complete trace', expected_span_count: 1 + it_behaves_like 'set single span sampling tags' end end end From 3e9c7ca00a84a275fdec83ecd4ba704a70d38f9b Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Wed, 27 Jul 2022 18:06:10 -0700 Subject: [PATCH 32/46] Lint commit --- lib/datadog/tracing/sampling/span/rule_parser.rb | 12 ++++++++---- lib/datadog/tracing/sampling/span/sampler.rb | 1 - spec/datadog/tracing/integration_spec.rb | 6 +++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/datadog/tracing/sampling/span/rule_parser.rb b/lib/datadog/tracing/sampling/span/rule_parser.rb index 58f196b674e..f0706cdc4aa 100644 --- a/lib/datadog/tracing/sampling/span/rule_parser.rb +++ b/lib/datadog/tracing/sampling/span/rule_parser.rb @@ -27,8 +27,10 @@ def parse_json(rules) begin list = JSON.parse(rules) rescue => e - Datadog.logger.warn("Error parsing Span Sampling Rules `#{rules.inspect}`: "\ - "#{e.class.name} #{e.message} at #{Array(e.backtrace).first}") + Datadog.logger.warn( + "Error parsing Span Sampling Rules `#{rules.inspect}`: "\ + "#{e.class.name} #{e.message} at #{Array(e.backtrace).first}" + ) return nil end @@ -57,8 +59,10 @@ def parse_list(rules) begin parse_rule(hash) rescue => e - Datadog.logger.warn("Cannot parse Span Sampling Rule #{hash.inspect}: " \ - "#{e.class.name} #{e} at #{Array(e.backtrace).first}") + Datadog.logger.warn( + "Cannot parse Span Sampling Rule #{hash.inspect}: " \ + "#{e.class.name} #{e} at #{Array(e.backtrace).first}" + ) return nil end end diff --git a/lib/datadog/tracing/sampling/span/sampler.rb b/lib/datadog/tracing/sampling/span/sampler.rb index 9f8c6197355..7da05163090 100644 --- a/lib/datadog/tracing/sampling/span/sampler.rb +++ b/lib/datadog/tracing/sampling/span/sampler.rb @@ -36,7 +36,6 @@ def initialize(rules = []) @rules = rules end - # Applies Single Span Sampling rules to the span if the trace has been rejected. # # The trace can be outright rejected, and never reach the transport, diff --git a/spec/datadog/tracing/integration_spec.rb b/spec/datadog/tracing/integration_spec.rb index 356406a681e..46cce34cef6 100644 --- a/spec/datadog/tracing/integration_spec.rb +++ b/spec/datadog/tracing/integration_spec.rb @@ -315,9 +315,9 @@ def agent_receives_span_step3(previous_success) # Capture trace segments as they are about to be serialized allow_any_instance_of(Datadog::Transport::Traces::Transport) .to receive(:send_traces).and_wrap_original do |function, traces| - trace_segments.concat(traces) - function.call(traces) - end + trace_segments.concat(traces) + function.call(traces) + end trace # Run test subject tracer.shutdown! # Ensure trace is flushed, so we can read writer statistics From c06621432c27e0491966a9c32c25f8f54c7b04e4 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Wed, 27 Jul 2022 18:13:45 -0700 Subject: [PATCH 33/46] Hide documentation TODO until public docs are available --- docs/GettingStarted.md | 2 +- lib/datadog/core/configuration/settings.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md index a14cdaf3a76..7828c96ed4f 100644 --- a/docs/GettingStarted.md +++ b/docs/GettingStarted.md @@ -2191,7 +2191,7 @@ trace.keep! You can configure sampling rule that allow you keep spans despite their respective traces being dropped by a trace-level sampling rule. -See (TODO: Insert documentation URL here when published. Search for references of this TODO) for the full documentation on Single Span Sampling. +[//]: # (TODO: See for the full documentation on Single Span Sampling.) ### Distributed Tracing diff --git a/lib/datadog/core/configuration/settings.rb b/lib/datadog/core/configuration/settings.rb index 28dd60d15ec..2c175185d2a 100644 --- a/lib/datadog/core/configuration/settings.rb +++ b/lib/datadog/core/configuration/settings.rb @@ -561,7 +561,7 @@ def initialize(*_) # These rules allow a span to be kept when its encompassing trace is dropped. # # The syntax for single span sampling rules can be found here: - # TODO: Insert documentation URL here when published. Search for references of this TODO + # TODO: # # @default `DD_SPAN_SAMPLING_RULES` environment variable. # Otherwise, `ENV_SPAN_SAMPLING_RULES_FILE` environment variable. From 339cd1865db44b286c00aa483780bf5d476aba9f Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 29 Jul 2022 13:22:15 -0700 Subject: [PATCH 34/46] Refactor flushing logic --- lib/datadog/tracing/flush.rb | 87 ++--- lib/datadog/tracing/metadata/tagging.rb | 5 +- .../tracing/sampling/span/rule_parser.rb | 4 +- lib/datadog/tracing/span.rb | 7 - lib/datadog/tracing/trace_operation.rb | 47 +-- spec/datadog/tracing/flush_spec.rb | 28 ++ spec/datadog/tracing/metadata/tagging_spec.rb | 4 +- spec/datadog/tracing/span_spec.rb | 20 -- spec/datadog/tracing/trace_operation_spec.rb | 304 ++++++------------ 9 files changed, 201 insertions(+), 305 deletions(-) diff --git a/lib/datadog/tracing/flush.rb b/lib/datadog/tracing/flush.rb index 8c580c4fa41..3e80c32f24a 100644 --- a/lib/datadog/tracing/flush.rb +++ b/lib/datadog/tracing/flush.rb @@ -3,70 +3,85 @@ module Datadog module Tracing module Flush - # Consumes only completed traces (where all spans have finished) - class Finished - # Consumes and returns completed traces (where all spans have finished) - # from the provided \trace_op, if any. + # Consumes and returns a {TraceSegment} to be flushed, from + # the provided {TraceSegment}. + # + # Only finished spans are consumed. Any spans consumed are + # removed from +trace_op+ as a side effect. Unfinished spans are + # unaffected. + class Base + # Consumes and returns a {TraceSegment} to be flushed, from + # the provided {TraceSegment}. # - # Any traces consumed are removed from +trace_op+ as a side effect. + # Only finished spans are consumed. Any spans consumed are + # removed from +trace_op+ as a side effect. Unfinished spans are + # unaffected. # + # @param [TraceOperation] trace_op # @return [TraceSegment] trace to be flushed, or +nil+ if the trace is not finished def consume!(trace_op) - return unless full_flush?(trace_op) + return unless flush?(trace_op) get_trace(trace_op) end - def full_flush?(trace_op) - trace_op && trace_op.finished? - end - protected + # Consumes all finished spans from trace. + # @return [TraceSegment] def get_trace(trace_op) - trace_op.flush! + trace_op.flush! do |spans| + spans.select! { |span| single_sampled?(span) } unless trace_op.sampled? + + spans + end + end + + # Single Span Sampling has chosen to keep this span + # regardless of the trace-level sampling decision + def single_sampled?(span) + span.get_metric(Sampling::Span::Ext::TAG_MECHANISM) == Sampling::Span::Ext::MECHANISM_SPAN_SAMPLING_RATE end end - # Performs partial trace flushing to avoid large traces residing in memory for too long - class Partial + # Consumes and returns completed traces (where all spans have finished), + # if any, from the provided +trace_op+. + # + # Spans consumed are removed from +trace_op+ as a side effect. + class Finished < Base + # Are all spans finished? + def flush?(trace_op) + trace_op && trace_op.finished? + end + end + + # Consumes and returns completed or partially completed + # traces from the provided +trace_op+, if any. + # + # Partial trace flushing avoids large traces residing in memory for too long. + # + # Partially completed traces, where not all spans have finished, + # will only be returned if there are at least + # +@min_spans_for_partial+ finished spans. + # + # Spans consumed are removed from +trace_op+ as a side effect. + class Partial < Base # Start flushing partial trace after this many active spans in one trace DEFAULT_MIN_SPANS_FOR_PARTIAL_FLUSH = 500 attr_reader :min_spans_for_partial def initialize(options = {}) + super() @min_spans_for_partial = options.fetch(:min_spans_before_partial_flush, DEFAULT_MIN_SPANS_FOR_PARTIAL_FLUSH) end - # Consumes and returns completed or partially completed - # traces from the provided +trace_op+, if any. - # - # Partially completed traces, where not all spans have finished, - # will only be returned if there are at least - # +@min_spans_for_partial+ finished spans. - # - # Any spans consumed are removed from +trace_op+ as a side effect. - # - # @return [TraceSegment] partial or complete trace to be flushed, or +nil+ if no spans are finished - def consume!(trace_op) - return unless partial_flush?(trace_op) - - get_trace(trace_op) - end - - def partial_flush?(trace_op) + def flush?(trace_op) return true if trace_op.finished? return false if trace_op.finished_span_count < @min_spans_for_partial true end - - protected - - def get_trace(trace_op) - trace_op.flush! - end end end end diff --git a/lib/datadog/tracing/metadata/tagging.rb b/lib/datadog/tracing/metadata/tagging.rb index 278ac2bdf71..d32b1e6affa 100644 --- a/lib/datadog/tracing/metadata/tagging.rb +++ b/lib/datadog/tracing/metadata/tagging.rb @@ -68,12 +68,9 @@ def set_tags(tags) # Returns true if the provided `tag` was set to a non-nil value. # False otherwise. # - # DEV: This method enables short-hand assertions on span tags: - # DEV: `expect(spans).to have_tag('http.method')` - # # @param [String] tag the tag or metric to check for presence # @return [Boolean] if the tag is present and not nil - def tag?(tag) + def has_tag?(tag) # rubocop:disable Naming/PredicateName !get_tag(tag).nil? # nil is considered not present, thus we can't use `Hash#has_key?` end diff --git a/lib/datadog/tracing/sampling/span/rule_parser.rb b/lib/datadog/tracing/sampling/span/rule_parser.rb index f0706cdc4aa..98aac49ae9a 100644 --- a/lib/datadog/tracing/sampling/span/rule_parser.rb +++ b/lib/datadog/tracing/sampling/span/rule_parser.rb @@ -29,7 +29,7 @@ def parse_json(rules) rescue => e Datadog.logger.warn( "Error parsing Span Sampling Rules `#{rules.inspect}`: "\ - "#{e.class.name} #{e.message} at #{Array(e.backtrace).first}" + "#{e.class.name} #{e.message} at #{Array(e.backtrace).first}" ) return nil end @@ -61,7 +61,7 @@ def parse_list(rules) rescue => e Datadog.logger.warn( "Cannot parse Span Sampling Rule #{hash.inspect}: " \ - "#{e.class.name} #{e} at #{Array(e.backtrace).first}" + "#{e.class.name} #{e} at #{Array(e.backtrace).first}" ) return nil end diff --git a/lib/datadog/tracing/span.rb b/lib/datadog/tracing/span.rb index 31a2d85d1cf..ee0ce054f8f 100644 --- a/lib/datadog/tracing/span.rb +++ b/lib/datadog/tracing/span.rb @@ -204,13 +204,6 @@ def pretty_print(q) end end - # Single Span Sampling has chosen to keep this span - # regardless of the trace-level sampling decision - # @!visibility private - def single_sampled? - get_metric(Sampling::Span::Ext::TAG_MECHANISM) == Sampling::Span::Ext::MECHANISM_SPAN_SAMPLING_RATE - end - private # Used for serialization diff --git a/lib/datadog/tracing/trace_operation.rb b/lib/datadog/tracing/trace_operation.rb index 254903bc723..075272e38de 100644 --- a/lib/datadog/tracing/trace_operation.rb +++ b/lib/datadog/tracing/trace_operation.rb @@ -243,24 +243,19 @@ def build_span( # Returns a {TraceSegment} with all finished spans that can be flushed # at invocation time. All other **finished** spans are discarded. # - # A span can be flushed if: - # - # 1. The span has finished, and - # 2. Either: - # a. The trace is kept by sampling. - # b. The span is kept by single span sampling. - # - # Unfinished spans are not affected by this method. - # + # @yield [spans] spans that will be returned as part of the trace segment returned # @return [TraceSegment] def flush! - if sampled? - flush_all_spans! - else - # Only spans where the span-level sampling overrides - # the trace-level sampling can be flushed. - flush_single_sampled_spans_only! - end + finished = finished? + + # Copy out completed spans + spans = @spans.dup + @spans = [] + + spans = yield(spans) if block_given? + + # Use them to build a trace + build_trace(spans, !finished) end # Returns a set of trace headers used for continuing traces. @@ -429,26 +424,6 @@ def set_root_span!(span) @root_span = span end - # Flushes all spans from this trace - def flush_all_spans! - # Copy out completed spans - spans = @spans.dup - @spans = [] - - # Use them to build a trace - build_trace(spans, !finished?) - end - - # Flush single sampled span only, as the trace as a whole was dropped by trace-level sampling - def flush_single_sampled_spans_only! - # Copy out completed, selected spans - spans = @spans.select(&:single_sampled?) - @spans = [] - - # Use them to build a trace - build_trace(spans, true) - end - def build_trace(spans, partial = false) TraceSegment.new( spans, diff --git a/spec/datadog/tracing/flush_spec.rb b/spec/datadog/tracing/flush_spec.rb index 760018a2f46..dd46c66fd5b 100644 --- a/spec/datadog/tracing/flush_spec.rb +++ b/spec/datadog/tracing/flush_spec.rb @@ -25,6 +25,34 @@ it { is_expected.to eq(trace) } end + + context 'with a single sampled span' do + let(:trace_op) { Datadog::Tracing::TraceOperation.new(sampled: sampled) } + + before do + trace_op.measure('single.sampled') do |span| + span.set_metric(Datadog::Tracing::Sampling::Span::Ext::TAG_MECHANISM, 8) + + trace_op.measure('not_single.sampled') {} + end + end + + context 'and a kept trace' do + let(:sampled) { true } + + it 'returns all spans' do + is_expected.to have_attributes(spans: have(2).items) + end + end + + context 'and a rejected trace' do + let(:sampled) { false } + + it 'returns only single sampled spans' do + is_expected.to have_attributes(spans: [have_attributes(name: 'single.sampled')]) + end + end + end end RSpec.describe Datadog::Tracing::Flush::Finished do diff --git a/spec/datadog/tracing/metadata/tagging_spec.rb b/spec/datadog/tracing/metadata/tagging_spec.rb index 536f7fe837a..d1a6fc24586 100644 --- a/spec/datadog/tracing/metadata/tagging_spec.rb +++ b/spec/datadog/tracing/metadata/tagging_spec.rb @@ -28,8 +28,8 @@ end end - describe '#tag?' do - subject(:tag?) { test_object.tag?(key) } + describe '#has_tag?' do + subject(:has_tag?) { test_object.has_tag?(key) } let(:key) { 'test_tag' } let(:value) { 'test_value' } diff --git a/spec/datadog/tracing/span_spec.rb b/spec/datadog/tracing/span_spec.rb index 5ab42b5784a..c716fdc13e1 100644 --- a/spec/datadog/tracing/span_spec.rb +++ b/spec/datadog/tracing/span_spec.rb @@ -272,24 +272,4 @@ expect { pretty_print }.to output.to_stdout end end - - describe '#single_sampled?' do - subject(:single_sampled) { span.single_sampled? } - - context 'with the single span sampling sampling mechanism tag' do - let(:span_options) { { meta: { '_dd.span_sampling.mechanism' => 8 } } } - - it { is_expected.to eq(true) } - end - - context 'with another span sampling sampling mechanism tag' do - let(:span_options) { { meta: { '_dd.span_sampling.mechanism' => 999 } } } - - it { is_expected.to eq(false) } - end - - context 'without a span sampling sampling mechanism tag' do - it { is_expected.to eq(false) } - end - end end diff --git a/spec/datadog/tracing/trace_operation_spec.rb b/spec/datadog/tracing/trace_operation_spec.rb index f1ce0d08b78..a12ec91fcef 100644 --- a/spec/datadog/tracing/trace_operation_spec.rb +++ b/spec/datadog/tracing/trace_operation_spec.rb @@ -911,8 +911,6 @@ end describe '#set_tag' do - include_context 'trace attributes' - it 'sets tag on trace before a measurement' do trace_op.set_tag('foo', 'bar') trace_op.measure('top') {} @@ -1553,226 +1551,138 @@ def span end end - context 'is sampled' do - let(:sampled) { true } - context 'is finished' do - before do + context 'is finished' do + before do + trace_op.measure( + 'grandparent', + service: 'boo', + resource: 'far', + type: 'faz' + ) do trace_op.measure( - 'grandparent', - service: 'boo', - resource: 'far', - type: 'faz' + 'parent', + service: 'foo', + resource: 'bar', + type: 'baz' ) do - trace_op.measure( - 'parent', - service: 'foo', - resource: 'bar', - type: 'baz' - ) do - # Do something - end + # Do something end end - - it 'flushes a trace with all spans' do - expect(trace_op.finished?).to be true - - is_expected.to be_a_kind_of(Datadog::Tracing::TraceSegment) - expect(trace.spans).to have(2).items - expect(trace.spans.map(&:name)).to include('parent', 'grandparent') - expect(trace.send(:root_span_id)).to be_a_kind_of(Integer) - - expect(trace).to have_attributes( - agent_sample_rate: agent_sample_rate, - hostname: hostname, - id: trace_op.id, - lang: Datadog::Core::Environment::Identity.lang, - name: name, - origin: origin, - process_id: Datadog::Core::Environment::Identity.pid, - rate_limiter_rate: rate_limiter_rate, - resource: resource, - rule_sample_rate: rule_sample_rate, - runtime_id: Datadog::Core::Environment::Identity.id, - sample_rate: sample_rate, - sampling_priority: sampling_priority, - service: service - ) - end - - it 'does not yield duplicate spans' do - expect(trace_op.flush!.spans).to have(2).items - expect(trace_op.flush!.spans).to have(0).items - end end - context 'is partially finished' do - it 'flushes spans as they finish' do - trace_op.measure('grandparent') do - trace_op.measure('parent') do - # Do something - end - - # Partial flush - flush! - end + it 'flushes a trace with all spans' do + expect(trace_op.finished?).to be true - # Verify partial flush - is_expected.to be_a_kind_of(Datadog::Tracing::TraceSegment) - expect(trace.spans).to have(1).items - expect(trace.spans.map(&:name)).to include('parent') - expect(trace.send(:root_span_id)).to be nil + is_expected.to be_a_kind_of(Datadog::Tracing::TraceSegment) + expect(trace.spans).to have(2).items + expect(trace.spans.map(&:name)).to include('parent', 'grandparent') + expect(trace.send(:root_span_id)).to be_a_kind_of(Integer) - expect(trace).to have_attributes( - agent_sample_rate: agent_sample_rate, - hostname: hostname, - id: trace_op.id, - lang: Datadog::Core::Environment::Identity.lang, - name: name, - origin: origin, - process_id: Datadog::Core::Environment::Identity.pid, - rate_limiter_rate: rate_limiter_rate, - resource: resource, - rule_sample_rate: rule_sample_rate, - runtime_id: Datadog::Core::Environment::Identity.id, - sample_rate: sample_rate, - sampling_priority: sampling_priority, - service: service - ) + expect(trace).to have_attributes( + agent_sample_rate: agent_sample_rate, + hostname: hostname, + id: trace_op.id, + lang: Datadog::Core::Environment::Identity.lang, + name: name, + origin: origin, + process_id: Datadog::Core::Environment::Identity.pid, + rate_limiter_rate: rate_limiter_rate, + resource: resource, + rule_sample_rate: rule_sample_rate, + runtime_id: Datadog::Core::Environment::Identity.id, + sample_rate: sample_rate, + sampling_priority: sampling_priority, + service: service + ) + end - # There should be finished spans pending - expect(trace_op.finished?).to be true - expect(trace_op.finished_span_count).to eq(1) + it 'does not yield duplicate spans' do + expect(trace_op.flush!.spans).to have(2).items + expect(trace_op.flush!.spans).to have(0).items + end - # Verify final flush - final_flush = trace_op.flush! - expect(final_flush.spans).to have(1).items - expect(final_flush.spans.map(&:name)).to include('grandparent') - expect(final_flush.send(:root_span_id)).to be_a_kind_of(Integer) + context 'with a block' do + subject(:flush!) { trace_op.flush! { |spans| spans } } - expect(final_flush).to have_attributes( - agent_sample_rate: agent_sample_rate, - hostname: hostname, - id: trace_op.id, - lang: Datadog::Core::Environment::Identity.lang, - name: name, - origin: origin, - process_id: Datadog::Core::Environment::Identity.pid, - rate_limiter_rate: rate_limiter_rate, - resource: resource, - rule_sample_rate: rule_sample_rate, - runtime_id: Datadog::Core::Environment::Identity.id, - sample_rate: sample_rate, - sampling_priority: sampling_priority, - service: service + it 'yields spans' do + expect { |b| trace_op.flush!(&b) }.to yield_with_args( + [ + have_attributes(name: 'parent'), + have_attributes(name: 'grandparent') + ] ) + end - # Make sure its actually empty - expect(trace_op.flush!.spans).to have(0).items + it 'uses block return as new span list' do + new_list = [double('span')] + expect(trace_op.flush! { new_list }).to have_attributes(spans: new_list) end end end - context 'is not sampled' do - let(:sampled) { false } - let(:sampling_priority) { nil } - - context 'is finished' do - before do - trace_op.measure( - 'grandparent', - service: 'boo', - resource: 'far', - type: 'faz' - ) do - trace_op.measure( - 'parent', - service: 'foo', - resource: 'bar', - type: 'baz', - tags: { '_dd.span_sampling.mechanism' => 8 } - ) do - # Do something - end + context 'is partially finished' do + it 'flushes spans as they finish' do + trace_op.measure('grandparent') do + trace_op.measure('parent') do + # Do something end - end - it 'flushes a trace with single sampled spans' do - expect(trace_op.finished?).to be true - - is_expected.to be_a_kind_of(Datadog::Tracing::TraceSegment) - expect(trace.spans).to have(1).items - expect(trace.spans.map(&:name)).to include('parent') - expect(trace.send(:root_span_id)).to be nil - - expect(trace).to have_attributes( - agent_sample_rate: agent_sample_rate, - hostname: hostname, - id: trace_op.id, - lang: Datadog::Core::Environment::Identity.lang, - name: name, - origin: origin, - process_id: Datadog::Core::Environment::Identity.pid, - rate_limiter_rate: rate_limiter_rate, - resource: resource, - rule_sample_rate: rule_sample_rate, - runtime_id: Datadog::Core::Environment::Identity.id, - sample_rate: sample_rate, - sampling_priority: sampling_priority, - service: service - ) - - # Verify that final flush is empty - expect(trace_op.flush!.spans).to have(0).items + # Partial flush + flush! end - it 'does not yield duplicate spans' do - expect(trace_op.flush!.spans).to have(1).items - expect(trace_op.flush!.spans).to have(0).items - end - end + # Verify partial flush + is_expected.to be_a_kind_of(Datadog::Tracing::TraceSegment) + expect(trace.spans).to have(1).items + expect(trace.spans.map(&:name)).to include('parent') + expect(trace.send(:root_span_id)).to be nil - context 'is partially finished' do - it 'flushes spans as they finish' do - trace_op.measure('grandparent') do - trace_op.measure('parent', tags: { '_dd.span_sampling.mechanism' => 8 }) do - # Do something - end - - # Partial flush - flush! - end + expect(trace).to have_attributes( + agent_sample_rate: agent_sample_rate, + hostname: hostname, + id: trace_op.id, + lang: Datadog::Core::Environment::Identity.lang, + name: name, + origin: origin, + process_id: Datadog::Core::Environment::Identity.pid, + rate_limiter_rate: rate_limiter_rate, + resource: resource, + rule_sample_rate: rule_sample_rate, + runtime_id: Datadog::Core::Environment::Identity.id, + sample_rate: sample_rate, + sampling_priority: sampling_priority, + service: service + ) - # Verify partial flush - is_expected.to be_a_kind_of(Datadog::Tracing::TraceSegment) - expect(trace.spans).to have(1).items - expect(trace.spans.map(&:name)).to include('parent') - expect(trace.send(:root_span_id)).to be nil + # There should be finished spans pending + expect(trace_op.finished?).to be true + expect(trace_op.finished_span_count).to eq(1) - expect(trace).to have_attributes( - agent_sample_rate: agent_sample_rate, - hostname: hostname, - id: trace_op.id, - lang: Datadog::Core::Environment::Identity.lang, - name: name, - origin: origin, - process_id: Datadog::Core::Environment::Identity.pid, - rate_limiter_rate: rate_limiter_rate, - resource: resource, - rule_sample_rate: rule_sample_rate, - runtime_id: Datadog::Core::Environment::Identity.id, - sample_rate: sample_rate, - sampling_priority: sampling_priority, - service: service - ) + # Verify final flush + final_flush = trace_op.flush! + expect(final_flush.spans).to have(1).items + expect(final_flush.spans.map(&:name)).to include('grandparent') + expect(final_flush.send(:root_span_id)).to be_a_kind_of(Integer) - # There should be finished spans pending - expect(trace_op.finished?).to be true - expect(trace_op.finished_span_count).to eq(1) + expect(final_flush).to have_attributes( + agent_sample_rate: agent_sample_rate, + hostname: hostname, + id: trace_op.id, + lang: Datadog::Core::Environment::Identity.lang, + name: name, + origin: origin, + process_id: Datadog::Core::Environment::Identity.pid, + rate_limiter_rate: rate_limiter_rate, + resource: resource, + rule_sample_rate: rule_sample_rate, + runtime_id: Datadog::Core::Environment::Identity.id, + sample_rate: sample_rate, + sampling_priority: sampling_priority, + service: service + ) - # Verify that final flush is empty - expect(trace_op.flush!.spans).to have(0).items - end + # Make sure its actually empty + expect(trace_op.flush!.spans).to have(0).items end end end @@ -2325,8 +2235,6 @@ def span end describe 'integration tests' do - include_context 'trace attributes' - context 'service_entry attributes' do context 'when service not given' do it do From 8f238ee01ed5f3ce3ff99af097fce5e60825b5bd Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 29 Jul 2022 13:41:30 -0700 Subject: [PATCH 35/46] Sorbet --- lib/datadog/tracing/flush.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/datadog/tracing/flush.rb b/lib/datadog/tracing/flush.rb index 3e80c32f24a..c9658b4eb8d 100644 --- a/lib/datadog/tracing/flush.rb +++ b/lib/datadog/tracing/flush.rb @@ -9,6 +9,8 @@ module Flush # Only finished spans are consumed. Any spans consumed are # removed from +trace_op+ as a side effect. Unfinished spans are # unaffected. + # + # @abstract class Base # Consumes and returns a {TraceSegment} to be flushed, from # the provided {TraceSegment}. @@ -25,6 +27,12 @@ def consume!(trace_op) get_trace(trace_op) end + # Should we consume spans from the +trace_op+? + # @abstract + def flush?(trace_op) + raise NotImplementedError + end + protected # Consumes all finished spans from trace. From 14a33bea358d78ae238c74583f82d5dc6498b77f Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Mon, 8 Aug 2022 16:44:41 -0700 Subject: [PATCH 36/46] Add benchmarks --- .../tracing/benchmark/microbenchmark_spec.rb | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/spec/datadog/tracing/benchmark/microbenchmark_spec.rb b/spec/datadog/tracing/benchmark/microbenchmark_spec.rb index 54e4772ede0..394ad6a6520 100644 --- a/spec/datadog/tracing/benchmark/microbenchmark_spec.rb +++ b/spec/datadog/tracing/benchmark/microbenchmark_spec.rb @@ -101,4 +101,78 @@ def subject(i) end end end + + describe 'single span sampling' do + before do + Datadog.configure do |c| + c.tracing.writer = FauxWriter.new(call_original: false) + end + end + + let(:name) { 'span'.freeze } + let(:tracer) { Datadog::Tracing.send(:tracer) } + let(:steps) { [1, 10, 100] } + + def subject(i) + trace(1, i) + end + + describe 'kept traces' do + include_examples 'benchmark' + + def trace(i, total) + tracer.trace(name) do |_, trace| + trace.keep! if i == 1 + trace(i + 1, total) unless i == total + end + end + end + + describe 'rejected traces' do + include_examples 'benchmark' + + def trace(i, total) + tracer.trace(name) do |_, trace| + trace.reject! if i == 1 + trace(i + 1, total) unless i == total + end + end + + describe 'with spans kept by single span sampling' do + before do + Datadog.configure do |c| + c.tracing.sampling.span_rules = json_rules + end + end + + let(:json_rules) { [rule].to_json } + let(:rule) do + { + name: name, + sample_rate: 1.0, + } + end + + include_examples 'benchmark' + end + + describe 'with spans also rejected by single span sampling' do + before do + Datadog.configure do |c| + c.tracing.sampling.span_rules = json_rules + end + end + + let(:json_rules) { [rule].to_json } + let(:rule) do + { + name: name, + sample_rate: 0.0, + } + end + + include_examples 'benchmark' + end + end + end end From 35686f67c7f0e78c1d656f794677f1598fcaea9d Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Tue, 9 Aug 2022 11:07:43 -0700 Subject: [PATCH 37/46] Expand on RateSampler future dev comment --- lib/datadog/tracing/sampling/rate_sampler.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/datadog/tracing/sampling/rate_sampler.rb b/lib/datadog/tracing/sampling/rate_sampler.rb index 1577a20d603..0cb2ed8a93a 100644 --- a/lib/datadog/tracing/sampling/rate_sampler.rb +++ b/lib/datadog/tracing/sampling/rate_sampler.rb @@ -22,7 +22,14 @@ class RateSampler < Sampler # sampled. # # DEV-2.0: Allow for `sample_rate` zero (drop all) to be allowed. This eases - # DEV-2.0: usage for many consumers of the {RateSampler} class. + # DEV-2.0: usage for all internal users of the {RateSampler} class: both + # DEV-2.0: RuleSampler and Single Span Sampling leverage the RateSampler, but want + # DEV-2.0: `sample_rate` zero to mean "drop all". They work around this by hard- + # DEV-2.0: setting the `sample_rate` to zero like so: + # DEV-2.0: ``` + # DEV-2.0: sampler = RateSampler.new + # DEV-2.0: sampler.sample_rate = sample_rate + # DEV-2.0: ``` def initialize(sample_rate = 1.0) super() From 49dc9026884007d11eb0c3822371e613be28e2a5 Mon Sep 17 00:00:00 2001 From: Tony Hsu Date: Thu, 25 Aug 2022 10:35:48 +0200 Subject: [PATCH 38/46] Added: 1.4.0 to CHANGELOG.md --- CHANGELOG.md | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82a513bf6a9..18ae7ddbfc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,25 @@ ## [Unreleased] +## [1.4.0] - 2022-08-25 + +Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v1.4.0 + +Git diff: https://github.com/DataDog/dd-trace-rb/compare/v1.3.0...v1.4.0 + +### Added + +* gRPC: tag `grpc.client.deadline` ([#2200][]) +* Implement telemetry, disable by default ([#2153][]) + +### Changed + +* Bump `libdatadog` dependency version ([#2229][]) + +### Fixed + +* Fix CI instrumentation configuration ([#2219][]) + ## [1.3.0] - 2022-08-04 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v1.3.0 @@ -2939,13 +2958,18 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1 [#2138]: https://github.com/DataDog/dd-trace-rb/issues/2138 [#2140]: https://github.com/DataDog/dd-trace-rb/issues/2140 [#2150]: https://github.com/DataDog/dd-trace-rb/issues/2150 +[#2153]: https://github.com/DataDog/dd-trace-rb/issues/2153 [#2158]: https://github.com/DataDog/dd-trace-rb/issues/2158 [#2162]: https://github.com/DataDog/dd-trace-rb/issues/2162 [#2163]: https://github.com/DataDog/dd-trace-rb/issues/2163 +[#2170]: https://github.com/DataDog/dd-trace-rb/issues/2170 [#2173]: https://github.com/DataDog/dd-trace-rb/issues/2173 [#2174]: https://github.com/DataDog/dd-trace-rb/issues/2174 [#2180]: https://github.com/DataDog/dd-trace-rb/issues/2180 +[#2200]: https://github.com/DataDog/dd-trace-rb/issues/2200 [#2201]: https://github.com/DataDog/dd-trace-rb/issues/2201 +[#2219]: https://github.com/DataDog/dd-trace-rb/issues/2219 +[#2229]: https://github.com/DataDog/dd-trace-rb/issues/2229 [@AdrianLC]: https://github.com/AdrianLC [@Azure7111]: https://github.com/Azure7111 [@BabyGroot]: https://github.com/BabyGroot @@ -3087,4 +3111,4 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1 [@walterking]: https://github.com/walterking [@y-yagi]: https://github.com/y-yagi [@yukimurasawa]: https://github.com/yukimurasawa -[@zachmccormick]: https://github.com/zachmccormick +[@zachmccormick]: https://github.com/zachmccormick \ No newline at end of file From 6b61d73778f6df17797d96a947cde9ba75ce4227 Mon Sep 17 00:00:00 2001 From: Tony Hsu Date: Thu, 25 Aug 2022 10:36:17 +0200 Subject: [PATCH 39/46] Bumping version 1.3.0 to 1.4.0 --- lib/ddtrace/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ddtrace/version.rb b/lib/ddtrace/version.rb index 1395548fd34..ac8f6f7a175 100644 --- a/lib/ddtrace/version.rb +++ b/lib/ddtrace/version.rb @@ -3,7 +3,7 @@ module DDTrace module VERSION MAJOR = 1 - MINOR = 3 + MINOR = 4 PATCH = 0 PRE = nil From b344f2f38aec77e1aab4bb87cecb6b07f7185ede Mon Sep 17 00:00:00 2001 From: Ivo Anjo Date: Thu, 25 Aug 2022 10:37:18 +0100 Subject: [PATCH 40/46] Updated: gemfiles for 1.4.0 --- gemfiles/jruby_9.2.18.0_contrib.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.18.0_contrib_old.gemfile.lock | 11 +++++++---- gemfiles/jruby_9.2.18.0_core_old.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.18.0_cucumber3.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.18.0_cucumber4.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.18.0_cucumber5.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.18.0_rails5_mysql2.gemfile.lock | 13 ++++++++----- .../jruby_9.2.18.0_rails5_postgres.gemfile.lock | 13 ++++++++----- ...ruby_9.2.18.0_rails5_postgres_redis.gemfile.lock | 13 ++++++++----- ...rails5_postgres_redis_activesupport.gemfile.lock | 13 ++++++++----- ...by_9.2.18.0_rails5_postgres_sidekiq.gemfile.lock | 13 ++++++++----- ...uby_9.2.18.0_rails5_semantic_logger.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.18.0_rails61_mysql2.gemfile.lock | 13 ++++++++----- .../jruby_9.2.18.0_rails61_postgres.gemfile.lock | 13 ++++++++----- ...uby_9.2.18.0_rails61_postgres_redis.gemfile.lock | 13 ++++++++----- ...y_9.2.18.0_rails61_postgres_sidekiq.gemfile.lock | 13 ++++++++----- ...by_9.2.18.0_rails61_semantic_logger.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.18.0_rails6_mysql2.gemfile.lock | 13 ++++++++----- .../jruby_9.2.18.0_rails6_postgres.gemfile.lock | 13 ++++++++----- ...ruby_9.2.18.0_rails6_postgres_redis.gemfile.lock | 13 ++++++++----- ...rails6_postgres_redis_activesupport.gemfile.lock | 13 ++++++++----- ...by_9.2.18.0_rails6_postgres_sidekiq.gemfile.lock | 13 ++++++++----- ...uby_9.2.18.0_rails6_semantic_logger.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.18.0_resque2_redis3.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.18.0_resque2_redis4.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.8.0_contrib.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.8.0_contrib_old.gemfile.lock | 11 +++++++---- gemfiles/jruby_9.2.8.0_core_old.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.8.0_cucumber3.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.8.0_cucumber4.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.8.0_cucumber5.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.8.0_rails5_mysql2.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.8.0_rails5_postgres.gemfile.lock | 13 ++++++++----- ...jruby_9.2.8.0_rails5_postgres_redis.gemfile.lock | 13 ++++++++----- ...rails5_postgres_redis_activesupport.gemfile.lock | 13 ++++++++----- ...uby_9.2.8.0_rails5_postgres_sidekiq.gemfile.lock | 13 ++++++++----- ...ruby_9.2.8.0_rails5_semantic_logger.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.8.0_rails61_mysql2.gemfile.lock | 13 ++++++++----- .../jruby_9.2.8.0_rails61_postgres.gemfile.lock | 13 ++++++++----- ...ruby_9.2.8.0_rails61_postgres_redis.gemfile.lock | 13 ++++++++----- ...by_9.2.8.0_rails61_postgres_sidekiq.gemfile.lock | 13 ++++++++----- ...uby_9.2.8.0_rails61_semantic_logger.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.8.0_rails6_mysql2.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.8.0_rails6_postgres.gemfile.lock | 13 ++++++++----- ...jruby_9.2.8.0_rails6_postgres_redis.gemfile.lock | 13 ++++++++----- ...rails6_postgres_redis_activesupport.gemfile.lock | 13 ++++++++----- ...uby_9.2.8.0_rails6_postgres_sidekiq.gemfile.lock | 13 ++++++++----- ...ruby_9.2.8.0_rails6_semantic_logger.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.8.0_resque2_redis3.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.2.8.0_resque2_redis4.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.3.4.0_contrib.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.3.4.0_contrib_old.gemfile.lock | 11 +++++++---- gemfiles/jruby_9.3.4.0_core_old.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.3.4.0_cucumber3.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.3.4.0_cucumber4.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.3.4.0_cucumber5.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.3.4.0_rails5_mysql2.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.3.4.0_rails5_postgres.gemfile.lock | 13 ++++++++----- ...jruby_9.3.4.0_rails5_postgres_redis.gemfile.lock | 13 ++++++++----- ...rails5_postgres_redis_activesupport.gemfile.lock | 13 ++++++++----- ...uby_9.3.4.0_rails5_postgres_sidekiq.gemfile.lock | 13 ++++++++----- ...ruby_9.3.4.0_rails5_semantic_logger.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.3.4.0_rails61_mysql2.gemfile.lock | 13 ++++++++----- .../jruby_9.3.4.0_rails61_postgres.gemfile.lock | 13 ++++++++----- ...ruby_9.3.4.0_rails61_postgres_redis.gemfile.lock | 13 ++++++++----- ...by_9.3.4.0_rails61_postgres_sidekiq.gemfile.lock | 13 ++++++++----- ...uby_9.3.4.0_rails61_semantic_logger.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.3.4.0_rails6_mysql2.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.3.4.0_rails6_postgres.gemfile.lock | 13 ++++++++----- ...jruby_9.3.4.0_rails6_postgres_redis.gemfile.lock | 13 ++++++++----- ...rails6_postgres_redis_activesupport.gemfile.lock | 13 ++++++++----- ...uby_9.3.4.0_rails6_postgres_sidekiq.gemfile.lock | 13 ++++++++----- ...ruby_9.3.4.0_rails6_semantic_logger.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.3.4.0_resque2_redis3.gemfile.lock | 13 ++++++++----- gemfiles/jruby_9.3.4.0_resque2_redis4.gemfile.lock | 13 ++++++++----- gemfiles/ruby_2.1.10_contrib.gemfile.lock | 6 +++--- gemfiles/ruby_2.1.10_core_old.gemfile.lock | 6 +++--- gemfiles/ruby_2.1.10_rails32_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.1.10_rails32_postgres.gemfile.lock | 6 +++--- .../ruby_2.1.10_rails32_postgres_redis.gemfile.lock | 6 +++--- ...uby_2.1.10_rails32_postgres_sidekiq.gemfile.lock | 6 +++--- gemfiles/ruby_2.1.10_rails4_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.1.10_rails4_postgres.gemfile.lock | 6 +++--- .../ruby_2.1.10_rails4_postgres_redis.gemfile.lock | 6 +++--- .../ruby_2.1.10_rails4_semantic_logger.gemfile.lock | 6 +++--- gemfiles/ruby_2.2.10_contrib.gemfile.lock | 6 +++--- gemfiles/ruby_2.2.10_core_old.gemfile.lock | 6 +++--- gemfiles/ruby_2.2.10_rails32_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.2.10_rails32_postgres.gemfile.lock | 6 +++--- .../ruby_2.2.10_rails32_postgres_redis.gemfile.lock | 6 +++--- ...uby_2.2.10_rails32_postgres_sidekiq.gemfile.lock | 6 +++--- gemfiles/ruby_2.2.10_rails4_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.2.10_rails4_postgres.gemfile.lock | 2 +- .../ruby_2.2.10_rails4_postgres_redis.gemfile.lock | 6 +++--- ...ruby_2.2.10_rails4_postgres_sidekiq.gemfile.lock | 2 +- .../ruby_2.2.10_rails4_semantic_logger.gemfile.lock | 6 +++--- gemfiles/ruby_2.2.10_rails5_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.2.10_rails5_postgres.gemfile.lock | 2 +- .../ruby_2.2.10_rails5_postgres_redis.gemfile.lock | 6 +++--- ...rails5_postgres_redis_activesupport.gemfile.lock | 2 +- ...ruby_2.2.10_rails5_postgres_sidekiq.gemfile.lock | 6 +++--- .../ruby_2.2.10_rails5_semantic_logger.gemfile.lock | 2 +- gemfiles/ruby_2.3.8_contrib.gemfile.lock | 6 +++--- gemfiles/ruby_2.3.8_contrib_old.gemfile.lock | 6 +++--- gemfiles/ruby_2.3.8_core_old.gemfile.lock | 6 +++--- gemfiles/ruby_2.3.8_cucumber3.gemfile.lock | 6 +++--- gemfiles/ruby_2.3.8_cucumber4.gemfile.lock | 6 +++--- gemfiles/ruby_2.3.8_rails32_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.3.8_rails32_postgres.gemfile.lock | 6 +++--- .../ruby_2.3.8_rails32_postgres_redis.gemfile.lock | 6 +++--- ...ruby_2.3.8_rails32_postgres_sidekiq.gemfile.lock | 6 +++--- gemfiles/ruby_2.3.8_rails4_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.3.8_rails4_postgres.gemfile.lock | 2 +- .../ruby_2.3.8_rails4_postgres_redis.gemfile.lock | 6 +++--- .../ruby_2.3.8_rails4_postgres_sidekiq.gemfile.lock | 2 +- .../ruby_2.3.8_rails4_semantic_logger.gemfile.lock | 6 +++--- gemfiles/ruby_2.3.8_rails5_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.3.8_rails5_postgres.gemfile.lock | 2 +- .../ruby_2.3.8_rails5_postgres_redis.gemfile.lock | 6 +++--- ...rails5_postgres_redis_activesupport.gemfile.lock | 6 +++--- .../ruby_2.3.8_rails5_postgres_sidekiq.gemfile.lock | 6 +++--- .../ruby_2.3.8_rails5_semantic_logger.gemfile.lock | 2 +- gemfiles/ruby_2.3.8_resque2_redis3.gemfile.lock | 6 +++--- gemfiles/ruby_2.3.8_resque2_redis4.gemfile.lock | 2 +- gemfiles/ruby_2.4.10_contrib.gemfile.lock | 8 ++++---- gemfiles/ruby_2.4.10_contrib_old.gemfile.lock | 6 +++--- gemfiles/ruby_2.4.10_core_old.gemfile.lock | 8 ++++---- gemfiles/ruby_2.4.10_cucumber3.gemfile.lock | 8 ++++---- gemfiles/ruby_2.4.10_cucumber4.gemfile.lock | 8 ++++---- gemfiles/ruby_2.4.10_rails5_mysql2.gemfile.lock | 8 ++++---- gemfiles/ruby_2.4.10_rails5_postgres.gemfile.lock | 8 ++++---- .../ruby_2.4.10_rails5_postgres_redis.gemfile.lock | 8 ++++---- ...rails5_postgres_redis_activesupport.gemfile.lock | 8 ++++---- ...ruby_2.4.10_rails5_postgres_sidekiq.gemfile.lock | 8 ++++---- .../ruby_2.4.10_rails5_semantic_logger.gemfile.lock | 8 ++++---- gemfiles/ruby_2.4.10_resque2_redis3.gemfile.lock | 8 ++++---- gemfiles/ruby_2.4.10_resque2_redis4.gemfile.lock | 8 ++++---- gemfiles/ruby_2.5.9_contrib.gemfile.lock | 6 +++--- gemfiles/ruby_2.5.9_contrib_old.gemfile.lock | 4 ++-- gemfiles/ruby_2.5.9_core_old.gemfile.lock | 6 +++--- gemfiles/ruby_2.5.9_cucumber3.gemfile.lock | 6 +++--- gemfiles/ruby_2.5.9_cucumber4.gemfile.lock | 6 +++--- gemfiles/ruby_2.5.9_cucumber5.gemfile.lock | 6 +++--- gemfiles/ruby_2.5.9_rails5_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.5.9_rails5_postgres.gemfile.lock | 6 +++--- .../ruby_2.5.9_rails5_postgres_redis.gemfile.lock | 6 +++--- ...rails5_postgres_redis_activesupport.gemfile.lock | 6 +++--- .../ruby_2.5.9_rails5_postgres_sidekiq.gemfile.lock | 6 +++--- .../ruby_2.5.9_rails5_semantic_logger.gemfile.lock | 6 +++--- gemfiles/ruby_2.5.9_rails61_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.5.9_rails61_postgres.gemfile.lock | 6 +++--- .../ruby_2.5.9_rails61_postgres_redis.gemfile.lock | 6 +++--- ...ruby_2.5.9_rails61_postgres_sidekiq.gemfile.lock | 6 +++--- .../ruby_2.5.9_rails61_semantic_logger.gemfile.lock | 6 +++--- gemfiles/ruby_2.5.9_rails6_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.5.9_rails6_postgres.gemfile.lock | 6 +++--- .../ruby_2.5.9_rails6_postgres_redis.gemfile.lock | 6 +++--- ...rails6_postgres_redis_activesupport.gemfile.lock | 6 +++--- .../ruby_2.5.9_rails6_postgres_sidekiq.gemfile.lock | 6 +++--- .../ruby_2.5.9_rails6_semantic_logger.gemfile.lock | 6 +++--- gemfiles/ruby_2.5.9_resque2_redis3.gemfile.lock | 6 +++--- gemfiles/ruby_2.5.9_resque2_redis4.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_contrib.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_contrib_old.gemfile.lock | 4 ++-- gemfiles/ruby_2.6.7_core_old.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_cucumber3.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_cucumber4.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_cucumber5.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_rails5_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_rails5_postgres.gemfile.lock | 6 +++--- .../ruby_2.6.7_rails5_postgres_redis.gemfile.lock | 6 +++--- ...rails5_postgres_redis_activesupport.gemfile.lock | 6 +++--- .../ruby_2.6.7_rails5_postgres_sidekiq.gemfile.lock | 6 +++--- .../ruby_2.6.7_rails5_semantic_logger.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_rails61_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_rails61_postgres.gemfile.lock | 6 +++--- .../ruby_2.6.7_rails61_postgres_redis.gemfile.lock | 6 +++--- ...ruby_2.6.7_rails61_postgres_sidekiq.gemfile.lock | 6 +++--- .../ruby_2.6.7_rails61_semantic_logger.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_rails6_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_rails6_postgres.gemfile.lock | 6 +++--- .../ruby_2.6.7_rails6_postgres_redis.gemfile.lock | 6 +++--- ...rails6_postgres_redis_activesupport.gemfile.lock | 6 +++--- .../ruby_2.6.7_rails6_postgres_sidekiq.gemfile.lock | 6 +++--- .../ruby_2.6.7_rails6_semantic_logger.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_resque2_redis3.gemfile.lock | 6 +++--- gemfiles/ruby_2.6.7_resque2_redis4.gemfile.lock | 6 +++--- gemfiles/ruby_2.7.3_contrib.gemfile.lock | 12 ++++++------ gemfiles/ruby_2.7.3_contrib_old.gemfile.lock | 9 +++++---- gemfiles/ruby_2.7.3_core_old.gemfile.lock | 11 ++++++----- gemfiles/ruby_2.7.3_cucumber3.gemfile.lock | 11 ++++++----- gemfiles/ruby_2.7.3_cucumber4.gemfile.lock | 11 ++++++----- gemfiles/ruby_2.7.3_cucumber5.gemfile.lock | 11 ++++++----- gemfiles/ruby_2.7.3_rails5_mysql2.gemfile.lock | 11 ++++++----- gemfiles/ruby_2.7.3_rails5_postgres.gemfile.lock | 11 ++++++----- .../ruby_2.7.3_rails5_postgres_redis.gemfile.lock | 11 ++++++----- ...rails5_postgres_redis_activesupport.gemfile.lock | 11 ++++++----- .../ruby_2.7.3_rails5_postgres_sidekiq.gemfile.lock | 11 ++++++----- .../ruby_2.7.3_rails5_semantic_logger.gemfile.lock | 11 ++++++----- gemfiles/ruby_2.7.3_rails61_mysql2.gemfile.lock | 11 ++++++----- gemfiles/ruby_2.7.3_rails61_postgres.gemfile.lock | 11 ++++++----- .../ruby_2.7.3_rails61_postgres_redis.gemfile.lock | 11 ++++++----- ...ruby_2.7.3_rails61_postgres_sidekiq.gemfile.lock | 11 ++++++----- .../ruby_2.7.3_rails61_semantic_logger.gemfile.lock | 11 ++++++----- gemfiles/ruby_2.7.3_rails6_mysql2.gemfile.lock | 11 ++++++----- gemfiles/ruby_2.7.3_rails6_postgres.gemfile.lock | 11 ++++++----- .../ruby_2.7.3_rails6_postgres_redis.gemfile.lock | 11 ++++++----- ...rails6_postgres_redis_activesupport.gemfile.lock | 11 ++++++----- .../ruby_2.7.3_rails6_postgres_sidekiq.gemfile.lock | 11 ++++++----- .../ruby_2.7.3_rails6_semantic_logger.gemfile.lock | 11 ++++++----- gemfiles/ruby_2.7.3_resque2_redis3.gemfile.lock | 11 ++++++----- gemfiles/ruby_2.7.3_resque2_redis4.gemfile.lock | 11 ++++++----- gemfiles/ruby_3.0.3_contrib.gemfile.lock | 9 +++------ gemfiles/ruby_3.0.3_contrib_old.gemfile.lock | 7 ++----- gemfiles/ruby_3.0.3_core_old.gemfile.lock | 9 +++------ gemfiles/ruby_3.0.3_cucumber3.gemfile.lock | 9 +++------ gemfiles/ruby_3.0.3_cucumber4.gemfile.lock | 9 +++------ gemfiles/ruby_3.0.3_cucumber5.gemfile.lock | 9 +++------ gemfiles/ruby_3.0.3_rails61_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_3.0.3_rails61_postgres.gemfile.lock | 9 +++------ .../ruby_3.0.3_rails61_postgres_redis.gemfile.lock | 9 +++------ ...ruby_3.0.3_rails61_postgres_sidekiq.gemfile.lock | 9 +++------ .../ruby_3.0.3_rails61_semantic_logger.gemfile.lock | 9 +++------ gemfiles/ruby_3.0.3_resque2_redis3.gemfile.lock | 9 +++------ gemfiles/ruby_3.0.3_resque2_redis4.gemfile.lock | 9 +++------ gemfiles/ruby_3.1.1_contrib.gemfile.lock | 8 ++++---- gemfiles/ruby_3.1.1_contrib_old.gemfile.lock | 6 +++--- gemfiles/ruby_3.1.1_core_old.gemfile.lock | 8 ++++---- gemfiles/ruby_3.1.1_cucumber3.gemfile.lock | 8 ++++---- gemfiles/ruby_3.1.1_cucumber4.gemfile.lock | 8 ++++---- gemfiles/ruby_3.1.1_cucumber5.gemfile.lock | 8 ++++---- gemfiles/ruby_3.1.1_rails61_mysql2.gemfile.lock | 8 ++++---- gemfiles/ruby_3.1.1_rails61_postgres.gemfile.lock | 8 ++++---- .../ruby_3.1.1_rails61_postgres_redis.gemfile.lock | 8 ++++---- ...ruby_3.1.1_rails61_postgres_sidekiq.gemfile.lock | 8 ++++---- .../ruby_3.1.1_rails61_semantic_logger.gemfile.lock | 8 ++++---- gemfiles/ruby_3.1.1_resque2_redis3.gemfile.lock | 8 ++++---- gemfiles/ruby_3.1.1_resque2_redis4.gemfile.lock | 8 ++++---- gemfiles/ruby_3.2.0_contrib.gemfile.lock | 6 +++--- gemfiles/ruby_3.2.0_contrib_old.gemfile.lock | 4 ++-- gemfiles/ruby_3.2.0_core_old.gemfile.lock | 6 +++--- gemfiles/ruby_3.2.0_cucumber3.gemfile.lock | 6 +++--- gemfiles/ruby_3.2.0_cucumber4.gemfile.lock | 6 +++--- gemfiles/ruby_3.2.0_cucumber5.gemfile.lock | 6 +++--- gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock | 6 +++--- gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock | 6 +++--- .../ruby_3.2.0_rails61_postgres_redis.gemfile.lock | 6 +++--- ...ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock | 6 +++--- .../ruby_3.2.0_rails61_semantic_logger.gemfile.lock | 6 +++--- gemfiles/ruby_3.2.0_resque2_redis3.gemfile.lock | 6 +++--- gemfiles/ruby_3.2.0_resque2_redis4.gemfile.lock | 6 +++--- 251 files changed, 1199 insertions(+), 986 deletions(-) diff --git a/gemfiles/jruby_9.2.18.0_contrib.gemfile.lock b/gemfiles/jruby_9.2.18.0_contrib.gemfile.lock index 8dc74c65a45..b5d1d3c18d3 100644 --- a/gemfiles/jruby_9.2.18.0_contrib.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_contrib.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -1438,7 +1438,7 @@ GEM addressable (>= 2.4) jsonapi-renderer (0.2.2) king_konf (1.0.0) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -1461,7 +1461,7 @@ GEM mongo (2.14.1) bson (>= 4.8.2, < 5.0.0) mono_logger (1.1.1) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_json (1.15.0) multi_test (0.1.2) multipart-post (2.1.1) @@ -1566,6 +1566,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -1691,7 +1693,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) ruby-kafka (>= 0.7.10) diff --git a/gemfiles/jruby_9.2.18.0_contrib_old.gemfile.lock b/gemfiles/jruby_9.2.18.0_contrib_old.gemfile.lock index 46445f5d0e9..c1e75542683 100644 --- a/gemfiles/jruby_9.2.18.0_contrib_old.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_contrib_old.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -59,7 +59,7 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) @@ -121,6 +121,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -174,7 +176,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_core_old.gemfile.lock b/gemfiles/jruby_9.2.18.0_core_old.gemfile.lock index 05d8dafc8fb..096e593a163 100644 --- a/gemfiles/jruby_9.2.18.0_core_old.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_core_old.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -45,12 +45,12 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) opentracing (0.5.0) os (1.1.4) parallel (1.22.1) @@ -101,6 +101,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -149,7 +151,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_cucumber3.gemfile.lock b/gemfiles/jruby_9.2.18.0_cucumber3.gemfile.lock index 3bf6455733c..ded3520ac5f 100644 --- a/gemfiles/jruby_9.2.18.0_cucumber3.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_cucumber3.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -63,12 +63,12 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_json (1.15.0) multi_test (0.1.2) opentracing (0.5.0) @@ -121,6 +121,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -170,7 +172,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_cucumber4.gemfile.lock b/gemfiles/jruby_9.2.18.0_cucumber4.gemfile.lock index 27ec5cffee6..e0bf8eaad88 100644 --- a/gemfiles/jruby_9.2.18.0_cucumber4.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_cucumber4.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -84,14 +84,14 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -148,6 +148,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -203,7 +205,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_cucumber5.gemfile.lock b/gemfiles/jruby_9.2.18.0_cucumber5.gemfile.lock index 71c36ff1b93..b75c3a830f8 100644 --- a/gemfiles/jruby_9.2.18.0_cucumber5.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_cucumber5.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -84,14 +84,14 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -148,6 +148,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -203,7 +205,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails5_mysql2.gemfile.lock index c82dcc2af99..4c4c455857e 100644 --- a/gemfiles/jruby_9.2.18.0_rails5_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails5_mysql2.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-mysql (8.0.27) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -201,6 +201,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -267,7 +269,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails5_postgres.gemfile.lock index 717fcbbc23c..e157c472000 100644 --- a/gemfiles/jruby_9.2.18.0_rails5_postgres.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails5_postgres.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -201,6 +201,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -267,7 +269,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails5_postgres_redis.gemfile.lock index b7a1d1a8c39..8e0a0a75d2a 100644 --- a/gemfiles/jruby_9.2.18.0_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails5_postgres_redis.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -202,6 +202,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -269,7 +271,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails5_postgres_redis_activesupport.gemfile.lock index 3a22749e3dc..572900b93f4 100644 --- a/gemfiles/jruby_9.2.18.0_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -218,6 +218,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -286,7 +288,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails5_postgres_sidekiq.gemfile.lock index 1e756434641..4a9fab772e4 100644 --- a/gemfiles/jruby_9.2.18.0_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails5_postgres_sidekiq.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -100,7 +100,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -118,7 +118,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -203,6 +203,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -274,7 +276,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) sidekiq diff --git a/gemfiles/jruby_9.2.18.0_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails5_semantic_logger.gemfile.lock index fb6ec12f065..864b2d0631b 100644 --- a/gemfiles/jruby_9.2.18.0_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails5_semantic_logger.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) loofah (2.15.0) @@ -112,7 +112,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -198,6 +198,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -266,7 +268,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails61_mysql2.gemfile.lock index ecf7a65890a..1c608b278ba 100644 --- a/gemfiles/jruby_9.2.18.0_rails61_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails61_mysql2.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -116,7 +116,7 @@ GEM jdbc-mysql (8.0.27) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -134,7 +134,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -220,6 +220,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -286,7 +288,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails61_postgres.gemfile.lock index a24ed5313fd..5ea361af815 100644 --- a/gemfiles/jruby_9.2.18.0_rails61_postgres.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails61_postgres.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -116,7 +116,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -134,7 +134,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -220,6 +220,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -286,7 +288,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails61_postgres_redis.gemfile.lock index c51723f8c7b..ea9008b4280 100644 --- a/gemfiles/jruby_9.2.18.0_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails61_postgres_redis.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -116,7 +116,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -134,7 +134,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -221,6 +221,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -288,7 +290,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails61_postgres_sidekiq.gemfile.lock index c09320b3602..a1819df399b 100644 --- a/gemfiles/jruby_9.2.18.0_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails61_postgres_sidekiq.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -117,7 +117,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -135,7 +135,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -222,6 +222,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -292,7 +294,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) sidekiq (>= 6.1.2) diff --git a/gemfiles/jruby_9.2.18.0_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails61_semantic_logger.gemfile.lock index 3585e63431f..cc82dab1187 100644 --- a/gemfiles/jruby_9.2.18.0_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails61_semantic_logger.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -116,7 +116,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) loofah (2.15.0) @@ -129,7 +129,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -217,6 +217,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -285,7 +287,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails6_mysql2.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails6_mysql2.gemfile.lock index 0c83694882c..8c5aeaddafc 100644 --- a/gemfiles/jruby_9.2.18.0_rails6_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails6_mysql2.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-mysql (8.0.27) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -216,6 +216,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -283,7 +285,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails6_postgres.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails6_postgres.gemfile.lock index c37447f7875..342f1ab59e7 100644 --- a/gemfiles/jruby_9.2.18.0_rails6_postgres.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails6_postgres.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -216,6 +216,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -283,7 +285,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails6_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails6_postgres_redis.gemfile.lock index c3a43a2826c..a11765af0b3 100644 --- a/gemfiles/jruby_9.2.18.0_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails6_postgres_redis.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -217,6 +217,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -285,7 +287,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails6_postgres_redis_activesupport.gemfile.lock index 3085c6af8a9..b752b10ed64 100644 --- a/gemfiles/jruby_9.2.18.0_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -233,6 +233,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -302,7 +304,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails6_postgres_sidekiq.gemfile.lock index ebe69e1fec9..2584d10c47e 100644 --- a/gemfiles/jruby_9.2.18.0_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails6_postgres_sidekiq.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -113,7 +113,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -131,7 +131,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -218,6 +218,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -290,7 +292,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) sidekiq diff --git a/gemfiles/jruby_9.2.18.0_rails6_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails6_semantic_logger.gemfile.lock index de4f27c3d6a..c446891c1b5 100644 --- a/gemfiles/jruby_9.2.18.0_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_rails6_semantic_logger.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) loofah (2.15.0) @@ -125,7 +125,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -213,6 +213,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -282,7 +284,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.2.18.0_resque2_redis3.gemfile.lock index 83e36679fb5..885c9b49a2e 100644 --- a/gemfiles/jruby_9.2.18.0_resque2_redis3.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_resque2_redis3.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -45,13 +45,13 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -116,6 +116,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -173,7 +175,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.18.0_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.2.18.0_resque2_redis4.gemfile.lock index b17dcd64237..8904f9c7054 100644 --- a/gemfiles/jruby_9.2.18.0_resque2_redis4.gemfile.lock +++ b/gemfiles/jruby_9.2.18.0_resque2_redis4.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -45,13 +45,13 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -116,6 +116,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -173,7 +175,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_contrib.gemfile.lock b/gemfiles/jruby_9.2.8.0_contrib.gemfile.lock index 60be4eb0d80..20183c863d1 100644 --- a/gemfiles/jruby_9.2.8.0_contrib.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_contrib.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -1438,7 +1438,7 @@ GEM addressable (>= 2.4) jsonapi-renderer (0.2.2) king_konf (1.0.0) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -1461,7 +1461,7 @@ GEM mongo (2.14.1) bson (>= 4.8.2, < 5.0.0) mono_logger (1.1.1) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_json (1.15.0) multi_test (0.1.2) multipart-post (2.1.1) @@ -1566,6 +1566,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -1691,7 +1693,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) ruby-kafka (>= 0.7.10) diff --git a/gemfiles/jruby_9.2.8.0_contrib_old.gemfile.lock b/gemfiles/jruby_9.2.8.0_contrib_old.gemfile.lock index 21aacabb0f5..00db4429f13 100644 --- a/gemfiles/jruby_9.2.8.0_contrib_old.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_contrib_old.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -59,7 +59,7 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) @@ -121,6 +121,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -174,7 +176,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_core_old.gemfile.lock b/gemfiles/jruby_9.2.8.0_core_old.gemfile.lock index a42b4b84c1a..a9adae68678 100644 --- a/gemfiles/jruby_9.2.8.0_core_old.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_core_old.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -45,12 +45,12 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) opentracing (0.5.0) os (1.1.4) parallel (1.22.1) @@ -101,6 +101,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -149,7 +151,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_cucumber3.gemfile.lock b/gemfiles/jruby_9.2.8.0_cucumber3.gemfile.lock index 9fb1cbef439..77aaca90cfc 100644 --- a/gemfiles/jruby_9.2.8.0_cucumber3.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_cucumber3.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -63,12 +63,12 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_json (1.15.0) multi_test (0.1.2) opentracing (0.5.0) @@ -121,6 +121,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -170,7 +172,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_cucumber4.gemfile.lock b/gemfiles/jruby_9.2.8.0_cucumber4.gemfile.lock index 9e61e303fee..d8cd05cfd49 100644 --- a/gemfiles/jruby_9.2.8.0_cucumber4.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_cucumber4.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -84,14 +84,14 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -148,6 +148,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -203,7 +205,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_cucumber5.gemfile.lock b/gemfiles/jruby_9.2.8.0_cucumber5.gemfile.lock index ac46650aea4..07b328d5c1b 100644 --- a/gemfiles/jruby_9.2.8.0_cucumber5.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_cucumber5.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -84,14 +84,14 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -148,6 +148,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -203,7 +205,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails5_mysql2.gemfile.lock index ccc704270a9..dc0946db85f 100644 --- a/gemfiles/jruby_9.2.8.0_rails5_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails5_mysql2.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-mysql (8.0.27) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -201,6 +201,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -267,7 +269,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails5_postgres.gemfile.lock index ee00499ef9f..f00078b572f 100644 --- a/gemfiles/jruby_9.2.8.0_rails5_postgres.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails5_postgres.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -201,6 +201,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -267,7 +269,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails5_postgres_redis.gemfile.lock index d17ea89f9b6..ee97c9a87ee 100644 --- a/gemfiles/jruby_9.2.8.0_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails5_postgres_redis.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -202,6 +202,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -269,7 +271,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails5_postgres_redis_activesupport.gemfile.lock index e55fe39fd6c..085299c4cfe 100644 --- a/gemfiles/jruby_9.2.8.0_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -218,6 +218,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -286,7 +288,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails5_postgres_sidekiq.gemfile.lock index 493841be410..dc8f4eea905 100644 --- a/gemfiles/jruby_9.2.8.0_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails5_postgres_sidekiq.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -100,7 +100,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -118,7 +118,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -203,6 +203,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -274,7 +276,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) sidekiq diff --git a/gemfiles/jruby_9.2.8.0_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails5_semantic_logger.gemfile.lock index b518ed09ebf..2bdec818257 100644 --- a/gemfiles/jruby_9.2.8.0_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails5_semantic_logger.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) loofah (2.15.0) @@ -112,7 +112,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -198,6 +198,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -266,7 +268,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails61_mysql2.gemfile.lock index e97c9877553..e28475342a5 100644 --- a/gemfiles/jruby_9.2.8.0_rails61_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails61_mysql2.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -116,7 +116,7 @@ GEM jdbc-mysql (8.0.27) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -134,7 +134,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -220,6 +220,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -286,7 +288,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails61_postgres.gemfile.lock index 1c89928601f..9faa65f4088 100644 --- a/gemfiles/jruby_9.2.8.0_rails61_postgres.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails61_postgres.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -116,7 +116,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -134,7 +134,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -220,6 +220,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -286,7 +288,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails61_postgres_redis.gemfile.lock index 970ebf748fa..0350b9c5620 100644 --- a/gemfiles/jruby_9.2.8.0_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails61_postgres_redis.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -116,7 +116,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -134,7 +134,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -221,6 +221,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -288,7 +290,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails61_postgres_sidekiq.gemfile.lock index 217f8811497..9f838da1a91 100644 --- a/gemfiles/jruby_9.2.8.0_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails61_postgres_sidekiq.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -117,7 +117,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -135,7 +135,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -222,6 +222,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -292,7 +294,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) sidekiq (>= 6.1.2) diff --git a/gemfiles/jruby_9.2.8.0_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails61_semantic_logger.gemfile.lock index 8a142999c3d..514aee06c4e 100644 --- a/gemfiles/jruby_9.2.8.0_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails61_semantic_logger.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -116,7 +116,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) loofah (2.15.0) @@ -129,7 +129,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -217,6 +217,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -285,7 +287,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails6_mysql2.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails6_mysql2.gemfile.lock index c0c1cca8105..4626fd7cab9 100644 --- a/gemfiles/jruby_9.2.8.0_rails6_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails6_mysql2.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-mysql (8.0.27) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -216,6 +216,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -283,7 +285,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails6_postgres.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails6_postgres.gemfile.lock index 502f1053f9f..f06979338b0 100644 --- a/gemfiles/jruby_9.2.8.0_rails6_postgres.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails6_postgres.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -216,6 +216,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -283,7 +285,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails6_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails6_postgres_redis.gemfile.lock index a5a1069dc37..d51be488188 100644 --- a/gemfiles/jruby_9.2.8.0_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails6_postgres_redis.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -217,6 +217,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -285,7 +287,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails6_postgres_redis_activesupport.gemfile.lock index 7f1a99484b9..83defd0abe5 100644 --- a/gemfiles/jruby_9.2.8.0_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -233,6 +233,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -302,7 +304,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails6_postgres_sidekiq.gemfile.lock index dc1232c1c85..9bc6330db2a 100644 --- a/gemfiles/jruby_9.2.8.0_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails6_postgres_sidekiq.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -113,7 +113,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -131,7 +131,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -218,6 +218,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -290,7 +292,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) sidekiq diff --git a/gemfiles/jruby_9.2.8.0_rails6_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails6_semantic_logger.gemfile.lock index 2e75560d9c3..3ece38b7b08 100644 --- a/gemfiles/jruby_9.2.8.0_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_rails6_semantic_logger.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) loofah (2.15.0) @@ -125,7 +125,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) @@ -213,6 +213,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -282,7 +284,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.2.8.0_resque2_redis3.gemfile.lock index 50d43c65994..adb3e8579e4 100644 --- a/gemfiles/jruby_9.2.8.0_resque2_redis3.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_resque2_redis3.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -45,13 +45,13 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -116,6 +116,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -173,7 +175,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.2.8.0_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.2.8.0_resque2_redis4.gemfile.lock index aca2ec62d61..6f90d34a3c7 100644 --- a/gemfiles/jruby_9.2.8.0_resque2_redis4.gemfile.lock +++ b/gemfiles/jruby_9.2.8.0_resque2_redis4.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -45,13 +45,13 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -116,6 +116,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -173,7 +175,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_contrib.gemfile.lock b/gemfiles/jruby_9.3.4.0_contrib.gemfile.lock index 5625a142f8e..efc2e80a238 100644 --- a/gemfiles/jruby_9.3.4.0_contrib.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_contrib.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -1438,7 +1438,7 @@ GEM addressable (>= 2.4) jsonapi-renderer (0.2.2) king_konf (1.0.0) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -1461,7 +1461,7 @@ GEM mongo (2.14.1) bson (>= 4.8.2, < 5.0.0) mono_logger (1.1.1) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_json (1.15.0) multi_test (0.1.2) multipart-post (2.1.1) @@ -1566,6 +1566,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -1690,7 +1692,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) ruby-kafka (>= 0.7.10) diff --git a/gemfiles/jruby_9.3.4.0_contrib_old.gemfile.lock b/gemfiles/jruby_9.3.4.0_contrib_old.gemfile.lock index cfac3253d69..b3a5a246de1 100644 --- a/gemfiles/jruby_9.3.4.0_contrib_old.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_contrib_old.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -59,7 +59,7 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) @@ -121,6 +121,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -174,7 +176,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_core_old.gemfile.lock b/gemfiles/jruby_9.3.4.0_core_old.gemfile.lock index 45ca4e6ec25..053dfcd5169 100644 --- a/gemfiles/jruby_9.3.4.0_core_old.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_core_old.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -45,12 +45,12 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) opentracing (0.5.0) os (1.1.4) parallel (1.22.1) @@ -101,6 +101,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -149,7 +151,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_cucumber3.gemfile.lock b/gemfiles/jruby_9.3.4.0_cucumber3.gemfile.lock index cb5c764b985..29991816f8b 100644 --- a/gemfiles/jruby_9.3.4.0_cucumber3.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_cucumber3.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -63,12 +63,12 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_json (1.15.0) multi_test (0.1.2) opentracing (0.5.0) @@ -121,6 +121,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -170,7 +172,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_cucumber4.gemfile.lock b/gemfiles/jruby_9.3.4.0_cucumber4.gemfile.lock index cc6e0222796..9f33b4875c1 100644 --- a/gemfiles/jruby_9.3.4.0_cucumber4.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_cucumber4.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -84,14 +84,14 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -148,6 +148,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -203,7 +205,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_cucumber5.gemfile.lock b/gemfiles/jruby_9.3.4.0_cucumber5.gemfile.lock index 576482e655e..45fb2231952 100644 --- a/gemfiles/jruby_9.3.4.0_cucumber5.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_cucumber5.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -84,14 +84,14 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -148,6 +148,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -203,7 +205,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails5_mysql2.gemfile.lock index 95aa0484255..c5fa09c4169 100644 --- a/gemfiles/jruby_9.3.4.0_rails5_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails5_mysql2.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-mysql (8.0.27) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -201,6 +201,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -266,7 +268,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails5_postgres.gemfile.lock index cbf7356142e..a281ee7177f 100644 --- a/gemfiles/jruby_9.3.4.0_rails5_postgres.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails5_postgres.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -201,6 +201,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -266,7 +268,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails5_postgres_redis.gemfile.lock index 751690418a3..93d15875225 100644 --- a/gemfiles/jruby_9.3.4.0_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails5_postgres_redis.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -202,6 +202,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -268,7 +270,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails5_postgres_redis_activesupport.gemfile.lock index f4c054d39a7..7802d0d32fe 100644 --- a/gemfiles/jruby_9.3.4.0_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -218,6 +218,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -285,7 +287,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails5_postgres_sidekiq.gemfile.lock index 49c43083fb6..4d387fa5d5b 100644 --- a/gemfiles/jruby_9.3.4.0_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails5_postgres_sidekiq.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -100,7 +100,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -118,7 +118,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -203,6 +203,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -273,7 +275,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) sidekiq diff --git a/gemfiles/jruby_9.3.4.0_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails5_semantic_logger.gemfile.lock index d95d5c62380..8b273a2fe54 100644 --- a/gemfiles/jruby_9.3.4.0_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails5_semantic_logger.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -99,7 +99,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) loofah (2.15.0) @@ -112,7 +112,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -198,6 +198,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -265,7 +267,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails61_mysql2.gemfile.lock index 6c7a962edba..c7dda588f90 100644 --- a/gemfiles/jruby_9.3.4.0_rails61_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails61_mysql2.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -116,7 +116,7 @@ GEM jdbc-mysql (8.0.27) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -134,7 +134,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -220,6 +220,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -285,7 +287,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails61_postgres.gemfile.lock index 459389a0cd4..509ed687653 100644 --- a/gemfiles/jruby_9.3.4.0_rails61_postgres.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails61_postgres.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -116,7 +116,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -134,7 +134,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -220,6 +220,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -285,7 +287,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails61_postgres_redis.gemfile.lock index 8c37ec50dc6..fc558b49827 100644 --- a/gemfiles/jruby_9.3.4.0_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails61_postgres_redis.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -116,7 +116,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -134,7 +134,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -221,6 +221,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -287,7 +289,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails61_postgres_sidekiq.gemfile.lock index 0ed9543fccd..6184637ca40 100644 --- a/gemfiles/jruby_9.3.4.0_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails61_postgres_sidekiq.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -117,7 +117,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -135,7 +135,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -222,6 +222,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -291,7 +293,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) sidekiq (>= 6.1.2) diff --git a/gemfiles/jruby_9.3.4.0_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails61_semantic_logger.gemfile.lock index fa369077efa..cd8fa0806db 100644 --- a/gemfiles/jruby_9.3.4.0_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails61_semantic_logger.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -116,7 +116,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) loofah (2.15.0) @@ -129,7 +129,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -217,6 +217,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -284,7 +286,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails6_mysql2.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails6_mysql2.gemfile.lock index fe8b0eba7ca..0469db2b9e0 100644 --- a/gemfiles/jruby_9.3.4.0_rails6_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails6_mysql2.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-mysql (8.0.27) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -216,6 +216,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -282,7 +284,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails6_postgres.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails6_postgres.gemfile.lock index cda65cb5073..a097a1e2a63 100644 --- a/gemfiles/jruby_9.3.4.0_rails6_postgres.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails6_postgres.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -216,6 +216,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -282,7 +284,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails6_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails6_postgres_redis.gemfile.lock index 44f6f734161..15e7e903ff0 100644 --- a/gemfiles/jruby_9.3.4.0_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails6_postgres_redis.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -217,6 +217,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -284,7 +286,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails6_postgres_redis_activesupport.gemfile.lock index f82039bd11f..2ff109bc202 100644 --- a/gemfiles/jruby_9.3.4.0_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -233,6 +233,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -301,7 +303,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails6_postgres_sidekiq.gemfile.lock index f05627ed2d4..82a7dc35f77 100644 --- a/gemfiles/jruby_9.3.4.0_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails6_postgres_sidekiq.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -113,7 +113,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.12.0) @@ -131,7 +131,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -218,6 +218,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -289,7 +291,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) sidekiq diff --git a/gemfiles/jruby_9.3.4.0_rails6_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3.4.0_rails6_semantic_logger.gemfile.lock index abf2a775151..23f691a398a 100644 --- a/gemfiles/jruby_9.3.4.0_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_rails6_semantic_logger.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -112,7 +112,7 @@ GEM jdbc-postgres (42.2.25) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) loofah (2.15.0) @@ -125,7 +125,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.3-java) + msgpack (1.5.6-java) nio4r (2.5.8-java) nokogiri (1.13.3-java) racc (~> 1.4) @@ -213,6 +213,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -281,7 +283,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.3.4.0_resque2_redis3.gemfile.lock index 3fe6527561c..f726ab76a57 100644 --- a/gemfiles/jruby_9.3.4.0_resque2_redis3.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_resque2_redis3.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -45,13 +45,13 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -116,6 +116,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -173,7 +175,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/jruby_9.3.4.0_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.3.4.0_resque2_redis4.gemfile.lock index fb319d7ee11..0c82fc4da7e 100644 --- a/gemfiles/jruby_9.3.4.0_resque2_redis4.gemfile.lock +++ b/gemfiles/jruby_9.3.4.0_resque2_redis4.gemfile.lock @@ -11,9 +11,9 @@ GIT PATH remote: .. specs: - ddtrace (1.2.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) - libddprof (~> 0.6.0.1.0) + libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) msgpack @@ -45,13 +45,13 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libddprof (0.6.0.1.0) + libdatadog (0.7.0.1.1) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.3-java) + msgpack (1.5.6-java) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -116,6 +116,8 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.16.0) parser (>= 3.1.1.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) rubocop-performance (1.13.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -173,7 +175,8 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) simplecov! diff --git a/gemfiles/ruby_2.1.10_contrib.gemfile.lock b/gemfiles/ruby_2.1.10_contrib.gemfile.lock index 66ac1035a3d..bdd4b64fe29 100644 --- a/gemfiles/ruby_2.1.10_contrib.gemfile.lock +++ b/gemfiles/ruby_2.1.10_contrib.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -126,8 +126,8 @@ GEM json (1.8.6) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) makara (0.4.1) activerecord (>= 3.0.0) diff --git a/gemfiles/ruby_2.1.10_core_old.gemfile.lock b/gemfiles/ruby_2.1.10_core_old.gemfile.lock index 783f812c6bd..8f0b3af138a 100644 --- a/gemfiles/ruby_2.1.10_core_old.gemfile.lock +++ b/gemfiles/ruby_2.1.10_core_old.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -37,8 +37,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.12) method_source (1.0.0) diff --git a/gemfiles/ruby_2.1.10_rails32_mysql2.gemfile.lock b/gemfiles/ruby_2.1.10_rails32_mysql2.gemfile.lock index 21ead599b95..68a882de68c 100644 --- a/gemfiles/ruby_2.1.10_rails32_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.1.10_rails32_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -74,8 +74,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) mail (2.5.5) mime-types (~> 1.16) diff --git a/gemfiles/ruby_2.1.10_rails32_postgres.gemfile.lock b/gemfiles/ruby_2.1.10_rails32_postgres.gemfile.lock index ddcaea2c503..dd2b0ceb4b8 100644 --- a/gemfiles/ruby_2.1.10_rails32_postgres.gemfile.lock +++ b/gemfiles/ruby_2.1.10_rails32_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -70,8 +70,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) mail (2.5.5) mime-types (~> 1.16) diff --git a/gemfiles/ruby_2.1.10_rails32_postgres_redis.gemfile.lock b/gemfiles/ruby_2.1.10_rails32_postgres_redis.gemfile.lock index 62414b53b35..4ac669f76c5 100644 --- a/gemfiles/ruby_2.1.10_rails32_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.1.10_rails32_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -70,8 +70,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) mail (2.5.5) mime-types (~> 1.16) diff --git a/gemfiles/ruby_2.1.10_rails32_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.1.10_rails32_postgres_sidekiq.gemfile.lock index 6590d07c527..8cebd6fdcbd 100644 --- a/gemfiles/ruby_2.1.10_rails32_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.1.10_rails32_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -71,8 +71,8 @@ GEM json (1.8.6) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) mail (2.5.5) mime-types (~> 1.16) diff --git a/gemfiles/ruby_2.1.10_rails4_mysql2.gemfile.lock b/gemfiles/ruby_2.1.10_rails4_mysql2.gemfile.lock index 20279687377..9fc9b8b4856 100644 --- a/gemfiles/ruby_2.1.10_rails4_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.1.10_rails4_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -78,8 +78,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.1.10_rails4_postgres.gemfile.lock b/gemfiles/ruby_2.1.10_rails4_postgres.gemfile.lock index 7a1a04873de..19421178c8c 100644 --- a/gemfiles/ruby_2.1.10_rails4_postgres.gemfile.lock +++ b/gemfiles/ruby_2.1.10_rails4_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -78,8 +78,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.1.10_rails4_postgres_redis.gemfile.lock b/gemfiles/ruby_2.1.10_rails4_postgres_redis.gemfile.lock index 80ce6e47f6e..71913c39bdf 100644 --- a/gemfiles/ruby_2.1.10_rails4_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.1.10_rails4_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -78,8 +78,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.1.10_rails4_semantic_logger.gemfile.lock b/gemfiles/ruby_2.1.10_rails4_semantic_logger.gemfile.lock index 6f82b12f3c7..3bbbbcb648b 100644 --- a/gemfiles/ruby_2.1.10_rails4_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.1.10_rails4_semantic_logger.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -78,8 +78,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) loofah (2.15.0) crass (~> 1.0.2) diff --git a/gemfiles/ruby_2.2.10_contrib.gemfile.lock b/gemfiles/ruby_2.2.10_contrib.gemfile.lock index 67bfe6f3f78..93d7d2195b4 100644 --- a/gemfiles/ruby_2.2.10_contrib.gemfile.lock +++ b/gemfiles/ruby_2.2.10_contrib.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -1268,8 +1268,8 @@ GEM addressable (>= 2.4) jsonapi-renderer (0.2.2) king_konf (1.0.0) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.2.10_core_old.gemfile.lock b/gemfiles/ruby_2.2.10_core_old.gemfile.lock index 68bd91223ac..ce8cff362c9 100644 --- a/gemfiles/ruby_2.2.10_core_old.gemfile.lock +++ b/gemfiles/ruby_2.2.10_core_old.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -37,8 +37,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.12) method_source (1.0.0) diff --git a/gemfiles/ruby_2.2.10_rails32_mysql2.gemfile.lock b/gemfiles/ruby_2.2.10_rails32_mysql2.gemfile.lock index 13506969657..b6980099b8c 100644 --- a/gemfiles/ruby_2.2.10_rails32_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails32_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -74,8 +74,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) mail (2.5.5) mime-types (~> 1.16) diff --git a/gemfiles/ruby_2.2.10_rails32_postgres.gemfile.lock b/gemfiles/ruby_2.2.10_rails32_postgres.gemfile.lock index a4af1bc62d9..3b916cb0de2 100644 --- a/gemfiles/ruby_2.2.10_rails32_postgres.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails32_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -70,8 +70,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) mail (2.5.5) mime-types (~> 1.16) diff --git a/gemfiles/ruby_2.2.10_rails32_postgres_redis.gemfile.lock b/gemfiles/ruby_2.2.10_rails32_postgres_redis.gemfile.lock index 402dd6a9d5e..f0aa50645fa 100644 --- a/gemfiles/ruby_2.2.10_rails32_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails32_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -70,8 +70,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) mail (2.5.5) mime-types (~> 1.16) diff --git a/gemfiles/ruby_2.2.10_rails32_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.2.10_rails32_postgres_sidekiq.gemfile.lock index af67632bf75..fcf7bf23774 100644 --- a/gemfiles/ruby_2.2.10_rails32_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails32_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -71,8 +71,8 @@ GEM json (1.8.6) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) mail (2.5.5) mime-types (~> 1.16) diff --git a/gemfiles/ruby_2.2.10_rails4_mysql2.gemfile.lock b/gemfiles/ruby_2.2.10_rails4_mysql2.gemfile.lock index b2220bb074e..5e4def04521 100644 --- a/gemfiles/ruby_2.2.10_rails4_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails4_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -78,8 +78,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.2.10_rails4_postgres.gemfile.lock b/gemfiles/ruby_2.2.10_rails4_postgres.gemfile.lock index 9522d46f245..893b2f31d6b 100644 --- a/gemfiles/ruby_2.2.10_rails4_postgres.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails4_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) diff --git a/gemfiles/ruby_2.2.10_rails4_postgres_redis.gemfile.lock b/gemfiles/ruby_2.2.10_rails4_postgres_redis.gemfile.lock index 1c44a76d78a..f568c031a62 100644 --- a/gemfiles/ruby_2.2.10_rails4_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails4_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -78,8 +78,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.2.10_rails4_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.2.10_rails4_postgres_sidekiq.gemfile.lock index 9a8442b8bc3..93ea643b947 100644 --- a/gemfiles/ruby_2.2.10_rails4_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails4_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) diff --git a/gemfiles/ruby_2.2.10_rails4_semantic_logger.gemfile.lock b/gemfiles/ruby_2.2.10_rails4_semantic_logger.gemfile.lock index 42b416d3923..5afd1d2ef7f 100644 --- a/gemfiles/ruby_2.2.10_rails4_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails4_semantic_logger.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -78,8 +78,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) loofah (2.15.0) crass (~> 1.0.2) diff --git a/gemfiles/ruby_2.2.10_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.2.10_rails5_mysql2.gemfile.lock index c57ac717a49..18d5d5e73b5 100644 --- a/gemfiles/ruby_2.2.10_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails5_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -85,8 +85,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.2.10_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.2.10_rails5_postgres.gemfile.lock index 18421a4bab7..c4c1ff1b446 100644 --- a/gemfiles/ruby_2.2.10_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails5_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) diff --git a/gemfiles/ruby_2.2.10_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.2.10_rails5_postgres_redis.gemfile.lock index 0e3c17980d5..db02aa4df47 100644 --- a/gemfiles/ruby_2.2.10_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails5_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -85,8 +85,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.2.10_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.2.10_rails5_postgres_redis_activesupport.gemfile.lock index e381211358f..8ea5038a413 100644 --- a/gemfiles/ruby_2.2.10_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails5_postgres_redis_activesupport.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) diff --git a/gemfiles/ruby_2.2.10_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.2.10_rails5_postgres_sidekiq.gemfile.lock index 8e049e616ae..e1772f9cc39 100644 --- a/gemfiles/ruby_2.2.10_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails5_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -86,8 +86,8 @@ GEM json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.2.10_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.2.10_rails5_semantic_logger.gemfile.lock index e711731e968..9a8226857a2 100644 --- a/gemfiles/ruby_2.2.10_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.2.10_rails5_semantic_logger.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) diff --git a/gemfiles/ruby_2.3.8_contrib.gemfile.lock b/gemfiles/ruby_2.3.8_contrib.gemfile.lock index 823b1a07fec..bdf04cd6704 100644 --- a/gemfiles/ruby_2.3.8_contrib.gemfile.lock +++ b/gemfiles/ruby_2.3.8_contrib.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -1364,8 +1364,8 @@ GEM addressable (>= 2.4) jsonapi-renderer (0.2.2) king_konf (1.0.0) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.3.8_contrib_old.gemfile.lock b/gemfiles/ruby_2.3.8_contrib_old.gemfile.lock index d596e910459..e2c24c8096d 100644 --- a/gemfiles/ruby_2.3.8_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.3.8_contrib_old.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -49,8 +49,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) diff --git a/gemfiles/ruby_2.3.8_core_old.gemfile.lock b/gemfiles/ruby_2.3.8_core_old.gemfile.lock index 74b09abd4f8..4cd4e293b90 100644 --- a/gemfiles/ruby_2.3.8_core_old.gemfile.lock +++ b/gemfiles/ruby_2.3.8_core_old.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -37,8 +37,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) diff --git a/gemfiles/ruby_2.3.8_cucumber3.gemfile.lock b/gemfiles/ruby_2.3.8_cucumber3.gemfile.lock index c370d052b55..3406fb3a662 100644 --- a/gemfiles/ruby_2.3.8_cucumber3.gemfile.lock +++ b/gemfiles/ruby_2.3.8_cucumber3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -55,8 +55,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) diff --git a/gemfiles/ruby_2.3.8_cucumber4.gemfile.lock b/gemfiles/ruby_2.3.8_cucumber4.gemfile.lock index 7342eadf66d..3152ae0b1b2 100644 --- a/gemfiles/ruby_2.3.8_cucumber4.gemfile.lock +++ b/gemfiles/ruby_2.3.8_cucumber4.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -75,8 +75,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) diff --git a/gemfiles/ruby_2.3.8_rails32_mysql2.gemfile.lock b/gemfiles/ruby_2.3.8_rails32_mysql2.gemfile.lock index aad866d695f..1d1ec5611c9 100644 --- a/gemfiles/ruby_2.3.8_rails32_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails32_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -74,8 +74,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) mail (2.5.5) mime-types (~> 1.16) diff --git a/gemfiles/ruby_2.3.8_rails32_postgres.gemfile.lock b/gemfiles/ruby_2.3.8_rails32_postgres.gemfile.lock index 89df08d4183..6be37822a07 100644 --- a/gemfiles/ruby_2.3.8_rails32_postgres.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails32_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -70,8 +70,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) mail (2.5.5) mime-types (~> 1.16) diff --git a/gemfiles/ruby_2.3.8_rails32_postgres_redis.gemfile.lock b/gemfiles/ruby_2.3.8_rails32_postgres_redis.gemfile.lock index c37516f4f0e..e284db6ec8f 100644 --- a/gemfiles/ruby_2.3.8_rails32_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails32_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -70,8 +70,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) mail (2.5.5) mime-types (~> 1.16) diff --git a/gemfiles/ruby_2.3.8_rails32_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.3.8_rails32_postgres_sidekiq.gemfile.lock index 2a36b140622..0b8234338bf 100644 --- a/gemfiles/ruby_2.3.8_rails32_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails32_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -71,8 +71,8 @@ GEM json (1.8.6) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) mail (2.5.5) mime-types (~> 1.16) diff --git a/gemfiles/ruby_2.3.8_rails4_mysql2.gemfile.lock b/gemfiles/ruby_2.3.8_rails4_mysql2.gemfile.lock index 1f863de04f2..b4ccbf34a91 100644 --- a/gemfiles/ruby_2.3.8_rails4_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails4_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -78,8 +78,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.3.8_rails4_postgres.gemfile.lock b/gemfiles/ruby_2.3.8_rails4_postgres.gemfile.lock index 22d64c0fc73..33dcb3c4619 100644 --- a/gemfiles/ruby_2.3.8_rails4_postgres.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails4_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) diff --git a/gemfiles/ruby_2.3.8_rails4_postgres_redis.gemfile.lock b/gemfiles/ruby_2.3.8_rails4_postgres_redis.gemfile.lock index 92ff17855a2..07869d32afd 100644 --- a/gemfiles/ruby_2.3.8_rails4_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails4_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -78,8 +78,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.3.8_rails4_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.3.8_rails4_postgres_sidekiq.gemfile.lock index e4fc195f568..9d83e65b0fb 100644 --- a/gemfiles/ruby_2.3.8_rails4_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails4_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) diff --git a/gemfiles/ruby_2.3.8_rails4_semantic_logger.gemfile.lock b/gemfiles/ruby_2.3.8_rails4_semantic_logger.gemfile.lock index e9fd93e1e28..602352d0945 100644 --- a/gemfiles/ruby_2.3.8_rails4_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails4_semantic_logger.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -78,8 +78,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) loofah (2.15.0) crass (~> 1.0.2) diff --git a/gemfiles/ruby_2.3.8_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.3.8_rails5_mysql2.gemfile.lock index c8089027722..09f04f4c324 100644 --- a/gemfiles/ruby_2.3.8_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails5_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -85,8 +85,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.3.8_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.3.8_rails5_postgres.gemfile.lock index 9823be08c12..7f0a7eaeb68 100644 --- a/gemfiles/ruby_2.3.8_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails5_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) diff --git a/gemfiles/ruby_2.3.8_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.3.8_rails5_postgres_redis.gemfile.lock index d1b10c87765..20e297fd553 100644 --- a/gemfiles/ruby_2.3.8_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails5_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -85,8 +85,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.3.8_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.3.8_rails5_postgres_redis_activesupport.gemfile.lock index 2be1ee03b81..4a2291e29f9 100644 --- a/gemfiles/ruby_2.3.8_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails5_postgres_redis_activesupport.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -85,8 +85,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.3.8_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.3.8_rails5_postgres_sidekiq.gemfile.lock index b3c255a866a..1a7a1e34983 100644 --- a/gemfiles/ruby_2.3.8_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails5_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -86,8 +86,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) diff --git a/gemfiles/ruby_2.3.8_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.3.8_rails5_semantic_logger.gemfile.lock index 8f4d7f249f9..065dad89014 100644 --- a/gemfiles/ruby_2.3.8_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.3.8_rails5_semantic_logger.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) diff --git a/gemfiles/ruby_2.3.8_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.3.8_resque2_redis3.gemfile.lock index 628b5b9d6b9..3c94edd919f 100644 --- a/gemfiles/ruby_2.3.8_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.3.8_resque2_redis3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -37,8 +37,8 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) - libddwaf (1.3.0.2.0) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) diff --git a/gemfiles/ruby_2.3.8_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.3.8_resque2_redis4.gemfile.lock index 54a062bac51..7c42148ae3c 100644 --- a/gemfiles/ruby_2.3.8_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.3.8_resque2_redis4.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) diff --git a/gemfiles/ruby_2.4.10_contrib.gemfile.lock b/gemfiles/ruby_2.4.10_contrib.gemfile.lock index f185eaa8692..58ac3c3faa9 100644 --- a/gemfiles/ruby_2.4.10_contrib.gemfile.lock +++ b/gemfiles/ruby_2.4.10_contrib.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -1458,7 +1458,7 @@ GEM mongo (2.14.1) bson (>= 4.8.2, < 5.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) multipart-post (2.1.1) @@ -1729,7 +1729,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -1751,4 +1751,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.4.10_contrib_old.gemfile.lock b/gemfiles/ruby_2.4.10_contrib_old.gemfile.lock index 6b77669d8cc..d081d0b240b 100644 --- a/gemfiles/ruby_2.4.10_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.4.10_contrib_old.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -181,7 +181,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -193,4 +193,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.4.10_core_old.gemfile.lock b/gemfiles/ruby_2.4.10_core_old.gemfile.lock index 56570b695fd..cd2572ae16c 100644 --- a/gemfiles/ruby_2.4.10_core_old.gemfile.lock +++ b/gemfiles/ruby_2.4.10_core_old.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -44,7 +44,7 @@ GEM ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) opentracing (0.5.0) os (1.1.4) parallel (1.20.1) @@ -158,7 +158,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -170,4 +170,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.4.10_cucumber3.gemfile.lock b/gemfiles/ruby_2.4.10_cucumber3.gemfile.lock index 0b3f6c3c7ab..18e27c0e9d4 100644 --- a/gemfiles/ruby_2.4.10_cucumber3.gemfile.lock +++ b/gemfiles/ruby_2.4.10_cucumber3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -62,7 +62,7 @@ GEM ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) opentracing (0.5.0) @@ -179,7 +179,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -191,4 +191,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.4.10_cucumber4.gemfile.lock b/gemfiles/ruby_2.4.10_cucumber4.gemfile.lock index 4dd95825381..d63b4ddc9bc 100644 --- a/gemfiles/ruby_2.4.10_cucumber4.gemfile.lock +++ b/gemfiles/ruby_2.4.10_cucumber4.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -84,7 +84,7 @@ GEM method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -210,7 +210,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -222,4 +222,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.4.10_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.4.10_rails5_mysql2.gemfile.lock index 4203a7db615..15146149cc0 100644 --- a/gemfiles/ruby_2.4.10_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.4.10_rails5_mysql2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -106,7 +106,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.4.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) mysql2 (0.5.3) nio4r (2.5.8) nokogiri (1.10.10) @@ -269,7 +269,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -282,4 +282,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.4.10_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.4.10_rails5_postgres.gemfile.lock index 8f016660a8a..a79c56b4d87 100644 --- a/gemfiles/ruby_2.4.10_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.4.10_rails5_postgres.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -106,7 +106,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.4.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) @@ -269,7 +269,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -282,4 +282,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.4.10_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.4.10_rails5_postgres_redis.gemfile.lock index a5b75980edd..377357a28a8 100644 --- a/gemfiles/ruby_2.4.10_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.4.10_rails5_postgres_redis.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -106,7 +106,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.4.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) @@ -271,7 +271,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -284,4 +284,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.4.10_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.4.10_rails5_postgres_redis_activesupport.gemfile.lock index cfe868c48ad..5187e5f9abd 100644 --- a/gemfiles/ruby_2.4.10_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.4.10_rails5_postgres_redis_activesupport.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -106,7 +106,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.4.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) @@ -288,7 +288,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -301,4 +301,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.4.10_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.4.10_rails5_postgres_sidekiq.gemfile.lock index 400eb5dfa6e..c188a4f2dd8 100644 --- a/gemfiles/ruby_2.4.10_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.4.10_rails5_postgres_sidekiq.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -107,7 +107,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.4.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) @@ -279,7 +279,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -293,4 +293,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.4.10_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.4.10_rails5_semantic_logger.gemfile.lock index b90970de09a..0773e3ae56a 100644 --- a/gemfiles/ruby_2.4.10_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.4.10_rails5_semantic_logger.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -101,7 +101,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.4.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) @@ -268,7 +268,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -281,4 +281,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.4.10_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.4.10_resque2_redis3.gemfile.lock index ebb0608ef8d..ceba8bde4c3 100644 --- a/gemfiles/ruby_2.4.10_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.4.10_resque2_redis3.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -45,7 +45,7 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -185,7 +185,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -197,4 +197,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.4.10_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.4.10_resque2_redis4.gemfile.lock index 0ed3ab97d04..9e5550e2c18 100644 --- a/gemfiles/ruby_2.4.10_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.4.10_resque2_redis4.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -45,7 +45,7 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -185,7 +185,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -197,4 +197,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.20 diff --git a/gemfiles/ruby_2.5.9_contrib.gemfile.lock b/gemfiles/ruby_2.5.9_contrib.gemfile.lock index 2bda76fab5a..149e764906c 100644 --- a/gemfiles/ruby_2.5.9_contrib.gemfile.lock +++ b/gemfiles/ruby_2.5.9_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -1459,7 +1459,7 @@ GEM mongo (2.14.1) bson (>= 4.8.2, < 5.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) multipart-post (2.1.1) @@ -1711,7 +1711,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_contrib_old.gemfile.lock b/gemfiles/ruby_2.5.9_contrib_old.gemfile.lock index 78f79a396d6..f778be8286c 100644 --- a/gemfiles/ruby_2.5.9_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.5.9_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -191,7 +191,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_core_old.gemfile.lock b/gemfiles/ruby_2.5.9_core_old.gemfile.lock index c9394560583..49087fdd364 100644 --- a/gemfiles/ruby_2.5.9_core_old.gemfile.lock +++ b/gemfiles/ruby_2.5.9_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -54,7 +54,7 @@ GEM ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) opentracing (0.5.0) os (1.1.4) parallel (1.22.1) @@ -166,7 +166,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_cucumber3.gemfile.lock b/gemfiles/ruby_2.5.9_cucumber3.gemfile.lock index 5e6f591177e..12fe599f3fc 100644 --- a/gemfiles/ruby_2.5.9_cucumber3.gemfile.lock +++ b/gemfiles/ruby_2.5.9_cucumber3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -72,7 +72,7 @@ GEM ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) opentracing (0.5.0) @@ -187,7 +187,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_cucumber4.gemfile.lock b/gemfiles/ruby_2.5.9_cucumber4.gemfile.lock index 76d3d7a16a7..f6fda2abc42 100644 --- a/gemfiles/ruby_2.5.9_cucumber4.gemfile.lock +++ b/gemfiles/ruby_2.5.9_cucumber4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -95,7 +95,7 @@ GEM method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -220,7 +220,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_cucumber5.gemfile.lock b/gemfiles/ruby_2.5.9_cucumber5.gemfile.lock index 1e9323b2391..4a12f116683 100644 --- a/gemfiles/ruby_2.5.9_cucumber5.gemfile.lock +++ b/gemfiles/ruby_2.5.9_cucumber5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -95,7 +95,7 @@ GEM method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -220,7 +220,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.5.9_rails5_mysql2.gemfile.lock index 32691e11f27..a96a5ba9994 100644 --- a/gemfiles/ruby_2.5.9_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -115,7 +115,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) mysql2 (0.5.3) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) @@ -279,7 +279,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.5.9_rails5_postgres.gemfile.lock index 4df9eec6d5c..30d4b5e3ff3 100644 --- a/gemfiles/ruby_2.5.9_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -115,7 +115,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -279,7 +279,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5.9_rails5_postgres_redis.gemfile.lock index 20ba01736ac..a211e1278b9 100644 --- a/gemfiles/ruby_2.5.9_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -115,7 +115,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -281,7 +281,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.5.9_rails5_postgres_redis_activesupport.gemfile.lock index b7e542bd09c..9c281414162 100644 --- a/gemfiles/ruby_2.5.9_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -115,7 +115,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -298,7 +298,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5.9_rails5_postgres_sidekiq.gemfile.lock index b646edcc60e..52ec2f1be0c 100644 --- a/gemfiles/ruby_2.5.9_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -116,7 +116,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -286,7 +286,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5.9_rails5_semantic_logger.gemfile.lock index 63921f2b1f4..8915a2a2f66 100644 --- a/gemfiles/ruby_2.5.9_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -110,7 +110,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -278,7 +278,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.5.9_rails61_mysql2.gemfile.lock index 315655ba27a..b7693256a0c 100644 --- a/gemfiles/ruby_2.5.9_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -132,7 +132,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) mysql2 (0.5.3) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) @@ -298,7 +298,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.5.9_rails61_postgres.gemfile.lock index 3cbe0d4b166..eb33c42f496 100644 --- a/gemfiles/ruby_2.5.9_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -132,7 +132,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -298,7 +298,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5.9_rails61_postgres_redis.gemfile.lock index 71e416b2318..4cfaa95493c 100644 --- a/gemfiles/ruby_2.5.9_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -132,7 +132,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -300,7 +300,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5.9_rails61_postgres_sidekiq.gemfile.lock index 3b6b4ea3954..69bd5671622 100644 --- a/gemfiles/ruby_2.5.9_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -133,7 +133,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -304,7 +304,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5.9_rails61_semantic_logger.gemfile.lock index 30519515e2f..d30403a18ed 100644 --- a/gemfiles/ruby_2.5.9_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -127,7 +127,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -297,7 +297,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.5.9_rails6_mysql2.gemfile.lock index 731fe5d920e..e3ce2bc6ca5 100644 --- a/gemfiles/ruby_2.5.9_rails6_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -128,7 +128,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) mysql2 (0.5.3) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) @@ -295,7 +295,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.5.9_rails6_postgres.gemfile.lock index 4682b157034..2df6459fdc0 100644 --- a/gemfiles/ruby_2.5.9_rails6_postgres.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -128,7 +128,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -295,7 +295,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5.9_rails6_postgres_redis.gemfile.lock index 25a9d36bcfb..35ba6444fe1 100644 --- a/gemfiles/ruby_2.5.9_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -128,7 +128,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -297,7 +297,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.5.9_rails6_postgres_redis_activesupport.gemfile.lock index e08212e42df..310af9e87bf 100644 --- a/gemfiles/ruby_2.5.9_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -128,7 +128,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -314,7 +314,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5.9_rails6_postgres_sidekiq.gemfile.lock index 460c340137d..94c88d25562 100644 --- a/gemfiles/ruby_2.5.9_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -129,7 +129,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -302,7 +302,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5.9_rails6_semantic_logger.gemfile.lock index 5c3d15b1a02..73e693fad48 100644 --- a/gemfiles/ruby_2.5.9_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.5.9_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -123,7 +123,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) @@ -294,7 +294,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.5.9_resque2_redis3.gemfile.lock index af815999482..be5baf21a1d 100644 --- a/gemfiles/ruby_2.5.9_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.5.9_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -55,7 +55,7 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -190,7 +190,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.5.9_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.5.9_resque2_redis4.gemfile.lock index 434cc77ecb1..b1c1ea771dc 100644 --- a/gemfiles/ruby_2.5.9_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.5.9_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -55,7 +55,7 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -190,7 +190,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_contrib.gemfile.lock b/gemfiles/ruby_2.6.7_contrib.gemfile.lock index e2f4f15eb17..417efc8b388 100644 --- a/gemfiles/ruby_2.6.7_contrib.gemfile.lock +++ b/gemfiles/ruby_2.6.7_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -1460,7 +1460,7 @@ GEM mongo (2.14.1) bson (>= 4.8.2, < 5.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) multipart-post (2.1.1) @@ -1712,7 +1712,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_contrib_old.gemfile.lock b/gemfiles/ruby_2.6.7_contrib_old.gemfile.lock index 26253e3c7ca..6c63ef3944f 100644 --- a/gemfiles/ruby_2.6.7_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.6.7_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -193,7 +193,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_core_old.gemfile.lock b/gemfiles/ruby_2.6.7_core_old.gemfile.lock index 0974488e888..33c76416f21 100644 --- a/gemfiles/ruby_2.6.7_core_old.gemfile.lock +++ b/gemfiles/ruby_2.6.7_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -55,7 +55,7 @@ GEM ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) opentracing (0.5.0) os (1.1.4) parallel (1.22.1) @@ -168,7 +168,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_cucumber3.gemfile.lock b/gemfiles/ruby_2.6.7_cucumber3.gemfile.lock index 2a60b6fa4b2..c7518403365 100644 --- a/gemfiles/ruby_2.6.7_cucumber3.gemfile.lock +++ b/gemfiles/ruby_2.6.7_cucumber3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -73,7 +73,7 @@ GEM ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) opentracing (0.5.0) @@ -189,7 +189,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_cucumber4.gemfile.lock b/gemfiles/ruby_2.6.7_cucumber4.gemfile.lock index cc4503d3fd3..7e29f9923c8 100644 --- a/gemfiles/ruby_2.6.7_cucumber4.gemfile.lock +++ b/gemfiles/ruby_2.6.7_cucumber4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -96,7 +96,7 @@ GEM method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -222,7 +222,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_cucumber5.gemfile.lock b/gemfiles/ruby_2.6.7_cucumber5.gemfile.lock index d961901aca2..19494932f1f 100644 --- a/gemfiles/ruby_2.6.7_cucumber5.gemfile.lock +++ b/gemfiles/ruby_2.6.7_cucumber5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -96,7 +96,7 @@ GEM method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -222,7 +222,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.6.7_rails5_mysql2.gemfile.lock index 19accd239a0..915a89b7d83 100644 --- a/gemfiles/ruby_2.6.7_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -116,7 +116,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) mysql2 (0.5.3) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) @@ -280,7 +280,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.6.7_rails5_postgres.gemfile.lock index ccef3ed2f61..1f22030d7d9 100644 --- a/gemfiles/ruby_2.6.7_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -116,7 +116,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -280,7 +280,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6.7_rails5_postgres_redis.gemfile.lock index d55c55103b1..d9fb31a4693 100644 --- a/gemfiles/ruby_2.6.7_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -116,7 +116,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -282,7 +282,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.6.7_rails5_postgres_redis_activesupport.gemfile.lock index 139a4426850..c7a825c52e1 100644 --- a/gemfiles/ruby_2.6.7_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -116,7 +116,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -299,7 +299,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6.7_rails5_postgres_sidekiq.gemfile.lock index 63078aa21ed..df5b99c18a2 100644 --- a/gemfiles/ruby_2.6.7_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -117,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -287,7 +287,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6.7_rails5_semantic_logger.gemfile.lock index 808b45126c6..db12615a31f 100644 --- a/gemfiles/ruby_2.6.7_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -111,7 +111,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -279,7 +279,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.6.7_rails61_mysql2.gemfile.lock index 96cc9faf71b..766da036eac 100644 --- a/gemfiles/ruby_2.6.7_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -133,7 +133,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) mysql2 (0.5.3) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) @@ -299,7 +299,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.6.7_rails61_postgres.gemfile.lock index 8a4e590a3ff..ad6fb8a4388 100644 --- a/gemfiles/ruby_2.6.7_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -133,7 +133,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -299,7 +299,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6.7_rails61_postgres_redis.gemfile.lock index 153862bd742..94d2ff388b4 100644 --- a/gemfiles/ruby_2.6.7_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -133,7 +133,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -301,7 +301,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6.7_rails61_postgres_sidekiq.gemfile.lock index 3d7e3c72b3f..2cb3f103075 100644 --- a/gemfiles/ruby_2.6.7_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -134,7 +134,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -305,7 +305,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6.7_rails61_semantic_logger.gemfile.lock index 34e0e99bfe7..505e426fd3b 100644 --- a/gemfiles/ruby_2.6.7_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -128,7 +128,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -298,7 +298,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.6.7_rails6_mysql2.gemfile.lock index a1ec0d15c6b..c5ac0a0d367 100644 --- a/gemfiles/ruby_2.6.7_rails6_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -129,7 +129,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) mysql2 (0.5.3) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) @@ -296,7 +296,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.6.7_rails6_postgres.gemfile.lock index 7111a6fb8bf..cc878a3395a 100644 --- a/gemfiles/ruby_2.6.7_rails6_postgres.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -129,7 +129,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -296,7 +296,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6.7_rails6_postgres_redis.gemfile.lock index c74bf987b12..08b3a3f22ba 100644 --- a/gemfiles/ruby_2.6.7_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -129,7 +129,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -298,7 +298,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.6.7_rails6_postgres_redis_activesupport.gemfile.lock index 7c35ca6de51..c0debef4eb7 100644 --- a/gemfiles/ruby_2.6.7_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -129,7 +129,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -315,7 +315,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6.7_rails6_postgres_sidekiq.gemfile.lock index 5a6d79fba98..7f73ca64451 100644 --- a/gemfiles/ruby_2.6.7_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -303,7 +303,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6.7_rails6_semantic_logger.gemfile.lock index f4a326e8556..4b0c88c49fb 100644 --- a/gemfiles/ruby_2.6.7_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.6.7_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -124,7 +124,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) @@ -295,7 +295,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.6.7_resque2_redis3.gemfile.lock index b8c0fb9e1f7..a78103c0614 100644 --- a/gemfiles/ruby_2.6.7_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.6.7_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -56,7 +56,7 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -192,7 +192,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.6.7_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.6.7_resque2_redis4.gemfile.lock index 029037104c5..790378b4aed 100644 --- a/gemfiles/ruby_2.6.7_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.6.7_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -56,7 +56,7 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -192,7 +192,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_2.7.3_contrib.gemfile.lock b/gemfiles/ruby_2.7.3_contrib.gemfile.lock index 640174e9956..4da3d63684b 100644 --- a/gemfiles/ruby_2.7.3_contrib.gemfile.lock +++ b/gemfiles/ruby_2.7.3_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -1374,7 +1374,6 @@ GEM ethon (0.15.0) ffi (>= 1.15.0) excon (0.92.1) - multipart-post (>= 1.2, < 3) faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -1437,7 +1436,7 @@ GEM addressable (>= 2.4) jsonapi-renderer (0.2.2) king_konf (1.0.0) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -1460,7 +1459,7 @@ GEM mongo (2.14.1) bson (>= 4.8.2, < 5.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) multipart-post (2.1.1) @@ -1618,6 +1617,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-19) + sorbet-static (0.5.9672-x86_64-linux) sorted_set (1.0.3) rbtree set (~> 1.0) @@ -1710,7 +1710,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -1733,4 +1733,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_contrib_old.gemfile.lock b/gemfiles/ruby_2.7.3_contrib_old.gemfile.lock index 4351d87a93e..95bbcde0040 100644 --- a/gemfiles/ruby_2.7.3_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.7.3_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -64,7 +64,7 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) @@ -144,6 +144,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-19) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -193,7 +194,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -206,4 +207,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.2.19 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_core_old.gemfile.lock b/gemfiles/ruby_2.7.3_core_old.gemfile.lock index b6358a77698..d5440ae0d87 100644 --- a/gemfiles/ruby_2.7.3_core_old.gemfile.lock +++ b/gemfiles/ruby_2.7.3_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -50,12 +50,12 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) opentracing (0.5.0) os (1.1.4) parallel (1.22.1) @@ -124,6 +124,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -168,7 +169,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -181,4 +182,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_cucumber3.gemfile.lock b/gemfiles/ruby_2.7.3_cucumber3.gemfile.lock index b43ee06cc4d..c3118b6e784 100644 --- a/gemfiles/ruby_2.7.3_cucumber3.gemfile.lock +++ b/gemfiles/ruby_2.7.3_cucumber3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -68,12 +68,12 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) opentracing (0.5.0) @@ -144,6 +144,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -189,7 +190,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -202,4 +203,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_cucumber4.gemfile.lock b/gemfiles/ruby_2.7.3_cucumber4.gemfile.lock index faf2af1d3d6..1f8a3a2b7a1 100644 --- a/gemfiles/ruby_2.7.3_cucumber4.gemfile.lock +++ b/gemfiles/ruby_2.7.3_cucumber4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -88,14 +88,14 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -170,6 +170,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -220,7 +221,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -233,4 +234,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_cucumber5.gemfile.lock b/gemfiles/ruby_2.7.3_cucumber5.gemfile.lock index 60831058210..9a1558bec96 100644 --- a/gemfiles/ruby_2.7.3_cucumber5.gemfile.lock +++ b/gemfiles/ruby_2.7.3_cucumber5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -88,14 +88,14 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -170,6 +170,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -220,7 +221,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -233,4 +234,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.7.3_rails5_mysql2.gemfile.lock index 75cc0b3724c..49167354f2a 100644 --- a/gemfiles/ruby_2.7.3_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -98,7 +98,7 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -117,7 +117,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) mysql2 (0.5.3) nio4r (2.5.8) nokogiri (1.13.3) @@ -221,6 +221,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -281,7 +282,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -295,4 +296,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.7.3_rails5_postgres.gemfile.lock index f19439c58ee..7a897f9212f 100644 --- a/gemfiles/ruby_2.7.3_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -98,7 +98,7 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -117,7 +117,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -221,6 +221,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -281,7 +282,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -295,4 +296,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7.3_rails5_postgres_redis.gemfile.lock index 01a7c766b0c..ee1846e8aac 100644 --- a/gemfiles/ruby_2.7.3_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -98,7 +98,7 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -117,7 +117,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -222,6 +222,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -283,7 +284,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -297,4 +298,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.7.3_rails5_postgres_redis_activesupport.gemfile.lock index 02150511fa8..e17a84f6cde 100644 --- a/gemfiles/ruby_2.7.3_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -98,7 +98,7 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -117,7 +117,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -238,6 +238,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -300,7 +301,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -314,4 +315,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7.3_rails5_postgres_sidekiq.gemfile.lock index b119dbe045e..5d3e7f183e5 100644 --- a/gemfiles/ruby_2.7.3_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -99,7 +99,7 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -118,7 +118,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -227,6 +227,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -288,7 +289,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -303,4 +304,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7.3_rails5_semantic_logger.gemfile.lock index 0ea3b76d75b..c18173b8ad1 100644 --- a/gemfiles/ruby_2.7.3_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -98,7 +98,7 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) loofah (2.15.0) @@ -112,7 +112,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -220,6 +220,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -280,7 +281,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -294,4 +295,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.7.3_rails61_mysql2.gemfile.lock index 3856db30495..bd5144eb0fd 100644 --- a/gemfiles/ruby_2.7.3_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -115,7 +115,7 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -134,7 +134,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) mysql2 (0.5.3) nio4r (2.5.8) nokogiri (1.13.3) @@ -240,6 +240,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -300,7 +301,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -314,4 +315,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.7.3_rails61_postgres.gemfile.lock index e3fd1ce45eb..f9ebd58c523 100644 --- a/gemfiles/ruby_2.7.3_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -115,7 +115,7 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -134,7 +134,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -240,6 +240,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -300,7 +301,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -314,4 +315,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7.3_rails61_postgres_redis.gemfile.lock index b2a9e2a4d20..b82576778f2 100644 --- a/gemfiles/ruby_2.7.3_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -116,7 +116,7 @@ GEM json-schema (2.8.1) addressable (>= 2.4) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-x86_64-linux) + libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) @@ -134,7 +134,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -241,6 +241,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -302,7 +303,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -316,4 +317,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7.3_rails61_postgres_sidekiq.gemfile.lock index 96364307412..3b946e1140f 100644 --- a/gemfiles/ruby_2.7.3_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -117,7 +117,7 @@ GEM json-schema (2.8.1) addressable (>= 2.4) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-x86_64-linux) + libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) @@ -135,7 +135,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -246,6 +246,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -306,7 +307,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -321,4 +322,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7.3_rails61_semantic_logger.gemfile.lock index 127ad3333ed..c06167c4a2f 100644 --- a/gemfiles/ruby_2.7.3_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -116,7 +116,7 @@ GEM json-schema (2.8.1) addressable (>= 2.4) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-x86_64-linux) + libddwaf (1.3.0.2.0) ffi (~> 1.0) loofah (2.15.0) crass (~> 1.0.2) @@ -129,7 +129,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -239,6 +239,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -299,7 +300,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -313,4 +314,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.7.3_rails6_mysql2.gemfile.lock index 9f554c9e067..3d0204895e2 100644 --- a/gemfiles/ruby_2.7.3_rails6_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -111,7 +111,7 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) @@ -130,7 +130,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) mysql2 (0.5.3) nio4r (2.5.8) nokogiri (1.13.3) @@ -236,6 +236,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -297,7 +298,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -311,4 +312,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.7.3_rails6_postgres.gemfile.lock index 223e3fc7209..47d9197738d 100644 --- a/gemfiles/ruby_2.7.3_rails6_postgres.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -112,7 +112,7 @@ GEM json-schema (2.8.1) addressable (>= 2.4) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-x86_64-linux) + libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) @@ -130,7 +130,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -236,6 +236,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -297,7 +298,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -311,4 +312,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7.3_rails6_postgres_redis.gemfile.lock index cd39bc21943..71cd3796643 100644 --- a/gemfiles/ruby_2.7.3_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -112,7 +112,7 @@ GEM json-schema (2.8.1) addressable (>= 2.4) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-x86_64-linux) + libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) @@ -130,7 +130,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -237,6 +237,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -299,7 +300,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -313,4 +314,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.7.3_rails6_postgres_redis_activesupport.gemfile.lock index 0e543daec13..0b1fd0e6b1d 100644 --- a/gemfiles/ruby_2.7.3_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -112,7 +112,7 @@ GEM json-schema (2.8.1) addressable (>= 2.4) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-x86_64-linux) + libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) @@ -130,7 +130,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -253,6 +253,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -316,7 +317,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -330,4 +331,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7.3_rails6_postgres_sidekiq.gemfile.lock index d3c66c251f0..17b4b1dcba2 100644 --- a/gemfiles/ruby_2.7.3_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -113,7 +113,7 @@ GEM json-schema (2.8.1) addressable (>= 2.4) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-x86_64-linux) + libddwaf (1.3.0.2.0) ffi (~> 1.0) lograge (0.11.2) actionpack (>= 4) @@ -131,7 +131,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -242,6 +242,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -304,7 +305,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -319,4 +320,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7.3_rails6_semantic_logger.gemfile.lock index 11ee99e4190..007768e58e3 100644 --- a/gemfiles/ruby_2.7.3_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.7.3_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -112,7 +112,7 @@ GEM json-schema (2.8.1) addressable (>= 2.4) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-x86_64-linux) + libddwaf (1.3.0.2.0) ffi (~> 1.0) loofah (2.15.0) crass (~> 1.0.2) @@ -125,7 +125,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -235,6 +235,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -296,7 +297,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -310,4 +311,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.7.3_resque2_redis3.gemfile.lock index 2d7b31f9780..98abcd5aec2 100644 --- a/gemfiles/ruby_2.7.3_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.7.3_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -50,13 +50,13 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -145,6 +145,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -192,7 +193,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -205,4 +206,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_2.7.3_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.7.3_resque2_redis4.gemfile.lock index d55d677f8bf..48bc29cb92d 100644 --- a/gemfiles/ruby_2.7.3_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.7.3_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -51,12 +51,12 @@ GEM json-schema (2.8.1) addressable (>= 2.4) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-x86_64-linux) + libddwaf (1.3.0.2.0) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -145,6 +145,7 @@ GEM sorbet-static (= 0.5.9672) sorbet-runtime (0.5.9807) sorbet-static (0.5.9672-universal-darwin-14) + sorbet-static (0.5.9672-x86_64-linux) spoom (1.1.9) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) @@ -192,7 +193,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -205,4 +206,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/gemfiles/ruby_3.0.3_contrib.gemfile.lock b/gemfiles/ruby_3.0.3_contrib.gemfile.lock index 768ba86bf40..eb4444355c7 100644 --- a/gemfiles/ruby_3.0.3_contrib.gemfile.lock +++ b/gemfiles/ruby_3.0.3_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -1447,10 +1447,7 @@ GEM json-schema (2.8.1) addressable (>= 2.4) jsonapi-renderer (0.2.2) - libdatadog (0.7.0.1.1-aarch64-linux) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-aarch64-linux) - ffi (~> 1.0) libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) loofah (2.15.0) @@ -1471,7 +1468,7 @@ GEM mongo (2.14.1) bson (>= 4.8.2, < 5.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) multipart-post (2.1.1) @@ -1731,7 +1728,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.0.3_contrib_old.gemfile.lock b/gemfiles/ruby_3.0.3_contrib_old.gemfile.lock index 2947fa76b44..593bb9663c1 100644 --- a/gemfiles/ruby_3.0.3_contrib_old.gemfile.lock +++ b/gemfiles/ruby_3.0.3_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -65,10 +65,7 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1-aarch64-linux) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-aarch64-linux) - ffi (~> 1.0) libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.14) @@ -197,7 +194,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.0.3_core_old.gemfile.lock b/gemfiles/ruby_3.0.3_core_old.gemfile.lock index abdcd0c2567..00f40bb721b 100644 --- a/gemfiles/ruby_3.0.3_core_old.gemfile.lock +++ b/gemfiles/ruby_3.0.3_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -51,15 +51,12 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1-aarch64-linux) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-aarch64-linux) - ffi (~> 1.0) libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) opentracing (0.5.0) os (1.1.4) parallel (1.22.1) @@ -173,7 +170,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.0.3_cucumber3.gemfile.lock b/gemfiles/ruby_3.0.3_cucumber3.gemfile.lock index 43689cf0bc0..892b07a372d 100644 --- a/gemfiles/ruby_3.0.3_cucumber3.gemfile.lock +++ b/gemfiles/ruby_3.0.3_cucumber3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -69,15 +69,12 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1-aarch64-linux) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-aarch64-linux) - ffi (~> 1.0) libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) opentracing (0.5.0) @@ -194,7 +191,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.0.3_cucumber4.gemfile.lock b/gemfiles/ruby_3.0.3_cucumber4.gemfile.lock index dc60d30d5c6..6cd0afd5e93 100644 --- a/gemfiles/ruby_3.0.3_cucumber4.gemfile.lock +++ b/gemfiles/ruby_3.0.3_cucumber4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -89,17 +89,14 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1-aarch64-linux) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-aarch64-linux) - ffi (~> 1.0) libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -225,7 +222,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.0.3_cucumber5.gemfile.lock b/gemfiles/ruby_3.0.3_cucumber5.gemfile.lock index 4de3503be70..45e5ac4568b 100644 --- a/gemfiles/ruby_3.0.3_cucumber5.gemfile.lock +++ b/gemfiles/ruby_3.0.3_cucumber5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -89,17 +89,14 @@ GEM concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1-aarch64-linux) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-aarch64-linux) - ffi (~> 1.0) libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -225,7 +222,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.0.3_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.0.3_rails61_mysql2.gemfile.lock index c4be2a33d4a..6e4b9d90fac 100644 --- a/gemfiles/ruby_3.0.3_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.0.3_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -139,7 +139,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) mysql2 (0.5.3) net-protocol (0.1.2) io-wait @@ -316,7 +316,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.0.3_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.0.3_rails61_postgres.gemfile.lock index 4d27bc03fac..c539de2de65 100644 --- a/gemfiles/ruby_3.0.3_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.0.3_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -118,10 +118,7 @@ GEM io-wait (0.2.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1-aarch64-linux) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-aarch64-linux) - ffi (~> 1.0) libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) @@ -139,7 +136,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.2) io-wait timeout @@ -316,7 +313,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.0.3_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.0.3_rails61_postgres_redis.gemfile.lock index e3507ed9405..b5bcc2bfc14 100644 --- a/gemfiles/ruby_3.0.3_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.0.3_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -118,10 +118,7 @@ GEM io-wait (0.2.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1-aarch64-linux) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-aarch64-linux) - ffi (~> 1.0) libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) @@ -139,7 +136,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.2) io-wait timeout @@ -318,7 +315,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.0.3_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.0.3_rails61_postgres_sidekiq.gemfile.lock index 3d5811f2ebf..31f63e6d7a9 100644 --- a/gemfiles/ruby_3.0.3_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.0.3_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -119,10 +119,7 @@ GEM io-wait (0.2.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1-aarch64-linux) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-aarch64-linux) - ffi (~> 1.0) libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) lograge (0.11.2) @@ -140,7 +137,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.2) io-wait timeout @@ -329,7 +326,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.0.3_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.0.3_rails61_semantic_logger.gemfile.lock index 6fee191f89b..59d641ea02b 100644 --- a/gemfiles/ruby_3.0.3_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.0.3_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -118,10 +118,7 @@ GEM io-wait (0.2.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1-aarch64-linux) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-aarch64-linux) - ffi (~> 1.0) libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) loofah (2.15.0) @@ -134,7 +131,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.2) io-wait timeout @@ -315,7 +312,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.0.3_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.0.3_resque2_redis3.gemfile.lock index fd5e0461628..990aa81c8fc 100644 --- a/gemfiles/ruby_3.0.3_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_3.0.3_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -51,16 +51,13 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1-aarch64-linux) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-aarch64-linux) - ffi (~> 1.0) libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -197,7 +194,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.0.3_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.0.3_resque2_redis4.gemfile.lock index db8a6a9cfee..90981dc8fc4 100644 --- a/gemfiles/ruby_3.0.3_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_3.0.3_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -51,16 +51,13 @@ GEM hashdiff (1.0.1) json-schema (2.8.1) addressable (>= 2.4) - libdatadog (0.7.0.1.1-aarch64-linux) libdatadog (0.7.0.1.1-x86_64-linux) - libddwaf (1.3.0.2.0-aarch64-linux) - ffi (~> 1.0) libddwaf (1.3.0.2.0-x86_64-linux) ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -197,7 +194,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.1.1_contrib.gemfile.lock b/gemfiles/ruby_3.1.1_contrib.gemfile.lock index e0041ed9c9e..f0fcaca7cae 100644 --- a/gemfiles/ruby_3.1.1_contrib.gemfile.lock +++ b/gemfiles/ruby_3.1.1_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -1464,7 +1464,7 @@ GEM mongo (2.14.1) bson (>= 4.8.2, < 5.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) multipart-post (2.1.1) @@ -1721,7 +1721,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -1745,4 +1745,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.1.1_contrib_old.gemfile.lock b/gemfiles/ruby_3.1.1_contrib_old.gemfile.lock index f3b4dc335bb..67cfc0bbee9 100644 --- a/gemfiles/ruby_3.1.1_contrib_old.gemfile.lock +++ b/gemfiles/ruby_3.1.1_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -192,7 +192,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -206,4 +206,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.1.1_core_old.gemfile.lock b/gemfiles/ruby_3.1.1_core_old.gemfile.lock index 0edd18fe16c..00ab1a45781 100644 --- a/gemfiles/ruby_3.1.1_core_old.gemfile.lock +++ b/gemfiles/ruby_3.1.1_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -55,7 +55,7 @@ GEM ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) opentracing (0.5.0) os (1.1.4) parallel (1.22.1) @@ -168,7 +168,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -182,4 +182,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.1.1_cucumber3.gemfile.lock b/gemfiles/ruby_3.1.1_cucumber3.gemfile.lock index 43a9acfc1fb..5f22de40493 100644 --- a/gemfiles/ruby_3.1.1_cucumber3.gemfile.lock +++ b/gemfiles/ruby_3.1.1_cucumber3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -73,7 +73,7 @@ GEM ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) opentracing (0.5.0) @@ -189,7 +189,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -203,4 +203,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.1.1_cucumber4.gemfile.lock b/gemfiles/ruby_3.1.1_cucumber4.gemfile.lock index 41ec611a766..376e9800b58 100644 --- a/gemfiles/ruby_3.1.1_cucumber4.gemfile.lock +++ b/gemfiles/ruby_3.1.1_cucumber4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -95,7 +95,7 @@ GEM method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -220,7 +220,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -234,4 +234,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.1.1_cucumber5.gemfile.lock b/gemfiles/ruby_3.1.1_cucumber5.gemfile.lock index d052df57105..08d539d9404 100644 --- a/gemfiles/ruby_3.1.1_cucumber5.gemfile.lock +++ b/gemfiles/ruby_3.1.1_cucumber5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -95,7 +95,7 @@ GEM method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -220,7 +220,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -234,4 +234,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.1.1_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.1.1_rails61_mysql2.gemfile.lock index e51ed5164a3..054ba5f60fe 100644 --- a/gemfiles/ruby_3.1.1_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.1.1_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -135,7 +135,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) mysql2 (0.5.3) net-protocol (0.1.2) io-wait @@ -309,7 +309,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -324,4 +324,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.1.1_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.1.1_rails61_postgres.gemfile.lock index 4e8646be501..70f87a966b3 100644 --- a/gemfiles/ruby_3.1.1_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.1.1_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -135,7 +135,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.2) io-wait timeout @@ -309,7 +309,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -324,4 +324,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.1.1_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.1.1_rails61_postgres_redis.gemfile.lock index 5e325d11ded..1bd155f6322 100644 --- a/gemfiles/ruby_3.1.1_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.1.1_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -135,7 +135,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.2) io-wait timeout @@ -311,7 +311,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -326,4 +326,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.1.1_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.1.1_rails61_postgres_sidekiq.gemfile.lock index 2fd8fd2232d..9347bff0987 100644 --- a/gemfiles/ruby_3.1.1_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.1.1_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -136,7 +136,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.2) io-wait timeout @@ -322,7 +322,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -338,4 +338,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.1.1_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.1.1_rails61_semantic_logger.gemfile.lock index 64611701379..67dd25e3c14 100644 --- a/gemfiles/ruby_3.1.1_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.1.1_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -130,7 +130,7 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.2) io-wait timeout @@ -308,7 +308,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -323,4 +323,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.1.1_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.1.1_resque2_redis3.gemfile.lock index d843dfaadb8..dfe63b82a6c 100644 --- a/gemfiles/ruby_3.1.1_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_3.1.1_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -56,7 +56,7 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -192,7 +192,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -206,4 +206,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.1.1_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.1.1_resque2_redis4.gemfile.lock index 4895617670f..93c0ea6169a 100644 --- a/gemfiles/ruby_3.1.1_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_3.1.1_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -56,7 +56,7 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -192,7 +192,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) @@ -206,4 +206,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/gemfiles/ruby_3.2.0_contrib.gemfile.lock b/gemfiles/ruby_3.2.0_contrib.gemfile.lock index 7cb2e382136..1916f6e93d9 100644 --- a/gemfiles/ruby_3.2.0_contrib.gemfile.lock +++ b/gemfiles/ruby_3.2.0_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -1467,7 +1467,7 @@ GEM mongo (2.14.1) bson (>= 4.8.2, < 5.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) multipart-post (2.1.1) @@ -1718,7 +1718,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.2.0_contrib_old.gemfile.lock b/gemfiles/ruby_3.2.0_contrib_old.gemfile.lock index f707cf2f602..8396fac5ab1 100644 --- a/gemfiles/ruby_3.2.0_contrib_old.gemfile.lock +++ b/gemfiles/ruby_3.2.0_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -187,7 +187,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.2.0_core_old.gemfile.lock b/gemfiles/ruby_3.2.0_core_old.gemfile.lock index 7497ac760d3..85c1ceaa578 100644 --- a/gemfiles/ruby_3.2.0_core_old.gemfile.lock +++ b/gemfiles/ruby_3.2.0_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -54,7 +54,7 @@ GEM ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) opentracing (0.5.0) os (1.1.4) parallel (1.22.1) @@ -163,7 +163,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.2.0_cucumber3.gemfile.lock b/gemfiles/ruby_3.2.0_cucumber3.gemfile.lock index b7004415a52..1766db47cee 100644 --- a/gemfiles/ruby_3.2.0_cucumber3.gemfile.lock +++ b/gemfiles/ruby_3.2.0_cucumber3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -72,7 +72,7 @@ GEM ffi (~> 1.0) memory_profiler (0.9.14) method_source (1.0.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) multi_test (0.1.2) opentracing (0.5.0) @@ -184,7 +184,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.2.0_cucumber4.gemfile.lock b/gemfiles/ruby_3.2.0_cucumber4.gemfile.lock index 4e91b1951ac..1cfb27b6673 100644 --- a/gemfiles/ruby_3.2.0_cucumber4.gemfile.lock +++ b/gemfiles/ruby_3.2.0_cucumber4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -94,7 +94,7 @@ GEM method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -215,7 +215,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.2.0_cucumber5.gemfile.lock b/gemfiles/ruby_3.2.0_cucumber5.gemfile.lock index d53fadb0ab7..33366061bd4 100644 --- a/gemfiles/ruby_3.2.0_cucumber5.gemfile.lock +++ b/gemfiles/ruby_3.2.0_cucumber5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -94,7 +94,7 @@ GEM method_source (1.0.0) middleware (0.1.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) multi_test (0.1.2) opentracing (0.5.0) os (1.1.4) @@ -215,7 +215,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock index 7e7f45099f4..8495d9a90e8 100644 --- a/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -134,7 +134,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.3) timeout net-smtp (0.3.1) @@ -302,7 +302,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock index e86643b95cc..07db29c0f67 100644 --- a/gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -134,7 +134,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.3) timeout net-smtp (0.3.1) @@ -304,7 +304,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile.lock index 540f392475d..ab3921e4fd1 100644 --- a/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -134,7 +134,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.3) timeout net-smtp (0.3.1) @@ -306,7 +306,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock index 18493e850d3..f8f8c08fef1 100644 --- a/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -135,7 +135,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.3) timeout net-smtp (0.3.1) @@ -317,7 +317,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile.lock index 7d2984deb6c..2b1df0f90a1 100644 --- a/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -129,7 +129,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.4) + msgpack (1.5.6) net-protocol (0.1.3) timeout net-smtp (0.3.1) @@ -303,7 +303,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.2.0_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.2.0_resque2_redis3.gemfile.lock index eb3357d1a41..ce8cc084019 100644 --- a/gemfiles/ruby_3.2.0_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_3.2.0_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -55,7 +55,7 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -187,7 +187,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) diff --git a/gemfiles/ruby_3.2.0_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.2.0_resque2_redis4.gemfile.lock index d3b98731b45..4589c944f6e 100644 --- a/gemfiles/ruby_3.2.0_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_3.2.0_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (1.3.0) + ddtrace (1.4.0) debase-ruby_core_source (= 0.10.16) libdatadog (~> 0.7.0.1.1) libddwaf (~> 1.3.0.2.0) @@ -55,7 +55,7 @@ GEM memory_profiler (0.9.14) method_source (1.0.0) mono_logger (1.1.1) - msgpack (1.5.4) + msgpack (1.5.6) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -187,7 +187,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1) rspec_junit_formatter (>= 0.5.1) rspec_n (~> 1.3) - rubocop (~> 1.10) + rubocop (~> 1.10, < 1.33.0) rubocop-packaging (~> 0.5) rubocop-performance (~> 1.9) rubocop-rspec (~> 2.2) From ef05007f667284dc172579866ffdcba3d95d75ee Mon Sep 17 00:00:00 2001 From: Tony Hsu Date: Tue, 30 Aug 2022 10:50:55 +0200 Subject: [PATCH 41/46] Restraint redis 5 version for known compatibility issue --- integration/apps/rack/Gemfile | 3 ++- integration/apps/rails-five/Gemfile | 3 ++- integration/apps/rails-seven/Gemfile | 3 ++- integration/apps/rails-six/Gemfile | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/integration/apps/rack/Gemfile b/integration/apps/rack/Gemfile index d7278acbab2..38dc19ed400 100644 --- a/integration/apps/rack/Gemfile +++ b/integration/apps/rack/Gemfile @@ -8,7 +8,8 @@ gem 'rack' if RUBY_VERSION < '2.3' gem 'redis', '< 4.1.1' # 4.1.1 "claims" to support 2.2 but is actually broken else - gem 'redis' + # Known compatibility issue: https://github.com/redis/redis-rb/issues/1142 + gem 'redis', '< 5' end if RUBY_VERSION < '2.2' gem 'sidekiq', '< 5' # 5.0.3 checks for older Rubies and breaks, but does not declare it on the gemspec :( diff --git a/integration/apps/rails-five/Gemfile b/integration/apps/rails-five/Gemfile index 2d20cd58948..9150ca071f3 100644 --- a/integration/apps/rails-five/Gemfile +++ b/integration/apps/rails-five/Gemfile @@ -68,7 +68,8 @@ gem 'ipaddress' gem 'rabl', platform: :ruby gem 'rack-cors' gem 'rake' -gem 'redis' +# Known compatibility issue: https://github.com/redis/redis-rb/issues/1142 +gem 'redis', '< 5' gem 'resque' # gem 'resque-pool' # Incompatible with Redis 4.0+ gem 'resque-scheduler' diff --git a/integration/apps/rails-seven/Gemfile b/integration/apps/rails-seven/Gemfile index d17af2274ba..99da202f131 100644 --- a/integration/apps/rails-seven/Gemfile +++ b/integration/apps/rails-seven/Gemfile @@ -86,7 +86,8 @@ gem 'aws-sdk' gem 'devise' gem 'httparty' gem 'mysql2' -gem 'redis' +# Known compatibility issue: https://github.com/redis/redis-rb/issues/1142 +gem 'redis', '< 5' gem 'resque' gem 'unicorn' diff --git a/integration/apps/rails-six/Gemfile b/integration/apps/rails-six/Gemfile index b50f9c0b108..cccbe5f64f0 100644 --- a/integration/apps/rails-six/Gemfile +++ b/integration/apps/rails-six/Gemfile @@ -63,7 +63,8 @@ gem 'ipaddress' gem 'rabl', platform: :ruby gem 'rack-cors' gem 'rake' -gem 'redis' +# Known compatibility issue: https://github.com/redis/redis-rb/issues/1142 +gem 'redis', '< 5' gem 'resque' # gem 'resque-pool' # Incompatible with Redis 4.0+ gem 'resque-scheduler' From fec401b2bc3720963bccdc50a9edd247881c457a Mon Sep 17 00:00:00 2001 From: Robert Pankowecki Date: Tue, 30 Aug 2022 12:00:28 +0200 Subject: [PATCH 42/46] Faraday middleware uses HttpAnnotationHelper service_name(env[:url].host, options) was called but the result was not used. --- lib/datadog/tracing/contrib/faraday/middleware.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/datadog/tracing/contrib/faraday/middleware.rb b/lib/datadog/tracing/contrib/faraday/middleware.rb index 56b26cefe6b..fcd16e65a9a 100644 --- a/lib/datadog/tracing/contrib/faraday/middleware.rb +++ b/lib/datadog/tracing/contrib/faraday/middleware.rb @@ -39,8 +39,7 @@ def call(env) def annotate!(span, env, options) span.resource = resource_name(env) - service_name(env[:url].host, options) - span.service = options[:split_by_domain] ? env[:url].host : options[:service_name] + span.service = service_name(env[:url].host, options) span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT) From 19f87ec1499821b2aec4147db7ac5a621f1c5e96 Mon Sep 17 00:00:00 2001 From: Ivo Anjo Date: Wed, 31 Aug 2022 11:14:29 +0100 Subject: [PATCH 43/46] [SCP-184] Fix incompatible library check when there's no libruby.so The logic in `ddtrace_profiling_loader.c` follows Ruby's `dln.c`; see the big comment at the top of the former for why it needs to exist. The `incompatible_library` sanity check exists to try to catch situations where the library being loaded is linked to a different `libruby.so` (or equivalent in other OSs) than the one that is doing the loading. BUT when we implemented `incompatible_library` we missed an check that upstream Ruby does. From https://github.com/ruby/ruby/blob/v3_1_2/dln.c#L295: ```c static bool dln_incompatible_library_p(void *handle) { void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc"); void *const fp = (void *)ruby_xmalloc; return ex && ex != fp; } ``` Ruby actually checks that the symbol found is **not NULL** (e.g. with the `ex && ` check). This is important, because there's a valid situation in which the symbol is expected to be NULL: when Ruby is built with `--disable-shared` at compilation time. What `--disable-shared` does is that it builds the Ruby VM logic inside the `ruby` executable itself INSTEAD OF splitting the logic between the `ruby` executable and the `libruby.so` shared library. To properly support this configuration, we should, like upstream Ruby does, consider a library compatible if the symbol lookup returns `NULL`. Extra note -- here's a few ways of telling if there's a `libruby`: * `RbConfig::CONFIG['configure_args']` will contain `--disable-shared` * `RbConfig::CONFIG['LIBRUBY']` will be `libruby-static.a` instead of, for instance `libruby.so.3.1.1` * Ruby will not be linked to libruby: ``` # with libruby $ ldd `which ruby` | grep libruby libruby.so.3.1 => /usr/local/lib/libruby.so.3.1 (0x00007fb37e260000) # without libruby $ ldd `which ruby` | grep libruby (no output) ``` --- .../ddtrace_profiling_loader.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ext/ddtrace_profiling_loader/ddtrace_profiling_loader.c b/ext/ddtrace_profiling_loader/ddtrace_profiling_loader.c index 7327a200e29..74f341dff12 100644 --- a/ext/ddtrace_profiling_loader/ddtrace_profiling_loader.c +++ b/ext/ddtrace_profiling_loader/ddtrace_profiling_loader.c @@ -85,7 +85,16 @@ static bool failed_to_load(void *handle, VALUE *failure_details) { static bool incompatible_library(void *handle, VALUE *failure_details) { // The library being loaded may be linked to a different libruby than the current executing Ruby. // We check if this is the case by checking if a well-known symbol resolves to a common address. - if (dlsym(handle, "ruby_xmalloc") != &ruby_xmalloc) { + + void *xmalloc_from_library = dlsym(handle, "ruby_xmalloc"); + + if (xmalloc_from_library == NULL) { + // This happens when ruby is built without a `libruby.so` by using `--disable-shared` at compilation time. + // In this situation, no conflict between libruby version is possible. + return false; + } + + if (xmalloc_from_library != &ruby_xmalloc) { *failure_details = rb_str_new_cstr("library was compiled and linked to a different Ruby version"); unload_failed_library(handle); return true; From 5feb4232f98f891f12cc87ebc6397129631278af Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Wed, 7 Sep 2022 17:35:32 -0700 Subject: [PATCH 44/46] chore:Fix Rack status code return type in integration tests --- integration/apps/rack/app/acme.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/integration/apps/rack/app/acme.rb b/integration/apps/rack/app/acme.rb index fc0ad6113c9..5a77ea8af8a 100644 --- a/integration/apps/rack/app/acme.rb +++ b/integration/apps/rack/app/acme.rb @@ -67,11 +67,11 @@ class Basic def fibonacci(request) n = rand(25..35) result = fib(n) - ['200', { 'Content-Type' => 'text/plain' }, ["Basic: Fibonacci(#{n}): #{result}"]] + [200, { 'Content-Type' => 'text/plain' }, ["Basic: Fibonacci(#{n}): #{result}"]] end def default(request) - ['200', { 'Content-Type' => 'text/plain' }, ["Basic: Default", "\nWebserver process: #{$PROGRAM_NAME}"]] + [200, { 'Content-Type' => 'text/plain' }, ["Basic: Default", "\nWebserver process: #{$PROGRAM_NAME}"]] end private @@ -83,11 +83,11 @@ def fib(n) class Health def check(request) - ['204', {}, []] + [204, {}, []] end def detailed_check(request) - ['200', { 'Content-Type' => 'application/json'}, [JSON.pretty_generate( + [200, { 'Content-Type' => 'application/json'}, [JSON.pretty_generate( webserver_process: $PROGRAM_NAME, profiler_available: Datadog::Profiling.start_if_enabled, # NOTE: Threads can't be named on Ruby 2.1 and 2.2 @@ -98,23 +98,23 @@ def detailed_check(request) class BackgroundJobs def read_sidekiq(request) - ['200', { 'Content-Type' => 'application/json' }, [SidekiqBackgroundJob.read(request.params.fetch('key')).to_s, "\n"]] + [200, { 'Content-Type' => 'application/json' }, [SidekiqBackgroundJob.read(request.params.fetch('key')).to_s, "\n"]] end def write_sidekiq(request) SidekiqBackgroundJob.async_write(request.params.fetch('key'), request.params.fetch('value')) - ['202', {}, []] + [202, {}, []] end def read_resque(request) - ['200', { 'Content-Type' => 'application/json' }, [ResqueBackgroundJob.read(request.params.fetch('key')).to_s, "\n"]] + [200, { 'Content-Type' => 'application/json' }, [ResqueBackgroundJob.read(request.params.fetch('key')).to_s, "\n"]] end def write_resque(request) ResqueBackgroundJob.async_write(request.params.fetch('key'), request.params.fetch('value')) - ['202', {}, []] + [202, {}, []] end end end From ffe5a8fbe63dfde55802e12f613c8873d457278f Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Wed, 7 Sep 2022 17:52:55 -0700 Subject: [PATCH 45/46] Headers should not have uppercase characters --- integration/apps/rack/app/acme.rb | 14 +++++++------- integration/apps/sinatra2-classic/app/acme.rb | 4 ++-- integration/apps/sinatra2-modular/app/basic.rb | 2 +- integration/apps/sinatra2-modular/app/health.rb | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/integration/apps/rack/app/acme.rb b/integration/apps/rack/app/acme.rb index 5a77ea8af8a..f0112cf7fb0 100644 --- a/integration/apps/rack/app/acme.rb +++ b/integration/apps/rack/app/acme.rb @@ -54,11 +54,11 @@ def route!(request) end def not_found(request) - [404, { 'Content-Type' => 'text/plain' }, ["404 Not Found: #{request.path}"]] + [404, { 'content-type' => 'text/plain' }, ["404 Not Found: #{request.path}"]] end def application_error(request, error) - [500, { 'Content-Type' => 'text/plain' }, ["500 Application Error: #{error.class.name} #{error.message} Location: #{error.backtrace.first(3)}"]] + [500, { 'content-type' => 'text/plain' }, ["500 Application Error: #{error.class.name} #{error.message} Location: #{error.backtrace.first(3)}"]] end end @@ -67,11 +67,11 @@ class Basic def fibonacci(request) n = rand(25..35) result = fib(n) - [200, { 'Content-Type' => 'text/plain' }, ["Basic: Fibonacci(#{n}): #{result}"]] + [200, { 'content-type' => 'text/plain' }, ["Basic: Fibonacci(#{n}): #{result}"]] end def default(request) - [200, { 'Content-Type' => 'text/plain' }, ["Basic: Default", "\nWebserver process: #{$PROGRAM_NAME}"]] + [200, { 'content-type' => 'text/plain' }, ["Basic: Default", "\nWebserver process: #{$PROGRAM_NAME}"]] end private @@ -87,7 +87,7 @@ def check(request) end def detailed_check(request) - [200, { 'Content-Type' => 'application/json'}, [JSON.pretty_generate( + [200, { 'content-type' => 'application/json'}, [JSON.pretty_generate( webserver_process: $PROGRAM_NAME, profiler_available: Datadog::Profiling.start_if_enabled, # NOTE: Threads can't be named on Ruby 2.1 and 2.2 @@ -98,7 +98,7 @@ def detailed_check(request) class BackgroundJobs def read_sidekiq(request) - [200, { 'Content-Type' => 'application/json' }, [SidekiqBackgroundJob.read(request.params.fetch('key')).to_s, "\n"]] + [200, { 'content-type' => 'application/json' }, [SidekiqBackgroundJob.read(request.params.fetch('key')).to_s, "\n"]] end def write_sidekiq(request) @@ -108,7 +108,7 @@ def write_sidekiq(request) end def read_resque(request) - [200, { 'Content-Type' => 'application/json' }, [ResqueBackgroundJob.read(request.params.fetch('key')).to_s, "\n"]] + [200, { 'content-type' => 'application/json' }, [ResqueBackgroundJob.read(request.params.fetch('key')).to_s, "\n"]] end def write_resque(request) diff --git a/integration/apps/sinatra2-classic/app/acme.rb b/integration/apps/sinatra2-classic/app/acme.rb index 3e5a8d889ab..09af208670a 100644 --- a/integration/apps/sinatra2-classic/app/acme.rb +++ b/integration/apps/sinatra2-classic/app/acme.rb @@ -33,7 +33,7 @@ get '/health/detailed' do [ 200, - { 'Content-Type' => 'application/json' }, + { 'content-type' => 'application/json' }, JSON.generate( webserver_process: $PROGRAM_NAME, profiler_available: Datadog::Profiling.start_if_enabled, @@ -57,7 +57,7 @@ [ 200, - { 'Content-Type' => 'text/plain' }, + { 'content-type' => 'text/plain' }, ["Basic: Fibonacci(#{n}): #{result}"] ] end diff --git a/integration/apps/sinatra2-modular/app/basic.rb b/integration/apps/sinatra2-modular/app/basic.rb index ea6f09af75b..aa252fd6ca9 100644 --- a/integration/apps/sinatra2-modular/app/basic.rb +++ b/integration/apps/sinatra2-modular/app/basic.rb @@ -14,7 +14,7 @@ class Basic < Sinatra::Base [ 200, - { 'Content-Type' => 'text/plain' }, + { 'content-type' => 'text/plain' }, ["Basic: Fibonacci(#{n}): #{result}"] ] end diff --git a/integration/apps/sinatra2-modular/app/health.rb b/integration/apps/sinatra2-modular/app/health.rb index c974d837222..7a899fc3dfc 100644 --- a/integration/apps/sinatra2-modular/app/health.rb +++ b/integration/apps/sinatra2-modular/app/health.rb @@ -11,7 +11,7 @@ class Health < Sinatra::Base get '/health/detailed' do [ 200, - { 'Content-Type' => 'application/json' }, + { 'content-type' => 'application/json' }, JSON.generate( webserver_process: $PROGRAM_NAME, profiler_available: Datadog::Profiling.start_if_enabled, From 715aef2682c410b0844b9954f2ad75be29d67f29 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Wed, 7 Sep 2022 18:00:55 -0700 Subject: [PATCH 46/46] Add rackup gem --- integration/apps/rack/Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration/apps/rack/Gemfile b/integration/apps/rack/Gemfile index 38dc19ed400..40ccfac91df 100644 --- a/integration/apps/rack/Gemfile +++ b/integration/apps/rack/Gemfile @@ -5,6 +5,8 @@ source "https://rubygems.org" gem 'puma' gem 'unicorn' gem 'rack' +gem 'rackup' if RUBY_VERSION >= '2.4' # The `rackup` is its own gem since Rack 3.0 + if RUBY_VERSION < '2.3' gem 'redis', '< 4.1.1' # 4.1.1 "claims" to support 2.2 but is actually broken else