upfluence-thrift 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 705d7f1ea6f2df5a1143b202d8d73897d2691ebb
-  data.tar.gz: 7f9bb47162ab72fe3a16b7ae40665225fb86a7ea
+  metadata.gz: fe3d3897cc33f528a63422abebca6ec7f5190266
+  data.tar.gz: 7f4bb8c724ceac70785300bd0ac3b410022b6a81
 SHA512:
-  metadata.gz: 0f85f3a790e50117fb64706387de9cfc553c7b3c3e42d9bfecdd115d139e46f2f4d9c782643b6b8619a312801a85215e5c826c64bd31e57bd3c6cbcf7da0cf40
-  data.tar.gz: eb9d58c7f200fb7f082ebb51cad7733a2295c6ebec0b567e2be77281e1e644a69e5c51690ee379845ee53306774b51d3ae1bf744797ec185ca8c69e36b9e94f5
+  metadata.gz: e029c7b2d81786f06c1e9d7e6fafe239fa3b94c43d5deb0f8b8d174ca05be934723f19a8d68b8a1cf08b69db1cd3fbea74842fb24f4de35b670bc9fc62e0ff55
+  data.tar.gz: 1acdcde96fe884a99f41ba8e4b293d1b52132d7e9c959c31e673216b9f94cc59d84256ca2cfb765310ade87761d35e6c8fb029f24d801d5fec160ae0d9ff4f4b

data/lib/thrift/metrics.rb

@@ -0,0 +1,72 @@
+require 'statsd'
+
+class NullStatsd
+  def method_missing(*)
+  end
+end
+
+module Thrift
+  module Metrics
+    module Middleware
+      class Timing
+        class << self
+          def send_duration(name, t0)
+            Metrics.client.timing(
+              "#{name}.duration",
+              ((Time.now - t0) * 1_000).to_i
+            )
+          end
+
+          def instrument(name, &block)
+            t0 = Time.now
+
+            begin
+              r = block.call
+              send_duration name, t0
+              r
+            rescue => e
+              send_duration name, t0
+              raise e
+            end
+          end
+        end
+      end
+
+      class Exception
+        class << self
+          def instrument(name, &block)
+            begin
+              r = block.call
+              Metrics.client.increment("#{name}.success")
+              r
+            rescue => e
+              Metrics.client.increment("#{name}.exceptions.#{e.class.name.downcase}")
+              raise e
+            end
+          end
+        end
+      end
+    end
+
+    MIDDLEWARES = [Middleware::Timing, Middleware::Exception]
+
+    class << self
+      def instrument(name, &block)
+        MIDDLEWARES.reduce(block) do |acc, cur|
+          Proc.new { cur.instrument(name) { acc.call } }
+        end.call
+      end
+
+      def client
+        @client ||= begin
+                      if ENV['STATSD_URL']
+                        ip, port = ENV['STATSD_URL'].split(':')
+                        Statsd.new ip, port.to_i
+                      else
+                        NullStatsd.new
+                      end
+                    end
+      end
+    end
+  end
+end

data/lib/thrift/server/rack_application.rb

@@ -21,7 +21,6 @@ require 'rack'
 
 module Thrift
   class RackApplication
-
     THRIFT_HEADER = "application/x-thrift"
 
     def self.for(path, processor, protocol_factory)

data/spec/rack_application_spec.rb

@@ -0,0 +1,77 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+require 'spec_helper'
+require 'rack/test'
+require 'thrift/server/thin_http_server'
+require 'thrift/server/rack_application'
+
+describe Thrift::RackApplication do
+  include Rack::Test::Methods
+
+  let(:processor) { mock('processor') }
+  let(:protocol_factory) { mock('protocol factory') }
+
+  def app
+    Thrift::RackApplication.for("/", processor, protocol_factory)
+  end
+
+  context "404 response" do
+
+    it 'receives a non-POST' do
+      header('Content-Type', "application/x-thrift")
+      get "/"
+      last_response.status.should be 404
+    end
+
+    it 'receives a header other than application/x-thrift' do
+      header('Content-Type', "application/json")
+      post "/"
+      last_response.status.should be 404
+    end
+
+  end
+
+  context "200 response" do
+
+    before do
+      protocol_factory.stub(:get_protocol)
+      processor.stub(:process)
+    end
+
+    it 'creates an IOStreamTransport' do
+      header('Content-Type', "application/x-thrift")
+      Thrift::IOStreamTransport.should_receive(:new).with(an_instance_of(Rack::Lint::InputWrapper), an_instance_of(Rack::Response))
+      post "/"
+    end
+
+    it 'fetches the right protocol based on the Transport' do
+      header('Content-Type', "application/x-thrift")
+      protocol_factory.should_receive(:get_protocol).with(an_instance_of(Thrift::IOStreamTransport))
+      post "/"
+    end
+
+    it 'status code 200' do
+      header('Content-Type', "application/x-thrift")
+      post "/"
+      last_response.ok?.should be_true
+    end
+
+  end
+end

data/spec/thin_http_server_spec.rb

@@ -20,6 +20,7 @@
 require 'spec_helper'
 require 'rack/test'
 require 'thrift/server/thin_http_server'
+require 'thrift/server/rack_application'
 
 describe Thrift::ThinHTTPServer do
 
@@ -35,7 +36,7 @@ describe Thrift::ThinHTTPServer do
       end
 
       it 'creates a ThinHTTPServer::RackApplicationContext' do
-        Thrift::ThinHTTPServer::RackApplication.should_receive(:for).with("/", processor, an_instance_of(Thrift::BinaryProtocolFactory)).and_return(anything)
+        Thrift::RackApplication.should_receive(:for).with("/", processor, an_instance_of(Thrift::BinaryProtocolFactory)).and_return(anything)
         Thrift::ThinHTTPServer.new(processor)
       end
 
@@ -60,7 +61,7 @@ describe Thrift::ThinHTTPServer do
       end
 
       it 'creates a ThinHTTPServer::RackApplicationContext with a different protocol factory' do
-        Thrift::ThinHTTPServer::RackApplication.should_receive(:for).with("/", processor, an_instance_of(Thrift::JsonProtocolFactory)).and_return(anything)
+        Thrift::RackApplication.should_receive(:for).with("/", processor, an_instance_of(Thrift::JsonProtocolFactory)).and_return(anything)
         Thrift::ThinHTTPServer.new(processor,
                            :protocol_factory => Thrift::JsonProtocolFactory.new)
       end
@@ -83,59 +84,3 @@ describe Thrift::ThinHTTPServer do
   end
 
 end
-
-describe Thrift::ThinHTTPServer::RackApplication do
-  include Rack::Test::Methods
-
-  let(:processor) { mock('processor') }
-  let(:protocol_factory) { mock('protocol factory') }
-
-  def app
-    Thrift::ThinHTTPServer::RackApplication.for("/", processor, protocol_factory)
-  end
-
-  context "404 response" do
-
-    it 'receives a non-POST' do
-      header('Content-Type', "application/x-thrift")
-      get "/"
-      last_response.status.should be 404
-    end
-
-    it 'receives a header other than application/x-thrift' do
-      header('Content-Type', "application/json")
-      post "/"
-      last_response.status.should be 404
-    end
-
-  end
-
-  context "200 response" do
-
-    before do
-      protocol_factory.stub(:get_protocol)
-      processor.stub(:process)
-    end
-
-    it 'creates an IOStreamTransport' do
-      header('Content-Type', "application/x-thrift")
-      Thrift::IOStreamTransport.should_receive(:new).with(an_instance_of(Rack::Lint::InputWrapper), an_instance_of(Rack::Response))
-      post "/"
-    end
-
-    it 'fetches the right protocol based on the Transport' do
-      header('Content-Type', "application/x-thrift")
-      protocol_factory.should_receive(:get_protocol).with(an_instance_of(Thrift::IOStreamTransport))
-      post "/"
-    end
-
-    it 'status code 200' do
-      header('Content-Type', "application/x-thrift")
-      post "/"
-      last_response.ok?.should be_true
-    end
-
-  end
-
-end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-thrift
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Thrift Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: statsd-ruby
+  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: Ruby bindings for the Apache Thrift RPC system
 email:
 - dev@thrift.apache.org
@@ -125,6 +139,7 @@ extra_rdoc_files:
 - lib/thrift/core_ext/fixnum.rb
 - lib/thrift/core_ext.rb
 - lib/thrift/exceptions.rb
+- lib/thrift/metrics.rb
 - lib/thrift/multiplexed_processor.rb
 - lib/thrift/processor.rb
 - lib/thrift/protocol/base_protocol.rb
@@ -195,6 +210,7 @@ files:
 - lib/thrift/core_ext.rb
 - lib/thrift/core_ext/fixnum.rb
 - lib/thrift/exceptions.rb
+- lib/thrift/metrics.rb
 - lib/thrift/multiplexed_processor.rb
 - lib/thrift/processor.rb
 - lib/thrift/protocol/base_protocol.rb
@@ -269,6 +285,7 @@ files:
 - spec/namespaced_spec.rb
 - spec/nonblocking_server_spec.rb
 - spec/processor_spec.rb
+- spec/rack_application_spec.rb
 - spec/serializer_spec.rb
 - spec/server_socket_spec.rb
 - spec/server_spec.rb
@@ -363,6 +380,7 @@ test_files:
 - spec/namespaced_spec.rb
 - spec/nonblocking_server_spec.rb
 - spec/processor_spec.rb
+- spec/rack_application_spec.rb
 - spec/Referenced.thrift
 - spec/serializer_spec.rb
 - spec/server_socket_spec.rb