thrift_rack 0.2.2 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 819f79b59cea9fc3dfd86830ce064789fc4c24ae
-  data.tar.gz: 2ddef4a2067d0c77e7146bd6bcb35adf4d660101
+SHA256:
+  metadata.gz: 3f79e2c9d1ce63045d0fb7042f7109911a632fec51c7e09a9c8edde7958447b5
+  data.tar.gz: 6f421077a9a66de076519bcfe42beb9f0316e928b36402bad86dea39ba71afee
 SHA512:
-  metadata.gz: d4b9dc298861c34bb55ab17f6fc0285d850481a23df99f68338004a770b3e86bf3218a968f8eb6dd0aec19492ddb24e3f33921bbdd8fbce1e986216e7d146ecb
-  data.tar.gz: 1dfd1db65ea8cc7f7c7f3494050bbf96044a594346a3ed882428dc39d4638654ba31895ec45d76d2cb4587f16c05b5586d023ff8c76c5d74213315d2a0125324
+  metadata.gz: 27020172c648b060af7a24b08f23d9ab8a3a1cf6a1b8c24a8b5f9547b2bd3ccbb2be5fdecb2b8caa5b7696800b160e82268f0bfb30ed340a7fa80713b198e638
+  data.tar.gz: 49cf0c76cf8f38f4d68ac06584fbe4e9b2e0a778c73926ac345f37885452482fbae10d81724392befe19de170f1021d85e87c0fd54b63d2f9968389b8be379e7

data/Gemfile.lock

@@ -1,25 +1,27 @@
 PATH
   remote: .
   specs:
-    thrift_rack (0.2.1)
+    thrift_rack (0.2.6)
       net-http-persistent (>= 3.0)
-      rack (>= 2.0)
-      thrift (~> 0.10.0)
+      rack (>= 2.0.6)
+      redis (>= 3.0)
+      thrift (~> 0.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
-    connection_pool (2.2.1)
+    connection_pool (2.2.5)
     method_source (0.9.0)
-    net-http-persistent (3.0.0)
+    net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (2.0.5)
-    rake (10.5.0)
-    thrift (0.10.0.0)
+    rack (2.2.3)
+    rake (13.0.1)
+    redis (4.4.0)
+    thrift (0.14.2)
 
 PLATFORMS
   ruby
@@ -27,8 +29,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   pry (~> 0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   thrift_rack!
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/README.md

@@ -1,8 +1,6 @@
 # ThriftRack
 
-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/thrift_rack`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+ThriftRack implements [thrift]([https://thrift.apache.org](https://thrift.apache.org/)) `Compact Protocol + HTTP Transport ` with rack, and makes it easy to write a server with convention.
 
 ## Installation
 
@@ -22,7 +20,207 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### Server
+
+Assume  you use rails only with `activemodel`、`activerecord`、`activesupport`. Because ThriftRack act as controller and view, you do not need `actionview` and `actionpack`
+
+You cloud new a rails app use this command
+
+```bash
+rails new demo --skip-action-mailer --skip-action-mailbox --skip-action-text --skip-active-record --skip-active-storage --skip-action-cable --skip-sprockets --skip-javascript --skip-turbolinks --skip-test --skip-system-test --skip-bootsnap --api --skip-webpack-install
+```
+
+Suppose you has a thrift named `math.thrift` to add two number:
+
+```thrift
+# math.thrift
+namespace rb thrift.math # namesapce should same with filename
+
+service MathService { # Math is capitalized from Math
+  int add(1: int i, 2: int j)
+}
+```
+
+then you should implement this thrift in `math_server.rb`
+
+```ruby
+class MathServer < ThriftRack::Server
+  def add(i, j)
+    i + j
+  end
+end
+```
+
+Then change the `config.ru`
+
+```
+require_relative 'config/environment'
+app = ThriftRack.app(ThriftRack::Server.children)
+run app
+```
+
+Another config under initializers
+
+```ruby
+#initializers/thrift.rb
+Dir["#{Rails.root}/lib/thrift/**/*.rb"].each { |file| require file } # support generate thrift files under lib/thrift
+Dir["#{Rails.root}/app/servers/*.rb"].each { |file| require file } # support servers under app/servers
+
+ThriftRack.redis = Redis.new
+ThriftRack::Logger.tag = { key: value} # tag to logs
+
+at_exit do
+  ThriftRack::Logger.logger.close
+end
+```
+
+Then run this bash
+
+```
+rackup
+```
+
+what happend?
+
+* We implement the math.thrift with `POST` method at `/math` path
+* A Server seems like a controller, except that you do not need to write routes.
+* We replace the default rails rack entrance, but it still a rack server. **You could use puma to web server, and enjoy puma's advantage**.
+* Client will auto retry with network jitter, Atom ensure each request at most processed once.
+* `/ping` should be use to health check, all request to `/ping` will not be log
+* `ThriftRack::Logger` log each rpc request with json format. You could use ELK to analyze each request
+
+### Client
+
+client cloud write like this
+
+```ruby
+class Math
+  attr_accessor :client
+  def initialize(request_id = "no-request-id") # web should has one request_id
+    @client = ThriftRack::Client.new("http://127.0.0.1:300/math", ThriftClientClass, request_id)
+  end
+
+  def add(i, j)
+    self.client.add(i, j)
+  end
+end
+```
+
+Another config under initializers
+
+```ruby
+#initializers/thrift.rb
+Dir["#{Rails.root}/lib/thrift/**/*.rb"].each { |file| require file }
+
+ThriftRack::Client.config Rails.application.class.parent.name.underscore
+```
+
+what happend?
+
+* Client will auto generate a `rpc_id` to tracer rpc request
+* Client will add app_name to header
+* Client use HTTP 1.1, wich persistent tcp connection with multi http requests
+* Client has a connection pool, network error will auto retry
+* Client will log each rpc process time
+
+#### Furthermore
+
+you chould write a supperclass like under, other client inherit superclass
+
+1. you could write a around_action to set request
+
+   ```ruby
+   class ApplicationController < ActionController::API
+     around_action :set_thread_local_request
+
+     private
+
+     def set_thread_local_request
+       Thread.current["request"] = request
+       yield
+     ensure
+       Thread.current["request"] = nil
+     end
+   end
+   ```
+
+2. write a superclass
+
+   ```ruby
+   class ClientBase
+     def initialize(req = nil)
+       if req
+         @request_id = req.request_id
+       end
+     end
+
+     def request_id
+       @request_id ||= Thread.current["request"] ? Thread.current["request"].request_id : "no-request-id"
+     end
+
+     def client
+       ThriftRack::Client.new("http:127.0.0.1:3000/#{_namespace.underscore}", _client_class, request_id)
+     end
+
+     def respond_to_missing?(method, include_private = false)
+       self.client.respond_to?(method)
+     end
+
+     def method_missing(method, *args)
+       return super unless self.client.respond_to?(method)
+       self.class_eval do
+         define_method method.to_sym do |*params|
+           self.client.public_send(method, *params)
+         end
+       end
+       self.public_send(method, *args)
+     end
+
+     private
+
+     def _namespace
+       @namespace ||= self.class.name
+     end
+
+     def _client_class
+       "Thrift::#{_namespace}::#{_namespace}Service::Client".constantize
+     end
+
+     class << self
+       def default
+         self.new
+       end
+
+       def respond_to_missing?(method, include_private = false)
+         self.default.respond_to?(method)
+       end
+
+       def method_missing(method, *params)
+         return super unless self.default.respond_to?(method)
+         define_singleton_method method.to_sym do |*args|
+           self.default.public_send(method, *args)
+         end
+         self.public_send(method, *params)
+       end
+     end
+   end
+   ```
+
+3. inherit super class
+
+   ```ruby
+   class Math < ClientBase
+     def add(i, j)
+       self.client.add(i, j)
+     end
+   end
+   ```
+
+4. use
+
+   ```
+   Math.add(1, 2) # will auto assign request_id is with request
+   ```
 
 ## Development
 

data/lib/thrift_rack/active_record.rb

@@ -0,0 +1,13 @@
+class ThriftRack
+  class ActiveRecord
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      ::ActiveRecord::Base.connection_pool.with_connection do
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/thrift_rack/atom.rb

@@ -0,0 +1,31 @@
+class ThriftRack
+  class Atom
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      req = Rack::Request.new(env)
+      rpc_id = req.env["HTTP_X_RPC_ID"]
+      if rpc_id
+        start_time = Time.now
+        valid = ThriftRack.redis.set("thrift_rack:atom:#{rpc_id}", true, nx: true, ex: 180)
+        if valid
+          env["ATOM_DURATION"] = ((Time.now - start_time) * 1000).round(4)
+          @app.call(env)
+        else
+          [409, {}, ["RPC Request Processed"]]
+        end
+      else
+        @app.call(env)
+      end
+    end
+
+    class << self
+      # compatibility with old version
+      def redis=(r)
+        ThriftRack.redis = r
+      end
+    end
+  end
+end

data/lib/thrift_rack/client.rb

@@ -1,67 +1,101 @@
 require 'securerandom'
 class ThriftRack
   class Client
-    def initialize(url, client_klass, request_id = nil)
-      @request_id = request_id || "no-request"
+    DEFAULT_REQUEST_ID = "no-request".freeze
+    def initialize(url, client_klass, request = nil)
+      if request.is_a?(ActionDispatch::Request)
+        @request = request
+        @request_id = request.request_id
+      else
+        @request_id = request || DEFAULT_REQUEST_ID
+      end
       @url = url
       @transport = ThriftRack::HttpClientTransport.new(url)
       protocol = protocol_factory.get_protocol(@transport)
       @client = client_klass.new(protocol)
     end
 
-    def logger
-      @logger ||= (defined? Rails) ? rails_logger : std_logger
-    end
-
     def protocol_factory
       Thrift::CompactProtocolFactory.new
     end
 
+    def respond_to_missing?(method, _include_private = false)
+      @client.respond_to?(method)
+    end
+
     def method_missing(method, *params)
       return super unless @client.respond_to?(method)
+
       self.class_eval do
         define_method method.to_sym do |*args|
           begin
             rpc_id = SecureRandom.uuid
             request_at = Time.now
-            @transport.add_headers({"X-Request-ID" => @request_id, "X-Rpc-ID" => rpc_id, "X-Rpc-Func" => method.to_s, "X-From" => ThriftRack::Client.app_name || "unknown"})
+            if Thread.current["RPC_FULL_TRACE"].to_s == "true"
+              full_trace = true
+            else
+              full_trace = @request_id == DEFAULT_REQUEST_ID || @request_id.hash % 8 == 0
+            end
+            @transport.add_headers("X-Request-ID" => @request_id, "X-Rpc-ID" => rpc_id, "X-Rpc-Func" => method.to_s, "X-From" => ThriftRack::Client.app_name || "unknown", "X-Full-Trace" => full_trace.to_s)
             @client.send(method, *args)
           ensure
             end_time = Time.now
-            self.logger.info(JSON.dump({
-              request_at: request_at.iso8601(6),
-              request_id: @request_id,
-              rpc_id: rpc_id,
-              duration: ((end_time - request_at) * 1000).round(4),
-              path: URI(@url).path,
-              func: method,
-            }))
+            duration = (end_time - request_at) * 1000
+            process_duration = @transport.response_headers["x-server-process-duration"]&.to_f
+            if full_trace || duration >= 100
+              ThriftRack::Client.logger.info(
+                JSON.dump(
+                  request_at: request_at.iso8601(6),
+                  request_id: @request_id,
+                  rpc_id: rpc_id,
+                  duration: duration.round(4),
+                  path: URI(@url).path,
+                  func: method,
+                  tag: ThriftRack::Client.logger_tag,
+                  full_trace: full_trace,
+                  extra_context: @request ? { context: "action_controller", controller: @request.params["controller"], action: @request.params["action"] } : {},
+                  server: {
+                    id: @transport.response_headers["x-server-id"],
+                    private_ip: @transport.response_headers["x-server-private-ip"],
+                    process_duration: process_duration ? process_duration.round(4) : nil,
+                    network_duration: process_duration ? (duration - process_duration).round(4) : nil,
+                  },
+                ),
+              )
+            end
           end
         end
       end
       self.public_send(method, *params)
     end
 
-    private
+    class << self
+      attr_writer :app_name, :logger_tag
 
-    def rails_logger
-      file = File.open("#{Rails.root}/log/rpc_client.log", File::WRONLY | File::APPEND | File::CREAT)
-      file.sync = true
-      ActiveSupport::Logger.new(file)
-    end
+      def app_name
+        @app_name ||= Rails.application.class.parent.name.underscore if defined? Rails
+        @app_name
+      end
 
-    def std_logger
-      ::Logger.new(STDOUT)
-    end
+      def logger_tag
+        @logger_tag || {}
+      end
 
-    class << self
-      attr_accessor :app_name, :pool_size
+      def logger
+        @logger ||= if defined? Rails
+                      ActiveSupport::Logger.new(File.open("#{Rails.root}/log/rpc_client.log", File::WRONLY | File::APPEND | File::CREAT))
+                    else
+                      ::Logger.new(STDOUT)
+                    end
+      end
 
-      def pool_size=(p)
-        http = Net::HTTP::Persistent.new(name: self.app_name, pool_size: p)
-        http.verify_mode = 0
-        HttpClientTransport.default = http
-        @pool_size = p
+      def config(app_name, max_requests: 100, logger_tag: {})
+        self.app_name = app_name
+        self.logger_tag = logger_tag
+        HttpClientTransport.default = HttpClientTransport.new_http(app_name, max_requests: max_requests)
+        at_exit do
+          ThriftRack::Client.logger.close
+        end
       end
     end
   end

data/lib/thrift_rack/downgrade.rb

@@ -0,0 +1,46 @@
+class ThriftRack
+  class Downgrade
+    def initialize(app)
+      @app = app
+      @drop_percentage = 0
+      @last_sync_drop_percentage_at = Time.at(0)
+    end
+
+    def call(env)
+      if rand(100) < drop_percentage
+        [509, {}, ["Downgrading"]]
+      else
+        @app.call(env)
+      end
+    end
+
+    private
+
+    def drop_percentage
+      if Time.now - @last_sync_drop_percentage_at > 3
+        @last_sync_drop_percentage_at = Time.now
+        @drop_percentage = self.class.current_drop_percentage
+      else
+        @drop_percentage
+      end
+    end
+
+    class << self
+      def change_downgrade(drop_percentage)
+        ThriftRack.redis.set(downgrade_redis_key, drop_percentage)
+      end
+
+      def current_drop_percentage
+        ThriftRack.redis.get(downgrade_redis_key).to_f
+      end
+
+      def close_downgrade
+        ThriftRack.redis.del(downgrade_redis_key)
+      end
+
+      def downgrade_redis_key
+        "thrift_rack:downgrade"
+      end
+    end
+  end
+end

data/lib/thrift_rack/format_check.rb

@@ -6,7 +6,7 @@ class ThriftRack
 
     def call(env)
       req = Rack::Request.new(env)
-      return Rack::Response.new(["Not Valid Thrift Request"], 400, {'Content-Type' => 'text/plain'}) unless req.post? && req.env["CONTENT_TYPE"] == THRIFT_HEADER
+      return 400, {'Content-Type' => 'text/plain'}, ["Not Valid Thrift Request"] unless req.post? && req.env["CONTENT_TYPE"] == THRIFT_HEADER
       @app.call(env)
     end
   end

data/lib/thrift_rack/http_client_transport.rb

@@ -4,9 +4,14 @@ require 'net/http/persistent'
 class ThriftRack
   class HttpClientTransport < Thrift::BaseTransport
     class RespCodeError < StandardError; end
+    class ProcessedRequest < RespCodeError; end
+    class ServerDowngradingError < RespCodeError; end
+
+    attr_accessor :response_headers
     def initialize(url, opts = {})
       @headers = {'Content-Type' => 'application/x-thrift'}
       @outbuf = Thrift::Bytes.empty_byte_buffer
+      @response_headers = {}
       @url = url
     end
 
@@ -18,29 +23,55 @@ class ThriftRack
       @headers = @headers.merge(headers)
     end
 
-
     def flush
+      self.response_headers = {}
       uri = URI(@url)
       post = Net::HTTP::Post.new uri.path
       post.body = @outbuf
       post.initialize_http_header(@headers)
-      resp = ThriftRack::HttpClientTransport.default.request(uri, post)
+      resp = retry_request_with_503{ThriftRack::HttpClientTransport.default.request(uri, post)}
       data = resp.body
-      raise RespCodeError.new("#{resp.code} on #{@url} with body #{data}") unless resp.code.to_i == 200
+      self.response_headers = resp.header
+      resp_code = resp.code.to_i
+      if resp_code != 200
+        if resp_code == 409
+          raise ProcessedRequest, @url
+        elsif resp_code == 509
+          raise ServerDowngradingError, @url
+        else
+          raise RespCodeError, "#{resp.code} on #{@url} with body #{data}"
+        end
+      end
       data = Thrift::Bytes.force_binary_encoding(data)
       @inbuf = StringIO.new data
     ensure
       @outbuf = Thrift::Bytes.empty_byte_buffer
     end
 
+    def retry_request_with_503
+      resp = nil
+      3.times do |i|
+        resp = yield
+        return resp unless resp.code.to_i == 503
+
+        sleep(0.1 * i)
+        ThriftRack::HttpClientTransport.default.reconnect
+      end
+      resp
+    end
+
     class << self
       attr_accessor :default
 
       def default
-        return @default if @default
-        @default = Net::HTTP::Persistent.new
-        @default.verify_mode = 0
-        @default
+        @default ||= new_http(ThriftRack::Client.app_name || "default")
+      end
+
+      def new_http(name, max_requests: 100)
+        http = Net::HTTP::Persistent.new(name: name)
+        http.max_requests = max_requests
+        http.verify_mode = 0
+        http
       end
     end
   end

data/lib/thrift_rack/launch_timestamp.rb

@@ -0,0 +1,12 @@
+class ThriftRack
+  class LaunchTimestamp
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      env['LAUNCH_AT'] = Time.now
+      @app.call(env)
+    end
+  end
+end

data/lib/thrift_rack/logger.rb

@@ -7,37 +7,52 @@ class ThriftRack
     end
 
     def call(env)
-      request_at = Time.now
+      request_at = env['LAUNCH_AT'] || Time.now
+      income_middleware_duration = Time.now - request_at
       req = Rack::Request.new(env)
       resp = @app.call(env)
       resp
     ensure
-      end_time = Time.now
-      self.logger.info(JSON.dump({
-        request_at: request_at.iso8601(6),
-        request_id: req.env["HTTP_X_REQUEST_ID"],
-        rpc_id: req.env["HTTP_X_RPC_ID"],
-        duration: ((end_time - request_at) * 1000).round(4),
-        path: req.path,
-        func: req.env["HTTP_X_RPC_FUNC"],
-        from: req.env["HTTP_X_FROM"],
-      }))
+      duration = ((Time.now - request_at) * 1000).round(4)
+      request_id = req.env["HTTP_X_REQUEST_ID"]
+      if req.env["HTTP_X_FULL_TRACE"]
+        full_trace = req.env["HTTP_X_FULL_TRACE"] == "true"
+      else
+        full_trace = request_id.hash % 8 == 0
+      end
+      if full_trace || duration >= 100
+        ThriftRack::Logger.logger.info(
+          JSON.dump(
+            request_at: request_at.iso8601(6),
+            request_id: request_id,
+            rpc_id: req.env["HTTP_X_RPC_ID"],
+            duration: duration,
+            income_middleware_duration: (income_middleware_duration * 1000).round(2),
+            atom_duration: env["ATOM_DURATION"],
+            path: req.path,
+            func: req.env["HTTP_X_RPC_FUNC"],
+            from: req.env["HTTP_X_FROM"],
+            full_trace: full_trace,
+            tag: Logger.tag,
+          ),
+        )
+      end
     end
 
-    def logger
-      @logger ||= (defined? Rails) ? rails_logger : std_logger
-    end
-
-    private
+    class << self
+      attr_writer :tag
 
-    def rails_logger
-      file = File.open("#{Rails.root}/log/rpc.log", File::WRONLY | File::APPEND | File::CREAT)
-      file.sync = true
-      ActiveSupport::Logger.new(file)
-    end
+      def logger
+        @logger ||= if defined? Rails
+                      ActiveSupport::Logger.new(File.open("#{Rails.root}/log/rpc.log", File::WRONLY | File::APPEND | File::CREAT))
+                    else
+                      ::Logger.new(STDOUT)
+                    end
+      end
 
-    def std_logger
-      ::Logger.new(STDOUT)
+      def tag
+        @tag ||= {}
+      end
     end
   end
 end

data/lib/thrift_rack/ping.rb

@@ -6,7 +6,7 @@ class ThriftRack
 
     def call(env)
       req = Rack::Request.new(env)
-      return Rack::Response.new(["PONG"], 200, {'Content-Type' => 'text/plain'}) if req.path == "/ping"
+      return 200, {'Content-Type' => 'text/plain'}, ["PONG"] if req.path == "/ping"
       @app.call(env)
     end
   end

data/lib/thrift_rack/sentry.rb

@@ -0,0 +1,13 @@
+class ThriftRack
+  class Sentry
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      req = Rack::Request.new(env)
+      Raven.extra_context(request_id: req.env["HTTP_X_REQUEST_ID"], rpc_id: req.env["HTTP_X_RPC_ID"], from: req.env["HTTP_X_FROM"])
+      @app.call(env)
+    end
+  end
+end

data/lib/thrift_rack/server.rb

@@ -1,5 +1,9 @@
 class ThriftRack
   class Server
+    def initialize(request = nil)
+      @_request = request
+    end
+
     class << self
       def inherited(subclass)
         warn "Your class should end with Server not it is #{subclass}" unless subclass.name.end_with?("Server")
@@ -22,7 +26,7 @@ class ThriftRack
         if Kernel.const_defined?(promissory_class_name)
           Kernel.const_get(promissory_class_name)
         else
-          raise "You should overwrite processor_class for #{self.class}"
+          raise "You should overwrite processor_class for #{self}"
         end
       end
 

data/lib/thrift_rack/server_metric.rb

@@ -0,0 +1,28 @@
+class ThriftRack
+  class ServerMetric
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      request_at = env['LAUNCH_AT'] || Time.now
+      status, headers, body = @app.call(env)
+      headers["x-server-process-duration"] = ((Time.now - request_at) * 1000).to_s
+      headers["x-server-id"] = self.class.server_id
+      headers["x-server-private-ip"] = self.class.server_private_ip
+      [status, headers, body]
+    end
+
+    class << self
+      attr_writer :server_id, :server_private_ip
+
+      def server_id
+        @server_id || "unkonwn"
+      end
+
+      def server_private_ip
+        @server_private_ip || "0.0.0.0"
+      end
+    end
+  end
+end

data/lib/thrift_rack/version.rb

@@ -1,3 +1,3 @@
 class ThriftRack
-  VERSION = "0.2.2"
+  VERSION = "0.2.6"
 end

data/lib/thrift_rack.rb

@@ -1,16 +1,23 @@
 require "thrift_rack/version"
 require "thrift_rack/server"
+require 'thrift_rack/sentry'
 require "thrift_rack/logger"
 require "thrift_rack/client"
+require 'thrift_rack/launch_timestamp'
 require 'thrift_rack/ping'
+require 'thrift_rack/atom'
 require 'thrift_rack/format_check'
+require 'thrift_rack/server_metric'
 require 'thrift_rack/http_client_transport'
+require 'thrift_rack/downgrade'
+require 'thrift_rack/active_record'
 
 require 'rack'
 require 'thrift'
+require 'redis'
 
 class ThriftRack
-  THRIFT_HEADER = "application/x-thrift"
+  THRIFT_HEADER = "application/x-thrift".freeze
 
   def initialize(servers = nil)
     servers ||= ThriftRack::Server.children
@@ -22,23 +29,41 @@ class ThriftRack
 
   def call(env)
     req = Rack::Request.new(env)
+    Thread.current["request"] = req
     server_class = @maps[req.path]
-    return Rack::Response.new(["No Thrift Server For #{req.path}"], 404, {'Content-Type' => 'text/plain'}) unless server_class
+    return 400, { 'Content-Type' => 'text/plain' }, ["No Thrift Server For #{req.path}"] unless server_class
 
-    resp = Rack::Response.new([], 200, {'Content-Type' => THRIFT_HEADER})
+    resp = Rack::Response.new([], 200, { 'Content-Type' => THRIFT_HEADER })
 
     transport = Thrift::IOStreamTransport.new req.body, resp
     protocol = server_class.protocol_factory.get_protocol transport
-    server_class.processor_class.new(server_class.new).process(protocol, protocol)
+    server_class.processor_class.new(server_class.new(req)).process(protocol, protocol)
 
-    resp
+    resp_a = resp.to_a
+    [resp_a[0], resp_a[1], [resp_a[2].join]]
+  ensure
+    Thread.current["request"] = nil
   end
+  class << self
+    attr_writer :redis
 
-  def self.app(servers = nil)
-    Rack::Builder.new(ThriftRack.new(servers)) do
-      use ThriftRack::Ping
-      use ThriftRack::FormatCheck
-      use ThriftRack::Logger
+    def app(servers = nil)
+      Rack::Builder.new(ThriftRack.new(servers)) do
+        use ThriftRack::LaunchTimestamp
+        use ThriftRack::ActiveRecord if defined? ::ActiveRecord::Base
+        # use(ActionDispatch::Executor, ::Rails.application.executor) if defined? ::Rails
+        use ThriftRack::Downgrade
+        use ThriftRack::Ping
+        use ThriftRack::FormatCheck
+        use ThriftRack::Atom
+        use ThriftRack::Logger
+        use ThriftRack::Sentry if defined? Raven
+        use ThriftRack::ServerMetric
+      end
+    end
+
+    def redis
+      @redis ||= Redis.new
     end
   end
 end

data/thrift_rack.gemspec

@@ -21,11 +21,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rack", ">= 2.0"
-  spec.add_dependency "thrift", '~> 0.10.0'
+  spec.add_dependency "rack", ">= 2.0.6"
+  spec.add_dependency "thrift", '~> 0.10'
   spec.add_dependency 'net-http-persistent', ">= 3.0"
+  spec.add_dependency 'redis', '>=3.0'
 
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "pry", "~> 0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrift_rack
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.6
 platform: ruby
 authors:
 - xuxiangyang
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: thrift
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -111,19 +125,25 @@ files:
 - config.ru
 - lib/config.ru
 - lib/thrift_rack.rb
+- lib/thrift_rack/active_record.rb
+- lib/thrift_rack/atom.rb
 - lib/thrift_rack/client.rb
+- lib/thrift_rack/downgrade.rb
 - lib/thrift_rack/format_check.rb
 - lib/thrift_rack/http_client_transport.rb
+- lib/thrift_rack/launch_timestamp.rb
 - lib/thrift_rack/logger.rb
 - lib/thrift_rack/ping.rb
+- lib/thrift_rack/sentry.rb
 - lib/thrift_rack/server.rb
+- lib/thrift_rack/server_metric.rb
 - lib/thrift_rack/version.rb
 - thrift_rack.gemspec
 homepage: https://github.com/xuxiangyang/thrift_rack
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,9 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: thrift http rakc server
 test_files: []