app_perf_rpm 0.0.5 → 0.0.6

data/lib/app_perf_rpm/tracing/collector.rb

@@ -0,0 +1,31 @@
+module AppPerfRpm
+  module Tracing
+    class Collector
+      attr_reader :buffer
+
+      def initialize(local_endpoint)
+        @buffer = Buffer.new
+        @local_endpoint = local_endpoint
+      end
+
+      def retrieve
+        @buffer.retrieve
+      end
+
+      def send_span(span, end_time)
+        duration = end_time - span.start_time
+
+        @buffer << {
+          "traceId" => span.context.trace_id,
+          "id" => span.context.span_id,
+          "parentId" => span.context.parent_id,
+          "name" => span.operation_name,
+          "timestamp" => span.start_time,
+          "duration" => duration * 1_000,
+          "logEntries" => span.log_entries,
+          "tags" => span.tags
+        }
+      end
+    end
+  end
+end

data/lib/app_perf_rpm/tracing/endpoint.rb

@@ -0,0 +1,19 @@
+require 'socket'
+
+module AppPerfRpm
+  module Tracing
+    class Endpoint
+      LOCAL_IP = (
+        Socket.ip_address_list.detect(&:ipv4_private?) ||
+        Socket.ip_address_list.reverse.detect(&:ipv4?)
+      ).ip_address
+
+      def self.local_endpoint(service_name)
+        {
+          "serviceName" => service_name,
+          "ipv4" => LOCAL_IP
+        }
+      end
+    end
+  end
+end

data/lib/app_perf_rpm/tracing/managed_span.rb

@@ -0,0 +1,36 @@
+module AppPerfRpm
+  module Tracing
+    class ManagedSpan < Span
+      extend Forwardable
+
+      def_delegators :@span, :context, :operation_name=, :set_tag, :set_baggage_item, :get_baggage_item, :log, :finish
+
+      def initialize(span, deactivate)
+        @span = span
+        @deactivate = deactivate.respond_to?(:call) ? deactivate : nil
+        @active = true
+      end
+
+      def wrapped
+        @span
+      end
+
+      def active?
+        @active
+      end
+
+      def deactivate
+        if @active && @deactivate
+          deactivated_span = @deactivate.call
+          warn "ActiveSpan::SpanSource inconsistency found during deactivation" unless deactivated_span == self
+          @active = false
+        end
+      end
+
+      def finish(end_time: AppPerfRpm.now)
+        deactivate
+        @span.finish(end_time: end_time)
+      end
+    end
+  end
+end

data/lib/app_perf_rpm/tracing/managed_tracer.rb

@@ -0,0 +1,32 @@
+module AppPerfRpm
+  module Tracing
+    class ManagedTracer < OpenTracing::Tracer
+      extend Forwardable
+      def_delegators :@tracer, :inject, :extract
+
+      attr_reader :thread_span_stack
+
+      def initialize(tracer, thread_span_stack = ThreadSpanStack.new)
+        @tracer = tracer
+        @thread_span_stack = thread_span_stack
+      end
+
+      def wrapped
+        @tracer
+      end
+
+      def collector
+        @tracer.collector
+      end
+
+      def active_span
+        thread_span_stack.active_span
+      end
+
+      def start_span(operation_name, child_of: active_span, **args)
+        span = @tracer.start_span(operation_name, child_of: child_of, **args)
+        @thread_span_stack.set_active_span(span)
+      end
+    end
+  end
+end

data/lib/app_perf_rpm/tracing/span.rb

@@ -0,0 +1,67 @@
+module AppPerfRpm
+  module Tracing
+    class Span
+      attr_accessor :operation_name
+
+      attr_reader :context, :start_time, :end_time, :tags, :log_entries
+      def initialize(context, operation_name, collector, start_time: AppPerfRpm.now, tags: {})
+        @context = context
+        @operation_name = operation_name
+        @collector = collector
+        @start_time = start_time
+        @end_time = nil
+        @tags = tags
+        @log_entries = []
+      end
+
+      def set_tag(key, value)
+        @tags = @tags.merge(key => value)
+      end
+
+      def add_tags(tags)
+        tags.each_pair do |key, value|
+          set_tag(key, value)
+        end
+      end
+
+      def set_baggage_item(key, value)
+        @context.set_baggage_item(key, value)
+      end
+
+      def get_baggage_item(key)
+        @context.get_baggage_item(key)
+      end
+
+      def log(event: nil, timestamp: AppPerfRpm.now, **fields)
+        entry = {
+          "event" => event,
+          "timestamp" => timestamp,
+        }
+
+        entry["fields"] = fields if fields
+        @log_entries << entry
+
+        nil
+      end
+
+      def log_error(exception, timestamp: AppPerfRpm.now)
+        log(
+          event: "error",
+          timestamp: timestamp,
+          message: exception.message,
+          error_class: exception.class.to_s,
+          backtrace: AppPerfRpm::Backtrace.clean(exception.backtrace),
+          source: AppPerfRpm::Backtrace.source_extract(exception.backtrace)
+        )
+      end
+
+      def exit(end_time: AppPerfRpm.now)
+        @end_time = end_time
+      end
+
+      def finish(end_time: AppPerfRpm.now)
+        @collector.send_span(self, @end_time || end_time)
+      end
+    end
+  end
+end

data/lib/app_perf_rpm/tracing/span_context.rb

@@ -0,0 +1,41 @@
+module AppPerfRpm
+  module Tracing
+    class SpanContext
+      def self.create_parent_context
+        trace_id = TraceId.generate
+        new(trace_id: trace_id, span_id: trace_id, sampled: true)
+      end
+
+      def self.create_from_parent_context(span_context)
+        new(
+          span_id: TraceId.generate,
+          parent_id: span_context.span_id,
+          trace_id: span_context.trace_id,
+          sampled: span_context.sampled?
+        )
+      end
+
+      attr_reader :span_id, :parent_id, :trace_id, :baggage
+
+      def initialize(span_id:, parent_id: nil, trace_id:, sampled:, baggage: {})
+        @span_id = span_id
+        @parent_id = parent_id
+        @trace_id = trace_id
+        @sampled = sampled
+        @baggage = baggage
+      end
+
+      def set_baggage_item(key, value)
+        baggage[key] = value
+      end
+
+      def get_baggage_item(key)
+        baggage[key]
+      end
+
+      def sampled?
+        @sampled
+      end
+    end
+  end
+end

data/lib/app_perf_rpm/tracing/thread_span_stack.rb

@@ -0,0 +1,32 @@
+module AppPerfRpm
+  module Tracing
+    class ThreadSpanStack
+      def set_active_span(span)
+        active_span = ManagedSpan.new(span, method(:pop))
+        push(active_span)
+        active_span
+      end
+
+      def active_span
+        local_stack.last
+      end
+
+      def clear
+        local_stack.clear
+      end
+
+    private
+      def push(span)
+        local_stack << span
+      end
+
+      def pop
+        local_stack.pop
+      end
+
+      def local_stack
+        Thread.current[:__active_span__] ||= []
+      end
+    end
+  end
+end

data/lib/app_perf_rpm/tracing/trace_id.rb

@@ -0,0 +1,11 @@
+module AppPerfRpm
+  module Tracing
+    module TraceId
+      TRACE_ID_UPPER_BOUND = 2 ** 64
+
+      def self.generate
+        rand(TRACE_ID_UPPER_BOUND).to_s(16)
+      end
+    end
+  end
+end

data/lib/app_perf_rpm/tracing/tracer.rb

@@ -0,0 +1,91 @@
+require 'opentracing'
+
+module AppPerfRpm
+  module Tracing
+    class Tracer
+      attr_reader :thread_span_stack, :collector
+
+      def self.build(collector:, sender:, service_name:)
+        sender.start
+        new(collector, sender)
+      end
+
+      def initialize(collector, sender)
+        @collector = collector
+        @sender = sender
+      end
+
+      def stop
+        @sender.stop
+      end
+
+      def start_span(operation_name, child_of: nil, start_time: AppPerfRpm.now, tags: {}, **)
+        context =
+          if child_of
+            parent_context = child_of.respond_to?(:context) ? child_of.context : child_of
+            SpanContext.create_from_parent_context(parent_context)
+          else
+            SpanContext.create_parent_context
+          end
+
+        span = Span.new(context, operation_name, @collector, {
+          start_time: start_time,
+          tags: tags
+        })
+      end
+
+      def inject(span_context, format, carrier)
+        case format
+        when OpenTracing::FORMAT_TEXT_MAP
+          carrier['trace-id'] = span_context.trace_id
+          carrier['parent-id'] = span_context.parent_id
+          carrier['span-id'] = span_context.span_id
+          carrier['sampled'] = span_context.sampled? ? '1' : '0'
+        when OpenTracing::FORMAT_RACK
+          carrier['X-AppPerf-TraceId'] = span_context.trace_id
+          carrier['X-AppPerf-ParentSpanId'] = span_context.parent_id
+          carrier['X-AppPerf-SpanId'] = span_context.span_id
+          carrier['X-AppPerf-Sampled'] = span_context.sampled? ? '1' : '0'
+        else
+          STDERR.puts "AppPerfRpm::Tracer with format #{format} is not supported yet"
+        end
+      end
+
+      def extract(format, carrier)
+        case format
+        when OpenTracing::FORMAT_TEXT_MAP
+          trace_id = carrier['trace-id']
+          parent_id = carrier['parent-id']
+          span_id = carrier['span-id']
+          sampled = carrier['sampled'] == '1'
+
+          create_span_context(trace_id, span_id, parent_id, sampled)
+        when OpenTracing::FORMAT_RACK
+          trace_id = carrier['HTTP_X_APPPERF_TRACEID']
+          parent_id = carrier['HTTP_X_APPPERF_PARENTSPANID']
+          span_id = carrier['HTTP_X_APPPERF_SPANID']
+          sampled = carrier['HTTP_X_APPPERF_SAMPLED'] == '1'
+
+          create_span_context(trace_id, span_id, parent_id, sampled)
+        else
+          STDERR.puts "AppPerfRpm::Tracer with format #{format} is not supported yet"
+          nil
+        end
+      end
+
+      private
+      def create_span_context(trace_id, span_id, parent_id, sampled)
+        if trace_id && span_id
+          SpanContext.new(
+            trace_id: trace_id,
+            parent_id: parent_id,
+            span_id: span_id,
+            sampled: sampled
+          )
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/app_perf_rpm/utils.rb

@@ -5,5 +5,23 @@ module AppPerfRpm
     def sanitize_sql(sql, adapter)
       sql.gsub(REGEXP, '?')
     end
+
+    def connection_config
+      @connection_config ||= if ::ActiveRecord::VERSION::MAJOR == 2
+                               ActiveRecord::Base.connection.instance_variable_get(:@config)
+                             else
+                               ::ActiveRecord::Base.connection_config
+                             end
+    end
+
+    def format_redis(command)
+      command.is_a?(Symbol) ? command.to_s.upcase : command.to_s
+    rescue StandardError => e
+      "?"
+    end
+
+    def format_redis_command(command)
+      command.map { |x| format_redis(x) }.join(' ')
+    end
   end
 end

data/lib/app_perf_rpm.rb

@@ -3,55 +3,84 @@ require 'oj'
 module AppPerfRpm
   require 'app_perf_rpm/logger'
   require 'app_perf_rpm/configuration'
-  require 'app_perf_rpm/span'
-  require 'app_perf_rpm/aggregator'
-  require 'app_perf_rpm/dispatcher'
-  require 'app_perf_rpm/worker'
   require 'app_perf_rpm/backtrace'
+
+  require 'app_perf_rpm/reporters/json_client'
+  require 'app_perf_rpm/reporters/null_client'
+
+  require 'app_perf_rpm/tracing/buffer'
+  require 'app_perf_rpm/tracing/carrier'
+  require 'app_perf_rpm/tracing/collector'
+  require 'app_perf_rpm/tracing/endpoint'
+  require 'app_perf_rpm/tracing/trace_id'
+  require 'app_perf_rpm/tracing/span_context'
+  require 'app_perf_rpm/tracing/span'
+  require 'app_perf_rpm/tracing/managed_span'
+  require 'app_perf_rpm/tracing/tracer'
+  require 'app_perf_rpm/tracing/managed_tracer'
+  require 'app_perf_rpm/tracing/thread_span_stack'
+
   require 'app_perf_rpm/tracer'
   require 'app_perf_rpm/utils'
-  require 'app_perf_rpm/middleware'
   require 'app_perf_rpm/instrumentation'
   require 'app_perf_rpm/rails'
   require 'app_perf_rpm/introspector'
 
+  TRACE_CONTEXT_KEY = 'AppPerf-Trace-Context'
+
   class << self
-    attr_writer :configuration
 
-    def configuration
-      @configuration ||= Configuration.new
+    attr_writer :config
+
+    def config
+      @config ||= Configuration.new
     end
 
     def configure
-      yield(configuration)
+      yield(config)
     end
 
     def load
       #Oj.mimic_JSON
       unless disable_agent?
         AppPerfRpm::Instrumentation.load
-        @worker = ::AppPerfRpm::Worker.new
-
-        if @worker.start
-          @worker_running = true
-          AppPerfRpm.tracing_on
-        end
+        AppPerfRpm.tracing_on
       end
     end
 
-    def worker
-      @worker
-    end
-
     def mutex
       @mutex ||= Mutex.new
     end
 
-    def store(event)
-      if @worker_running && tracing?
-        @worker.save(event)
-      end
-      event
+    def endpoint
+      @endpoint ||= AppPerfRpm::Tracing::Endpoint.local_endpoint(config.application_name)
+    end
+
+    def collector
+      @collector ||= AppPerfRpm::Tracing::Collector.new(endpoint)
+    end
+
+    def url
+      @url ||= "#{config.host}/api/listener/3/#{config.license_key}"
+    end
+
+    def sender
+      @sender ||= AppPerfRpm::Reporters::JsonClient.new(
+        url: url,
+        collector: collector,
+        flush_interval: config.flush_interval
+      )
+    end
+
+    def tracer
+      @tracer ||= AppPerfRpm::Tracing::ManagedTracer.new(
+        AppPerfRpm::Tracing::Tracer.build(
+          :service_name => config.application_name,
+          :sender => sender,
+          :collector => collector
+        ),
+        AppPerfRpm::Tracing::ThreadSpanStack.new
+      )
     end
 
     def tracing_on
@@ -73,7 +102,7 @@ module AppPerfRpm
     end
 
     def tracing?
-      @tracing
+      !!@tracing
     end
 
     def without_tracing
@@ -111,7 +140,7 @@ module AppPerfRpm
     end
 
     def disable_agent?
-      if configuration.agent_disabled
+      if config.agent_disabled
         true
       elsif Introspector.agentable?
         false
@@ -120,5 +149,9 @@ module AppPerfRpm
       end
     end
 
+    def now
+      Process.clock_gettime(Process::CLOCK_REALTIME)
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_perf_rpm
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Randy Girard
@@ -10,6 +10,34 @@ bindir: exe
 cert_chain: []
 date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: opentracing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +95,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: '0'
 description: Ruby Agent for the AppPerf app.
 email: rgirard59@yahoo.com
 executables: []
@@ -87,10 +157,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/app_perf_rpm.rb
-- lib/app_perf_rpm/aggregator.rb
 - lib/app_perf_rpm/backtrace.rb
 - lib/app_perf_rpm/configuration.rb
-- lib/app_perf_rpm/dispatcher.rb
 - lib/app_perf_rpm/instrumentation.rb
 - lib/app_perf_rpm/instruments/action_controller.rb
 - lib/app_perf_rpm/instruments/action_view.rb
@@ -110,13 +178,23 @@ files:
 - lib/app_perf_rpm/instruments/typhoeus.rb
 - lib/app_perf_rpm/introspector.rb
 - lib/app_perf_rpm/logger.rb
-- lib/app_perf_rpm/middleware.rb
 - lib/app_perf_rpm/rails.rb
 - lib/app_perf_rpm/railtie.rb
-- lib/app_perf_rpm/span.rb
+- lib/app_perf_rpm/reporters/json_client.rb
+- lib/app_perf_rpm/reporters/null_client.rb
 - lib/app_perf_rpm/tracer.rb
+- lib/app_perf_rpm/tracing/buffer.rb
+- lib/app_perf_rpm/tracing/carrier.rb
+- lib/app_perf_rpm/tracing/collector.rb
+- lib/app_perf_rpm/tracing/endpoint.rb
+- lib/app_perf_rpm/tracing/managed_span.rb
+- lib/app_perf_rpm/tracing/managed_tracer.rb
+- lib/app_perf_rpm/tracing/span.rb
+- lib/app_perf_rpm/tracing/span_context.rb
+- lib/app_perf_rpm/tracing/thread_span_stack.rb
+- lib/app_perf_rpm/tracing/trace_id.rb
+- lib/app_perf_rpm/tracing/tracer.rb
 - lib/app_perf_rpm/utils.rb
-- lib/app_perf_rpm/worker.rb
 - lib/tasks/install.rake
 homepage: https://www.github.com/randy-girard/app_perf_rpm
 licenses: