roqua-support 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b7684543b65ccc1553042df3e832dba5f40a8f42d0ff15fa31f42d865755b32
-  data.tar.gz: 3ba17388d2c2b947756ddb1ca3b4172a6bcbde85bef76b0c70a5eb9fe7fe16d5
+  metadata.gz: 32f750bb036e58d68411a3a96f126a551cb4766811fb7fa0daea753a6d7d3613
+  data.tar.gz: 4895312bd0ab8055da376681c894d32a62dbb9885d923d6a452cf3688ee076fb
 SHA512:
-  metadata.gz: 880ee19112ad1e4f596a451228b7b3b6f5b07ad381f0d1706ee00c42b070af2c8dd3048a26363183c09ba9ceb2f7e34c72b3289b11f8829ee0e02a613e173742
-  data.tar.gz: fa8da4fcb52839b129019a08f4ba852cc629af98944c9aef9add34c4ef2244ace706e59f53765b551c95da8a6231bed7a096afeb0e4dacfa7e7a1d02a5f14f17
+  metadata.gz: '0187621d35a2c8b8e379eb330f6b91a5a34856b6fe411fa2837850af5fb885ce97cb8f69cd2720ce5908b2e081b72f2445fee91a8216d3836be5f3571864ae19'
+  data.tar.gz: 6148e080d64301dd0cb410ed4c5d0337018411cea03041b865e6c239936ed12f6a7032b451704dbecac984a1c66e5340d87fb69632b184f0fbdaa807f6292765

data/.gitlab-ci.yml

@@ -2,25 +2,12 @@ variables:
   RAILS_ENV: "test"
 
 before_script:
+  - if [ -x "$(command -v apk)" ]; then apk add sqlite-dev; fi
   - export BUNDLE_PATH=$CI_PROJECT_DIR/.gems
   - bundle --jobs 2 --retry 3
   - bundle exec appraisal
   - bundle --jobs 2 --retry 3
 
-.ruby_23: &ruby_23
-  image: registry.roqua.nl/roqua/roqua-build-images:ruby-2.3-rails-base-test
-  cache:
-    key: ruby_23
-    paths:
-      - .gems
-
-.ruby_24: &ruby_24
-  image: registry.roqua.nl/roqua/roqua-build-images:ruby-2.4-rails-base-test
-  cache:
-    key: ruby_24
-    paths:
-      - .gems
-
 .ruby_25: &ruby_25
   image: registry.roqua.nl/roqua/docker-base-images:ruby-2.5
   cache:
@@ -28,52 +15,34 @@ before_script:
     paths:
       - .gems
 
-rails_42_ruby_23:
-  <<: *ruby_23
-  script:
-    - bundle exec appraisal rails42 bundle exec rspec
-
-rails_50_ruby_23:
-  <<: *ruby_23
-  script:
-    - bundle exec appraisal rails50 bundle exec rspec
-
-rails_50_ruby_24:
-  <<: *ruby_24
-  script:
-    - bundle exec appraisal rails50 bundle exec rspec
-
-rails_50_ruby_25:
-  <<: *ruby_25
-  script:
-    - bundle exec appraisal rails50 bundle exec rspec
-
-rails_51_ruby_23:
-  <<: *ruby_23
-  script:
-    - bundle exec appraisal rails51 bundle exec rspec
-
-rails_51_ruby_24:
-  <<: *ruby_24
-  script:
-    - bundle exec appraisal rails51 bundle exec rspec
+.ruby_26: &ruby_26
+  image: registry.roqua.nl/roqua/docker-base-images:ruby-2.6-builder
+  cache:
+    key: ruby_26
+    paths:
+      - .gems
 
 rails_51_ruby_25:
   <<: *ruby_25
   script:
     - bundle exec appraisal rails51 bundle exec rspec
 
-rails_52_ruby_23:
-  <<: *ruby_23
+rails_52_ruby_25:
+  <<: *ruby_25
   script:
     - bundle exec appraisal rails52 bundle exec rspec
 
-rails_52_ruby_24:
-  <<: *ruby_24
+rails_52_ruby_26:
+  <<: *ruby_26
   script:
     - bundle exec appraisal rails52 bundle exec rspec
 
-rails_52_ruby_25:
+rails_60_ruby_25:
   <<: *ruby_25
   script:
-    - bundle exec appraisal rails52 bundle exec rspec
+    - bundle exec appraisal rails60 bundle exec rspec
+
+rails_60_ruby_26:
+  <<: *ruby_26
+  script:
+    - bundle exec appraisal rails60 bundle exec rspec

data/Appraisals

@@ -1,15 +1,16 @@
-appraise "rails42" do
-  gem "activesupport", "~> 4.2.10"
-end
-
-appraise "rails50" do
-  gem "activesupport", "~> 5.0.0"
-end
-
 appraise "rails51" do
   gem "activesupport", "~> 5.1.0"
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails52" do
   gem "activesupport", "~> 5.2.0"
+  gem 'sqlite3', '~> 1.4'
+  gem 'appsignal', '~> 2.9.8' # test each minor versions we support
+end
+
+appraise "rails60" do
+  gem "activesupport", "~> 6.0.0"
+  gem 'sqlite3', '~> 1.4'
+  gem 'appsignal', '~> 2.10.6'
 end

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.3.5
+
+* Update AppSignal gauge for every minute the probe runs
+
+## 0.3.4
+
+* gemspec and tests: Removed rails 4.2 and 5.0, remove ruby 2.3 and 2.4, added ruby 2.6, allow appsignal 2.10
+
+## 0.3.3
+
+* Added support for hl7 namespace when reporting errors
+
+## 0.3.2
+
+* Use tags for better appsignal metrics
+* Require Appsignal 2.9 to avoid probe registration problems
+
+## 0.3.1
+
+* Added Appsignal counters for probe calls and scheduling probe call tasks in particular.
+
 ## 0.3.0
 
 * Support for Ruby 2.5

data/Gemfile

@@ -9,12 +9,12 @@ gem 'roqua_styleguide', git: 'https://gitlab.roqua.nl/roqua/styleguide.git'
 group :test do
   gem 'actionpack', '>= 4.0'
   gem 'active_interaction', '~> 3.0'
-  gem 'appsignal', '~> 2.9.6'
   gem 'climate_control' # For ENV modification in specs
-  gem 'combustion', '~> 0.5.2'
+  gem 'combustion', '~> 1.1.1'
   gem 'fakefs', require: 'fakefs/safe'
   gem 'guard-rspec', '~> 4.2.6'
   gem 'responders'
   gem 'rspec-instrumentation-matcher'
   gem 'rspec-rails'
-end
+  gem 'pry'
+end

data/Gemfile.lock

@@ -1,78 +1,80 @@
 GIT
   remote: https://gitlab.roqua.nl/roqua/styleguide.git
-  revision: e1fbbb611484e295719ed91c4eef889753ac8d8f
+  revision: 6d98107ef10d2dc5a4a785a4b0977f100475e007
   specs:
-    roqua_styleguide (0.0.6)
-      rubocop (~> 0.50.0)
+    roqua_styleguide (0.0.8)
+      rubocop (~> 0.80.0)
+      rubocop-rails
 
 PATH
   remote: .
   specs:
-    roqua-support (0.3.0)
+    roqua-support (0.3.5)
       active_interaction (~> 3.0)
-      activesupport (>= 3.2, < 6)
+      activesupport (>= 5.1, < 6.1)
+      appsignal (>= 2.9, < 2.11)
       naught (~> 1.0)
       with_advisory_lock (~> 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_interaction (3.4.0)
-      activemodel (>= 4, < 6)
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.1)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    active_interaction (3.8.2)
+      activemodel (>= 4, < 7)
+    activemodel (6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activerecord (6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (2.1.0)
+      zeitwerk (~> 2.2)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    appsignal (2.9.6)
+    appsignal (2.10.12)
       rack
-    arel (7.1.4)
-    ast (2.3.0)
-    builder (3.2.3)
+    ast (2.4.0)
+    builder (3.2.4)
     climate_control (0.2.0)
-    coderay (1.1.1)
-    combustion (0.5.5)
+    coderay (1.1.2)
+    combustion (1.1.2)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.0.4)
-    delayed_job (4.1.4)
-      activesupport (>= 3.0, < 5.2)
-    delayed_job_active_record (4.1.2)
-      activerecord (>= 3.0, < 5.2)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
+    delayed_job (4.1.8)
+      activesupport (>= 3.0, < 6.1)
+    delayed_job_active_record (4.1.4)
+      activerecord (>= 3.0, < 6.1)
       delayed_job (>= 3.0, < 5)
     diff-lcs (1.3)
-    erubis (2.7.0)
-    fakefs (0.15.0)
-    ffi (1.9.17)
+    erubi (1.9.0)
+    fakefs (1.2.2)
+    ffi (1.12.2)
     formatador (0.2.5)
-    guard (2.14.0)
+    guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -81,98 +83,102 @@ GEM
     guard-rspec (4.2.10)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    i18n (0.7.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    loofah (2.0.3)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    loofah (2.5.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.11)
-    method_source (0.8.2)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    lumberjack (1.2.4)
+    method_source (1.0.0)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
     naught (1.1.0)
     nenv (0.3.0)
-    nokogiri (1.7.0.1)
-      mini_portile2 (~> 2.1.0)
-    notiffany (0.1.1)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (2.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
+    parallel (1.19.1)
+    parser (2.7.1.2)
+      ast (~> 2.4.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.2)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
-    rake (12.1.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    responders (3.0.0)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-instrumentation-matcher (0.0.4)
+      rspec-support (~> 3.9.0)
+    rspec-instrumentation-matcher (0.0.9)
       activesupport
       rspec-expectations
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.50.0)
+      rspec-support (~> 3.9.0)
+    rspec-rails (4.0.0)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
+    rspec-support (3.9.3)
+    rubocop (0.80.1)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.3)
-    ruby_dep (1.5.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-rails (2.5.2)
+      activesupport
+      rack (>= 1.1)
+      rubocop (>= 0.72.0)
+    ruby-progressbar (1.10.1)
     shellany (0.0.1)
-    slop (3.6.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
-    thread_safe (0.3.5)
+    thor (1.0.1)
+    thread_safe (0.3.6)
     timecop (0.9.1)
-    tzinfo (1.2.2)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.6.1)
     with_advisory_lock (3.2.0)
       activerecord (>= 3.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -181,13 +187,13 @@ DEPENDENCIES
   actionpack (>= 4.0)
   active_interaction (~> 3.0)
   appraisal
-  appsignal (~> 2.9.6)
-  bundler (~> 1.0)
+  bundler (~> 2.0)
   climate_control
-  combustion (~> 0.5.2)
+  combustion (~> 1.1.1)
   delayed_job_active_record
   fakefs
   guard-rspec (~> 4.2.6)
+  pry
   rake
   responders
   roqua-support!
@@ -195,8 +201,7 @@ DEPENDENCIES
   rspec (>= 2.12.0, < 4.0)
   rspec-instrumentation-matcher
   rspec-rails
-  sqlite3 (~> 1.3.6)
   timecop
 
 BUNDLED WITH
-   1.16.6
+   2.1.4

data/gemfiles/rails51.gemfile

@@ -3,20 +3,21 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "~> 5.1.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "actionpack", ">= 4.0"
   gem "active_interaction", "~> 3.0"
-  gem "appsignal"
   gem "climate_control"
-  gem "combustion", "~> 0.5.2"
-  gem "fakefs", :require => "fakefs/safe"
+  gem "combustion", "~> 1.1.1"
+  gem "fakefs", require: "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
   gem "rspec-rails"
+  gem "pry"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails52.gemfile

@@ -3,20 +3,22 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "~> 5.2.0"
+gem "sqlite3", "~> 1.4"
+gem "appsignal", "~> 2.9.8"
 
 group :test do
   gem "actionpack", ">= 4.0"
   gem "active_interaction", "~> 3.0"
-  gem "appsignal"
   gem "climate_control"
-  gem "combustion", "~> 0.5.2"
-  gem "fakefs", :require => "fakefs/safe"
+  gem "combustion", "~> 1.1.1"
+  gem "fakefs", require: "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
   gem "rspec-rails"
+  gem "pry"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/{rails42.gemfile → rails60.gemfile}

@@ -3,20 +3,22 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
-gem "activesupport", "~> 4.2.10"
+gem "roqua_styleguide", git: "https://gitlab.roqua.nl/roqua/styleguide.git"
+gem "activesupport", "~> 6.0.0"
+gem "sqlite3", "~> 1.4"
+gem "appsignal", "~> 2.10.6"
 
 group :test do
   gem "actionpack", ">= 4.0"
   gem "active_interaction", "~> 3.0"
-  gem "appsignal"
   gem "climate_control"
-  gem "combustion", "~> 0.5.2"
-  gem "fakefs", :require => "fakefs/safe"
+  gem "combustion", "~> 1.1.1"
+  gem "fakefs", require: "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
   gem "rspec-rails"
+  gem "pry"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/roqua-support/version.rb

@@ -1,5 +1,5 @@
 module Roqua
   module Support
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.3.5'.freeze
   end
 end

data/lib/roqua/probes/base_probe.rb

@@ -1,12 +1,24 @@
+require 'active_support/concern'
+
 module Roqua
   module Probes
     module BaseProbe
-      def enable
-        new.tap do |probe|
-          probe_sym = probe.class.to_s.to_sym
-          Appsignal::Minutely.probes.register(probe_sym, probe) unless Appsignal::Minutely.probes[probe_sym]
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def enable
+          new.tap do |probe|
+            probe_sym = probe.class.to_s.to_sym
+            Appsignal::Minutely.probes.register(probe_sym, probe) unless Appsignal::Minutely.probes[probe_sym]
+          end
         end
       end
+
+      # do not override me, implement probes by implementing the #run method
+      def call
+        run
+        Appsignal.increment_counter("probe.call.completed", 1, probe_name: self.class.name.demodulize.underscore)
+      end
     end
   end
 end

data/lib/roqua/probes/delayed_job_probe.rb

@@ -3,13 +3,13 @@ require_relative 'base_probe'
 module Roqua
   module Probes
     class DelayedJobProbe
-      extend BaseProbe
+      include BaseProbe
 
       def backlog_count
         Delayed::Job.where(locked_at: nil).where('run_at < ?', Time.zone.now).count
       end
 
-      def call
+      def run
         Appsignal.set_gauge('delayed_job_backlog_count', backlog_count)
       end
     end

data/lib/roqua/probes/monitoring_probe.rb

@@ -3,7 +3,7 @@ require_relative 'base_probe'
 module Roqua
   module Probes
     class MonitoringProbe
-      extend BaseProbe
+      include BaseProbe
 
       def incomplete_jobs
         Roqua::Scheduling::CronJob.where('completed_at IS NULL OR completed_at < next_run_at')
@@ -19,7 +19,7 @@ module Roqua
         (longest_delay_in_seconds / 1.minute).to_i
       end
 
-      def call
+      def run
         Appsignal.set_gauge('scheduler_delay_in_minutes', longest_delay_in_minutes)
       end
     end

data/lib/roqua/probes/scheduling_probe.rb

@@ -3,9 +3,9 @@ require_relative 'base_probe'
 module Roqua
   module Probes
     class SchedulingProbe
-      extend BaseProbe
+      include BaseProbe
 
-      def call
+      def run
         ActiveRecord::Base.establish_connection
         require_relative Rails.root.join('config', 'schedule.rb')
         Roqua::Scheduling::Scheduler.new.ping

data/lib/roqua/scheduling/scheduler.rb

@@ -11,6 +11,8 @@ class Roqua::Scheduling::Scheduler
           raise ex if Rails.env.test?
         end
       end
+
+      Appsignal.increment_counter("scheduler.completed", 1)
     end
   end
 
@@ -42,6 +44,7 @@ class Roqua::Scheduling::Scheduler
     task = schedule.tasks[cron_job.name]
     task.run
 
+    Appsignal.increment_counter("scheduler.run_task.completed", 1, task_name: task.name)
     cron_job.update completed_at: Time.now, next_run_at: task.next_run_at
   end
 end

data/lib/roqua/support/errors.rb

@@ -33,6 +33,7 @@ module Roqua
         case category
         when :background then Appsignal::Transaction::BACKGROUND_JOB
         when :web then        Appsignal::Transaction::HTTP_REQUEST
+        when :hl7 then        'hl7'
         else                  Appsignal::Transaction::BLANK
         end
       end

data/roqua-support.gemspec

@@ -18,16 +18,16 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.required_ruby_version = '>= 2.5'
   gem.add_dependency 'active_interaction', '~> 3.0'
-  gem.add_dependency 'activesupport', '>= 3.2', '< 6'
+  gem.add_dependency 'activesupport', '>= 5.1', '< 6.1'
   gem.add_dependency 'naught', '~> 1.0'
   gem.add_dependency 'with_advisory_lock', '~> 3.2'
+  gem.add_dependency 'appsignal', '>= 2.9', '< 2.11'
 
-  gem.add_development_dependency 'appsignal', '>= 2.3.1'
-  gem.add_development_dependency 'bundler', '~> 1.0'
+  gem.add_development_dependency 'bundler', '~> 2.0'
   gem.add_development_dependency 'delayed_job_active_record'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '>= 2.12.0', '< 4.0'
-  gem.add_development_dependency 'sqlite3', '~> 1.3.6'
   gem.add_development_dependency 'timecop'
 end

data/spec/roqua/probes/delayed_job_probe_spec.rb

@@ -7,7 +7,7 @@ require 'roqua/probes/delayed_job_probe'
 describe Roqua::Probes::DelayedJobProbe do
   before { Timecop.freeze }
   after { Timecop.return }
-  subject(:probe) { Roqua::Probes::DelayedJobProbe.new }
+  subject(:probe) { described_class.new }
 
   describe 'backlog_count' do
     context 'if a single job unlocked job exists that has a run_at in the past' do
@@ -24,12 +24,17 @@ describe Roqua::Probes::DelayedJobProbe do
     end
   end
 
-  describe 'call' do
+  describe '#call' do
     it 'sends the correct metric to Appsignal' do
       expect(probe).to receive(:backlog_count).and_return(12)
       expect(Appsignal).to receive(:set_gauge).with('delayed_job_backlog_count', 12)
       probe.call
     end
+
+    it 'increments the probe call counter' do
+      expect(Appsignal).to receive(:increment_counter).with('probe.call.completed', 1, probe_name: "delayed_job_probe")
+      probe.call
+    end
   end
 
   context '.enable' do

data/spec/roqua/probes/monitoring_probe_spec.rb

@@ -4,21 +4,26 @@ require 'timecop'
 
 require 'roqua/probes/delayed_job_probe'
 
-describe Roqua::Probes::DelayedJobProbe do
+describe Roqua::Probes::MonitoringProbe do
   before { Timecop.freeze }
   after { Timecop.return }
-  subject(:probe) { Roqua::Probes::MonitoringProbe.new }
+  subject(:probe) { described_class.new }
 
   before do
     Roqua::Scheduling::CronJob.delete_all
   end
 
-  describe 'call' do
+  describe '#call' do
     it 'sends data to AppSignal' do
       expect(Appsignal).to receive(:set_gauge).with('scheduler_delay_in_minutes', 10)
       expect(probe).to receive(:longest_delay_in_minutes).and_return(10)
       probe.call
     end
+
+    it 'increments the probe call counter' do
+      expect(Appsignal).to receive(:increment_counter).with('probe.call.completed', 1, probe_name: "monitoring_probe")
+      probe.call
+    end
   end
 
   describe 'longest_delay' do

data/spec/roqua/scheduling/scheduler_spec.rb

@@ -72,16 +72,24 @@ describe Roqua::Scheduling::Scheduler do
   describe 'callbacks' do
     let(:callback_spy) { spy(:callback) }
 
-    it 'get executed' do
+    before do
       Roqua::Scheduling::Schedule.setup do |cron|
         cron.add_task 'hourly', next_run_at: proc { 1.minute.ago } do
           callback_spy.execute
         end
       end
+    end
 
+    it 'get executed' do
       expect(callback_spy).to receive(:execute)
       subject.ping
     end
+
+    it 'counts task calls' do
+      expect(Appsignal).to receive(:increment_counter).with('scheduler.completed', 1)
+      expect(Appsignal).to receive(:increment_counter).with('scheduler.run_task.completed', 1, task_name: 'hourly')
+      subject.ping
+    end
   end
 
   describe 'when running multiple times' do

data/spec/roqua/support/errors_spec.rb

@@ -94,6 +94,7 @@ describe 'Error reporting' do
     let(:transaction) { double("transaction") }
 
     before do
+      Appsignal.config = Appsignal::Config.new(Dir.pwd, "test")
       allow(Appsignal).to receive(:active?).and_return(true)
       allow(Appsignal).to receive(:is_ignored_exception?).and_return(false)
       allow(Appsignal).to receive(:agent).and_return(agent)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-support
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - Marten Veldthuis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_interaction
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: naught
   requirement: !ruby/object:Gem::Requirement
@@ -78,28 +78,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
-  type: :development
+        version: '2.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: '2.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
@@ -148,20 +154,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -196,10 +188,9 @@ files:
 - README.md
 - Rakefile
 - circle.yml
-- gemfiles/rails42.gemfile
-- gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
 - lib/roqua-support.rb
 - lib/roqua-support/railtie.rb
 - lib/roqua-support/version.rb
@@ -266,7 +257,7 @@ homepage: https://github.com/roqua/roqua-support
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -274,16 +265,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Helper objects and proxies used by a lot of RoQua applications
 test_files:

data/gemfiles/rails50.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
-gem "activesupport", "~> 5.0.0"
-
-group :test do
-  gem "actionpack", ">= 4.0"
-  gem "active_interaction", "~> 3.0"
-  gem "appsignal"
-  gem "climate_control"
-  gem "combustion", "~> 0.5.2"
-  gem "fakefs", :require => "fakefs/safe"
-  gem "guard-rspec", "~> 4.2.6"
-  gem "responders"
-  gem "rspec-instrumentation-matcher"
-  gem "rspec-rails"
-end
-
-gemspec :path => "../"