oneapm_rpm 1.3.5 → 1.3.6.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGNiMGEzMDI4NDdmZDY3MWM4Y2NjNjY2ZDgyMzU3ZDUxODNiNTc1MQ==
+    ZTNiNTJlODlmNmExOGM0MTU5MWY5YWYyMWJmNzBiMjJhNjkwOGZkMg==
   data.tar.gz: !binary |-
-    NDc2NTlhNTJiOWU3MTNiYjdiNWRjYjg1MWE4MjIxYTY0MmZhNTIxNw==
+    YmRkODUxYTg0MjNiNWRkMzFkMjdjNGQ5MDkzOWM1MDk2ODQxMGQxMw==
 SHA512:
   metadata.gz: !binary |-
-    YjFlYjY3MzMyZmJjYzI5M2RhZTkyNTVhOTRkNTgyMjc5MDIyMGE2OTYwMmZm
-    MWEwYjc0ZTAzN2MyZDFiOGQxNGRkNjA3NTM5NTkyNjUxZGNkMDRmMzM4ZTU5
-    MDhlZWI0ODgyMjM2MmIxMGU1YjU4MTAzMDc1MTRmYmVkZWFlM2I=
+    Mzg4MzUzYmMxOWQ1N2UyMTg5OTRiNGM5NDBkODhiYjg2YjBiNTNjZDU3YmFm
+    MDIyYmEzZDU0NDYwMDc0MGY0MGFiYjQ4NjVkNGFmZjkyZGYzNTExYTgxMjEy
+    NGVmNTZlNTk4NTRiMmQzNjNmMjUzZTM4OWVmZmU5NjM4ZTM3MjQ=
   data.tar.gz: !binary |-
-    YWEyNDI1MDAxYjNkMjNhYjIxMzE0Yzk0YTEzMDFjODFmYjBlY2EwODA2YWU0
-    Mjg4NDc2YmE0ZmM0OTlhZDNiMGQ2NjVjYjI1NTA2NzE0ZGExNzEyM2QzYzk2
-    N2VlZjUxZDVmZWU3NjU1NjE4YWRiYzczOThmZGRhZmYyYWFmNjI=
+    ODk3Yjc4ZDFkNWExMzQ5YTdmNTg0ZmIzZTUxOWI3YjRhOTU1ZTRkODFkYjY5
+    ZGRhOGJmM2NhOTc0ZGM4MDRlZDU1ZjMxMzRiNmRiNTNmNGQyODYwNzMzZTM2
+    YzQ5Y2Y4ZjMwNTQ0NDJiZGQ5YmMxMTBhNTBjN2IxYzgxMjExOGY=

data/lib/one_apm/inst/framework/grape.rb

@@ -9,10 +9,10 @@ module OneApm
         extend self
 
         API_ENDPOINT   = 'api.endpoint'.freeze
-        FORMAT_REGEX   = /\(\/?\.:format\)/.freeze
+        FORMAT_REGEX   = /\(\/?\.(:format|json)?\)/.freeze
         VERSION_REGEX  = /:version(\/|$)/.freeze
         EMPTY_STRING   = ''.freeze
-        MIN_VERSION    = VersionNumber.new("0.2.0")
+        MIN_VERSION    = VersionNumber.new('0.2.0')
 
         def handle_transaction(endpoint, class_name)
           return unless endpoint && route = endpoint.route
@@ -27,16 +27,27 @@ module OneApm
         end
 
         def name_for_transaction(route, class_name)
-          action_name = route.route_path.sub(FORMAT_REGEX, EMPTY_STRING)
-          method_name = route.route_method
+          route_path, route_method, route_version = path_method_version_of(route)
+          action_name = route_path.sub(FORMAT_REGEX, EMPTY_STRING)
+          method_name = route_method
 
-          if route.route_version
+          if route_version
             action_name = action_name.sub(VERSION_REGEX, EMPTY_STRING)
-            "#{class_name}-#{route.route_version}#{action_name} (#{method_name})"
+            "#{class_name}-#{route_version}#{action_name} (#{method_name})"
           else
             "#{class_name}#{action_name} (#{method_name})"
           end
         end
+        
+        if defined?(::Grape::VERSION) && VersionNumber.new(::Grape::VERSION) >= VersionNumber.new('0.16.0')
+          def path_method_version_of(route)
+            [route.path, route.request_method, route.version]
+          end    
+        else
+          def path_method_version_of(route)
+            [route.route_path, route.route_method, route.route_version]
+          end
+        end
 
         def capture_params(endpoint)
           txn = Transaction.tl_current

data/lib/one_apm/version.rb

@@ -5,9 +5,10 @@ module OneApm
 
     MAJOR = 1
     MINOR = 3
-    TINY  = 5
+    TINY  = 6
+    TAG   = 'rc1'
 
-    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6.rc1
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake