tpt-rails 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f34cc827a621a48f4a71602ddf6de4c8da4738a1644708136cb5d0e716795be
-  data.tar.gz: 165dbfd4ffc8e3a149ae0c4a88600ee39319b21ba99882846902ec7d1511fd74
+  metadata.gz: d7990c91ca054f067f184b1ba9bb3ddfd43fc21ec0006b1600ed0b5ac54631fa
+  data.tar.gz: d4971b9eb12c19ee4cac5053dcea9260cf6edef742e32a2acda6190bca56744a
 SHA512:
-  metadata.gz: a9a6507480b7e46bee217c524c243b89c7994135cd06c1353e30b97fa4b57088cf6dcfac699f1bd10407da15fd0d1c872922bf9ad6d52d4d8a1b8680926da1fc
-  data.tar.gz: bcf18231087259a786e1254c3d81520f383163928043cf42415a0ab4e0af199e28b8aea695ebfa9c2d660c9e5a1e847ddfcb0d0b99a6effd00ebfc3da11d3934
+  metadata.gz: 5747eccc8946d8d082aa40c7a815b37b38833a4af2bda0c38ab870c03e8a05f09dfc747478155065e253c10b1979aa59d36e91f218abed503466efac62e12c2a
+  data.tar.gz: 36800d28c159f7e3a14e6ab753955dd19d79449bdbb00679544e88920d249d74eab5d460ea991331564d493b85606722f540120d96e61a5d17774e0c3e01280f

data/README.md

@@ -117,7 +117,7 @@ Note: this currently only collects metrics when running Puma in _clustered_ mode
 ### Running tests
 
 1. Start `docker-compose up` (provides a real Redis instance for tests)
-2. Run `rails test`
+2. Run `bin/test`
 
 ### Using your local version of this gem in a local app
 
@@ -131,7 +131,7 @@ gem 'tpt-rails', path: '/your/local/path/to/tpt/rails'
 
 First ensure you have permissions to publish to rubygems.org.
 
-Then execute:
+Once you've merged, check out the `master` branch and execute:
 ```sh
 bundle exec gem bump --push --tag --version patch # patch/minor/major/X.X.X
 bundle exec gem release

data/lib/generators/tpt_rails/kubernetes/templates/kubernetes/helm/values.staging.yaml.tt

@@ -9,7 +9,7 @@ image:
 
 environment:
   ENVIRONMENT: staging
-  APP_ENV: production
+  APP_ENV: staging
   RAILS_ENV: production
 
 postgresql:

data/lib/tpt/rails.rb

@@ -68,5 +68,10 @@ module Tpt::Rails
     def config # :nodoc:
       configured? ? @config : raise(NotConfigured)
     end
+
+    # This should be set by the deployment tool. E.g. Jenkins: https://git.io/JJFiD
+    def release_version
+      ENV['TPT_RELEASE_VERSION'].presence
+    end
   end
 end

data/lib/tpt/rails/internal/datadog.rb

@@ -29,18 +29,21 @@ class Tpt::Rails::Internal::Datadog # :nodoc:
     url = @statsd_url || 'statsd://localhost'
     uri = URI.parse(url)
 
+    tags = ["env:#{Tpt::Rails.app_env}"]
+    tags << ["tpt_release_version:#{Tpt::Rails.release_version}"] if Tpt::Rails.release_version
+
     ::Datadog::Statsd.new(
       uri.host,
       uri.port || DEFAULT_STATSD_PORT,
-      {
-        namespace: Tpt::Rails.app_name,
-        tags: ["env:#{Tpt::Rails.app_env}"],
-      }
+      namespace: Tpt::Rails.app_name,
+      tags: tags,
     )
   end
 
   def configure_tracing
     uri = URI.parse(@trace_url)
+    tags = { 'env' => Tpt::Rails.app_env }
+    tags["tpt_release_version"] = Tpt::Rails.release_version if Tpt::Rails.release_version
 
     ::Datadog.configure do |c|
       # This will activate auto-instrumentation for Rails
@@ -53,8 +56,10 @@ class Tpt::Rails::Internal::Datadog # :nodoc:
         enabled: true,
         hostname: uri.host,
         port: uri.port || DEFAULT_TRACE_PORT,
-        tags: { 'env' => Tpt::Rails.app_env },
+        tags: tags,
       )
+
+      c.logger.level = ::Logger::WARN
     end
 
     ::Datadog::Pipeline.before_flush(

data/lib/tpt/rails/internal/error_reporter.rb

@@ -49,6 +49,7 @@ class Tpt::Rails::Internal::ErrorReporter # :nodoc:
 
     Bugsnag.configure do |config|
       config.api_key = @bugsnag_api_key
+      config.app_version = Tpt::Rails.release_version if Tpt::Rails.release_version
     end
   end
 
@@ -58,8 +59,10 @@ class Tpt::Rails::Internal::ErrorReporter # :nodoc:
 
     Rollbar.configure do |config|
       config.access_token = @rollbar_access_token
+      config.code_version = Tpt::Rails.release_version if Tpt::Rails.release_version
       config.enabled = @rollbar_enabled
       config.environment = Tpt::Rails.app_env
+      config.populate_empty_backtraces = true
     end
   end
 end

data/lib/tpt/rails/version.rb

@@ -1,5 +1,5 @@
 module Tpt
   module Rails
-    VERSION = '1.2.0'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tpt-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - TpT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: 6.0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: 6.0.3.3
 - !ruby/object:Gem::Dependency
   name: dogstatsd-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.40'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ files:
 - lib/tpt/rails/version.rb
 homepage: https://github.com/TeachersPayTeachers/tpt-rails
 licenses:
-- None
+- Nonstandard
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Utils for TpT Rails apps