grape-appsignal 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef8b6005a99f1788d2cf708e934499bd6d7938e5
-  data.tar.gz: 64364dfa86711b95f2b48fdb4aacedad5788180b
+  metadata.gz: dbcec5bbe2309a4d6830fd69ba1a5d265a52a5a5
+  data.tar.gz: d934ad23a9c540929fd13d637109bd906d5601c6
 SHA512:
-  metadata.gz: c08db89ea7ec6ee1d9ef30fcdd231d34e8513a094a1282fa735b4e08eb9cced781b2f70ae505e54b4c723ab089c6bdccd9279e21a6f3dab605beda2c4df5f008
-  data.tar.gz: c5304941d5780db740801216f542910671df179f091f42200cda51c3de0873ab14b5ba681fc93270069584548f2cd83c320ffe67f3242051aa332990476f4a3a
+  metadata.gz: 04317616fc5aee9fb4297c8733eb5b95c2240393eceea51634070beff08df2010daedef41ed046b6a56f7846d960c806fb160fb54b566aacf1e9903a9c79921b
+  data.tar.gz: 4eef7f5e6a39550ce9770858e6786272a8300b1b782a283728c122fa4a80e712db72e7c263a03e33388e9eee5b2119c413b84e36fd39d95ab4bb9ac345589102

data/lib/grape-appsignal/middleware.rb

@@ -9,12 +9,14 @@ module Appsignal
       end
 
       def call(env)
-        req = ::Rack::Request.new(env)
-        metric_action = env['PATH_INFO'].gsub("/", ".")
+        method = env['REQUEST_METHOD']
+        metric_path = env['PATH_INFO'].nil? ? ".api" : env['PATH_INFO'].gsub("/", ".")
         request_path = env['api.endpoint'].routes.first.route_path[1..-1].gsub(/\(\.:format\)\z/, "")
-        metric_name  = "process_action.api#{metric_action}"
-        action = "#{req.request_method}::#{request_path}"
-        ActiveSupport::Notifications.instrument(metric_name, { method: req.request_method, path: request_path, action: action } ) do |payload|
+
+        metric_name  = "process_action.grape#{metric_path}"
+        action = "#{method}#{metric_path}"
+
+        ActiveSupport::Notifications.instrument(metric_name, { method: method, path: request_path, action: action } ) do |payload|
           @app.call(env)
         end
       end

data/lib/grape-appsignal/version.rb

@@ -1,5 +1,5 @@
 module Appsignal
   module Grape
-    VERSION = "0.0.5"
+    VERSION = "0.1.0"
   end
 end

data/spec/grape-appsignal/middleware_spec.rb

@@ -3,9 +3,14 @@ require 'spec_helper'
 describe Appsignal::Grape::Middleware do
 
   class TestAPI < Grape::API
+    prefix "api"
+    version "v1"
     use Appsignal::Grape::Middleware
-    get 'hello/:name' do
-      "hello #{params['name']}"
+
+    resource :hello do
+      get ':name' do
+        "hello #{params['name']}"
+      end
     end
   end
 
@@ -16,17 +21,17 @@ describe Appsignal::Grape::Middleware do
 
   before(:all) do
     @events     = []
-    ActiveSupport::Notifications.subscribe('process_action.api.hello.mark') do |*args|
+    ActiveSupport::Notifications.subscribe('process_action.grape.api.v1.hello.mark') do |*args|
       @events << ActiveSupport::Notifications::Event.new(*args)
     end
   end
 
   before(:each) do
-    get "/hello/mark"
+    get "api/v1/hello/mark"
   end
 
   it do
-    should == { method: "GET" , path: "hello/:name", action: "GET::hello/:name"}
+    should == { method: "GET" , path: "api/:version/hello/:name", action: "GET.api.v1.hello.mark"}
   end
 
   context "verify the api request" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-appsignal
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Mark Madsen