gitlab-labkit 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef9aed12ba67f4628dcddf7273d14a420325935afe77dfad8950a57b2a28bf8
-  data.tar.gz: 4cd67209a2a395f1e0b2e0b866a3df8d266a4bb3390f14de24336265e78d88bd
+  metadata.gz: bf6262472d851bcdfeb96b0ed3b7acf25f462b0b968d2ac2f431ea946b68b33a
+  data.tar.gz: b04bfc82c7ea63848849af40c7940788796b486a16c41416de824b7440f01992
 SHA512:
-  metadata.gz: d672a393f0491b986882ecedc0d80ebff33bc266a2eb34f407cc1158b1ba3c19e419fcac64ce0b86d59eb039da16cc57fd937f69eb88529deb014dfc4c587566
-  data.tar.gz: bac5642a671b7a86ed7b375273fe9fa3aa76335ac1718ece9104017104e639ad86e16d3361d8721ddb39ddea94628a8d7a990a63adc17ca63263083397c0f815
+  metadata.gz: 7c5a7b9002239cf23e7609fd8c07174bf588c0f2f1f2177616d6f98f4490c8e32f74cb7c8e62c1bf8ae839da24e30023e9bd733f1a6e40bbf75484d614a3d9ad
+  data.tar.gz: e699b4a653c268c7333bdad41006a5c52d0fbdaf0aa4c21ca90bbb396695d6519695243e0548e0f5439f9bd11366c6a3359c013766deadaa6996e31bbbfb7c7a

data/gitlab-labkit.gemspec

@@ -27,8 +27,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "grpc", ">= 1.75" # Be sure to update the "grpc-tools" dev_dependency too
   spec.add_runtime_dependency "google-protobuf", ">= 3.25", "< 5.0"
   spec.add_runtime_dependency "jaeger-client", "~> 1.1.0"
-  spec.add_runtime_dependency 'json_schemer', '>= 2.3.0', '< 3.0'
+  spec.add_runtime_dependency "json_schemer", ">= 2.3.0", "< 3.0"
   spec.add_runtime_dependency "openssl", "~> 3.3.2"
+  spec.add_runtime_dependency "opentelemetry-sdk", "~> 1.10"
+  spec.add_runtime_dependency "opentelemetry-instrumentation-all", "~> 0.89.1"
+  spec.add_runtime_dependency "opentelemetry-exporter-otlp", "~> 0.31.1"
   spec.add_runtime_dependency "opentracing", "~> 0.4"
   spec.add_runtime_dependency "pg_query", ">= 6.1.0", "< 7.0"
   spec.add_runtime_dependency "prometheus-client-mmap", ">= 1.2", "< 2.0"
@@ -46,6 +49,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry", "~> 0.12"
   spec.add_development_dependency "pry-byebug", "~> 3.11"
   spec.add_development_dependency "rack", "~> 2.0"
+  spec.add_development_dependency "railties", ">= 5.0.0", "< 8.1.0"
   spec.add_development_dependency "rake", "~> 13.2"
   spec.add_development_dependency "rest-client", "~> 2.1.0"
   spec.add_development_dependency "rspec", "~> 3.12.0"

data/lib/gitlab-labkit.rb

@@ -47,4 +47,6 @@ module Labkit
   autoload :HTTPClientPublisher, "labkit/httpclient_publisher"
 end
 
+Labkit::Tracing::AutoInitialize.initialize! if defined?(Labkit::Tracing)
+
 # rubocop:enable Naming/FileName

data/lib/labkit/logging/field_validator.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require 'set'
-require 'json'
-require 'yaml'
+require "json"
+require "yaml"
 
-require_relative 'field_validator/config'
-require_relative 'field_validator/log_interceptor'
-require_relative 'field_validator/registry'
+require_relative "field_validator/config"
+require_relative "field_validator/log_interceptor"
+require_relative "field_validator/registry"
 
 module Labkit
   module Logging
@@ -46,14 +45,14 @@ module Labkit
 
           return if detected_offenses.empty? && new_offenses.empty? && removed_offenses.empty?
 
-          in_ci = ENV['CI'] == 'true'
+          in_ci = ENV["CI"] == "true"
 
           output_ndjson(detected_offenses) if in_ci
 
           # Auto-remove fixed offenses (not in CI to avoid race conditions)
           handle_removed_offenses(removed_offenses) if removed_offenses.any? && !in_ci
 
-          if ENV['LABKIT_LOGGING_TODO_UPDATE'] == 'true'
+          if ENV["LABKIT_LOGGING_TODO_UPDATE"] == "true"
             handle_update(new_offenses)
           elsif new_offenses.any?
             handle_new_offenses(new_offenses)
@@ -98,7 +97,7 @@ module Labkit
         end
 
         def handle_new_offenses(new_offenses)
-          if ENV['CI'] == 'true' && Config.skip_ci_failure?
+          if ENV["CI"] == "true" && Config.skip_ci_failure?
             warn baseline_generation_message(new_offenses)
           else
             warn report_new_offenses(new_offenses)
@@ -120,7 +119,7 @@ module Labkit
             "Documentation: https://gitlab.com/gitlab-org/ruby/gems/labkit-ruby/-/blob/master/doc/FIELD_STANDARDIZATION.md",
             "",
             "--- Offenses Summary ---",
-            "Total offenses: #{offenses.size} across #{offenses.map { |o| o['callsite'] }.uniq.size} file(s)",
+            "Total offenses: #{offenses.size} across #{offenses.map { |o| o['callsite'] }.uniq.size} file(s)", # rubocop:disable Rails/Pluck
             ""
           ]
           lines.join("\n")
@@ -157,7 +156,7 @@ module Labkit
 
           lines << ""
           lines << ("=" * 80)
-          lines << "Total: #{new_offenses.size} new offense(s) in #{new_offenses.map { |o| o['callsite'] }.uniq.size} file(s)"
+          lines << "Total: #{new_offenses.size} new offense(s) in #{new_offenses.map { |o| o['callsite'] }.uniq.size} file(s)" # rubocop:disable Rails/Pluck
           lines << ""
           lines << "See https://gitlab.com/gitlab-org/ruby/gems/labkit-ruby/-/blob/master/doc/FIELD_STANDARDIZATION.md"
           lines << ("=" * 80)

data/lib/labkit/middleware/sidekiq/tracing/client.rb

@@ -17,7 +17,7 @@ module Labkit
           def call(_worker_class, job, _queue, _redis_pool)
             Labkit::Tracing::TracingUtils.with_tracing(operation_name: "sidekiq:#{job_class(job)}", tags: tags_from_job(job, SPAN_KIND)) do |span|
               # Inject the details directly into the job
-              Labkit::Tracing::TracingUtils.tracer.inject(span.context, OpenTracing::FORMAT_TEXT_MAP, job)
+              Labkit::Tracing::TracingUtils.tracer.inject_context(span, job)
 
               yield
             end

data/lib/labkit/middleware/sidekiq/tracing/server.rb

@@ -15,7 +15,7 @@ module Labkit
           SPAN_KIND = "server"
 
           def call(_worker, job, _queue)
-            context = Labkit::Tracing::TracingUtils.tracer.extract(OpenTracing::FORMAT_TEXT_MAP, job)
+            context = Labkit::Tracing::TracingUtils.tracer.extract_context(job)
 
             Labkit::Tracing::TracingUtils.with_tracing(operation_name: "sidekiq:#{job_class(job)}", child_of: context, tags: tags_from_job(job, SPAN_KIND)) { |_span| yield }
           end