Commit 6cf38f1a authored by Bob Van Landuyt's avatar Bob Van Landuyt 💬
Browse files

Merge branch 'pl-ruby27-kwargs-deprecations-warnings' into 'master' 

Fix kwargs deprecation warnings for Ruby 2.7.2

See merge request gitlab-org/labkit-ruby!47
parents 3f5a2969 53d20bea

.gitignore

+1 −0
Original line number Diff line number Diff line 
Gemfile.lock

*.gem

node_modules

.bundle

.ruby-version

+1 −1
Original line number Diff line number Diff line 
2.6.3
 
2.7.2

lib/labkit/tracing/jaeger_factory.rb

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ module Labkit 
          warn message

        end



        Jaeger::Client.build(kwargs)

        Jaeger::Client.build(**kwargs)

      end



      def self.get_sampler(sampler_type, sampler_param)

lib/labkit/tracing/tracing_utils.rb

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ module Labkit 
      # Add exception logging to a span

      def self.log_exception_on_span(span, exception)

        span.set_tag("error", true)

        span.log_kv(kv_tags_for_exception(exception))

        span.log_kv(**kv_tags_for_exception(exception))

      end



      # Generate key-value tags for an exception

spec/labkit/correlation/grpc/client_interceptor_spec.rb

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ describe Labkit::Correlation::GRPC::ClientInterceptor do 
      let(:custom_error) { Class.new(StandardError) }



      it "yields" do

        expect { |b| method.call(kwargs, &b) }.to yield_control

        expect { |b| method.call(**kwargs, &b) }.to yield_control

      end



      it "propagates exceptions" do

        expect { method.call(kwargs) { raise custom_error } }.to raise_error(custom_error)

        expect { method.call(**kwargs) { raise custom_error } }.to raise_error(custom_error)

      end

    end