tpt-rails 1.2.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 497582b6de66fdec5dda45c775b2a6df6de864b3ef849cbfbb9c1d563f8f7f03
-  data.tar.gz: df47f25ac00874f91d34c90cac1a605aa18d8b900f14e14ccf1747236a394655
+  metadata.gz: '07648987ff33dc59d3d0d762ffc4561e9afb0ead7dd214288d98f0337fd7c9c3'
+  data.tar.gz: 49a7fa8920ed72e28a935cf906f1513a9854980096e16793187e5527121c9ab6
 SHA512:
-  metadata.gz: bbb38c7deaf7e76406180c68c21f7c56f9e7918bff3a4b36d65040a0e3930ef4c522d58e97c6b53bb4e7ccdd508da6591b609615e773b5141a2c6a13e908c635
-  data.tar.gz: f132370dc957a26ded8bc6f7611ccb04a886e12257043a9a1f3a9a11f9429891278ff2ca6f40557e9c0b0d3e64285d594be749a2518465e58529df3d5873b0d3
+  metadata.gz: 2453d891668fc96c18d169576a997db5a2f3017aba91b26ac7d347546c1fccc7baf5fc219770b8b7b03a072f17663f701ccbb4f4672248b5e310215c53ae3114
+  data.tar.gz: e803f8b9c00da8d637161d0bbe15936aca93ee882e54386e02a9ffbaa35199de498f7dbfa8ca3a935c8c79c6318c4af48e8c69545036a5bdf90510d494d37288

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,6 @@
 module Tpt
   module Rails
-    VERSION = '1.2.1'
+    # Do not change this manually. Our tooling will do it automatically.
+    VERSION = '1.4.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tpt-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.1
 platform: ruby
 authors:
 - TpT
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2021-03-26 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'
     - - ">="
       - !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'
     - - ">="
       - !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
@@ -72,8 +72,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -132,7 +132,7 @@ homepage: https://github.com/TeachersPayTeachers/tpt-rails
 licenses:
 - Nonstandard
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,8 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Utils for TpT Rails apps
 test_files: []