apisonator 3.3.1.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09ccae8a2719bc3717d22dcdd78c5c996cbd4774f2528b91d77c74fbbe2e51b7'
-  data.tar.gz: 4a9f237a6d1b25f9cc763817030cbe562536a6d5ed89374326db2f99ea82971c
+  metadata.gz: 881dcbb24dbe3757ed8d786f49cdf6aab9dce3bb060f26387f142b4e825e06a1
+  data.tar.gz: e25f370546c286d5400fdbf19331ef554f34ce47c91df522007039c1fbf322e4
 SHA512:
-  metadata.gz: 2818f8b3a97b701218c28ae93339650db57a0229181ee3573a24ffe215611747c1381e9f0e643eb9dc85b81d13d43336a08252a88cd63cd7fc78ed9a182c5c83
-  data.tar.gz: 7a9c2e389c239094e2c6f303749056d5a8ea2d216f5097e98e9a87ef5c3bcd4ea2d190c4b8277d659608f7c80f57d5d727bf65eb9330f4c08fb8777ab5a1ae81
+  metadata.gz: 618be1a317cee54f1892357f7a64739b79eb0e203e15ae03a367176642e4d526c72d283a59438640e1e6503fd5e72a85be230deab76e6ac13c2305e8080aacd5
+  data.tar.gz: e7150ec528c2dc2b2b0f53a69fa50b2f5b7af52f736ca0a74196a38ae6be1b8a6913fd81fc609f00e18278c2fab571a7a926f647635b9b264b7abd7099673584

data/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 Notable changes to Apisonator will be tracked in this document.
 
+## 3.3.2 - 2021-02-23
+
+### Fixed
+
+- Fixed nil exception in `Aggregator.process`
+([#269](https://github.com/3scale/apisonator/pull/269)).
+
+### Changed
+
+- Updated to Ruby 2.7 in Docker images
+([#265](https://github.com/3scale/apisonator/pull/265)) and
+([#266](https://github.com/3scale/apisonator/pull/266)).
+- Updated pry to 0.14.0 and pry-doc to 1.1.0
+([#267](https://github.com/3scale/apisonator/pull/267)).
+- Updated Docker image to be based on RHEL UBI 8
+([#268](https://github.com/3scale/apisonator/pull/268)).
+
+### Removed
+
+- Removed redundant prometheus config params
+(`listener_prometheus_metrics.enabled` and `listener_prometheus_metrics.port`)
+([#270](https://github.com/3scale/apisonator/pull/270)).
+
 ## 3.3.1.1 - 2021-02-12
 
 ### Changed

data/Gemfile.base

@@ -36,8 +36,8 @@ end
 group :development do
   gem 'sshkit'
   gem 'source2swagger', git: 'https://github.com/3scale/source2swagger', branch: 'backend'
-  gem 'pry',      '~> 0.11.3'
-  gem 'pry-doc',  '~> 0.11.1'
+  gem 'pry',      '~> 0.14'
+  gem 'pry-doc',  '~> 1.1'
   gem 'license_finder', '~> 5'
 end
 

data/Gemfile.lock

@@ -36,7 +36,7 @@ GIT
 PATH
   remote: .
   specs:
-    apisonator (3.3.1.1)
+    apisonator (3.3.2)
 
 GEM
   remote: https://rubygems.org/
@@ -96,7 +96,7 @@ GEM
     chronic (0.10.2)
     codeclimate-test-reporter (0.6.0)
       simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.1.6)
     console (1.8.2)
     daemons (1.2.4)
@@ -131,7 +131,7 @@ GEM
     localhost (1.1.6)
     mapping (1.1.1)
     metaclass (0.0.4)
-    method_source (0.9.0)
+    method_source (1.0.0)
     mini_portile2 (2.4.0)
     minitest (5.14.1)
     mocha (1.3.0)
@@ -164,15 +164,15 @@ GEM
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.15)
     protocol-redis (0.5.0)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     pry-byebug (3.5.1)
       byebug (~> 9.1)
       pry (~> 0.10)
-    pry-doc (0.11.1)
-      pry (~> 0.9)
-      yard (~> 0.9)
+    pry-doc (1.1.0)
+      pry (~> 0.11)
+      yard (~> 0.9.11)
     rack (2.1.4)
     rack-protection (2.0.3)
       rack
@@ -260,7 +260,7 @@ GEM
       prometheus-client (~> 1.0)
       yabeda (~> 0.5)
     yajl-ruby (1.3.1)
-    yard (0.9.20)
+    yard (0.9.26)
 
 PLATFORMS
   ruby
@@ -284,9 +284,9 @@ DEPENDENCIES
   nokogiri (~> 1.10.8)
   pg (= 0.20.0)
   pkg-config (~> 1.1.7)
-  pry (~> 0.11.3)
+  pry (~> 0.14)
   pry-byebug (~> 3.5.1)
-  pry-doc (~> 0.11.1)
+  pry-doc (~> 1.1)
   puma!
   rack (~> 2.1.4)
   rack-test (= 0.8.2)

data/Gemfile.on_prem.lock

@@ -36,7 +36,7 @@ GIT
 PATH
   remote: .
   specs:
-    apisonator (3.3.1.1)
+    apisonator (3.3.2)
 
 GEM
   remote: https://rubygems.org/
@@ -86,7 +86,7 @@ GEM
     byebug (9.1.0)
     codeclimate-test-reporter (0.6.0)
       simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.1.6)
     console (1.8.2)
     daemons (1.2.4)
@@ -120,7 +120,7 @@ GEM
     localhost (1.1.6)
     mapping (1.1.1)
     metaclass (0.0.4)
-    method_source (0.9.0)
+    method_source (1.0.0)
     mini_portile2 (2.4.0)
     minitest (5.14.1)
     mocha (1.3.0)
@@ -152,15 +152,15 @@ GEM
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.15)
     protocol-redis (0.5.0)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     pry-byebug (3.5.1)
       byebug (~> 9.1)
       pry (~> 0.10)
-    pry-doc (0.11.1)
-      pry (~> 0.9)
-      yard (~> 0.9)
+    pry-doc (1.1.0)
+      pry (~> 0.11)
+      yard (~> 0.9.11)
     rack (2.1.4)
     rack-protection (2.0.3)
       rack
@@ -244,7 +244,7 @@ GEM
       prometheus-client (~> 1.0)
       yabeda (~> 0.5)
     yajl-ruby (1.3.1)
-    yard (0.9.20)
+    yard (0.9.26)
 
 PLATFORMS
   ruby
@@ -265,9 +265,9 @@ DEPENDENCIES
   mocha (~> 1.3)
   nokogiri (~> 1.10.8)
   pkg-config (~> 1.1.7)
-  pry (~> 0.11.3)
+  pry (~> 0.14)
   pry-byebug (~> 3.5.1)
-  pry-doc (~> 0.11.1)
+  pry-doc (~> 1.1)
   puma!
   rack (~> 2.1.4)
   rack-test (= 0.8.2)

data/lib/3scale/backend/configuration.rb

@@ -58,7 +58,6 @@ module ThreeScale
       config.add_section(:internal_api, :user, :password)
       config.add_section(:master, :metrics)
       config.add_section(:worker_prometheus_metrics, :enabled, :port)
-      config.add_section(:listener_prometheus_metrics, :enabled, :port)
 
       config.add_section(
           :async_worker,

data/lib/3scale/backend/rack.rb

@@ -17,7 +17,10 @@ module ThreeScale
 
           Backend::Logging::External.setup_rack self
 
-          if Backend.configuration.listener_prometheus_metrics.enabled
+          # Notice that this cannot be specified via config, it needs to be an
+          # ENV because the metric server is started in Puma/Falcon
+          # "before_fork" and the configuration is not loaded at that point.
+          if ENV['CONFIG_LISTENER_PROMETHEUS_METRICS_ENABLED'].to_s.downcase.freeze == 'true'.freeze
             use Rack::Prometheus
           end
 

data/lib/3scale/backend/stats/aggregator.rb

@@ -145,6 +145,10 @@ module ThreeScale
               application = Backend::Application.load(service_id,
                                                       values[:application_id])
 
+              # The app could have been deleted at some point since the job was
+              # enqueued. No need to update alerts in that case.
+              next unless application
+
               application.load_metric_names
               usage = Usage.application_usage(application, current_timestamp)
               status = Transactor::Status.new(service_id: service_id,

data/lib/3scale/backend/version.rb

@@ -1,5 +1,5 @@
 module ThreeScale
   module Backend
-    VERSION = '3.3.1.1'
+    VERSION = '3.3.2'
   end
 end

data/lib/3scale/prometheus_server.rb

@@ -4,7 +4,7 @@
 require_relative '../3scale/backend/listener_metrics'
 
 # Config is not loaded at this point, so read ENV instead.
-if ENV['CONFIG_LISTENER_PROMETHEUS_METRICS_ENABLED'].to_s == 'true'
+if ENV['CONFIG_LISTENER_PROMETHEUS_METRICS_ENABLED'].to_s.downcase.freeze == 'true'.freeze
   prometheus_port = ENV['CONFIG_LISTENER_PROMETHEUS_METRICS_PORT']
   ThreeScale::Backend::ListenerMetrics.start_metrics_server(prometheus_port)
 end

data/licenses.xml

@@ -23,7 +23,7 @@
       </dependency>
           <dependency>
         <packageName>apisonator</packageName>
-        <version>3.3.1.1</version>
+        <version>3.3.2</version>
         <licenses>
                       <license>
               <name>Apache 2.0</name>
@@ -233,7 +233,7 @@
       </dependency>
           <dependency>
         <packageName>coderay</packageName>
-        <version>1.1.2</version>
+        <version>1.1.3</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -421,7 +421,7 @@
       </dependency>
           <dependency>
         <packageName>method_source</packageName>
-        <version>0.9.0</version>
+        <version>1.0.0</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -679,7 +679,7 @@
       </dependency>
           <dependency>
         <packageName>pry</packageName>
-        <version>0.11.3</version>
+        <version>0.14.0</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -699,7 +699,7 @@
       </dependency>
           <dependency>
         <packageName>pry-doc</packageName>
-        <version>0.11.1</version>
+        <version>1.1.0</version>
         <licenses>
                       <license>
               <name>MIT</name>
@@ -1143,7 +1143,7 @@
       </dependency>
           <dependency>
         <packageName>yard</packageName>
-        <version>0.9.20</version>
+        <version>0.9.26</version>
         <licenses>
                       <license>
               <name>MIT</name>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apisonator
 version: !ruby/object:Gem::Version
-  version: 3.3.1.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Adam Ciganek
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies: []
 description: This gem provides a daemon that handles authorization and reporting of
   web services managed by 3scale.
@@ -207,8 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.2.10
 signing_key: 
 specification_version: 4
 summary: 3scale web service management system backend