ruby-druid 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5c242b82f9ca73bc79a18d0fed69b6f956f515900c363bd7878b53f10eaad62d
-  data.tar.gz: e1699daefede54f60a9ac0e2be9b175b8d6dfd356c4550a36421933bd3e57866
+SHA1:
+  metadata.gz: 50802fa6fd17c18928330f89aa8a9e8aa1b552c9
+  data.tar.gz: 52827d8bb44dc95de2335f9792ab79f211ed0ad0
 SHA512:
-  metadata.gz: c9e438973e1a8816ebbd293a409aafbad9c015a29ffa93a55826bf4c13c741f223eb30597e059f7b35357941f818cdba791a9337ea0cb0833c45c6fd7a9a5842
-  data.tar.gz: 5ac8395f4155f4c830bf6518e292a4fc7a7ce9b54df8337931072e5cd49409c1a54d739182ce82f6a148fcd040c8c3c0dde772d06ff192a0605363d27408cdfa
+  metadata.gz: 9606e256ba1341ba5de30371eb5a65307506131be89ebff99cbc21e2546f5e692a8487b89ad8d410e8491cfc2980dec00a79476400e1091a8cf92247726ab0c2
+  data.tar.gz: 82a3948ec8332ff637ba32b0a981fb07fdce8efc7e44c5d59a5c37ca70d5cd27d406988bb8c74071936ac28ec3a3cbfeef07a5453cad2825796413e35db5c1f0

data/README.md

@@ -276,6 +276,13 @@ Druid::Query::Builder.new.filter{dimension => 1, dimension1 =>2, dimension2 => 3
 Druid::Query::Builder.new.filter{dimension.eq(1) & dimension1.eq(2) & dimension2.eq(3)}
 ```
 
+## Instrumentation
+
+Provides a single event `post.druid`. Payload:
+
+ - `data_source`
+ - `query`
+
 ## Contributing
 
 1. Fork it

data/lib/druid/data_source.rb

@@ -59,12 +59,16 @@ module Druid
       query.dataSource = name
 
       req = Net::HTTP::Post.new(uri.path, { 'Content-Type' => 'application/json' })
-      req.body = query.to_json
+      query_as_json = query.as_json
+      req.body = MultiJson.dump(query_as_json)
 
-      response = Net::HTTP.new(uri.host, uri.port).start do |http|
-        http.open_timeout = 10 # if druid is down fail fast
-        http.read_timeout = nil # we wait until druid is finished
-        http.request(req)
+
+      response = ActiveSupport::Notifications.instrument('post.druid', data_source: name, query: query_as_json) do
+        Net::HTTP.new(uri.host, uri.port).start do |http|
+          http.open_timeout = 10 # if druid is down fail fast
+          http.read_timeout = nil # we wait until druid is finished
+          http.request(req)
+        end
       end
 
       if response.code != '200'

data/lib/druid/version.rb

@@ -1,3 +1,3 @@
 module Druid
-  VERSION = '0.11.2'
+  VERSION = '0.11.3'
 end

data/spec/lib/data_source_spec.rb

@@ -1,7 +1,8 @@
 describe Druid::DataSource do
 
   context '#post' do
-    it 'parses response on 200' do
+  context 'if the request is succesful' do
+    before do
       # MRI
       stub_request(:post, "http://www.example.com/druid/v2").
         with(:body => "{\"context\":{\"queryId\":null},\"queryType\":\"timeseries\",\"intervals\":[\"2013-04-04T00:00:00+00:00/2013-04-04T00:00:00+00:00\"],\"granularity\":\"all\",\"dataSource\":\"test\"}",
@@ -12,12 +13,25 @@ describe Druid::DataSource do
         with(:body => "{\"context\":{\"queryId\":null},\"granularity\":\"all\",\"intervals\":[\"2013-04-04T00:00:00+00:00/2013-04-04T00:00:00+00:00\"],\"queryType\":\"timeseries\",\"dataSource\":\"test\"}",
           :headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type' => 'application/json', 'User-Agent' => 'Ruby' }).
         to_return(:status => 200, :body => '[]', :headers => {})
+    end
+
+    it 'parses response on 200' do
       ds = Druid::DataSource.new('test/test', 'http://www.example.com/druid/v2')
       query = Druid::Query::Builder.new.interval('2013-04-04', '2013-04-04').granularity(:all).query
       query.context.queryId = nil
       expect(ds.post(query)).to be_empty
     end
 
+    it 'instruments requests' do
+      expect(ActiveSupport::Notifications).to receive(:instrument).with('post.druid', data_source: 'test', query: instance_of(Hash)).and_call_original
+
+      ds = Druid::DataSource.new('test/test', 'http://www.example.com/druid/v2')
+      query = Druid::Query::Builder.new.interval('2013-04-04', '2013-04-04').granularity(:all).query
+      query.context.queryId = nil
+      ds.post(query)
+    end
+  end
+
     it 'raises on request failure' do
       stub_request(:post, 'http://www.example.com/druid/v2')
         .with(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-druid
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Ruby Druid Community
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -165,7 +165,7 @@ dependencies:
 description: |2
       ruby-druid is a Ruby client for Druid. It includes a Squeel-like query DSL
       and generates a JSON query that can be sent to Druid directly.
-email:
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -195,7 +195,7 @@ homepage: https://github.com/ruby-druid/ruby-druid
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -210,8 +210,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.11
+signing_key: 
 specification_version: 4
 summary: A Ruby client for Druid
 test_files: