grape-datadog 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ba4b9a27af459dcef450e036d45bcfb8f41b08f
-  data.tar.gz: 599981b5f22f182a9834055ed00338f37b103461
+  metadata.gz: b14dbd829e8c193af488bfcde4a5bbd625a5ecbf
+  data.tar.gz: c3055618f84b9970c4fc308bb363db61225691da
 SHA512:
-  metadata.gz: c0a3c9077a3fb3bcd784a6969980a559e68bfbe5ebe96e747a9c41e87059149cf2d0e590671a328bf103658f4a0f5e635cb6c50b06f4d674029ac5c62aa479bb
-  data.tar.gz: 77e186ee2d920fc3505e8b4c7b74a5d2481df12eabf0741685c255881eca5b27bac010989c1c8cf722b339424fde634f1b159008cefe67006e39af3d830e3ed4
+  metadata.gz: bd8d20ca60f27da9cc0ee74d60410dbc4e79033ce7471a8be31e6ff71f79d9f0ddacfdb4d74a946bd02c109b2a4f555c7cc6c25cdb40b9fefe28acd4a2ab7fb0
+  data.tar.gz: 3be84c6ea24b6c259cd872a9b2fa3b1c3ee2996acd789f89971deff5b2fba0a55f8968b5dc776eee67935fde047edd296acd741b4214540e4e36a7a25a526804

data/lib/grape/datadog/middleware.rb

@@ -25,7 +25,7 @@ module Grape
         @metric = opts[:metric_name] || "grape.request"
         @statsd = opts[:prefer_global] == false || !defined?($statsd) ? ::Statsd.new(statsd_host, statsd_port) : $statsd
         @tags   = opts[:tags] || []
-        @tags.push "host:#{hostname}"
+        @tags  += ["host:#{hostname}"]
       end
 
       def call(env)
@@ -41,15 +41,18 @@ module Grape
       private
 
       def prepare_tags(env)
-        path = env['api.endpoint'].routes.first.route_path[1..-1].gsub("/", ".").sub(/\(\.:format\)\z/, "").gsub(/\.:(\w+)/, '.{\1}')
+        endpoint = env['api.endpoint']
+        path     = File.join endpoint.namespace, endpoint.options[:path].join('/').gsub(/:(\w+)/) {|m| "_#{m[1..-1]}_" }
+        versions = endpoint.namespace_inheritable(:version)
+        version  = versions.first if versions
+
         @tags.map do |tag|
-          case tag
-          when String
-            tag
-          when Proc
-            tag.call(env)
-          end
-        end.compact + ["method:#{env[Rack::REQUEST_METHOD]}", "path:#{path}"]
+          case tag when String then tag when Proc then tag.call(env) end
+        end.compact + [
+          "method:#{env[Rack::REQUEST_METHOD]}",
+          "path:#{path}",
+          (version ? "version:#{version}" : nil),
+        ].compact
       end
 
     end

data/lib/grape/datadog/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Datadog
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/spec/grape/datadog/middleware_spec.rb

@@ -2,6 +2,13 @@ require 'spec_helper'
 
 describe Grape::Datadog::Middleware do
 
+  class VersionedTestAPI < Grape::API
+    version 'v1'
+    prefix  'api'
+
+    get('versioned') { "OK" }
+  end
+
   class TestAPI < Grape::API
     use Grape::Datadog::Middleware,
       hostname: "test.host",
@@ -10,6 +17,10 @@ describe Grape::Datadog::Middleware do
     get 'echo/:key1/:key2' do
       "#{params['key1']} #{params['key2']}"
     end
+
+    namespace :sub do
+      mount VersionedTestAPI
+    end
   end
 
   def app; TestAPI; end
@@ -31,8 +42,20 @@ describe Grape::Datadog::Middleware do
     expect(last_response.body).to eq('1 1234')
 
     expect($statsd.buffer).to eq([
-      "grape.request:1|c|#custom:tag,scheme:http,host:test.host,method:GET,path:echo.{key1}.{key2},status:200",
-      "grape.request.time:333|ms|#custom:tag,scheme:http,host:test.host,method:GET,path:echo.{key1}.{key2},status:200"
+      "grape.request:1|c|#custom:tag,scheme:http,host:test.host,method:GET,path:/echo/_key1_/_key2_,status:200",
+      "grape.request.time:333|ms|#custom:tag,scheme:http,host:test.host,method:GET,path:/echo/_key1_/_key2_,status:200",
+    ])
+  end
+
+  it 'should support namespaces and versioning' do
+    get '/api/v1/sub/versioned'
+    expect(last_response.status).to eq(200)
+    expect(last_response.body).to eq('OK')
+
+    expect($statsd.buffer).to eq([
+      "grape.request:1|c|#custom:tag,scheme:http,host:test.host,method:GET,path:/sub/versioned,version:v1,status:200",
+      "grape.request.time:333|ms|#custom:tag,scheme:http,host:test.host,method:GET,path:/sub/versioned,version:v1,status:200",
     ])
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-datadog
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Artem Chernyshev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape