govuk_sidekiq 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aee561f69e1eedfe1142713f3477597dc773427
-  data.tar.gz: b90f651358f70dfdcd0f66d2490ee47d6ceed252
+  metadata.gz: 1be19282faabbf2677cfc7ef513a07b7eba4cf58
+  data.tar.gz: 95c1fe848d469231ec76263a56a6094dd85d7c6c
 SHA512:
-  metadata.gz: e2dd6b60266dfc6d8db43268e669b29300a48ee5c95290f2468bc87899f4dfec2fd33ad466fe72d27716a9e0123c18526c869a387871baf842014469c810b739
-  data.tar.gz: 5c2ff2c94185cc3328f33702b288a6ee805af767f265ef252dea19833dc6a9c22df2f36323c84f75768014c6677d90d0ef15a45ebd0d996f086be3c7d02d08b0
+  metadata.gz: 5dae35a20d6f158cff09780b6b1d3bea5bef9ca8e24c2588e05136dda98249650224270ca6b3ed1f93827038e48f7f6b10c4fa61c6badc7cb0ce4f795548392f
+  data.tar.gz: 9a13810fcecd5bb5068f357f043507379f106e2808f8e6f61adb2437fcf4166e966b91e17229e6ef3baaa07e4ae637cb1e1361297c8ecc5ad0b1b6676e5499a5

data/README.md

@@ -10,13 +10,14 @@ What does `govuk_sidekiq` do for you?
 1. Makes sure Sidekiq can connect to Redis correctly, using the default
   environment variables (these are set in [govuk-puppet](https://github.com/alphagov/govuk-puppet)).
 2. Makes sure that the correct HTTP headers are passed on to [gds-api-adapters](https://github.com/alphagov/gds-api-adapters).
- This means that for each request a unique ID (govuk_request_id) will be passed on to downstream applications.
- [Read more about request tracing](https://github.gds/pages/gds/opsmanual/infrastructure/howto/setting-up-request-tracing.html).
+ This means that for each request a unique ID (`govuk_request_id`) will be passed on to downstream applications.
+ [Read more about request tracing][req-tracing].
 3. Makes sure that we use JSON logging, so that Sidekiq logs will end up
  properly in Kibana.
 4. Sends activity stats to Statsd, so that you can make pretty graphs of activity
  in Grafana or Graphite. See the [Rummager dashboards for an example](https://grafana.publishing.service.gov.uk/dashboard/file/rummager_queues.json).
-5. Configures Sidekiq so that exceptions will be sent to our [Errbit instance](errbit.publishing.service.gov.uk).
+
+[req-tracing]: https://docs.publishing.service.gov.uk/manual/setting-up-request-tracing.html
 
 ## Installation (Rails only)
 
@@ -55,7 +56,7 @@ requires more advanced connection settings (eg username and password) you can in
 set a `REDIS_URL` variable, this will take precidence over `REDIS_HOST` and `REDIS_PORT`.
 
     Apply redis variables for your app in [the default config](https://github.com/alphagov/govuk-puppet/blob/master/hieradata/common.yaml). For example:
-    
+
     ```
     govuk::apps::your_app::redis_host: "%{hiera('sidekiq_host')}"
     govuk::apps::your_app::redis_port: "%{hiera('sidekiq_port')}"
@@ -77,12 +78,16 @@ after "deploy:restart", "deploy:restart_procfile_worker"
 
 This makes sure that your development environment behaves like production.
 
-See the [Pinfile](https://github.gds/gds/development/blob/master/Pinfile) and
-[Procfile](https://github.gds/gds/development/blob/master/Procfile) for examples.
+See the [Pinfile][] and [Procfile][] for examples.
+
+[Pinfile]: https://github.com/alphagov/govuk-puppet/tree/master/development-vm/Pinfile
+[Procfile]: https://github.com/alphagov/govuk-puppet/tree/master/development-vm/Procfile
 
 ### 7. Add app to sidekiq-monitoring
 
-See the opsmanual for a step-by-step guide: [HOWTO: Add sidekiq-monitoring to your application](https://docs.publishing.service.gov.uk/manual/setting-up-new-sidekiq-monitoring-app.html)
+See the opsmanual for a step-by-step guide: [Add sidekiq-monitoring to your application][monitoring]
+
+[monitoring]: https://docs.publishing.service.gov.uk/manual/setting-up-new-sidekiq-monitoring-app.html
 
 ### 8. Create some jobs
 

data/lib/govuk_sidekiq/sidekiq_initializer.rb

@@ -2,6 +2,7 @@ require "sidekiq"
 require "sidekiq/logging/json"
 require "sidekiq-statsd"
 require "govuk_sidekiq/api_headers"
+require "govuk_app_config/govuk_statsd"
 
 module GovukSidekiq
   module SidekiqInitializer
@@ -15,7 +16,7 @@ module GovukSidekiq
         config.redis = redis_config
 
         config.server_middleware do |chain|
-          chain.add Sidekiq::Statsd::ServerMiddleware, env: "govuk.app.#{govuk_app_name}", prefix: "workers"
+          chain.add Sidekiq::Statsd::ServerMiddleware, statsd: GovukStatsd, env: nil, prefix: "workers"
           chain.add GovukSidekiq::APIHeaders::ServerMiddleware
         end
       end

data/lib/govuk_sidekiq/testing.rb

@@ -1,4 +1,5 @@
 require "sidekiq/testing"
+require "govuk_sidekiq/api_headers"
 
 Sidekiq::Testing.server_middleware do |chain|
   chain.add GovukSidekiq::APIHeaders::ServerMiddleware

data/lib/govuk_sidekiq/version.rb

@@ -1,3 +1,3 @@
 module GovukSidekiq
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: govuk_sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Elliot Crosby-McCullough
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: sidekiq-statsd
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +78,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: govuk_app_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +120,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Provides standard setup and behaviour for Sidekiq in GOV.UK applications.