upfluence-utils 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9013ce0511178b0b0f2bbfd16704d016e41ef8126c0632fdc8289a6f2928dabd
-  data.tar.gz: '09dc43555bf935fe12be76168692d24b72b4ae064f7a7edc27a1e52b0e0acdcb'
+  metadata.gz: b5084c4d4ec0053296da08af0f701e3533c3c04e097c58bd48d674ab6ce02f15
+  data.tar.gz: 04dff5174d8d510c22c8236f54d1033100bdde9102955e66bb28e25e8c94146e
 SHA512:
-  metadata.gz: 0bf6d2d6b2ea5398ebed18ed22e21951414a35f67a7bc4c8b8461b55600337c0e7e88ace3cc040c7e3c4affafbe7f0c702cfadd490b317dd63f3747081ed9d4e
-  data.tar.gz: ac825fd4f3bcb4bd5e8dd33b512bd53c7e61f8cd5049ef427a53960f8f4dc9108f66fe70e80e768aa2c58f02a0fc1d4854e9f42a290803e7455a4d77c4a7609a
+  metadata.gz: 10db3f2f7d9e1ae72d51ae9f6007d994b6e1b7d86752a68c94d212c1bb894360c6bf7f7f88857afb67c8fe780077f72d251499b0146d32583aa4686f4a24568f
+  data.tar.gz: 811cba7d199587b6d65ebac7a613c23e47f159c5e581d1d09340c34c76a684a8b1d1ae6a56f1a97eae93dabc717673246d8a65805aa35d32fd94834da2fe1cd5

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

@@ -0,0 +1,16 @@
+module Upfluence
+  module HTTP
+    module Middleware
+      class RequestStapler
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          Server.request = Rack::Request.new(env)
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/upfluence/http/server.rb

@@ -14,23 +14,26 @@ require 'upfluence/http/middleware/application_headers'
 require 'upfluence/http/middleware/handle_exception'
 require 'upfluence/http/middleware/prometheus'
 require 'upfluence/http/middleware/cors'
+require 'upfluence/http/middleware/request_stapler'
 
 module Upfluence
   module HTTP
     class Server
+      REQUEST_CONTEXT_KEY = :uhtt_request_context
+      DEFAULT_MIDDLEWARES = []
       DEFAULT_OPTIONS = {
-        server: :puma,
-        Port: ENV['PORT'] || 8080,
-        Host: '0.0.0.0',
-        threaded: true,
-        interfaces: [],
-        push_gateway_url: ENV['PUSH_GATEWAY_URL'],
+        server:                :puma,
+        Port:                  ENV.fetch('PORT', 8080),
+        Host:                  '0.0.0.0',
+        threaded:              true,
+        interfaces:            [],
+        push_gateway_url:      ENV.fetch('PUSH_GATEWAY_URL', nil),
         push_gateway_interval: 15, # sec
-        app_name: ENV['APP_NAME'] || 'uhttp-rb-server',
-        unit_name: ENV['UNIT_NAME'] || 'uhttp-rb-server-anonymous',
-        base_processor_klass: nil,
-        base_handler_klass: nil,
-        debug: ENV['DEBUG']
+        app_name:              ENV.fetch('APP_NAME', 'uhttp-rb-server'),
+        unit_name:             ENV.fetch('UNIT_NAME','uhttp-rb-server-anonymous'),
+        base_processor_klass:  nil,
+        base_handler_klass:    nil,
+        debug:                 ENV.fetch('DEBUG', nil)
       }
 
       def initialize(options = {}, &block)
@@ -43,6 +46,7 @@ module Upfluence
         end
 
         @builder = Builder.new do
+          use Middleware::RequestStapler
           use Middleware::Logger
           use Middleware::Prometheus
           use Middleware::ApplicationHeaders, base_handler
@@ -55,6 +59,11 @@ module Upfluence
           use Rack::ETag
           use Middleware::CORS if Upfluence.env.development?
 
+          DEFAULT_MIDDLEWARES.each do |m|
+            m = [m] unless m.is_a?(Array)
+            use(*m)
+          end
+
           map '/healthcheck' do
             run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
           end
@@ -87,6 +96,16 @@ module Upfluence
         end
       end
 
+      class << self
+        def request
+          Thread.current[REQUEST_CONTEXT_KEY]
+        end
+
+        def request=(req)
+          Thread.current[REQUEST_CONTEXT_KEY] = req
+        end
+      end
+
       private
 
       def run_prometheus_exporter
@@ -101,7 +120,7 @@ module Upfluence
 
           begin
             push.replace Prometheus::Client.registry
-          rescue => e
+          rescue StandardError => e
             Upfluence.error_logger.notify(e)
           end
         end

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.11.3'.freeze
+    VERSION = '0.11.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Upfluence
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -267,6 +267,7 @@ files:
 - lib/upfluence/http/middleware/handle_exception.rb
 - lib/upfluence/http/middleware/logger.rb
 - lib/upfluence/http/middleware/prometheus.rb
+- lib/upfluence/http/middleware/request_stapler.rb
 - lib/upfluence/http/server.rb
 - lib/upfluence/logger.rb
 - lib/upfluence/mixin/html_scrubbing.rb