upfluence-utils 0.14.0 → 0.14.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yml +24 -1
- data/.gitignore +1 -0
- data/Appraisals +13 -0
- data/gemfiles/rack_2.gemfile +10 -0
- data/gemfiles/rack_3.gemfile +10 -0
- data/lib/upfluence/http/builder.rb +12 -0
- data/lib/upfluence/http/endpoint/api_endpoint.rb +5 -4
- data/lib/upfluence/http/middleware/application_headers.rb +2 -2
- data/lib/upfluence/http/middleware/cors.rb +3 -3
- data/lib/upfluence/http/middleware/logger.rb +0 -1
- data/lib/upfluence/http/middleware/mount_point.rb +26 -0
- data/lib/upfluence/http/middleware/prometheus.rb +2 -34
- data/lib/upfluence/http/route_resolver.rb +79 -0
- data/lib/upfluence/http/server.rb +118 -44
- data/lib/upfluence/instrumentation/periodic_instrumenter.rb +1 -1
- data/lib/upfluence/instrumentation/puma_instrumenter.rb +11 -7
- data/lib/upfluence/utils/version.rb +1 -1
- data/upfluence_utils.gemspec +7 -5
- metadata +77 -14
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 920e21b518b65d1fbf2666cf2cb402080cdc680ad5f6d6a32fede37731b6a8b9
|
|
4
|
+
data.tar.gz: 6b6be2530c8e316c33571f4f4d8c6ed4fd90766be61b213d88fbc474ff7bfe9f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b5fdd076d5ff2b44442da2b2a67a8b9f25fa7bb87ff4962f0345ff3b745115c8a9e2277c35ae5c457dfd52100aa74a6c5b54876b9c9682f486999acccdea5490
|
|
7
|
+
data.tar.gz: 8056d4d48c051c0ecfe50e3f1bbd983a73669bbb755bbb216b4d9c7e0d36811c56b43bec169495ddfb8fcaa1bf9bc2671a97fded343ceb8f30b1111a0191e424
|
data/.github/workflows/ci.yml
CHANGED
|
@@ -11,8 +11,31 @@ jobs:
|
|
|
11
11
|
uses: upfluence/actions/.github/workflows/lib-ruby-test.yml@master
|
|
12
12
|
secrets: inherit
|
|
13
13
|
|
|
14
|
+
rack-compatibility:
|
|
15
|
+
runs-on: ubuntu-24.04
|
|
16
|
+
strategy:
|
|
17
|
+
fail-fast: false
|
|
18
|
+
matrix:
|
|
19
|
+
appraisal:
|
|
20
|
+
- rack-2
|
|
21
|
+
- rack-3
|
|
22
|
+
steps:
|
|
23
|
+
- name: Checkout
|
|
24
|
+
uses: actions/checkout@v6
|
|
25
|
+
- name: Install Ruby
|
|
26
|
+
uses: ruby/setup-ruby@v1
|
|
27
|
+
with:
|
|
28
|
+
ruby-version: '3.4.1'
|
|
29
|
+
bundler-cache: true
|
|
30
|
+
- name: Install appraisal dependencies
|
|
31
|
+
run: bundle exec appraisal ${{ matrix.appraisal }} bundle install
|
|
32
|
+
- name: Run the test suite
|
|
33
|
+
run: bundle exec appraisal ${{ matrix.appraisal }} rspec
|
|
34
|
+
|
|
14
35
|
release:
|
|
15
|
-
needs:
|
|
36
|
+
needs:
|
|
37
|
+
- test
|
|
38
|
+
- rack-compatibility
|
|
16
39
|
if: github.ref == 'refs/heads/master'
|
|
17
40
|
runs-on: ubuntu-24.04
|
|
18
41
|
steps:
|
data/.gitignore
CHANGED
data/Appraisals
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
appraise 'rack-2' do
|
|
2
|
+
gem 'rack', '~> 2.2'
|
|
3
|
+
gem 'rackup', '~> 1.0'
|
|
4
|
+
gem 'sinatra', '~> 2.1.0'
|
|
5
|
+
gem 'sinatra-contrib', '~> 2.1.0'
|
|
6
|
+
end
|
|
7
|
+
|
|
8
|
+
appraise 'rack-3' do
|
|
9
|
+
gem 'rack', '~> 3.2'
|
|
10
|
+
gem 'rackup', '~> 2.0'
|
|
11
|
+
gem 'sinatra', '~> 4.2'
|
|
12
|
+
gem 'sinatra-contrib', '~> 4.2'
|
|
13
|
+
end
|
|
@@ -1,10 +1,22 @@
|
|
|
1
1
|
require 'rack/builder'
|
|
2
2
|
require 'thrift/server/rack_application'
|
|
3
|
+
require 'upfluence/http/middleware/mount_point'
|
|
3
4
|
require 'upfluence/utils'
|
|
4
5
|
|
|
5
6
|
module Upfluence
|
|
6
7
|
module HTTP
|
|
7
8
|
class Builder < Rack::Builder
|
|
9
|
+
def map(path, &block)
|
|
10
|
+
super(path) do
|
|
11
|
+
use Middleware::MountPoint, self
|
|
12
|
+
instance_eval(&block)
|
|
13
|
+
end
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
def endpoint
|
|
17
|
+
@run
|
|
18
|
+
end
|
|
19
|
+
|
|
8
20
|
def run_thrift(processor, handler, timeout = 30)
|
|
9
21
|
run Thrift::RackApplication.for(
|
|
10
22
|
'/',
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
require 'sinatra/base'
|
|
2
2
|
require 'active_record'
|
|
3
3
|
require 'active_support/hash_with_indifferent_access'
|
|
4
|
+
require 'rack/rewindable_input'
|
|
4
5
|
require 'upfluence/http/endpoint/validation_error'
|
|
5
6
|
require 'upfluence/mixin/strong_parameters'
|
|
6
7
|
|
|
@@ -17,6 +18,8 @@ module Upfluence
|
|
|
17
18
|
|
|
18
19
|
enable :raise_errors
|
|
19
20
|
|
|
21
|
+
use Rack::RewindableInput::Middleware if defined?(Rack::RewindableInput::Middleware)
|
|
22
|
+
|
|
20
23
|
before { content_type :json }
|
|
21
24
|
|
|
22
25
|
configure :development do
|
|
@@ -81,11 +84,9 @@ module Upfluence
|
|
|
81
84
|
end
|
|
82
85
|
|
|
83
86
|
def request_body
|
|
84
|
-
|
|
85
|
-
data = request.body.read
|
|
87
|
+
request.env['upfluence.request_body'] ||= begin
|
|
86
88
|
request.body.rewind
|
|
87
|
-
|
|
88
|
-
data
|
|
89
|
+
request.body.read
|
|
89
90
|
end
|
|
90
91
|
end
|
|
91
92
|
|
|
@@ -16,8 +16,8 @@ module Upfluence
|
|
|
16
16
|
|
|
17
17
|
def build_headers(handler)
|
|
18
18
|
{
|
|
19
|
-
'
|
|
20
|
-
'
|
|
19
|
+
'x-upfluence-unit-name' => handler.getName,
|
|
20
|
+
'x-upfluence-version' => build_version(handler.getVersion)
|
|
21
21
|
}
|
|
22
22
|
end
|
|
23
23
|
|
|
@@ -3,9 +3,9 @@ module Upfluence
|
|
|
3
3
|
module Middleware
|
|
4
4
|
class CORS
|
|
5
5
|
HEADERS = {
|
|
6
|
-
'
|
|
7
|
-
'
|
|
8
|
-
'
|
|
6
|
+
'access-control-allow-origin' => '*',
|
|
7
|
+
'access-control-allow-headers' => 'Authorization, Content-Type, Scope, X-Upfluence-Plugin-Version',
|
|
8
|
+
'access-control-allow-methods' => 'GET, POST, PUT, OPTIONS, DELETE'
|
|
9
9
|
}.freeze
|
|
10
10
|
|
|
11
11
|
def initialize(app, headers = nil)
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
module Upfluence
|
|
2
|
+
module HTTP
|
|
3
|
+
module Middleware
|
|
4
|
+
class MountPoint
|
|
5
|
+
ENV_KEY = 'upfluence.mount'.freeze
|
|
6
|
+
|
|
7
|
+
Mount = Struct.new(:script_name, :path_info, :endpoint)
|
|
8
|
+
|
|
9
|
+
def initialize(app, builder)
|
|
10
|
+
@app = app
|
|
11
|
+
@endpoint = builder.endpoint
|
|
12
|
+
end
|
|
13
|
+
|
|
14
|
+
def call(env)
|
|
15
|
+
env[ENV_KEY] = Mount.new(
|
|
16
|
+
env['SCRIPT_NAME'].to_s,
|
|
17
|
+
env['PATH_INFO'].to_s,
|
|
18
|
+
@endpoint
|
|
19
|
+
)
|
|
20
|
+
|
|
21
|
+
@app.call(env)
|
|
22
|
+
end
|
|
23
|
+
end
|
|
24
|
+
end
|
|
25
|
+
end
|
|
26
|
+
end
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
require 'prometheus/client'
|
|
2
2
|
require 'upfluence/environment'
|
|
3
|
+
require 'upfluence/http/route_resolver'
|
|
3
4
|
|
|
4
5
|
module Upfluence
|
|
5
6
|
module HTTP
|
|
@@ -44,7 +45,7 @@ module Upfluence
|
|
|
44
45
|
end
|
|
45
46
|
|
|
46
47
|
def record(env, code, duration)
|
|
47
|
-
path =
|
|
48
|
+
path = RouteResolver.resolve(env, code)
|
|
48
49
|
|
|
49
50
|
@request_total_count.increment(
|
|
50
51
|
labels: {
|
|
@@ -64,39 +65,6 @@ module Upfluence
|
|
|
64
65
|
}
|
|
65
66
|
)
|
|
66
67
|
end
|
|
67
|
-
|
|
68
|
-
def parse_route(env, code)
|
|
69
|
-
parse_route_sinatra(env) || parse_route_rails(env) ||
|
|
70
|
-
parse_route_default(env, code)
|
|
71
|
-
end
|
|
72
|
-
|
|
73
|
-
def parse_route_rails(env)
|
|
74
|
-
params = env['action_dispatch.request.parameters']
|
|
75
|
-
return nil if params.nil?
|
|
76
|
-
|
|
77
|
-
"#{params['controller']}##{params['action']}"
|
|
78
|
-
end
|
|
79
|
-
|
|
80
|
-
def parse_route_sinatra(env)
|
|
81
|
-
route = env['sinatra.route']
|
|
82
|
-
return nil if route.nil? || route.strip == ''
|
|
83
|
-
|
|
84
|
-
path = Rack::Request.new(env).path
|
|
85
|
-
|
|
86
|
-
splitted_template = route.split.last.split('/').reject do |v|
|
|
87
|
-
v.eql?('')
|
|
88
|
-
end.reverse
|
|
89
|
-
|
|
90
|
-
path.split('/').reverse.map.with_index do |part, i|
|
|
91
|
-
splitted_template[i] || part
|
|
92
|
-
end.reverse.join('/')
|
|
93
|
-
end
|
|
94
|
-
|
|
95
|
-
def parse_route_default(env, code)
|
|
96
|
-
return 'unexpected-route' if code.to_s.eql? '404'
|
|
97
|
-
|
|
98
|
-
Rack::Request.new(env).path.gsub(%r{/\d+(/|$)}, '/:id\\1')
|
|
99
|
-
end
|
|
100
68
|
end
|
|
101
69
|
end
|
|
102
70
|
end
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
require 'rack/request'
|
|
2
|
+
require 'upfluence/http/middleware/mount_point'
|
|
3
|
+
|
|
4
|
+
module Upfluence
|
|
5
|
+
module HTTP
|
|
6
|
+
module RouteResolver
|
|
7
|
+
UNEXPECTED_ROUTE = 'unexpected-route'.freeze
|
|
8
|
+
|
|
9
|
+
class << self
|
|
10
|
+
def resolve(env, code = nil)
|
|
11
|
+
mount = env[Middleware::MountPoint::ENV_KEY]
|
|
12
|
+
not_found = code.to_s.eql?('404')
|
|
13
|
+
|
|
14
|
+
resolve_sinatra(env, mount) || resolve_rails(env) ||
|
|
15
|
+
resolve_mount(env, mount, not_found) ||
|
|
16
|
+
resolve_default(env, not_found)
|
|
17
|
+
end
|
|
18
|
+
|
|
19
|
+
private
|
|
20
|
+
|
|
21
|
+
def resolve_rails(env)
|
|
22
|
+
params = env['action_dispatch.request.parameters']
|
|
23
|
+
return nil if params.nil?
|
|
24
|
+
|
|
25
|
+
"#{params['controller']}##{params['action']}"
|
|
26
|
+
end
|
|
27
|
+
|
|
28
|
+
def resolve_sinatra(env, mount)
|
|
29
|
+
route = env['sinatra.route']
|
|
30
|
+
return nil if route.nil? || route.strip == ''
|
|
31
|
+
|
|
32
|
+
"#{mount&.script_name}#{route.split(' ', 2).last}"
|
|
33
|
+
end
|
|
34
|
+
|
|
35
|
+
# Used when the request never reached the router of the mounted app
|
|
36
|
+
# (e.g. throttled or failed in a middleware), so the route has to be
|
|
37
|
+
# resolved statically from the mount point.
|
|
38
|
+
def resolve_mount(env, mount, not_found)
|
|
39
|
+
return nil if mount.nil? || not_found
|
|
40
|
+
|
|
41
|
+
route = resolve_sinatra_route(
|
|
42
|
+
mount.endpoint,
|
|
43
|
+
env['REQUEST_METHOD'],
|
|
44
|
+
mount.path_info
|
|
45
|
+
)
|
|
46
|
+
|
|
47
|
+
route ||= '/*' unless ['', '/'].include?(mount.path_info)
|
|
48
|
+
|
|
49
|
+
"#{mount.script_name}#{route}"
|
|
50
|
+
end
|
|
51
|
+
|
|
52
|
+
def resolve_sinatra_route(endpoint, verb, path)
|
|
53
|
+
return nil unless defined?(::Sinatra::Base)
|
|
54
|
+
|
|
55
|
+
klass = endpoint.respond_to?(:settings) ? endpoint.settings : endpoint
|
|
56
|
+
path = '/' if path.empty?
|
|
57
|
+
|
|
58
|
+
while klass.is_a?(Class) && klass <= ::Sinatra::Base
|
|
59
|
+
(klass.routes[verb] || []).each do |pattern, _conditions, _block|
|
|
60
|
+
return pattern.to_s if pattern.params(path)
|
|
61
|
+
end
|
|
62
|
+
|
|
63
|
+
klass = klass.superclass
|
|
64
|
+
end
|
|
65
|
+
|
|
66
|
+
nil
|
|
67
|
+
rescue StandardError
|
|
68
|
+
nil
|
|
69
|
+
end
|
|
70
|
+
|
|
71
|
+
def resolve_default(env, not_found)
|
|
72
|
+
return UNEXPECTED_ROUTE if not_found
|
|
73
|
+
|
|
74
|
+
Rack::Request.new(env).path.gsub(%r{/\d+(/|$)}, '/:id\\1')
|
|
75
|
+
end
|
|
76
|
+
end
|
|
77
|
+
end
|
|
78
|
+
end
|
|
79
|
+
end
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
require 'rack/handler'
|
|
2
1
|
require 'rack/etag'
|
|
3
2
|
require 'rack/timeout/base'
|
|
4
3
|
require 'prometheus/client'
|
|
@@ -20,12 +19,19 @@ require 'upfluence/http/middleware/cors'
|
|
|
20
19
|
require 'upfluence/http/middleware/request_stapler'
|
|
21
20
|
require 'upfluence/instrumentation'
|
|
22
21
|
|
|
22
|
+
begin
|
|
23
|
+
require 'rackup/handler'
|
|
24
|
+
rescue LoadError
|
|
25
|
+
require 'rack/handler'
|
|
26
|
+
end
|
|
27
|
+
|
|
23
28
|
Rack::Timeout::Logger.disable
|
|
24
29
|
|
|
25
30
|
module Upfluence
|
|
26
31
|
module HTTP
|
|
27
32
|
class Server
|
|
28
33
|
REQUEST_CONTEXT_KEY = :uhttp_request_context
|
|
34
|
+
SHUTDOWN_SIGNALS = %w[INT TERM].freeze
|
|
29
35
|
DEFAULT_MIDDLEWARES = []
|
|
30
36
|
DEFAULT_OPTIONS = {
|
|
31
37
|
server: :puma,
|
|
@@ -51,7 +57,7 @@ module Upfluence
|
|
|
51
57
|
],
|
|
52
58
|
admin_port: ENV.fetch('ADMIN_PORT', nil),
|
|
53
59
|
debug: ENV.fetch('DEBUG', nil)
|
|
54
|
-
}
|
|
60
|
+
}
|
|
55
61
|
|
|
56
62
|
def initialize(options = {}, &block)
|
|
57
63
|
@options = DEFAULT_OPTIONS.dup.merge(options)
|
|
@@ -61,20 +67,28 @@ module Upfluence
|
|
|
61
67
|
|
|
62
68
|
@admin_builder = admin_builder(opts) if opts[:admin_port]
|
|
63
69
|
@production_builder = production_builder(opts, &block)
|
|
64
|
-
|
|
70
|
+
handler = defined?(Rackup::Handler) ? Rackup::Handler : Rack::Handler
|
|
71
|
+
@handler = handler.get(opts[:server])
|
|
72
|
+
@stoppables = []
|
|
65
73
|
end
|
|
66
74
|
|
|
67
75
|
def serve
|
|
68
76
|
ENV['RACK_ENV'] = Upfluence.env.to_s
|
|
77
|
+
@stopping = false
|
|
78
|
+
signal_handlers = install_signal_handlers
|
|
79
|
+
admin_thread = nil
|
|
69
80
|
|
|
70
|
-
|
|
81
|
+
register_stoppable(prometheus_exporter_thread) if @options[:push_gateway_url]
|
|
71
82
|
|
|
72
|
-
@options[:instrumentations].each
|
|
83
|
+
@options[:instrumentations].each do |instrumentation|
|
|
84
|
+
instrumentation.start
|
|
85
|
+
register_stoppable(instrumentation) if instrumentation.respond_to?(:stop)
|
|
86
|
+
end
|
|
73
87
|
|
|
74
88
|
if @admin_builder
|
|
75
89
|
admin_port = @options[:admin_port].to_i
|
|
76
90
|
|
|
77
|
-
Thread.new do
|
|
91
|
+
admin_thread = Thread.new do
|
|
78
92
|
run_builder(@admin_builder, Port: admin_port)
|
|
79
93
|
end
|
|
80
94
|
|
|
@@ -84,6 +98,10 @@ module Upfluence
|
|
|
84
98
|
end
|
|
85
99
|
|
|
86
100
|
run_builder(@production_builder)
|
|
101
|
+
ensure
|
|
102
|
+
stop
|
|
103
|
+
admin_thread&.join
|
|
104
|
+
restore_signal_handlers(signal_handlers) if signal_handlers
|
|
87
105
|
end
|
|
88
106
|
|
|
89
107
|
class << self
|
|
@@ -102,6 +120,9 @@ module Upfluence
|
|
|
102
120
|
opts = @options.merge(overrides)
|
|
103
121
|
|
|
104
122
|
@handler.run(builder, **opts) do |server|
|
|
123
|
+
register_stoppable(server)
|
|
124
|
+
register_booted_handler(server)
|
|
125
|
+
configure_puma_instrumenter(server) if builder.equal?(@production_builder)
|
|
105
126
|
server.threaded = opts[:threaded] if server.respond_to? :threaded=
|
|
106
127
|
|
|
107
128
|
# Thin does not recognize the max_thread argument, howerver it has a
|
|
@@ -110,18 +131,62 @@ module Upfluence
|
|
|
110
131
|
end
|
|
111
132
|
end
|
|
112
133
|
|
|
134
|
+
def register_booted_handler(server)
|
|
135
|
+
return unless server.respond_to?(:events)
|
|
136
|
+
|
|
137
|
+
server.events.after_booted { install_signal_handlers }
|
|
138
|
+
end
|
|
139
|
+
|
|
140
|
+
def configure_puma_instrumenter(server)
|
|
141
|
+
@options[:instrumentations].select { |instrumentation| instrumentation.respond_to?(:server=) }.each do |instrumentation|
|
|
142
|
+
instrumentation.server = server
|
|
143
|
+
end
|
|
144
|
+
end
|
|
145
|
+
|
|
146
|
+
def install_signal_handlers
|
|
147
|
+
SHUTDOWN_SIGNALS.to_h do |signal|
|
|
148
|
+
previous_handler = Signal.trap(signal) do
|
|
149
|
+
Thread.new { stop }
|
|
150
|
+
end
|
|
151
|
+
|
|
152
|
+
[signal, previous_handler]
|
|
153
|
+
end
|
|
154
|
+
end
|
|
155
|
+
|
|
156
|
+
def restore_signal_handlers(handlers)
|
|
157
|
+
handlers.each { |signal, handler| Signal.trap(signal, handler) }
|
|
158
|
+
end
|
|
159
|
+
|
|
160
|
+
def register_stoppable(stoppable)
|
|
161
|
+
return stoppable.stop if @stopping
|
|
162
|
+
|
|
163
|
+
@stoppables << stoppable
|
|
164
|
+
end
|
|
165
|
+
|
|
166
|
+
def stop
|
|
167
|
+
@stopping = true
|
|
168
|
+
stoppables = @stoppables
|
|
169
|
+
@stoppables = []
|
|
170
|
+
|
|
171
|
+
stoppables.each(&:stop)
|
|
172
|
+
end
|
|
173
|
+
|
|
174
|
+
def prometheus_exporter_thread
|
|
175
|
+
Thread.new { run_prometheus_exporter }.tap do |thread|
|
|
176
|
+
thread.define_singleton_method(:stop) do
|
|
177
|
+
kill
|
|
178
|
+
join
|
|
179
|
+
end
|
|
180
|
+
end
|
|
181
|
+
end
|
|
182
|
+
|
|
113
183
|
def production_builder(opts, &block)
|
|
114
|
-
base_handler = @base_handler
|
|
115
184
|
has_admin = !opts[:admin_port].nil?
|
|
116
|
-
|
|
185
|
+
builder = Builder.new
|
|
117
186
|
|
|
118
|
-
|
|
119
|
-
use Middleware::RequestStapler, timeout: opts[:request_timeout]
|
|
120
|
-
use Middleware::Logger
|
|
121
|
-
use Middleware::Prometheus
|
|
122
|
-
use Middleware::ApplicationHeaders, base_handler
|
|
123
|
-
use Middleware::HandleException
|
|
187
|
+
mount_middlewares(builder, opts)
|
|
124
188
|
|
|
189
|
+
builder.instance_eval do
|
|
125
190
|
if opts[:enable_active_record_middleware] &&
|
|
126
191
|
defined?(ActiveRecord::Base) &&
|
|
127
192
|
ActiveRecord::Base.configurations.any?
|
|
@@ -130,44 +195,25 @@ module Upfluence
|
|
|
130
195
|
use Middleware::ActiveRecord
|
|
131
196
|
end
|
|
132
197
|
|
|
133
|
-
use Rack::Timeout, service_timeout: opts[:request_timeout] if opts[:request_timeout]
|
|
134
|
-
|
|
135
|
-
use Upfluence.error_logger.middleware
|
|
136
|
-
|
|
137
|
-
use Rack::ContentLength
|
|
138
|
-
use Rack::Chunked
|
|
139
|
-
use Rack::Lint if Upfluence.env.development?
|
|
140
|
-
use Rack::TempfileReaper
|
|
141
|
-
use Rack::ETag
|
|
142
|
-
use Middleware::CORS if Upfluence.env.development?
|
|
143
|
-
|
|
144
198
|
(DEFAULT_MIDDLEWARES + opts[:middlewares]).each do |m|
|
|
145
199
|
m = [m] unless m.is_a?(Array)
|
|
146
200
|
use(*m)
|
|
147
201
|
end
|
|
202
|
+
end
|
|
148
203
|
|
|
149
|
-
|
|
204
|
+
mount_admin_endpoints(builder, opts) unless has_admin
|
|
205
|
+
builder.instance_eval(&block)
|
|
150
206
|
|
|
151
|
-
|
|
152
|
-
run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
|
|
153
|
-
end
|
|
154
|
-
|
|
155
|
-
instance_eval(&block)
|
|
156
|
-
end
|
|
207
|
+
builder
|
|
157
208
|
end
|
|
158
209
|
|
|
159
210
|
def admin_builder(opts)
|
|
160
|
-
|
|
211
|
+
builder = Builder.new
|
|
161
212
|
|
|
162
|
-
|
|
163
|
-
|
|
213
|
+
mount_middlewares(builder, opts)
|
|
214
|
+
mount_admin_endpoints(builder, opts)
|
|
164
215
|
|
|
165
|
-
|
|
166
|
-
run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
|
|
167
|
-
end
|
|
168
|
-
|
|
169
|
-
mount.call(self, opts)
|
|
170
|
-
end
|
|
216
|
+
builder
|
|
171
217
|
end
|
|
172
218
|
|
|
173
219
|
def mount_admin_endpoints(builder, opts)
|
|
@@ -186,11 +232,39 @@ module Upfluence
|
|
|
186
232
|
end
|
|
187
233
|
end
|
|
188
234
|
|
|
235
|
+
def mount_middlewares(builder, opts)
|
|
236
|
+
base_handler = @base_handler
|
|
237
|
+
|
|
238
|
+
builder.instance_eval do
|
|
239
|
+
use Middleware::RequestStapler, timeout: opts[:request_timeout]
|
|
240
|
+
use Middleware::Logger
|
|
241
|
+
use Middleware::Prometheus
|
|
242
|
+
use Middleware::ApplicationHeaders, base_handler
|
|
243
|
+
use Middleware::HandleException
|
|
244
|
+
|
|
245
|
+
use Rack::Timeout, service_timeout: opts[:request_timeout] if opts[:request_timeout]
|
|
246
|
+
|
|
247
|
+
use Upfluence.error_logger.middleware
|
|
248
|
+
|
|
249
|
+
use Rack::ContentLength
|
|
250
|
+
use Rack::Lint if Upfluence.env.development?
|
|
251
|
+
use Rack::TempfileReaper
|
|
252
|
+
use Rack::ETag
|
|
253
|
+
use Middleware::CORS if Upfluence.env.development?
|
|
254
|
+
end
|
|
255
|
+
|
|
256
|
+
builder.instance_eval do
|
|
257
|
+
map '/healthcheck' do
|
|
258
|
+
run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
|
|
259
|
+
end
|
|
260
|
+
end
|
|
261
|
+
end
|
|
262
|
+
|
|
189
263
|
def run_prometheus_exporter
|
|
190
264
|
push = Prometheus::Client::Push.new(
|
|
191
|
-
@options[:app_name],
|
|
192
|
-
@options[:unit_name],
|
|
193
|
-
@options[:push_gateway_url]
|
|
265
|
+
job: @options[:app_name],
|
|
266
|
+
grouping_key: { instance: @options[:unit_name] },
|
|
267
|
+
gateway: @options[:push_gateway_url]
|
|
194
268
|
)
|
|
195
269
|
|
|
196
270
|
loop do
|
|
@@ -6,6 +6,8 @@ module Upfluence
|
|
|
6
6
|
class PumaInstrumenter < PeriodicInstrumenter
|
|
7
7
|
KEYS = %i[backlog_thread running_thread busy_thread pool_capacity requests_count].freeze
|
|
8
8
|
|
|
9
|
+
attr_writer :server
|
|
10
|
+
|
|
9
11
|
def prefix
|
|
10
12
|
'puma'
|
|
11
13
|
end
|
|
@@ -17,15 +19,17 @@ module Upfluence
|
|
|
17
19
|
end
|
|
18
20
|
|
|
19
21
|
def values
|
|
20
|
-
|
|
22
|
+
return {} unless @server
|
|
23
|
+
|
|
24
|
+
stats = @server.stats
|
|
21
25
|
|
|
22
26
|
{
|
|
23
|
-
requests_count:
|
|
24
|
-
backlog_thread:
|
|
25
|
-
running_thread:
|
|
26
|
-
busy_thread:
|
|
27
|
-
pool_capacity:
|
|
28
|
-
}
|
|
27
|
+
requests_count: stats[:requests_count],
|
|
28
|
+
backlog_thread: stats[:backlog],
|
|
29
|
+
running_thread: stats[:running],
|
|
30
|
+
busy_thread: stats[:busy_threads],
|
|
31
|
+
pool_capacity: stats[:max_threads]
|
|
32
|
+
}.compact.transform_values { |value| [{ value: value }] }
|
|
29
33
|
rescue NoMethodError
|
|
30
34
|
{}
|
|
31
35
|
end
|
data/upfluence_utils.gemspec
CHANGED
|
@@ -18,18 +18,20 @@ Gem::Specification.new do |spec|
|
|
|
18
18
|
spec.required_ruby_version = '>= 2.7.0'
|
|
19
19
|
|
|
20
20
|
spec.add_development_dependency "bundler", ">= 2.2"
|
|
21
|
+
spec.add_development_dependency "appraisal", "~> 2.5"
|
|
21
22
|
spec.add_development_dependency "rake", ">= 13.0.0"
|
|
22
23
|
spec.add_development_dependency "rspec", ">= 3.10"
|
|
23
24
|
spec.add_runtime_dependency 'upfluence-thrift'
|
|
24
|
-
spec.add_runtime_dependency 'sinatra'
|
|
25
|
+
spec.add_runtime_dependency 'sinatra', '>= 2.1', '< 5'
|
|
25
26
|
spec.add_runtime_dependency 'redis'
|
|
26
27
|
spec.add_runtime_dependency 'sentry-ruby', '< 6.0'
|
|
27
|
-
spec.add_runtime_dependency 'sinatra-contrib'
|
|
28
|
+
spec.add_runtime_dependency 'sinatra-contrib', '>= 2.1', '< 5'
|
|
28
29
|
spec.add_runtime_dependency 'activesupport'
|
|
29
|
-
spec.add_runtime_dependency 'puma'
|
|
30
|
-
spec.add_runtime_dependency 'rack', '
|
|
30
|
+
spec.add_runtime_dependency 'puma', '>= 7.0'
|
|
31
|
+
spec.add_runtime_dependency 'rack', '>= 2.2', '< 4'
|
|
32
|
+
spec.add_runtime_dependency 'rackup', '>= 1.0', '< 3'
|
|
31
33
|
spec.add_runtime_dependency 'stackprof'
|
|
32
|
-
spec.add_runtime_dependency 'prometheus-client', '
|
|
34
|
+
spec.add_runtime_dependency 'prometheus-client', '>= 4.1', '< 6'
|
|
33
35
|
spec.add_runtime_dependency 'userializer'
|
|
34
36
|
spec.add_runtime_dependency 'activerecord'
|
|
35
37
|
spec.add_runtime_dependency 'loofah'
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: upfluence-utils
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.14.
|
|
4
|
+
version: 0.14.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Upfluence
|
|
8
8
|
bindir: bin
|
|
9
9
|
cert_chain: []
|
|
10
|
-
date: 2026-
|
|
10
|
+
date: 2026-11-17 00:00:00.000000000 Z
|
|
11
11
|
dependencies:
|
|
12
12
|
- !ruby/object:Gem::Dependency
|
|
13
13
|
name: bundler
|
|
@@ -23,6 +23,20 @@ dependencies:
|
|
|
23
23
|
- - ">="
|
|
24
24
|
- !ruby/object:Gem::Version
|
|
25
25
|
version: '2.2'
|
|
26
|
+
- !ruby/object:Gem::Dependency
|
|
27
|
+
name: appraisal
|
|
28
|
+
requirement: !ruby/object:Gem::Requirement
|
|
29
|
+
requirements:
|
|
30
|
+
- - "~>"
|
|
31
|
+
- !ruby/object:Gem::Version
|
|
32
|
+
version: '2.5'
|
|
33
|
+
type: :development
|
|
34
|
+
prerelease: false
|
|
35
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
36
|
+
requirements:
|
|
37
|
+
- - "~>"
|
|
38
|
+
- !ruby/object:Gem::Version
|
|
39
|
+
version: '2.5'
|
|
26
40
|
- !ruby/object:Gem::Dependency
|
|
27
41
|
name: rake
|
|
28
42
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -71,14 +85,20 @@ dependencies:
|
|
|
71
85
|
requirements:
|
|
72
86
|
- - ">="
|
|
73
87
|
- !ruby/object:Gem::Version
|
|
74
|
-
version: '
|
|
88
|
+
version: '2.1'
|
|
89
|
+
- - "<"
|
|
90
|
+
- !ruby/object:Gem::Version
|
|
91
|
+
version: '5'
|
|
75
92
|
type: :runtime
|
|
76
93
|
prerelease: false
|
|
77
94
|
version_requirements: !ruby/object:Gem::Requirement
|
|
78
95
|
requirements:
|
|
79
96
|
- - ">="
|
|
80
97
|
- !ruby/object:Gem::Version
|
|
81
|
-
version: '
|
|
98
|
+
version: '2.1'
|
|
99
|
+
- - "<"
|
|
100
|
+
- !ruby/object:Gem::Version
|
|
101
|
+
version: '5'
|
|
82
102
|
- !ruby/object:Gem::Dependency
|
|
83
103
|
name: redis
|
|
84
104
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -113,14 +133,20 @@ dependencies:
|
|
|
113
133
|
requirements:
|
|
114
134
|
- - ">="
|
|
115
135
|
- !ruby/object:Gem::Version
|
|
116
|
-
version: '
|
|
136
|
+
version: '2.1'
|
|
137
|
+
- - "<"
|
|
138
|
+
- !ruby/object:Gem::Version
|
|
139
|
+
version: '5'
|
|
117
140
|
type: :runtime
|
|
118
141
|
prerelease: false
|
|
119
142
|
version_requirements: !ruby/object:Gem::Requirement
|
|
120
143
|
requirements:
|
|
121
144
|
- - ">="
|
|
122
145
|
- !ruby/object:Gem::Version
|
|
123
|
-
version: '
|
|
146
|
+
version: '2.1'
|
|
147
|
+
- - "<"
|
|
148
|
+
- !ruby/object:Gem::Version
|
|
149
|
+
version: '5'
|
|
124
150
|
- !ruby/object:Gem::Dependency
|
|
125
151
|
name: activesupport
|
|
126
152
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -141,28 +167,54 @@ dependencies:
|
|
|
141
167
|
requirements:
|
|
142
168
|
- - ">="
|
|
143
169
|
- !ruby/object:Gem::Version
|
|
144
|
-
version: '0'
|
|
170
|
+
version: '7.0'
|
|
145
171
|
type: :runtime
|
|
146
172
|
prerelease: false
|
|
147
173
|
version_requirements: !ruby/object:Gem::Requirement
|
|
148
174
|
requirements:
|
|
149
175
|
- - ">="
|
|
150
176
|
- !ruby/object:Gem::Version
|
|
151
|
-
version: '0'
|
|
177
|
+
version: '7.0'
|
|
152
178
|
- !ruby/object:Gem::Dependency
|
|
153
179
|
name: rack
|
|
154
180
|
requirement: !ruby/object:Gem::Requirement
|
|
155
181
|
requirements:
|
|
182
|
+
- - ">="
|
|
183
|
+
- !ruby/object:Gem::Version
|
|
184
|
+
version: '2.2'
|
|
185
|
+
- - "<"
|
|
186
|
+
- !ruby/object:Gem::Version
|
|
187
|
+
version: '4'
|
|
188
|
+
type: :runtime
|
|
189
|
+
prerelease: false
|
|
190
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
191
|
+
requirements:
|
|
192
|
+
- - ">="
|
|
193
|
+
- !ruby/object:Gem::Version
|
|
194
|
+
version: '2.2'
|
|
195
|
+
- - "<"
|
|
196
|
+
- !ruby/object:Gem::Version
|
|
197
|
+
version: '4'
|
|
198
|
+
- !ruby/object:Gem::Dependency
|
|
199
|
+
name: rackup
|
|
200
|
+
requirement: !ruby/object:Gem::Requirement
|
|
201
|
+
requirements:
|
|
202
|
+
- - ">="
|
|
203
|
+
- !ruby/object:Gem::Version
|
|
204
|
+
version: '1.0'
|
|
156
205
|
- - "<"
|
|
157
206
|
- !ruby/object:Gem::Version
|
|
158
|
-
version: '3
|
|
207
|
+
version: '3'
|
|
159
208
|
type: :runtime
|
|
160
209
|
prerelease: false
|
|
161
210
|
version_requirements: !ruby/object:Gem::Requirement
|
|
162
211
|
requirements:
|
|
212
|
+
- - ">="
|
|
213
|
+
- !ruby/object:Gem::Version
|
|
214
|
+
version: '1.0'
|
|
163
215
|
- - "<"
|
|
164
216
|
- !ruby/object:Gem::Version
|
|
165
|
-
version: '3
|
|
217
|
+
version: '3'
|
|
166
218
|
- !ruby/object:Gem::Dependency
|
|
167
219
|
name: stackprof
|
|
168
220
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -181,16 +233,22 @@ dependencies:
|
|
|
181
233
|
name: prometheus-client
|
|
182
234
|
requirement: !ruby/object:Gem::Requirement
|
|
183
235
|
requirements:
|
|
184
|
-
- - "
|
|
236
|
+
- - ">="
|
|
185
237
|
- !ruby/object:Gem::Version
|
|
186
|
-
version: '
|
|
238
|
+
version: '4.1'
|
|
239
|
+
- - "<"
|
|
240
|
+
- !ruby/object:Gem::Version
|
|
241
|
+
version: '6'
|
|
187
242
|
type: :runtime
|
|
188
243
|
prerelease: false
|
|
189
244
|
version_requirements: !ruby/object:Gem::Requirement
|
|
190
245
|
requirements:
|
|
191
|
-
- - "
|
|
246
|
+
- - ">="
|
|
192
247
|
- !ruby/object:Gem::Version
|
|
193
|
-
version: '
|
|
248
|
+
version: '4.1'
|
|
249
|
+
- - "<"
|
|
250
|
+
- !ruby/object:Gem::Version
|
|
251
|
+
version: '6'
|
|
194
252
|
- !ruby/object:Gem::Dependency
|
|
195
253
|
name: userializer
|
|
196
254
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -300,11 +358,14 @@ files:
|
|
|
300
358
|
- ".gitignore"
|
|
301
359
|
- ".rspec"
|
|
302
360
|
- ".travis.yml"
|
|
361
|
+
- Appraisals
|
|
303
362
|
- Gemfile
|
|
304
363
|
- LICENSE.txt
|
|
305
364
|
- Makefile
|
|
306
365
|
- README.md
|
|
307
366
|
- Rakefile
|
|
367
|
+
- gemfiles/rack_2.gemfile
|
|
368
|
+
- gemfiles/rack_3.gemfile
|
|
308
369
|
- lib/test.rb
|
|
309
370
|
- lib/upfluence.rb
|
|
310
371
|
- lib/upfluence/amqp/server.rb
|
|
@@ -324,8 +385,10 @@ files:
|
|
|
324
385
|
- lib/upfluence/http/middleware/cors.rb
|
|
325
386
|
- lib/upfluence/http/middleware/handle_exception.rb
|
|
326
387
|
- lib/upfluence/http/middleware/logger.rb
|
|
388
|
+
- lib/upfluence/http/middleware/mount_point.rb
|
|
327
389
|
- lib/upfluence/http/middleware/prometheus.rb
|
|
328
390
|
- lib/upfluence/http/middleware/request_stapler.rb
|
|
391
|
+
- lib/upfluence/http/route_resolver.rb
|
|
329
392
|
- lib/upfluence/http/server.rb
|
|
330
393
|
- lib/upfluence/instrumentation.rb
|
|
331
394
|
- lib/upfluence/instrumentation/active_record_pool_instrumenter.rb
|