Merge remote-tracking branch 'upstream/master' into update-log-error

Author: tycooon

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: reidmorrison

.github/workflows/ci.yml

@@ -12,36 +12,34 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - rails: 5.1
-            ruby: 2.5
-
-          - rails: 5.2
-            ruby: 2.5
-          - rails: 5.2
-            ruby: 2.6
-          - rails: 5.2
-            ruby: jruby-9.3
-
-          - rails: "6.0"
-            ruby: 2.6
-          - rails: "6.0"
-            ruby: 2.7
           - rails: "6.0"
-            ruby: jruby
+            ruby: "2.7"
 
           - rails: "6.1"
             ruby: "2.7"
           - rails: "6.1"
-            ruby: jruby
-
-          - rails: "7.0"
             ruby: "3.0"
+          - rails: "6.1"
+            ruby: "3.1"
+          - rails: "6.1"
+            ruby: "3.2"
+
           - rails: "7.0"
-            ruby: 3.1
-          - rails: "7.0"
-            ruby: 3.2
-          - rails: "7.0"
-            ruby: jruby 
+            ruby: "3.1"
+          - rails: "7.0b"
+            ruby: "3.2"
+
+          - rails: "7.1"
+            ruby: "3.1"
+          - rails: "7.1b"
+            ruby: "3.1"
+          - rails: "7.1.1"
+            ruby: "3.2"
+          - rails: "7.1"
+            ruby: "3.2"
+
+          - rails: "7.2"
+            ruby: "3.3"
 
     env:
       BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile

.gitignore

@@ -2,6 +2,7 @@
 *.log
 pkg/
 test/dummy/tmp/
+test/dummy/db/test.sqlite3-*
 test/dummy/.sass-cache
 *.gem
 /.idea
@@ -12,6 +13,7 @@ Gemfile.lock
 
 *.sqlite3
 .rakeTasks
-*.sqlite3
 TODO.md
 
+.tool-versions
+test/dummy/db/test.sqlite3

.rubocop.yml

@@ -1,9 +1,10 @@
 AllCops:
-  TargetRubyVersion: 2.4
   Exclude:
-    - '.git/**/*'
-    - '.github/**/*'
-    - 'gemfiles/**/*'
+    - ".git/**/*"
+    - "docs/**/*"
+    - "gemfiles/*"
+  NewCops: enable
+  TargetRubyVersion: 2.5
 
 #
 # RuboCop built-in settings.
@@ -31,7 +32,7 @@ Layout/HashAlignment:
 Layout/LineLength:
   Max: 128
   Exclude:
-    - '**/test/**/*'
+    - "**/test/**/*"
 
 # Match existing layout
 Layout/SpaceInsideHashLiteralBraces:
@@ -44,17 +45,17 @@ Metrics/AbcSize:
 # Support long block lengths for tests
 Metrics/BlockLength:
   Exclude:
-    - 'test/**/*'
-    - '**/*/cli.rb'
-  ExcludedMethods:
-    - 'aasm'
-    - 'included'
+    - "test/**/*"
+    - "**/*/cli.rb"
+  AllowedMethods:
+    - "aasm"
+    - "included"
 
 # Soften limits
 Metrics/ClassLength:
   Max: 250
   Exclude:
-    - 'test/**/*'
+    - "test/**/*"
 
 # TODO: Soften Limits for phase 1 only
 Metrics/CyclomaticComplexity:
@@ -77,15 +78,15 @@ Metrics/PerceivedComplexity:
 
 # Initialization Vector abbreviation
 Naming/MethodParameterName:
-  AllowedNames: ['iv', '_', 'io', 'ap']
+  AllowedNames: [ "iv", "_", "io", "ap", "id", "_id" ]
 
 # Does not allow Symbols to load
 Security/YAMLLoad:
   AutoCorrect: false
 
 # Needed for testing DateTime
 Style/DateTime:
-  Exclude: ['test/**/*']
+  Exclude: [ "test/**/*" ]
 
 # TODO: Soften Limits for phase 1 only
 Style/Documentation:

Appraisals

@@ -1,33 +1,46 @@
-appraise "rails_5.1" do
-  gem "rails", "~> 5.1.5"
-  gem "sqlite3", "~> 1.3.0", platform: :ruby
-  gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
-end
-
-appraise "rails_5.2" do
-  gem "rails", "~> 5.2.0"
-  gem "sqlite3", "~> 1.3.0", platform: :ruby
-  gem "activerecord-jdbcsqlite3-adapter", "~> 52.0", platform: :jruby
-end
-
 appraise "rails_6.0" do
   gem "rails", "~> 6.0.0"
-  gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platform: :jruby
-  gem "sqlite3", "~> 1.4.0", platform: :ruby
+  gem "sidekiq", "~> 4.2"
+  gem "sqlite3", "~> 1.4"
 end
 
 appraise "rails_6.1" do
   gem "rails", "~> 6.1.0"
-  gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platform: :jruby
-  gem "sqlite3", "~> 1.4.0", platform: :ruby
+  gem "sidekiq", "~> 5.2"
+  gem "sqlite3", "~> 1.4"
 end
 
 appraise "rails_7.0" do
-  # Remove this deprecated gem once the following patch is released
-  # https://github.com/rails-api/active_model_serializers/pull/2428
-  gem "thread_safe", "~> 0.3.6"
+  gem "rails", "~> 7.0.0"
+  gem "sidekiq", "~> 6.2.0"
+  gem "sqlite3", "~> 1.4"
+end
 
+appraise "rails_7.0b" do
   gem "rails", "~> 7.0.0"
-  gem "activerecord-jdbcsqlite3-adapter", "~> 70.0", platform: :jruby
-  gem "sqlite3", "~> 1.4.0", platform: :ruby
+  gem "sidekiq", "~> 6.5"
+  gem "sqlite3", "~> 1.4"
+end
+
+appraise "rails_7.1.1" do
+  gem "rails", "7.1.1"
+  gem "sidekiq", "~> 7.0.9"
+  gem "sqlite3", "~> 1.4"
+end
+
+appraise "rails_7.1" do
+  gem "rails", "~> 7.1.0"
+  gem "sidekiq", "~> 7.1.6"
+  gem "sqlite3", "~> 1.4"
+end
+
+appraise "rails_7.1b" do
+  gem "rails", "~> 7.1.0"
+  gem "sidekiq", "~> 7.3.0"
+  gem "sqlite3", "~> 1.4"
+end
+
+appraise "rails_7.2" do
+  gem "rails", "~> 7.2.0.beta2"
+  gem "sidekiq", "~> 7.2.4"
 end

Gemfile

@@ -12,7 +12,8 @@ gem "minitest-rails"
 gem "rake"
 gem "sprockets", "< 4.0"
 
-gem "rails", "~> 7.0.0"
-gem "sqlite3", "~> 1.4.0", platform: :ruby
+gem "rails", "~> 7.2.0.beta2"
+gem "sidekiq", "~> 7.2.4"
+gem "sqlite3"
 
 gem "rubocop"

README.md

@@ -3,12 +3,116 @@
 
 Rails Semantic Logger replaces the Rails default logger with [Semantic Logger](https://logger.rocketjob.io/)
 
+When any large Rails application is deployed to production one of the first steps is to move to centralized logging, so that logs can be viewed and searched from a central location.
+
+Centralized logging quickly falls apart when trying to consume the current human readable log files:
+- Log entries often span multiple lines, resulting in unrelated log lines in the centralized logging system. For example, stack traces.
+- Complex Regular Expressions are needed to parse the text lines and make them machine readable. For example to build queries, or alerts that are looking for specific elements in the message.
+- Writing searches, alerts, or dashboards based on text logs is incredibly brittle, since a small change to the text logged can often break the parsing of those logs.
+- Every log entry often has a completely different format, making it difficult to make consistent searches against the data.
+
+For these and many other reasons switching to structured logging, or logs in JSON format, in testing and production makes centralized logging incredibly powerful.
+
+For example, adding these lines to `config/application.rb` and removing any other log overrides from other environments, will switch automatically to structured logging when running inside Kubernetes:
+~~~ruby
+    # Setup structured logging
+    config.semantic_logger.application = "my_application"
+    config.semantic_logger.environment = ENV["STACK_NAME"] || Rails.env
+    config.log_level = ENV["LOG_LEVEL"] || :info
+
+    # Switch to JSON Logging output to stdout when running on Kubernetes
+    if ENV["LOG_TO_CONSOLE"] || ENV["KUBERNETES_SERVICE_HOST"]
+      config.rails_semantic_logger.add_file_appender = false
+      config.semantic_logger.add_appender(io: $stdout, formatter: :json)
+    end
+~~~
+
+Then configure the centralized logging system to tell it that the data is in JSON format, so that it will parse it for you into a hierarchy.
+
+For example, the following will instruct [Observe](https://www.observeinc.com/) to parse the JSON data and create machine readable data from it:
+~~~ruby
+interface "log", "log":log
+
+make_col event:parse_json(log)
+
+make_col
+   time:parse_isotime(event.timestamp),
+   application:string(event.application),
+   environment:string(event.environment),
+   duration:duration_ms(event.duration_ms),
+   level:string(event.level),
+   name:string(event.name),
+   message:string(event.message),
+   named_tags:event.named_tags,
+   payload:event.payload,
+   metric:string(event.metric),
+   metric_amount:float64(event.metric_amount),
+   tags:array(event.tags),
+   exception:event.exception,
+   host:string(event.host),
+   pid:int64(event.pid),
+   thread:string(event.thread),
+   file:string(event.file),
+   line:int64(event.line),
+   dimensions:event.dimensions,
+   backtrace:array(event.backtrace),
+   level_index:int64(event.level_index)
+
+set_valid_from(time)
+drop_col timestamp, log, event, stream
+rename_col timestamp:time
+~~~
+
+Now queries can be built to drill down into each of these fields, including `payload` which is a nested object.
+
+For example to find all failed Sidekiq job calls where the causing exception class name is `NoMethodError`:
+~~~ruby
+filter environment = "uat2"
+filter level = "error"
+filter metric = "sidekiq.job.perform"
+filter (string(exception.cause.name) = "NoMethodError")
+~~~
+
+Example: create a dashboard showing the duration of all successful Sidekiq jobs:
+~~~ruby
+filter environment = "production"
+filter level = "info"
+filter metric = "sidekiq.job.perform"
+timechart duration:avg(duration), group_by(name)
+~~~
+
+Example: create a dashboard showing the queue latency of all Sidekiq jobs. 
+The queue latency is the time between when the job was enqueued and when it was started:
+~~~ruby
+filter environment = "production"
+filter level = "info"
+filter metric = "sidekiq.queue.latency"
+timechart latency:avg(metric_amount/1000), group_by(string(named_tags.queue))
+~~~
+
 * http://github.com/reidmorrison/rails_semantic_logger
 
 ## Documentation
 
 For complete documentation see: https://logger.rocketjob.io/rails
 
+## Upgrading to Semantic Logger V4.16 - Sidekiq Metrics Support
+
+Rails Semantic Logger now supports Sidekiq metrics. 
+Below are the metrics that are now available when the JSON logging format is used:
+- `sidekiq.job.perform`
+  - The duration of each Sidekiq job.
+  - `duration` contains the time in milliseconds that the job took to run.
+- `sidekiq.queue.latency` 
+  - The time between when a Sidekiq job was enqueued and when it was started.
+  - `metric_amount` contains the time in milliseconds that the job was waiting in the queue.
+
+## Upgrading to Semantic Logger v4.15 & V4.16 - Sidekiq Support
+
+Rails Semantic Logger introduces direct support for Sidekiq v4, v5, v6, and v7. 
+Please remove any previous custom patches or configurations to make Sidekiq work with Semantic Logger.
+To see the complete list of patches being made, and to contribute your own changes, see: [Sidekiq Patches](https://github.com/reidmorrison/rails_semantic_logger/blob/master/lib/rails_semantic_logger/extensions/sidekiq/sidekiq.rb)
+
 ## Upgrading to Semantic Logger v4.4
 
 With some forking frameworks it is necessary to call `reopen` after the fork. With v4.4 the
@@ -19,7 +123,18 @@ I.e. Please remove the following line if being called anywhere:
 SemanticLogger::Processor.instance.instance_variable_set(:@queue, Queue.new)
 ~~~
 
-## Supports
+## New Versions of Rails, etc.
+
+The primary purpose of the Rails Semantic Logger gem is to patch other gems, primarily Rails, to make them support structured logging though Semantic Logger.
+
+When new versions of Rails and other gems are published they often make changes to the internals, so the existing patches stop working.
+
+Rails Semantic Logger survives only when someone in the community upgrades to a newer Rails or other supported libraries, runs into problems, 
+and then contributes the fix back to the community by means of a pull request.
+
+Additionally, when new popular gems come out, we rely only the community to supply the necessary patches in Rails Semantic Logger to make those gems support structured logging.
+
+## Supported Platforms
 
 For the complete list of supported Ruby and Rails versions, see the [Testing file](https://github.com/reidmorrison/rails_semantic_logger/blob/master/.github/workflows/ci.yml).
 

gemfiles/rails_6.0.gemfile

@@ -10,13 +10,9 @@ gem "minitest"
 gem "minitest-rails"
 gem "rake"
 gem "sprockets", "< 4.0"
-gem "semantic_logger", github: "reidmorrison/semantic_logger"
 gem "rails", "~> 6.0.0"
-gem "sqlite3", "~> 1.4.0", platform: :ruby
-gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platform: :jruby
-
-group :development do
-  gem "rubocop"
-end
+gem "sidekiq", "~> 4.2"
+gem "sqlite3", "~> 1.4"
+gem "rubocop"
 
 gemspec path: "../"

gemfiles/rails_6.1.gemfile

@@ -10,13 +10,9 @@ gem "minitest"
 gem "minitest-rails"
 gem "rake"
 gem "sprockets", "< 4.0"
-gem "semantic_logger", github: "reidmorrison/semantic_logger"
 gem "rails", "~> 6.1.0"
-gem "sqlite3", "~> 1.4.0", platform: :ruby
-gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platform: :jruby
-
-group :development do
-  gem "rubocop"
-end
+gem "sidekiq", "~> 5.2"
+gem "sqlite3", "~> 1.4"
+gem "rubocop"
 
 gemspec path: "../"