upfluence-utils 0.14.1 → 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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 568c4033f087730c94a75c756587432873ee149b4d2462ea04b1b03169d9b551
4
- data.tar.gz: e824e37e1cd2c901342f0089e859af8d62a908aa1c755d2527dc1a20309449f2
3
+ metadata.gz: 920e21b518b65d1fbf2666cf2cb402080cdc680ad5f6d6a32fede37731b6a8b9
4
+ data.tar.gz: 6b6be2530c8e316c33571f4f4d8c6ed4fd90766be61b213d88fbc474ff7bfe9f
5
5
  SHA512:
6
- metadata.gz: 60d4fd0ba8383217d60a73eadf48920d15259c77be69922f7a65f313b9a297dc62274c598655e739f3403a51e0d0f2cdd8f116e714528cc261dfb1a59ea47536
7
- data.tar.gz: c6cbf56699eb8e3d540dea322fda7920a35c5bb06162d1483aaeb337dae7ea16f1f30137d052aab41497b8596f73efdac21f10a87961060194fdcd00809e1106
6
+ metadata.gz: b5fdd076d5ff2b44442da2b2a67a8b9f25fa7bb87ff4962f0345ff3b745115c8a9e2277c35ae5c457dfd52100aa74a6c5b54876b9c9682f486999acccdea5490
7
+ data.tar.gz: 8056d4d48c051c0ecfe50e3f1bbd983a73669bbb755bbb216b4d9c7e0d36811c56b43bec169495ddfb8fcaa1bf9bc2671a97fded343ceb8f30b1111a0191e424
@@ -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: test
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
@@ -1,6 +1,7 @@
1
1
  /.bundle/
2
2
  /.yardoc
3
3
  /Gemfile.lock
4
+ /gemfiles/*.lock
4
5
  /_yardoc/
5
6
  /coverage/
6
7
  /doc/
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
@@ -0,0 +1,10 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "rack", "~> 2.2"
6
+ gem "rackup", "~> 1.0"
7
+ gem "sinatra", "~> 2.1.0"
8
+ gem "sinatra-contrib", "~> 2.1.0"
9
+
10
+ gemspec path: "../"
@@ -0,0 +1,10 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "rack", "~> 3.2"
6
+ gem "rackup", "~> 2.0"
7
+ gem "sinatra", "~> 4.2"
8
+ gem "sinatra-contrib", "~> 4.2"
9
+
10
+ gemspec path: "../"
@@ -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
- @request_body ||= begin
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
- 'X-Upfluence-Unit-Name' => handler.getName,
20
- 'X-Upfluence-Version' => build_version(handler.getVersion)
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
- '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'
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)
@@ -11,7 +11,6 @@ module Upfluence
11
11
  def call(env)
12
12
  began_at = Time.now
13
13
  status, header, body = @app.call(env)
14
- header = Rack::Utils::HeaderHash.new(header)
15
14
  body = Rack::BodyProxy.new(body) do
16
15
  log(env, status, header, began_at)
17
16
  end
@@ -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 = parse_route(env, code)
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,6 +19,12 @@ 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
@@ -62,7 +67,8 @@ module Upfluence
62
67
 
63
68
  @admin_builder = admin_builder(opts) if opts[:admin_port]
64
69
  @production_builder = production_builder(opts, &block)
65
- @handler = Rack::Handler.get(opts[:server])
70
+ handler = defined?(Rackup::Handler) ? Rackup::Handler : Rack::Handler
71
+ @handler = handler.get(opts[:server])
66
72
  @stoppables = []
67
73
  end
68
74
 
@@ -241,7 +247,6 @@ module Upfluence
241
247
  use Upfluence.error_logger.middleware
242
248
 
243
249
  use Rack::ContentLength
244
- use Rack::Chunked
245
250
  use Rack::Lint if Upfluence.env.development?
246
251
  use Rack::TempfileReaper
247
252
  use Rack::ETag
@@ -257,9 +262,9 @@ module Upfluence
257
262
 
258
263
  def run_prometheus_exporter
259
264
  push = Prometheus::Client::Push.new(
260
- @options[:app_name],
261
- @options[:unit_name],
262
- @options[:push_gateway_url]
265
+ job: @options[:app_name],
266
+ grouping_key: { instance: @options[:unit_name] },
267
+ gateway: @options[:push_gateway_url]
263
268
  )
264
269
 
265
270
  loop do
@@ -1,5 +1,5 @@
1
1
  module Upfluence
2
2
  module Utils
3
- VERSION = '0.14.1'.freeze
3
+ VERSION = '0.14.3'.freeze
4
4
  end
5
5
  end
@@ -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
30
  spec.add_runtime_dependency 'puma', '>= 7.0'
30
- spec.add_runtime_dependency 'rack', '< 3.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', '~> 2.1'
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.1
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-08-19 00:00:00.000000000 Z
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: '0'
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: '0'
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: '0'
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: '0'
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
@@ -153,16 +179,42 @@ dependencies:
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.0'
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.0'
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: '2.1'
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: '2.1'
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