upfluence-utils 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e24f463af1cedaea6f805dbe067e1ff244fe836a
-  data.tar.gz: 71b0dc7435ae3f3c5313aac3207a4c5dde6e33fd
+  metadata.gz: 3b29dc2613a02e871f444d7a919234f8008be6dc
+  data.tar.gz: b41f20f54b515e2da0199a14c1564fc1e2a8cdfd
 SHA512:
-  metadata.gz: 0d1c4e0b5e68d57a01597c560edf8dd29bae268733a44f062685e95144b042cb645f25fc98986d75be4d4d46d118fdcfa85a44ae452f007cbbe572ef6645c469
-  data.tar.gz: c5bb1ddf19acadb8185493ef957c874220d0044e938a70d1befeb4f2f0a1dba5ab2eebaceec9f1eb1c8a321477e445d0d5027518c2bfbb7f9361e712bad34773
+  metadata.gz: 9a1e7ffef29b92a0a63b01be4c78cc8f6b66da1162d899840881d1f3b2d2ce6a1ca3b303ad19b41de8ae3c588d2bed5d9d0d33541bfdf2ca4232907272545ab9
+  data.tar.gz: 9d80a474745c87584904a822d11fe5f4ee589786dc1be441eac11290c9d7b1f3ec34a0b1378978a91b78b2974cef032abd3b2abebf915e2c98f71cfca557019c

data/lib/upfluence/error_logger/sentry.rb

@@ -20,11 +20,15 @@ module Upfluence
       end
 
       def notify(error, method, *args)
-        Raven.capture_exception(
-          error,
-          extra: { method: method, arguments: args },
-          tags: { method: method }
-        )
+        begin
+          Raven.capture_exception(
+            error,
+            extra: { method: method, arguments: args },
+            tags: { method: method }
+          )
+        rescue Raven::Error => e
+          Upfluence.logger.error e.message
+        end
       end
 
       def user=(user)

data/lib/upfluence/http/middleware/prometheus.rb

@@ -0,0 +1,87 @@
+require 'prometheus/client'
+
+module Upfluence
+  module HTTP
+    module Middleware
+      class Prometheus
+        def initialize(app, registry = ::Prometheus::Client.registry)
+          @registry = registry
+
+          @request_total_count = @registry.get(
+            :uhttp_handler_requests_total
+          ) || @registry.counter(
+            :uhttp_handler_requests_total,
+            'Histogram of processed items',
+          )
+
+          @request_histogram = @registry.get(
+            :uhttp_handler_requests_duration_second
+          ) || @registry.histogram(
+            :uhttp_handler_requests_duration_second,
+            'Histogram of processing time',
+          )
+
+          @app = app
+        end
+
+        def call(env)
+          trace(env) { @app.call(env) }
+        end
+
+        private
+
+        def trace(env)
+          start = Time.now
+          yield.tap do |response|
+            duration = [(Time.now - start).to_f, 0.0].max
+            record(env, response.first.to_s, duration)
+          end
+        end
+
+        def record(env, code, duration)
+          @request_total_count.increment(
+            path: parse_route(env),
+            method: env['REQUEST_METHOD'].downcase,
+            status: code
+          )
+
+          @request_histogram.observe(
+            { path: parse_route(env), method: env['REQUEST_METHOD'].downcase },
+            duration
+          )
+        end
+
+        def parse_route(env)
+          parse_route_sinatra(env) || parse_route_rails(env) ||
+            parse_route_default(env)
+        end
+
+        def parse_route_rails(env)
+          params = env["action_dispatch.request.parameters"]
+          return nil if params.nil?
+
+          "#{params["controller"]}##{params["action"]}"
+        end
+
+        def parse_route_sinatra(env)
+          route = env['sinatra.route']
+          return nil if route.nil? || route.strip == ''
+
+          path = Rack::Request.new(env).path
+
+          splitted_template = route.split(' ').last.split('/').select do |v|
+            v != ''
+          end.reverse
+
+          path.split('/').reverse.map.with_index do |part, i|
+            splitted_template[i] || part
+          end.reverse.join('/')
+        end
+
+        def parse_route_default(env)
+          Rack::Request.new(env).path.gsub(%r{/\d+(/|$)}, '/:id\\1')
+        end
+      end
+    end
+  end
+end

data/lib/upfluence/http/server.rb

@@ -1,5 +1,7 @@
 require 'rack/handler'
 require 'rack/etag'
+require 'prometheus/client'
+require 'prometheus/client/push'
 
 require 'upfluence/environment'
 require 'upfluence/error_logger'
@@ -9,6 +11,7 @@ require 'upfluence/http/endpoint/healthcheck'
 require 'upfluence/http/middleware/logger'
 require 'upfluence/http/middleware/application_headers'
 require 'upfluence/http/middleware/handle_exception'
+require 'upfluence/http/middleware/prometheus'
 require 'upfluence/handler/base'
 
 module Upfluence
@@ -19,7 +22,11 @@ module Upfluence
         Port: ENV['PORT'] || 8080,
         Host: '0.0.0.0',
         threaded: true,
-        interfaces: []
+        interfaces: [],
+        push_gateway_url: ENV['PUSH_GATEWAY_URL'],
+        push_gateway_interval: 15, # sec
+        app_name: ENV['APP_NAME'] || 'uhttp-rb-server',
+        unit_name: ENV['UNIT_NAME'] || 'uhttp-rb-server-anonymous'
       }.freeze
 
       def initialize(options = {}, &block)
@@ -29,6 +36,7 @@ module Upfluence
 
         @builder = Builder.new do
           use Middleware::Logger
+          use Middleware::Prometheus
           use Middleware::ApplicationHeaders, base_handler
           use Middleware::HandleException
           use Upfluence.error_logger.middleware
@@ -54,6 +62,9 @@ module Upfluence
 
       def serve
         ENV['RACK_ENV'] = Upfluence.env.to_s
+
+        Thread.new { run_prometheus_exporter } if @options[:push_gateway_url]
+
         @handler.run(@builder, @options) do |server|
           server.threaded = @options[:threaded] if server.respond_to? :threaded=
 
@@ -62,6 +73,24 @@ module Upfluence
           end
         end
       end
+
+      private
+
+      def run_prometheus_exporter
+        push = Prometheus::Client::Push.new(
+          @options[:app_name],
+          @options[:unit_name],
+          @options[:push_gateway_url]
+        )
+
+        loop do
+          sleep @options[:push_gateway_interval]
+
+          push.replace Prometheus::Client.registry
+        end
+      rescue => e
+        puts e
+      end
     end
   end
 end

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.3.1'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/rbutils.gemspec

@@ -28,5 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'puma'
   spec.add_runtime_dependency 'rack'
+  spec.add_runtime_dependency 'prometheus-client'
   spec.add_runtime_dependency 'active_model_serializers', '~> 0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Upfluence
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,6 +184,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: prometheus-client
+  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: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +241,7 @@ files:
 - lib/upfluence/http/middleware/application_headers.rb
 - lib/upfluence/http/middleware/handle_exception.rb
 - lib/upfluence/http/middleware/logger.rb
+- lib/upfluence/http/middleware/prometheus.rb
 - lib/upfluence/http/server.rb
 - lib/upfluence/logger.rb
 - lib/upfluence/mixin/strong_parameters.rb