newrelic-grape 1.3.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3172a804df57e407393d92969bec41ce62a5bc3f
-  data.tar.gz: 9f371aa6aef084cafa4f21c6f1eb9b154d199d8e
+  metadata.gz: c545d92d15495cb96292ad77d6974efd96ff166f
+  data.tar.gz: bc1329532adab8dc61c47c43e558281cb9888f46
 SHA512:
-  metadata.gz: 3d03b55e6f73e2baa79e623619db643127333e82c43d6d5d7d6e0fb61cb262f3f39c386d8be57d6dbcbaf17ba651ac1615416b3fa2e607aa023381afc4d407a0
-  data.tar.gz: 0bda6142e4db3e7d3e613e89c37c98c60cf6a172761175ec4193b27979103596e94939cfa40810df70bc1287ef320cab2b5410adf2fce8800dc2c0f760cc56f9
+  metadata.gz: 32085b97c249625e064489d56f40c4839dce1e20af04bb8306afee7e4f468f34c132a6e5927700ae76929a572d0fa1aa392df129d637df0d2253b2da0e46476e
+  data.tar.gz: 939339e1fa59c3ebc7f52a6263e45a922cedf65cd6df2020ffe7460b677bd033ba1125b0cdc82201dbb428ea322f03260d59b3c4ec400a48966c74cd18cbe31d

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Next Release
 
+## 1.4.1 (07/04/2014)
+
+* Fix "uninitialized constant NewRelic::MetricSpec (NameError)" with
+newrelic_rpm 3.8.1.221
+* Fix "uninitialized constant Grape"
+
+## 1.4.0 (05/09/2014)
+
+* Add version to request path [@donbobka](https://github.com/donbobka)
+
 ## 1.3.1 (06/08/2013)
 
 * Remove explicit newrelic_rpm require [@rymai](https://github.com/rymai)

data/lib/newrelic-grape/instrument.rb

@@ -1,4 +1,6 @@
+require 'new_relic/agent/instrumentation'
 require 'new_relic/agent/instrumentation/controller_instrumentation'
+require 'grape'
 
 module NewRelic
   module Agent
@@ -20,14 +22,21 @@ module NewRelic
           end
         end
 
+        def route
+          env['api.endpoint'].routes.first
+        end
+
         def request_path
-          env['api.endpoint'].routes.first.route_path[1..-1].gsub("/", "-").sub(/\(\.:format\)\z/, "")
+          path = route.route_path[1..-1].gsub('/', '-')
+          path.sub!(/\(\.:format\)\z/, '')
+          route.route_version && path.sub!(':version', route.route_version)
+
+          path
         end
 
         def request_method
           @newrelic_request.request_method
         end
-
       end
     end
   end

data/lib/newrelic-grape/version.rb

@@ -1,5 +1,5 @@
 module NewRelic
   module Grape
-    VERSION = "1.3.1"
+    VERSION = "1.4.1"
   end
 end

data/spec/newrelic-grape/instrumenter_spec.rb

@@ -8,19 +8,47 @@ describe NewRelic::Agent::Instrumentation::Grape do
     subject
   end
 
-  before do
-    subject.get :hello do
-      "Hello World"
+  context 'api without version' do
+    before do
+      subject.get :hello do
+        'Hello World'
+      end
     end
-  end
 
-  it "perform_action_with_newrelic_trace" do
-    NewRelic::Agent::Instrumentation::Grape.any_instance.should_receive(:perform_action_with_newrelic_trace).and_yield
-    get "/hello"
-    last_response.status.should == 200
-    last_response.body.should == "Hello World"
+    it 'perform_action_with_newrelic_trace' do
+      NewRelic::Agent::Instrumentation::Grape.any_instance
+        .should_receive(:perform_action_with_newrelic_trace)
+        .with(hash_including(path: 'GET hello'))
+        .and_yield
+
+      get '/hello'
+      expect(last_response.status).to eq 200
+      expect(last_response.body).to eq 'Hello World'
+    end
   end
 
-end
+  context 'api with version' do
+    context 'in path' do
+      before do
+        subject.version 'v1', using: :path
+
+        subject.get :hello do
+          'Hello World'
+        end
+      end
 
+      it 'perform_action_with_newrelic_trace' do
+        NewRelic::Agent::Instrumentation::Grape.any_instance
+          .should_receive(:perform_action_with_newrelic_trace)
+          .with(hash_including(path: 'GET v1-hello'))
+          .and_yield
 
+        get '/v1/hello'
+
+        expect(last_response.status).to eq 200
+        expect(last_response.body).to eq 'Hello World'
+      end
+    end
+  end
+
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-grape
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: newrelic instrument for grape
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -69,17 +69,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: newrelic instrument for grape