Commit 3cfe2f1d authored by Ou.Yang.Jin.Ting's avatar Ou.Yang.Jin.Ting
Browse files

Support rails-8-0

parent c97fcfcb

gitlab-labkit.gemspec

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec| 
  spec.required_ruby_version = ">= 2.6.0"



  # Please maintain alphabetical order for dependencies

  spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 8.0.0"

  spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 8.0.0"

  spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 8.1.0"

  spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 8.1.0"

  spec.add_runtime_dependency "grpc", ">= 1.62" # Be sure to update the "grpc-tools" dev_dependency too

  spec.add_runtime_dependency "jaeger-client", "~> 1.1.0"

  spec.add_runtime_dependency "opentracing", "~> 0.4"

lib/labkit/logging/sanitizer.rb

+8 −0
Original line number Diff line number Diff line
@@ -39,6 +39,14 @@ module Labkit 
        url = url.to_s.strip

        p = URI::DEFAULT_PARSER.parse(url)



        # After upgrading uri to 1.0.0, the DEFAULT_PARSER has been changed from rfc2396 to rfc3986,

        # and there are the following differences in parsing between rfc2396 and rfc3986.

        # e.g:

        #

        #     URI::RFC3986_PARSER.parse('ssh://') => #<URI::Generic ssh://>

        #     URI::RFC2396_PARSER.parse('ssh://') => raise URI::InvalidURIError

        return "" if p.host.empty?



        p.password = "*****" if p.password.present?

        p.user = "*****" if p.user.present?

        p.to_s