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

Add tracing middleware to the labkit middleware 

This adds the existing tracing-sidekiq middleware to the overarching
middleware so we don't have to add it separatly in gitlab-rails
parent 1655d896

lib/labkit/middleware/sidekiq.rb

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ module Labkit 
      autoload :Client, "labkit/middleware/sidekiq/client"

      autoload :Server, "labkit/middleware/sidekiq/server"

      autoload :Context, "labkit/middleware/sidekiq/context"

      autoload :Tracing, "labkit/middleware/sidekiq/tracing"

    end

  end

end

lib/labkit/middleware/sidekiq/client.rb

+5 −2
Original line number Diff line number Diff line
@@ -9,12 +9,15 @@ module Labkit 
      # It uses a new `Sidekiq::Middleware::Chain` to string multiple middlewares

      # together.

      class Client

        LABKIT_CLIENT_CHAIN = ::Sidekiq::Middleware::Chain.new do |chain|

        def self.chain

          @chain ||= ::Sidekiq::Middleware::Chain.new do |chain|

            chain.add Labkit::Middleware::Sidekiq::Context::Client

            chain.add Labkit::Middleware::Sidekiq::Tracing::Client if Labkit::Tracing.enabled?

          end

        end



        def call(*args)

          LABKIT_CLIENT_CHAIN.invoke(*args) do

          self.class.chain.invoke(*args) do

            yield

          end

        end

lib/labkit/middleware/sidekiq/server.rb

+5 −2
Original line number Diff line number Diff line
@@ -9,12 +9,15 @@ module Labkit 
      # It uses a new `Sidekiq::Middleware::Chain` to string multiple middlewares

      # together.

      class Server

        LABKIT_SERVER_CHAIN = ::Sidekiq::Middleware::Chain.new do |chain|

        def self.chain

          @chain ||= ::Sidekiq::Middleware::Chain.new do |chain|

            chain.add Labkit::Middleware::Sidekiq::Context::Server

            chain.add Labkit::Middleware::Sidekiq::Tracing::Server if Labkit::Tracing.enabled?

          end

        end



        def call(*args)

          LABKIT_SERVER_CHAIN.invoke(*args) do

          self.class.chain.invoke(*args) do

            yield

          end

        end

lib/labkit/middleware/sidekiq/tracing.rb

0 → 100644
+15 −0
Original line number Diff line number Diff line 
# frozen_string_literal: true



module Labkit

  module Middleware

    module Sidekiq

      # Sidekiq provides classes for instrumenting Sidekiq client and server

      # functionality

      module Tracing

        autoload :Client, "labkit/middleware/sidekiq/tracing/client"

        autoload :Server, "labkit/middleware/sidekiq/tracing/server"

        autoload :SidekiqCommon, "labkit/middleware/sidekiq/tracing/sidekiq_common"

      end

    end

  end

end

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

0 → 100644
+29 −0
Original line number Diff line number Diff line 
# frozen_string_literal: true



require "opentracing"



module Labkit

  module Middleware

    module Sidekiq

      module Tracing

        # Client provides a sidekiq client middleware for

        # instrumenting distributed tracing calls made from the client

        # application

        class Client

          include SidekiqCommon



          SPAN_KIND = "client"



          def call(_worker_class, job, _queue, _redis_pool)

            Labkit::Tracing::TracingUtils.with_tracing(operation_name: "sidekiq:#{job["class"]}", 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)



              yield

            end

          end

        end

      end

    end

  end

end