elastic-apm 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b3dde3453861c6e77db385bea9d0bd54c6d76dd2cb8dd253c046a4f42beb8c
-  data.tar.gz: a1b948919538e6e5c3eecd1db3fc6bcccff95eef8be335c7cc8913183b47f9fc
+  metadata.gz: 2efd1832264da2eb5036fdbf6b3fcb26e47b0f3272779caed2d92c8315a0db7a
+  data.tar.gz: c9f91f38ae3433566cdc16584ee862e7c8ac7f364c0fd05879c96ef87a6406d5
 SHA512:
-  metadata.gz: d454b1c732c8acc5b2e5ce5cb1b3d5243f563cd0697ae126a104a9bd1c1be8c9b1adbdcadc50d45e9c9e6e9e31aebb6ed6dfc74e68620d859d591d4b7597e9aa
-  data.tar.gz: 77b6649b0b80b2a1294e1d628cee48b47db707c688766fa517ad2e360ae88ae9ff75645f8b8d9fe50a69afb17dd4f15f94e2c7320c5a5521dd9333dc3360c82d
+  metadata.gz: 29c6d93909f2726527d09a62345ef920aba5b301a0fef1bd72e7739e2ace645afb22fd73039360e321e1d2cf68ac26745341deeada4f2e2aeb37e5f7bd3d70d3
+  data.tar.gz: 48e84149066cb00fd66f2dc03d275626e7b4a9750b1cd97c6530f5cbf0c7d70f1fade887b228ad9d6e178f5e51c7225673e0f0a1a97a2ffe25dae9cab44721df

data/lib/elastic_apm/config.rb

@@ -42,7 +42,7 @@ module ElasticAPM
       source_lines_error_library_frames: 0,
       source_lines_span_library_frames: 0,
 
-      enabled_injectors: %w[net_http],
+      disabled_injectors: %w[],
 
       current_user_id_method: :id,
       current_user_email_method: :email,
@@ -78,7 +78,9 @@ module ElasticAPM
       'ELASTIC_APM_TRANSACTION_SAMPLE_RATE' =>
         [:float, 'transaction_sample_rate'],
       'ELASTIC_APM_VERIFY_SERVER_CERT' => [:bool, 'verify_server_cert'],
-      'ELASTIC_APM_TRANSACTION_MAX_SPANS' => [:int, 'transaction_max_spans']
+      'ELASTIC_APM_TRANSACTION_MAX_SPANS' => [:int, 'transaction_max_spans'],
+
+      'ELASTIC_APM_DISABLED_INJECTORS' => [:list, 'disabled_injectors']
     }.freeze
 
     def initialize(options = {})
@@ -125,7 +127,7 @@ module ElasticAPM
     attr_accessor :source_lines_error_library_frames
     attr_accessor :source_lines_span_library_frames
 
-    attr_accessor :enabled_injectors
+    attr_accessor :disabled_injectors
 
     attr_accessor :view_paths
     attr_accessor :root_path
@@ -171,6 +173,27 @@ module ElasticAPM
       @logger = logger || build_logger(log_path, log_level)
     end
 
+    # rubocop:disable Metrics/MethodLength
+    def available_injectors
+      %w[
+        action_dispatch
+        delayed_job
+        elasticsearch
+        json
+        net_http
+        redis
+        sequel
+        sidekiq
+        sinatra
+        tilt
+      ]
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    def enabled_injectors
+      available_injectors - disabled_injectors
+    end
+
     private
 
     def assign(options)
@@ -217,7 +240,6 @@ module ElasticAPM
       self.service_name = format_name(service_name || app.to_s)
       self.framework_name = framework_name || 'Sinatra'
       self.framework_version = framework_version || Sinatra::VERSION
-      self.enabled_injectors += %w[sinatra]
       self.root_path = Dir.pwd
     end
 

data/lib/elastic_apm/injectors/net_http.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'net/http'
-
 module ElasticAPM
   # @api private
   module Injectors

data/lib/elastic_apm/span.rb

@@ -48,5 +48,12 @@ module ElasticAPM
     def running?
       relative_start && !done?
     end
+
+    def inspect
+      "<ElasticAPM::Span id:#{id}" \
+        " name:#{name.inspect}" \
+        " type:#{type.inspect}" \
+        '>'
+    end
   end
 end

data/lib/elastic_apm/stacktrace/frame.rb

@@ -42,7 +42,7 @@ module ElasticAPM
           return cached
         end
 
-        LineCache.set(path, range, File.readlines(path)[range])
+        LineCache.set(path, range, File.readlines(path)[range]) || []
       rescue Errno::ENOENT
         []
       end

data/lib/elastic_apm/transaction.rb

@@ -112,7 +112,10 @@ module ElasticAPM
     end
 
     def inspect
-      "<ElasticAPM::Transaction id:#{id}>"
+      "<ElasticAPM::Transaction id:#{id}" \
+        " name:#{name.inspect}" \
+        " type:#{type.inspect}" \
+        '>'
     end
 
     private

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport