Commit 7bca9072 authored by Igor's avatar Igor
Browse files

rename Subscriber => Instrumenter

parent 16bf9074

lib/labkit/tracing/rails/action_view_subscriber.rb

+6 −6
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ module Labkit 
          subscriber = new



          subscriptions = [

            ActiveSupport::Notifications.subscribe(RENDER_TEMPLATE_NOTIFICATION_TOPIC, RenderTemplateSubscriber.new),

            ActiveSupport::Notifications.subscribe(RENDER_COLLECTION_NOTIFICATION_TOPIC, RenderCollectionSubscriber.new),

            ActiveSupport::Notifications.subscribe(RENDER_PARTIAL_NOTIFICATION_TOPIC, RenderPartialSubscriber.new),

            ActiveSupport::Notifications.subscribe(RENDER_TEMPLATE_NOTIFICATION_TOPIC, RenderTemplateInstrumenter.new),

            ActiveSupport::Notifications.subscribe(RENDER_COLLECTION_NOTIFICATION_TOPIC, RenderCollectionInstrumenter.new),

            ActiveSupport::Notifications.subscribe(RENDER_PARTIAL_NOTIFICATION_TOPIC, RenderPartialInstrumenter.new),

          ]



          create_unsubscriber subscriptions
@@ -29,7 +29,7 @@ module Labkit 


        # For more information on the payloads: https://guides.rubyonrails.org/active_support_instrumentation.html



        class RenderTemplateSubscriber < AbstractSubscriber

        class RenderTemplateInstrumenter < AbstractInstrumenter

          def span_name(payload)

            "render_template"

          end
@@ -39,7 +39,7 @@ module Labkit 
          end

        end



        class RenderCollectionSubscriber < AbstractSubscriber

        class RenderCollectionInstrumenter < AbstractInstrumenter

          def span_name(payload)

            "render_collection"

          end
@@ -54,7 +54,7 @@ module Labkit 
          end

        end



        class RenderPartialSubscriber < AbstractSubscriber

        class RenderPartialInstrumenter < AbstractInstrumenter

          def span_name(payload)

            "render_partial"

          end

lib/labkit/tracing/rails/active_record_subscriber.rb

+2 −2
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ module Labkit 
        def self.instrument

          subscriber = new



          subscription = ActiveSupport::Notifications.subscribe(ACTIVE_RECORD_NOTIFICATION_TOPIC, SqlSubscriber.new)

          subscription = ActiveSupport::Notifications.subscribe(ACTIVE_RECORD_NOTIFICATION_TOPIC, SqlInstrumenter.new)



          create_unsubscriber [subscription]

        end



        # For more information on the payloads: https://guides.rubyonrails.org/active_support_instrumentation.html



        class SqlSubscriber < AbstractSubscriber

        class SqlInstrumenter < AbstractInstrumenter

          def span_name(payload)

            OPERATION_NAME_PREFIX + (payload[:name].presence || DEFAULT_OPERATION_NAME)

          end

lib/labkit/tracing/rails/active_support_subscriber.rb

+10 −10
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ module Labkit 
          subscriber = new



          subscriptions = [

            ActiveSupport::Notifications.subscribe(CACHE_READ_TOPIC, CacheReadSubscriber.new),

            ActiveSupport::Notifications.subscribe(CACHE_GENERATE_TOPIC, CacheGenerateSubscriber.new),

            ActiveSupport::Notifications.subscribe(CACHE_FETCH_HIT_TOPIC, CacheFetchHitSubscriber.new),

            ActiveSupport::Notifications.subscribe(CACHE_WRITE_TOPIC, CacheWriteSubscriber.new),

            ActiveSupport::Notifications.subscribe(CACHE_DELETE_TOPIC, CacheDeleteSubscriber.new),

            ActiveSupport::Notifications.subscribe(CACHE_READ_TOPIC, CacheReadInstrumenter.new),

            ActiveSupport::Notifications.subscribe(CACHE_GENERATE_TOPIC, CacheGenerateInstrumenter.new),

            ActiveSupport::Notifications.subscribe(CACHE_FETCH_HIT_TOPIC, CacheFetchHitInstrumenter.new),

            ActiveSupport::Notifications.subscribe(CACHE_WRITE_TOPIC, CacheWriteInstrumenter.new),

            ActiveSupport::Notifications.subscribe(CACHE_DELETE_TOPIC, CacheDeleteInstrumenter.new),

          ]



          create_unsubscriber subscriptions
@@ -34,7 +34,7 @@ module Labkit 


        # For more information on the payloads: https://guides.rubyonrails.org/active_support_instrumentation.html#active-support



        class CacheReadSubscriber < AbstractSubscriber

        class CacheReadInstrumenter < AbstractInstrumenter

          def span_name(payload)

            "cache_read"

          end
@@ -49,7 +49,7 @@ module Labkit 
          end

        end



        class CacheGenerateSubscriber < AbstractSubscriber

        class CacheGenerateInstrumenter < AbstractInstrumenter

          def span_name(payload)

            "cache_generate"

          end
@@ -59,7 +59,7 @@ module Labkit 
          end

        end



        class CacheFetchHitSubscriber < AbstractSubscriber

        class CacheFetchHitInstrumenter < AbstractInstrumenter

          def span_name(payload)

            "cache_fetch_hit"

          end
@@ -69,7 +69,7 @@ module Labkit 
          end

        end



        class CacheWriteSubscriber < AbstractSubscriber

        class CacheWriteInstrumenter < AbstractInstrumenter

          def span_name(payload)

            "cache_write"

          end
@@ -79,7 +79,7 @@ module Labkit 
          end

        end



        class CacheDeleteSubscriber < AbstractSubscriber

        class CacheDeleteInstrumenter < AbstractInstrumenter

          def span_name(payload)

            "cache_delete"

          end

lib/labkit/tracing/rails/rails_common.rb

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ module Labkit 
      module RailsCommon

        extend ActiveSupport::Concern



        class AbstractSubscriber

        class AbstractInstrumenter

          def start(name, id, payload)

            scope = OpenTracing.start_active_span(span_name(payload))

spec/labkit/tracing/rails/action_view_subscriber_spec.rb

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ describe Labkit::Tracing::Rails::ActionViewSubscriber do 


    let(:id) { SecureRandom.hex }

    let(:notification_name) { "render_template" }

    let(:subscriber) { Labkit::Tracing::Rails::ActionViewSubscriber::RenderTemplateSubscriber.new }

    let(:subscriber) { Labkit::Tracing::Rails::ActionViewSubscriber::RenderTemplateInstrumenter.new }



    let(:scope) { OpenTracing::Scope.new }

    let(:span) { OpenTracing::Span.new }
@@ -75,7 +75,7 @@ describe Labkit::Tracing::Rails::ActionViewSubscriber do 


    let(:id) { SecureRandom.hex }

    let(:notification_name) { "render_collection" }

    let(:subscriber) { Labkit::Tracing::Rails::ActionViewSubscriber::RenderCollectionSubscriber.new }

    let(:subscriber) { Labkit::Tracing::Rails::ActionViewSubscriber::RenderCollectionInstrumenter.new }



    let(:scope) { OpenTracing::Scope.new }

    let(:span) { OpenTracing::Span.new }
@@ -107,7 +107,7 @@ describe Labkit::Tracing::Rails::ActionViewSubscriber do 


    let(:id) { SecureRandom.hex }

    let(:notification_name) { "render_partial" }

    let(:subscriber) { Labkit::Tracing::Rails::ActionViewSubscriber::RenderPartialSubscriber.new }

    let(:subscriber) { Labkit::Tracing::Rails::ActionViewSubscriber::RenderPartialInstrumenter.new }



    let(:scope) { OpenTracing::Scope.new }

    let(:span) { OpenTracing::Span.new }