roo_on_rails 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 70e6ae53825362d05a01b32b115700151a67c521
-  data.tar.gz: 62533bd3d864845ac6d12ba9ffd0542f97c1190b
+SHA256:
+  metadata.gz: b4613e4f2d71a1b6105071d8a1c283f97d89e0bb740165bc87088c26b403881b
+  data.tar.gz: c13b32bd6d0bbe8fc47858352becf81ac684ba7f7f082e33145c54284a6f9b5c
 SHA512:
-  metadata.gz: 64657f21e77a5fc055491a7e82f7b3d8ee13018a515a5ff94089a57551d0d8571049069ba27b2528aca5894efa0c3d185f6a54d03eb5d2411379ccd425ae669a
-  data.tar.gz: 62550c09f3256819deb5208581e557a51cd7d9526227a2cd7eb71211254e5d02028d9a7eacaa668693c35f2f0d82fa564ef40f3dfeed98d403e517ecc8bfab0e
+  metadata.gz: 05dad7f1435d8d051d80df90b54dce24c447a468dbcb35090ddac4f962c1026d0059b1364f8a9219834e4e4f2c5b4cf5e3054a63061a950e3f433c44dfedb772
+  data.tar.gz: 2f9304451d8320f02e59d80febff8a1f3065dc688f4f56d99ed502588004338341855b8aa5218eb82e2cc75ab4506d4578454ff00e8dc1345e5e47074208e9f7

data/CHANGELOG.md

@@ -1,16 +1,22 @@
-# HEAD
+# v1.20.0 (2018-03-27)
 
-_A description of your awesome changes here!_
+Features:
 
-# v1.19.0 (2018-01-23)
+- Add Hopper compatibility for DataDog integration (#90)
 
 Bug fix:
 
-- Avoid New Relic initialization warning by following Rails initializer behaviour
+- Set log level when instantiating logger; this avoids always outputting an initial "debug" line (#89)
+
+# v1.19.0 (2018-01-23)
+
+Bug fixes:
+
+- Avoid New Relic initialization warning by following Rails initializer behaviour (#88)
 
 Features:
 
-- Allow disabling New Relic synchronous startup by setting `NEW_RELIC_SYNC_STARTUP=false`
+- Allow disabling New Relic synchronous startup by setting `NEW_RELIC_SYNC_STARTUP=false` (#88)
 
 # v1.18.0 (2018-01-11)
 
@@ -27,14 +33,14 @@ Features:
 
 # v1.16.2 (2017-12-15)
 
-Bug fix:
+Bug fixes:
 
 - It's possible to set an invalid log level and crash on boot (#84)
 - Do not disable ActiveRecord connection reaping by default; set default behaviour to Rails' default behaviour. (#85)
 
 # v1.16.1 (2017-11-20)
 
-Bug fix:
+Bug fixes:
 
 - Auto-load roo identity if configured, prevent failing in CI (#83)
 
@@ -44,7 +50,7 @@ Features:
 
 - Allow SSL enforcement to be disabled via `ROO_ON_RAILS_DISABLE_SSL_ENFORCEMENT` environment variable (#82)
 
-Bug fix:
+Bug fixes:
 
 - Ensure we can distinguish between environments' identity services (#81)
 
@@ -63,7 +69,7 @@ Bug Fix:
 
 # v1.13.1 (2017-10-18)
 
-Bug fix:
+Bug fixes:
 
 - Fixes issue when `service_name` is null in `require_api_key` (#74)
 
@@ -74,7 +80,7 @@ Features:
 - Provide `ROUTEMASTER_VERIFY_SSL` environment variable to disable
   routemaster-client's SSL verification. (#68)
 
-Bug fix:
+Bug fixes:
 
 - Fixes issue with `fix` command of the service setup scripts for papertrail (#66)
 - Fixes issue with API authentication concern where service name was incorrect (#71)

data/README.md

@@ -278,31 +278,29 @@ This is automatically configured when running `roo_on_rails harness`.
 
 #### Custom application metrics
 
-Sending custom metrics to Datadog through Statsd requires an agent running in
-each dyno.
-You need to add the buildpack
-[`heroku-buildpack-datadog`](https://github.com/deliveroo/heroku-buildpack-datadog).
+Sending custom metrics to Datadog through Statsd requires an agent running in each dyno or container. For Heroku you need to add the buildpack [`heroku-buildpack-datadog`](https://github.com/deliveroo/heroku-buildpack-datadog).
 
 Once this is done, you can send metrics with e.g.:
 
 ```ruby
-RooOnRails.statsd.increment('my.metric', tags: 'tag:value')
+RooOnRails.statsd.increment('my.metric', tags: ['tag:value'])
 ```
 
-Tags `env:{name}`, `source:{dyno}`, and `app:{name}` will automatically be added
-to all your metrics.
-
-The following environment variables are being used.  The default values are fine
-except for `STATSD_ENV` which should be set.
-
-- `STATSD_ENV`
-- `STATSD_HOST`
-- `STATSD_PORT`
-
-These extra required variables are automatically set by Heroku:
-
-- `DYNO`
-- `HEROKU_APP_NAME`
+The following tags will automatically be added to all your metrics and their value depends on the environment variables listed below, in order of priority:
+
+* `env:{name}`
+  * `STATDS_ENV` – optional and to be set manually (e.g. `staging`);
+  * `HOPPER_ECS_CLUSTER_NAME` – automatically set by Hopper (e.g. `staging`);
+  * Defaults to `unknown`.
+* `source:{name}`
+  * `DYNO` – automatically set by Heroku (e.g. `web.3`);
+  * `HOSTNAME` – automatically set by Hopper (e.g. `876c57c17207`);
+  * Defaults to `unknown`.
+* `app:{name}`
+  * `STATSD_APP_NAME` – optional and to be set manually (e.g. `notifications-staging`);
+  * `HEROKU_APP_NAME` – automatically set by Heroku (e.g. `roo-notifications-staging`);
+  * `HOPPER_APP_NAME`+`HOPPER_ECS_CLUSTER_NAME` – automatically set by Hopper (e.g. `notifications-staging`);
+  * Defaults to `unknown`.
 
 ### Routemaster Client
 

data/lib/roo_on_rails/railties/logging.rb

@@ -4,16 +4,19 @@ module RooOnRails
       initializer 'roo_on_rails.logging.before', before: :initialize_logger do
         require 'roo_on_rails/logger'
         Rails.logger = config.logger = RooOnRails::Logger.new
-        Rails.logger.debug 'initializer roo_on_rails.logging.before'
-      end
-
-      initializer 'roo_on_rails.logging.after', after: :initialize_logger do
         # It is not possible to set log_level to an invalid value without some
         # deliberate gymnastics (the setter will raise an error), and Rails
         # defaults this to `debug`, so we don't need to guard against nil /
         # invalidity
         log_level = Rails.configuration.log_level
 
+        Rails.logger.set_log_level(default: log_level)
+        Rails.logger.debug 'initializer roo_on_rails.logging.before'
+      end
+
+      initializer 'roo_on_rails.logging.after', after: :initialize_logger do
+        log_level = Rails.configuration.log_level
+
         Rails.logger.set_log_level(default: log_level)
         Rails.logger.debug 'initializer roo_on_rails.logging.after'
       end

data/lib/roo_on_rails/statsd.rb

@@ -23,11 +23,30 @@ module RooOnRails
 
     def tags
       [
-        "env:#{ENV.fetch('STATSD_ENV', 'unknown')}",
-        "source:#{ENV.fetch('DYNO', 'unknown')}",
-        "app:#{ENV.fetch('HEROKU_APP_NAME', 'unknown')}"
+        "env:#{env_name}",
+        "source:#{source_name}",
+        "app:#{app_name}"
       ]
     end
+
+    def env_name
+      ENV['STATSD_ENV'] || ENV['HOPPER_ECS_CLUSTER_NAME'] || 'unknown'
+    end
+
+    def source_name
+      ENV['DYNO'] || ENV['HOSTNAME'] || 'unknown'
+    end
+
+    def app_name
+      ENV['STATSD_APP_NAME'] || ENV['HEROKU_APP_NAME'] || hopper_app_name || 'unknown'
+    end
+
+    def hopper_app_name
+      app_name = ENV['HOPPER_APP_NAME']
+      cluster_name = ENV['HOPPER_ECS_CLUSTER_NAME']
+      return unless app_name && cluster_name
+      [app_name, cluster_name].join('-')
+    end
   end
 
   def self.statsd

data/lib/roo_on_rails/version.rb

@@ -1,3 +1,3 @@
 module RooOnRails
-  VERSION = '1.19.0'.freeze
+  VERSION = '1.20.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roo_on_rails
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv-rails
@@ -501,7 +501,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Scaffolding for building services