rack-perf 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef2e18d1488130915f01a382eb6a43a9518d77f
-  data.tar.gz: 131652337428f1170991a0abf162bfc174c4dc84
+  metadata.gz: d40a9c9b78033566ae211b1f8693ded86d5e3879
+  data.tar.gz: c9fc951074422528b556d4e8d4df5169e84e92cb
 SHA512:
-  metadata.gz: 3d9403f830389e9c5191e1dd67a1e062e8dd4e77711680f771097fb2833309e587aec76a872acd518b4b5fda8c8bafee2f3e83d27f896e9e2c10c511d203ed73
-  data.tar.gz: 9bf53c33adaa84f98abc6437dbb57f337cc18f837290d98df1e866119004c6b9bb9d00df9866c8c384e3a49a93953e712c30e9d4054e68b84de827aa2a7f9328
+  metadata.gz: da0b950d9dabf8a043b5cbc1b565993512a0490ae1bfd3c41658c9bbc1af77ec683a023b1dec5d40ece5a5289ff9ce32a9d9c5a71c314a528924e356a7b892c7
+  data.tar.gz: f5eb8a8ddd21bc86b45ef30de01fa70adfdcbcb07892558c4b6ecc59fca1b6e6f79f39b6965334daf1f6520b213f0f675de6156ff019187c2a1b6ad529f5125d

data/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rack-perf.gemspec
+gemspec

data/README.md

@@ -0,0 +1,36 @@
+# Rack::Perf
+
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/rack/perf`. To experiment with that code, run `bin/console` for an interactive prompt.
+
+TODO: Delete this and the text above, and describe your gem
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'rack-perf'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install rack-perf
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rack-perf.
+

data/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+task :default => :spec

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "rack/perf"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/rack/perf/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Perf
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

data/lib/rack/perf.rb

@@ -8,39 +8,100 @@ module Rack
     attr_reader :endtime
     private :endtime
 
-    attr_reader :label
-    private :label
+    attr_reader :api_key
+    private :api_key
 
-    def initialize(stack, label = "X-Perf-Timing")
+    attr_reader :debug
+    private :debug
+
+    def initialize(stack, api_key, debug = false)
       @stack = stack
-      @label = label
+      @api_key = api_key
+      @debug = debug
     end
 
-    def call(previous_state)
-      @state = previous_state
+    def call(env)
+      @env = env
       @starttime = Time.now
 
-      @status, @headers, @body = stack.call(state)
+      request = Rack::Request.new(env)
+      @status, @headers, @body = stack.call(env)
 
       @endtime = Time.now
 
-      unless headers.has_key?(label)
-        headers[label] = runtime
-      end
+      ip_addr = request.ip
+      ip_addr = env["HTTP_X_FORWARDED_FOR"] if env["HTTP_X_FORWARDED_FOR"]
 
+      send_data(request.ip, request.request_method, request.url, get_normalized_path(request), status, runtime)
       [status, headers, body]
     end
 
+    private def send_data(ip_addr, request_method, request_url, normalized_uri, status_code, time_in_millis)
+      uri = URI.parse("https://data.perf.sh")
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+
+      request = Net::HTTP::Post.new('/ingest')
+      request.add_field('Content-Type', 'application/json')
+      request.add_field('X-Perf-Public-API-Key', api_key)
+      request.body = {
+        'ip_addr' => ip_addr,
+        'request_method' => request_method,
+        'request_url' => request_url,
+        'normalized_uri' => normalized_uri,
+        'status_code' => status_code,
+        'time_in_millis' => time_in_millis
+      }.to_json
+
+      puts request.body if debug
+
+      response = http.request(request)
+    end
+
+    private def get_normalized_path(request)
+      path = request.path
+
+      begin
+        route = Rails.application.routes.recognize_path path, method: request.request_method
+        params = {}
+        route.each{ |param, value|
+          if not ["controller", "action"].include?(param.to_s)
+            params[param.to_s] = value
+          end
+        }
+
+        normalized_path = []
+        path.split(/\//).each { |path_part|
+          params.each { |param, path_value|
+            if path_part == path_value
+              path_part = ":" + param.to_s
+            end
+
+            if params["format"] && path_part == path_value + "." + params["format"]
+              path_part = ":" + param.to_s
+            end
+          }
+
+          normalized_path.push(path_part)
+        }
+
+        return normalized_path.join("/")
+      rescue ActionController::RoutingError
+        return nil
+      end
+    end
+
     private def runtime
-      (endtime - starttime).to_s
+      ((endtime - starttime) * 1000).round
     end
 
     private def stack
       @stack
     end
 
-    private def state
-      @state
+    private def env
+      @env
     end
 
     private def headers

data/rack-perf.gemspec

@@ -0,0 +1,25 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rack/perf/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "rack-perf"
+  spec.version       = Rack::Perf::VERSION
+  spec.authors       = ["Steven Lu"]
+  spec.email         = ["steve@perf.sh"]
+
+  spec.summary       = %q{Perf middleware}
+  spec.description   = %q{Rack middleware that records endpoint timing and status codes to Perf}
+  spec.homepage      = "https://github.com/perflabs/rack-perf"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "rake", "~> 10.0"
+end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rack-perf
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Steven Lu
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
 date: 2016-10-30 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: Rack middleware that records endpoint timing and status codes to Perf
 email:
 - steve@perf.sh
@@ -17,12 +45,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- Gemfile
+- README.md
+- Rakefile
+- bin/console
+- bin/setup
 - lib/rack-perf.rb
 - lib/rack/perf.rb
 - lib/rack/perf/version.rb
+- rack-perf.gemspec
 homepage: https://github.com/perflabs/rack-perf
-licenses:
-- GPL-3.0
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -43,5 +77,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Rack middleware that records endpoint timing and status codes to Perf
+summary: Perf middleware
 test_files: []