grape-appsignal 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 858d3282919c11fa61d0b327def403754a7f09a3
-  data.tar.gz: cc176dc11602e423482b51bd1a4c20d53ee75ee6
+  metadata.gz: eca276a652910634f9bc78d02cea3c704f9322be
+  data.tar.gz: 8516f43b625fcf4bb519d03cb6a8d2a1b6488cd4
 SHA512:
-  metadata.gz: b1f1c0ece2081125e6e78f82a0ea1ce9e2143743637737017cd5c5c7d2d556081963e94c9de56dd5225936495a19ae0baa031adefa78d084815617c546d9492b
-  data.tar.gz: 3ed231a95f68584ece63014e2f66472e9e8f5e2de6ac8fe689c1715f33702fe43bd89eb62c4d50df7ed9d1fc8b52609790a09fc768626ce47206055b63e941a1
+  metadata.gz: b4b817a504e242701e9b087158679dd4d41d5c29535c5bf355829ea1a23640a6e1b1870c450a7ee73abb7646f232b50deca4fed7e088336d411c7e5b31e88671
+  data.tar.gz: 5f6be88e8678dfbede37021e9f7d33a5fccaab04819885029c3cce38cfaeb4ee83ca8ada2327920af5932a7a8db1ee1ba43ca7b716be207b48d2d72f9335ea0e

data/lib/grape-appsignal/middleware.rb

@@ -12,13 +12,25 @@ module Appsignal
         req = ::Rack::Request.new(env)
         method = env['REQUEST_METHOD']
 
-        request_path = env['api.endpoint'].routes.first.route_path[1..-1].sub(/\(\.:format\)\z/, "")
+        api_endpoint = env['api.endpoint']
+
+        puts api_endpoint.method_name
+
+        method_name = api_endpoint.method_name.gsub(/ ?[ \/]/, '/') if api_endpoint && api_endpoint.method_name
+
+        request_path = api_endpoint.routes.first.route_path[1..-1].sub(/\(\.:format\)\z/, "")
 
         metric_name  = "process_action.grape.#{req.request_method}.#{request_path}"
         metric_name = metric_name.gsub(/\/:?/, '.')
 
-        action = "GRAPE#{env['PATH_INFO']}"
-        action = action.gsub(/\//, '::')
+        action = "Grape"
+        action = action + "(#{api_endpoint.settings[:version].first})" if
+          api_endpoint.settings[:version] && api_endpoint.settings[:version].first
+        action = action + "(#{api_endpoint.settings[:root_prefix]})" if
+          api_endpoint.settings  && api_endpoint.settings[:root_prefix]
+
+        action = action + "::#{method_name}"
+        #action = action.gsub(/  ?/, '/')
 
         ActiveSupport::Notifications.instrument(metric_name, { method: method, path: request_path, action: action, class: "API" } ) do |payload|
           @app.call(env)

data/lib/grape-appsignal/version.rb

@@ -1,5 +1,5 @@
 module Appsignal
   module Grape
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/spec/grape-appsignal/middleware_spec.rb

@@ -8,7 +8,7 @@ describe Appsignal::Grape::Middleware do
     use Appsignal::Grape::Middleware
 
     resource :hello do
-      get ':name' do
+      get 'name/:name' do
         "hello #{params['name']}"
       end
     end
@@ -37,7 +37,7 @@ describe Appsignal::Grape::Middleware do
 
     it "delivers a payload consistent with the API call."do
       expect(subject.payload ).to eq(
-        { method: "GET" , path: "hello/:id", action: "GRAPE::hello::1337", class: "API"}
+        { method: "GET" , path: "hello/:id", action: "Grape::GET/hello/:id", class: "API"}
       )
     end
 
@@ -66,20 +66,20 @@ describe Appsignal::Grape::Middleware do
       end
     end
 
-    subject { get "api/v1/hello/mark"; events.last}
+    subject { get "api/v1/hello/name/mark"; events.last}
 
     it "delivers a payload consistent with the API call."do
       expect(subject.payload ).to eq(
-        { method: "GET" , path: "api/:version/hello/:name", action: "GRAPE::api::v1::hello::mark", class: "API"}
+        { method: "GET" , path: "api/:version/hello/name/:name", action: "Grape(v1)(api)::GET/hello/name/:name", class: "API"}
       )
     end
 
     it "names the payload consistent with the API call."do
-      expect(subject.name ).to eq("process_action.grape.GET.api.version.hello.name")
+      expect(subject.name ).to eq("process_action.grape.GET.api.version.hello.name.name")
     end
 
     context "verify the api request" do
-      subject{ get "api/v1/hello/mark"; last_response }
+      subject{ get "api/v1/hello/name/mark"; last_response }
 
       it "returns the correct body" do
         expect(subject.body).to eq("hello mark")

metadata

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