elastic-apm 0.1.0 → 0.2.0

data/lib/elastic_apm/http.rb

@@ -4,6 +4,7 @@ require 'net/http'
 
 require 'elastic_apm/service_info'
 require 'elastic_apm/system_info'
+require 'elastic_apm/process_info'
 
 module ElasticAPM
   # @api private
@@ -19,6 +20,7 @@ module ElasticAPM
       @adapter = adapter.new(config)
       @base_payload = {
         service: ServiceInfo.build(config),
+        process: ProcessInfo.build(config),
         system: SystemInfo.build(config)
       }
     end
@@ -57,7 +59,7 @@ module ElasticAPM
     end
 
     def url_for(path)
-      "#{@config.server}#{path}"
+      "#{@config.server_url}#{path}"
     end
   end
 
@@ -97,7 +99,7 @@ module ElasticAPM
     end
 
     def server_uri
-      @uri ||= URI(@config.server)
+      @uri ||= URI(@config.server_url)
     end
   end
 end

data/lib/elastic_apm/injectors/action_dispatch.rb

@@ -10,7 +10,7 @@ module ElasticAPM
           alias render_exception_without_apm render_exception
 
           def render_exception(env, exception)
-            ElasticAPM.report(exception, rack_env: env)
+            ElasticAPM.report(exception)
             render_exception_without_apm env, exception
           end
         end

data/lib/elastic_apm/instrumenter.rb

@@ -13,6 +13,10 @@ module ElasticAPM
 
     # @api private
     class TransactionInfo
+      def initialize
+        self.current = nil
+      end
+
       def current
         Thread.current[KEY]
       end
@@ -80,6 +84,14 @@ module ElasticAPM
       transaction.span(*args, &block)
     end
 
+    def set_tag(key, value)
+      transaction.context.tags[key] = value.to_s
+    end
+
+    def set_custom_context(context)
+      transaction.context.custom.merge!(context)
+    end
+
     def submit_transaction(transaction)
       @pending_transactions << transaction
 
@@ -108,5 +120,11 @@ module ElasticAPM
 
       true
     end
+
+    def inspect
+      '<ElasticAPM::Instrumenter ' \
+        "current_transaction=#{current_transaction.inspect}" \
+        '>'
+    end
   end
 end

data/lib/elastic_apm/middleware.rb

@@ -10,13 +10,16 @@ module ElasticAPM
     # rubocop:disable Metrics/MethodLength
     def call(env)
       begin
-        transaction = ElasticAPM.transaction 'Rack', 'request'
+        transaction = ElasticAPM.transaction 'Rack', type_for(env),
+          context: ElasticAPM.build_context(env)
+
         resp = @app.call env
-        transaction.submit(resp[0]) if transaction
+
+        transaction.submit(resp[0], headers: resp[1]) if transaction
       rescue InternalError
         raise # Don't report ElasticAPM errors
       rescue ::Exception => e
-        ElasticAPM.report(e, rack_env: env, handled: false)
+        ElasticAPM.report(e, handled: false)
         transaction.submit(500) if transaction
         raise
       ensure
@@ -26,5 +29,14 @@ module ElasticAPM
       resp
     end
     # rubocop:enable Metrics/MethodLength
+
+    private
+
+    def type_for(env)
+      format(
+        'request.%s'.freeze,
+        env.fetch('REQUEST_METHOD'.freeze, 'unknown'.freeze)
+      )
+    end
   end
 end

data/lib/elastic_apm/naively_hashable.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ElasticAPM
+  # @api private
+  module NaivelyHashable
+    def naively_hashable?
+      true
+    end
+
+    def to_h
+      instance_variables.each_with_object({}) do |name, h|
+        key = name.to_s.delete('@').to_sym
+        value = instance_variable_get(name)
+        is_hashable =
+          value.respond_to?(:naively_hashable?) && value.naively_hashable?
+
+        h[key] = is_hashable ? value.to_h : value
+      end
+    end
+  end
+end

data/lib/elastic_apm/process_info.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module ElasticAPM
+  # @api private
+  class ProcessInfo
+    def initialize(config)
+      @config = config
+    end
+
+    def build
+      {
+        argv: ARGV,
+        pid: $PID,
+        title: $PROGRAM_NAME
+      }
+    end
+
+    def self.build(config)
+      new(config).build
+    end
+  end
+end

data/lib/elastic_apm/serializers/errors.rb

@@ -4,19 +4,26 @@ module ElasticAPM
   module Serializers
     # @api private
     class Errors < Serializer
+      # rubocop:disable Metrics/MethodLength
       def build(error)
         base = {
-          id: SecureRandom.uuid,
+          id: error.id,
           culprit: error.culprit,
-          timestamp: micros_to_time(error.timestamp).utc.iso8601
+          timestamp: micros_to_time(error.timestamp).utc.iso8601,
+          context: error.context.to_h
         }
 
         if (exception = error.exception)
           base[:exception] = build_exception exception
         end
 
+        if (transaction_id = error.transaction_id)
+          base[:transaction] = { id: transaction_id }
+        end
+
         base
       end
+      # rubocop:enable Metrics/MethodLength
 
       def build_all(errors)
         { errors: Array(errors).map(&method(:build)) }
@@ -32,7 +39,7 @@ module ElasticAPM
           code: exception.code,
           attributes: exception.attributes,
           stacktrace: exception.stacktrace.to_a,
-          unhandled: !exception.handled
+          handled: exception.handled
         }
       end
     end

data/lib/elastic_apm/serializers/transactions.rb

@@ -7,7 +7,7 @@ module ElasticAPM
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def build(transaction)
         {
-          id: SecureRandom.uuid,
+          id: transaction.id,
           name: transaction.name,
           type: transaction.type,
           result: transaction.result.to_s,
@@ -23,7 +23,9 @@ module ElasticAPM
               duration: ms(span.duration),
               context: span.context && { db: span.context.to_h }
             }
-          end
+          end,
+          sampled: transaction.sampled,
+          context: transaction.context.to_h
         }
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength

data/lib/elastic_apm/service_info.rb

@@ -19,13 +19,10 @@ module ElasticAPM
           version: VERSION
         },
         framework: nil,
-        argv: ARGV,
         language: {
           name: 'ruby',
           version: RUBY_VERSION
         },
-        pid: $PID,
-        process_title: $PROGRAM_NAME,
         runtime: runtime,
         version: git_sha
       }

data/lib/elastic_apm/span/context.rb

@@ -4,6 +4,8 @@ module ElasticAPM
   class Span
     # @api private
     class Context
+      include NaivelyHashable
+
       def initialize(**args)
         args.each do |key, val|
           send(:"#{key}=", val)
@@ -11,10 +13,6 @@ module ElasticAPM
       end
 
       attr_accessor :instance, :statement, :type, :user
-
-      def to_h
-        { instance: instance, statement: statement, type: type, user: user }
-      end
     end
   end
 end

data/lib/elastic_apm/stacktrace/frame.rb

@@ -4,6 +4,8 @@ module ElasticAPM
   class Stacktrace
     # @api private
     class Frame
+      include NaivelyHashable
+
       attr_accessor(
         :abs_path,
         :filename,
@@ -32,24 +34,6 @@ module ElasticAPM
       end
       # rubocop:enable Metrics/AbcSize
 
-      # rubocop:disable Metrics/MethodLength
-      def to_h
-        {
-          abs_path: abs_path,
-          filename: filename,
-          function: function,
-          vars: vars,
-          pre_context: pre_context,
-          context_line: context_line,
-          post_context: post_context,
-          in_app: in_app,
-          lineno: lineno,
-          module: self.module,
-          coln: colno
-        }
-      end
-      # rubocop:enable Metrics/MethodLength
-
       private
 
       def read_lines(path)

data/lib/elastic_apm/transaction.rb

@@ -3,7 +3,9 @@
 module ElasticAPM
   # @api private
   class Transaction
-    def initialize(instrumenter, name, type = 'custom')
+    # rubocop:disable Metrics/MethodLength
+    def initialize(instrumenter, name, type = 'custom', context: nil)
+      @id = SecureRandom.uuid
       @instrumenter = instrumenter
       @name = name
       @type = type
@@ -16,20 +18,25 @@ module ElasticAPM
 
       @notifications = [] # for AS::Notifications
 
+      @context = context || Context.new
+
+      @sampled = true
+
       yield self if block_given?
     end
+    # rubocop:enable Metrics/MethodLength
 
-    attr_accessor :name, :result, :type
-    attr_reader :duration, :root_span, :timestamp, :spans, :notifications
+    attr_accessor :id, :name, :result, :type
+    attr_reader :context, :duration, :root_span, :timestamp, :spans,
+      :notifications, :sampled
 
     def release
       @instrumenter.current_transaction = nil
     end
 
     def done(result = nil)
-      @result = result
-
       @duration = Util.micros - @timestamp
+      @result = result
 
       self
     end
@@ -38,8 +45,10 @@ module ElasticAPM
       !!(@result && @duration)
     end
 
-    def submit(result = nil)
-      done result
+    def submit(status = nil, headers: {})
+      done status
+
+      context.response = Context::Response.new(status, headers: headers)
 
       release
 
@@ -72,6 +81,10 @@ module ElasticAPM
       spans.reverse.lazy.find(&:running?)
     end
 
+    def inspect
+      "<ElasticAPM::Transaction id:#{id}>"
+    end
+
     private
 
     def next_span_id

data/lib/elastic_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-27 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,13 +43,26 @@ files:
 - bin/console
 - bin/setup
 - bin/with_framework
+- docs/api.asciidoc
+- docs/configuration.asciidoc
+- docs/context.asciidoc
+- docs/custom-instrumentation.asciidoc
+- docs/getting-started-rack.asciidoc
+- docs/getting-started-rails.asciidoc
+- docs/index.asciidoc
 - elastic-apm.gemspec
 - lib/elastic-apm.rb
 - lib/elastic_apm.rb
 - lib/elastic_apm/agent.rb
 - lib/elastic_apm/config.rb
+- lib/elastic_apm/context.rb
+- lib/elastic_apm/context/request.rb
+- lib/elastic_apm/context/request/socket.rb
+- lib/elastic_apm/context/request/url.rb
+- lib/elastic_apm/context/response.rb
+- lib/elastic_apm/context/user.rb
+- lib/elastic_apm/context_builder.rb
 - lib/elastic_apm/error.rb
-- lib/elastic_apm/error/context.rb
 - lib/elastic_apm/error/exception.rb
 - lib/elastic_apm/error/log.rb
 - lib/elastic_apm/error_builder.rb
@@ -66,10 +79,12 @@ files:
 - lib/elastic_apm/internal_error.rb
 - lib/elastic_apm/log.rb
 - lib/elastic_apm/middleware.rb
+- lib/elastic_apm/naively_hashable.rb
 - lib/elastic_apm/normalizers.rb
 - lib/elastic_apm/normalizers/action_controller.rb
 - lib/elastic_apm/normalizers/action_view.rb
 - lib/elastic_apm/normalizers/active_record.rb
+- lib/elastic_apm/process_info.rb
 - lib/elastic_apm/railtie.rb
 - lib/elastic_apm/serializers.rb
 - lib/elastic_apm/serializers/errors.rb
@@ -92,7 +107,8 @@ files:
 homepage: https://github.com/elastic/apm-agent-ruby
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/elastic/apm-agent-ruby
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/elastic_apm/error/context.rb

@@ -1,119 +0,0 @@
-# frozen_string_literal: true
-
-module ElasticAPM
-  class Error
-    # @api private
-    class Context
-      # @api private
-      class Request
-        def initialize
-          @socket = {}
-          @headers = {}
-          @cookies = {}
-          @env = {}
-        end
-
-        attr_accessor(
-          :socket,
-          :http_version,
-          :method,
-          :url,
-          :headers,
-          :cookies,
-          :env,
-          :body
-        )
-
-        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        def add_rack_env(rack_env)
-          req = rails_req?(rack_env) ? rack_env : Rack::Request.new(rack_env)
-
-          self.socket = {
-            remote_address: req.ip,
-            encrypted: req.scheme == 'https'
-          }
-          http_version = rack_env['HTTP_VERSION']
-          self.http_version =
-            http_version && http_version.gsub(%r{HTTP/}, '')
-          self.method = req.request_method
-          self.url = {
-            protocol: req.scheme,
-            hostname: req.host,
-            port: req.port,
-            pathname: req.path,
-            search: req.query_string,
-            hash: nil,
-            raw: req.fullpath
-          }
-
-          add_headers(rack_env)
-          add_body(req)
-
-          self
-        end
-        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-
-        def self.from_rack_env(rack_env)
-          request = new
-          request.add_rack_env rack_env
-          request
-        end
-
-        private
-
-        def add_body(req)
-          if req.form_data?
-            self.body = req.POST
-          else
-            self.body = req.body.read
-            req.body.rewind
-          end
-        end
-
-        def rails_req?(env)
-          defined?(ActionDispatch::Request) &&
-            env.is_a?(ActionDispatch::Request)
-        end
-
-        def add_headers(rack_env)
-          get_headers(rack_env).each do |key, value|
-            next unless key.upcase == key
-
-            if key.start_with?('HTTP_')
-              headers[camel_key(key)] = value
-            else
-              env[key] = value
-            end
-          end
-        end
-
-        def camel_key(key)
-          key.gsub(/^HTTP_/, '').split('_').map(&:capitalize).join('-')
-        end
-
-        def get_headers(rack_env)
-          # In Rails < 5 ActionDispatch::Request inherits from Hash
-          rack_env.respond_to?(:headers) ? rack_env.headers : rack_env
-        end
-      end
-
-      # @api private
-      class Response
-        attr_accessor(
-          :status_code,
-          :headers,
-          :headers_sent,
-          :finished
-        )
-      end
-
-      attr_accessor(
-        :request,
-        :response,
-        :user,
-        :tags,
-        :custom
-      )
-    end
-  end
-end