gitlab-labkit 0.26.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67d751c41c569f082517aca92fb16a5671d9b82693a6a02065ad349ad648c4ab
-  data.tar.gz: 94ac25bcad3f2cdb07626e882866b232e75328d5ad458d99dd7feeb81d656852
+  metadata.gz: a7858d4755aa67f53d9ec232cfba39e8ee1245cea7e19a27a902e37fb3a80fda
+  data.tar.gz: f730b09600a2d855a1391ef7c10538cdaa757838cef2ca7daff2d1a0349be3e3
 SHA512:
-  metadata.gz: 11754a10140341571519d42e999240c3f580b32e7313852c361ba93c42f9b9d0b18599d019d07217566440e128d8f8a00490ab39938e1dec7f813f1d45c03806
-  data.tar.gz: 7b993168a160a5beacf9757893b424f3da57eeb4fa71600d7ed41e99841a92d0bc7cb4a95fefa572697957c5e7081a672cbe570897db08e5d78e55d6bac3cedb
+  metadata.gz: 878574f3a7c26400e6ea7fcfbc2c4d16fc7f86cec1f9651dfad977d07a1bf203c6ef3ab843a3c996b3c0a6c17bbf5e847d23d7a2ab160c559f7617a24d9d9345
+  data.tar.gz: 4b7aea548f16103da6ac81aa8a9a195efdc952feaa13860415fc50ab028eb0e5ce76c4283d10b7e2f03807573ca2717de2386e9becdd0ec7031c18658495b27b

data/.env.example.sh

@@ -0,0 +1,7 @@
+export CI_PROJECT_ID=10947578
+export CI_API_V4_URL="https://gitlab.com/api/v4"
+export CI_PROJECT_URL="https://gitlab.com/gitlab-org/ruby/gems/labkit-ruby"
+# Don't keep secrets in plaintext files. Use a keyring or 1password to load
+# it instead and export it as an env var.
+token=$(load-your-token)
+export GITLAB_TOKEN=$token

data/.gitignore

@@ -2,3 +2,4 @@ Gemfile.lock
 *.gem
 node_modules
 .bundle
+/.env.sh

data/README.md

@@ -44,6 +44,20 @@ Note that LabKit-Ruby uses the [`rufo`](https://github.com/ruby-formatter/rufo)
 
 Please also review the [development section of the LabKit (go) README](https://gitlab.com/gitlab-org/labkit#developing-labkit) for details of the LabKit architectural philosophy.
 
+To work on some of the scripts we use for releasing a new version,
+make sure to add a new `.env.sh`.
+
+```console
+cp .env.example.sh .env.sh`
+```
+
+Inside `.env.sh`, add a personal acccess token for the `GITLAB_TOKEN`
+environment variable. Next source the file:
+
+```console
+. .env.sh
+```
+
 ### Releasing a new version
 
 Releasing a new version can be done by pushing a new tag, or creating

data/gitlab-labkit.gemspec

@@ -42,6 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.10.0"
   spec.add_development_dependency "rspec-parameterized", "~> 0.4"
   spec.add_development_dependency "rufo", "0.9.0"
-  spec.add_development_dependency "sidekiq", ">= 5.2"
+  spec.add_development_dependency "sidekiq", ">= 5.2", "< 7"
   spec.add_development_dependency "webrick", "~> 1.7.0"
 end

data/lib/labkit/fips.rb

@@ -30,6 +30,7 @@ module Labkit
       # Swap Ruby's Digest::SHAx implementations for OpenSSL::Digest::SHAx.
       def enable_fips_mode!
         require "digest"
+        require "digest/sha1"
         require "digest/sha2"
 
         ::Digest::SHA2.singleton_class.prepend(Labkit::Digest::SHA2)

data/lib/labkit/tracing/jaeger_factory.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "active_support"
+require "active_support/core_ext"
+
 require "jaeger/client"
 
 module Labkit
@@ -22,10 +25,13 @@ module Labkit
         # The service_name parameter from GITLAB_TRACING takes precedence over the application one
         service_name = options[:service_name] if options[:service_name]
 
+        # parse reporter headers as necessary
+        headers = build_headers(options)
+
         kwargs = {
           service_name: service_name,
           sampler: get_sampler(options[:sampler], options[:sampler_param]),
-          reporter: get_reporter(service_name, options[:http_endpoint], options[:udp_endpoint]),
+          reporter: get_reporter(service_name, options[:http_endpoint], options[:udp_endpoint], headers),
         }.compact
 
         extra_params = options.except(:sampler, :sampler_param, :http_endpoint, :udp_endpoint, :strict_parsing, :debug)
@@ -40,6 +46,24 @@ module Labkit
         Jaeger::Client.build(**kwargs)
       end
 
+      def self.build_headers(options)
+        return unless options&.key?(:http_endpoint)
+
+        http_endpoint = options[:http_endpoint]
+        parsed = URI.parse(http_endpoint)
+
+        headers = {}
+        # add basic auth header only when both user and password are setup correctly
+        user = parsed.user
+        password = parsed.password
+        if user.present? && password.present?
+          headers["Authorization"] = "Basic " + Base64.strict_encode64("#{user}:#{password}")
+        end
+
+        return headers
+      end
+      private_class_method :build_headers
+
       def self.get_sampler(sampler_type, sampler_param)
         case sampler_type
         when "probabilistic"
@@ -52,11 +76,11 @@ module Labkit
       end
       private_class_method :get_sampler
 
-      def self.get_reporter(service_name, http_endpoint, udp_endpoint)
+      def self.get_reporter(service_name, http_endpoint, udp_endpoint, headers)
         encoder = Jaeger::Encoders::ThriftEncoder.new(service_name: service_name)
 
         if http_endpoint.present?
-          sender = get_http_sender(encoder, http_endpoint)
+          sender = get_http_sender(encoder, http_endpoint, headers)
         elsif udp_endpoint.present?
           sender = get_udp_sender(encoder, udp_endpoint)
         else
@@ -67,8 +91,8 @@ module Labkit
       end
       private_class_method :get_reporter
 
-      def self.get_http_sender(encoder, address)
-        Jaeger::HttpSender.new(url: address, encoder: encoder, logger: Logger.new(STDOUT))
+      def self.get_http_sender(encoder, address, headers)
+        Jaeger::HttpSender.new(url: address, headers: headers, encoder: encoder, logger: Logger.new(STDOUT))
       end
       private_class_method :get_http_sender
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2022-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -329,6 +329,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -336,6 +339,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -357,6 +363,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.example.sh"
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".gitlab/CODEOWNERS"