elastic-apm 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b045346ff96e6883189cd9f1b50b5b32669cf76f57d85f1191fcc3b4154ae6dc
-  data.tar.gz: 61b29af6c3cc9e5d41691a2de713b865c77b9d6fc918dbd4b81ac1fe01d4496b
+  metadata.gz: 2048d68aba066259b3448d694b4114bc2eb9d28ed089ed1b1ed58315204454ca
+  data.tar.gz: 2450babb2527f469cfe7d64ddfae2a9483e6af33a2275ef658b49a59c8107896
 SHA512:
-  metadata.gz: 0b5d2126872bd5f371cfee8afcb262738690d629c4fb59466274af02b9c6c2bc45ce01bdf35cc44e5782960bff470abd8e62e18902f607afc0bb5ce382f15c66
-  data.tar.gz: 45474a91122920e3e5b03da6db1247f402f17d01c20c633dd866788dcb6c4fadac9738be02ab4b3df354023fd0ba9022172ecef20c0ac9b9e8194e5013564c11
+  metadata.gz: c4ab0f4a603297e34e2b7d266557f34476c12ab840fa4d4a214315df2ac960977890a7d9125db3c42486abf834ced00a2b1ffce9b76e341034d2cb10e7a83ec1
+  data.tar.gz: 69263285fb5c5fc9385666768235ae2a7c06a5824d089e22d3e212fe2d6a331429d5b0f206765cf3c7512aa91327dd15e0512e677e729820f920651f185813bf

data/lib/elastic_apm/stacktrace.rb

@@ -6,7 +6,11 @@ require 'elastic_apm/stacktrace/line_cache'
 module ElasticAPM
   # @api private
   class Stacktrace
-    GEMS_REGEX = %r{/gems/}
+    JAVA_FORMAT = /^(.+)\.([^\.]+)\(([^\:]+)\:(\d+)\)$/
+    RUBY_FORMAT = /^(.+?):(\d+)(?::in `(.+?)')?$/
+
+    RUBY_VERS_REGEX = %r{ruby[-/](\d+\.)+\d}
+    JRUBY_ORG_REGEX = %r{org/jruby}
 
     def initialize(backtrace)
       @backtrace = backtrace
@@ -38,9 +42,6 @@ module ElasticAPM
 
     private
 
-    JAVA_FORMAT = /^(.+)\.([^\.]+)\(([^\:]+)\:(\d+)\)$/
-    RUBY_FORMAT = /^(.+?):(\d+)(?::in `(.+?)')?$/
-
     def parse_line(line)
       ruby_match = line.match(RUBY_FORMAT)
 
@@ -56,24 +57,38 @@ module ElasticAPM
       [file, number, method, module_name]
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def library_frame?(config, abs_path)
+      return false unless abs_path
+
+      if abs_path.start_with?(config.root_path)
+        return true if abs_path.match(config.root_path + '/vendor')
+        return false
+      end
+
+      return true if abs_path.match(RUBY_VERS_REGEX)
+      return true if abs_path.match(JRUBY_ORG_REGEX)
+
+      false
+    end
+
+    # rubocop:disable Metrics/MethodLength
     def build_frame(config, line, type)
       abs_path, lineno, function, _module_name = parse_line(line)
-      library_frame = !(abs_path && abs_path.start_with?(config.root_path))
 
       frame = Frame.new
       frame.abs_path = abs_path
       frame.filename = strip_load_path(abs_path)
       frame.function = function
       frame.lineno = lineno.to_i
-      frame.library_frame = library_frame
+      frame.library_frame = library_frame?(config, abs_path)
 
-      line_count = context_lines_for(config, type, library_frame: library_frame)
+      line_count =
+        context_lines_for(config, type, library_frame: frame.library_frame)
       frame.build_context line_count
 
       frame
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength
 
     def strip_load_path(path)
       return nil unless path

data/lib/elastic_apm/version.rb

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

metadata

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