Verified Commit f6fde9d4 authored by Hercules Merscher's avatar Hercules Merscher 🌴
Browse files

refactor: Replacing Opentracing specifics

parent 89eec0bd

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

+1 −1
Original line number Diff line number Diff line
@@ -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.inject_context(span.context, OpenTracing::FORMAT_TEXT_MAP, job)

              Labkit::Tracing::TracingUtils.tracer.inject_context(span.context, job)



              yield

            end

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ module Labkit 
          SPAN_KIND = "server"



          def call(_worker, job, _queue)

            context = Labkit::Tracing::TracingUtils.extract_context(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

lib/labkit/tracing/adapters/base_tracer.rb

+2 −2
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ module Labkit 
          raise NotImplementedError, "#{self.class.name}#in_span must be implemented"

        end



        def extract_context(_format, _carrier)

        def extract_context(_carrier, format: nil)

          raise NotImplementedError, "#{self.class.name}#extract_context must be implemented"

        end



        def inject_context(_span_context, _format, _carrier)

        def inject_context(_span_context, _carrier, format: nil)

          raise NotImplementedError, "#{self.class.name}#inject_context must be implemented"

        end

lib/labkit/tracing/adapters/opentelemetry_tracer.rb

+10 −11
Original line number Diff line number Diff line
@@ -39,20 +39,19 @@ module Labkit 
          end

        end



        def extract_context(format, carrier)

          case format

          when OpenTracing::FORMAT_RACK, OpenTracing::FORMAT_TEXT_MAP

        def extract_context(carrier, format: nil) # rubocop:disable Lint/UnusedMethodArgument

          # Format parameter is ignored for OpenTelemetry - propagation format is configured

          # globally via OTEL_PROPAGATORS environment variable, not per-call like OpenTracing.

          # The parameter exists only for BaseTracer API compatibility.

          OpenTelemetry.propagation.extract(carrier)

          else

            OpenTelemetry::Context.current

          end

        end



        def inject_context(_span_context, format, carrier)

          case format

          when OpenTracing::FORMAT_TEXT_MAP, OpenTracing::FORMAT_RACK

            OpenTelemetry.propagation.inject(carrier)

          end

        def inject_context(span_context, carrier, format: nil) # rubocop:disable Lint/UnusedMethodArgument

          # Format parameter is ignored for OpenTelemetry - propagation format is configured

          # globally via OTEL_PROPAGATORS environment variable, not per-call like OpenTracing.

          # The parameter exists only for BaseTracer API compatibility.

          context = OpenTelemetry::Trace.context_with_span(span_context)

          OpenTelemetry.propagation.inject(carrier, context: context)

        end



        def active_span

lib/labkit/tracing/adapters/opentracing_tracer.rb

+2 −2
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ module Labkit 
          end

        end



        def extract_context(format, carrier)

        def extract_context(carrier, format: OpenTracing::FORMAT_TEXT_MAP)

          tracer.extract(format, carrier)

        end



        def inject_context(span_context, format, carrier)

        def inject_context(span_context, carrier, format: OpenTracing::FORMAT_TEXT_MAP)

          tracer.inject(span_context, format, carrier)

        end