zuora_observability 0.3.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 664115d7965e1d549ab2bb227565f51379a7ba3cc4ca0205d80523024918e0f4
-  data.tar.gz: 2ce847ad2f5ed52a267c2cbf2ea5496a1d700d78240b3680fc25f037c5fd0d8a
+  metadata.gz: 91f680541f7eca83fa2a24aa721bb70c36b266e3ed2688b4311d4aa357cba5a8
+  data.tar.gz: 73bba0de9a68376e11484881afcc38280a0f6b7aa53ffba1cf9c8013289f42d5
 SHA512:
-  metadata.gz: dd64817b0143ae8213875a024da8c3546d4b70fba916ca930860dab84a66522ae25733657f3a929a1d12161ce7d24dc7c305a4df98a13576c9d10e55f1116bef
-  data.tar.gz: ece638c0238dd314be5cdc3ed5a62317f44c3eb15f75bdf63a6443024cbd7a5f89619cf7d0ed7d7c282e7a9cdb4201259ac1c15e1eddd4d1cbc00c4cbb3f8e65
+  metadata.gz: e36d3484052f8a857aaf17fac5fb2c142e6f6370ff9b0d19ae6a8088948e2920c9d524bd737303a790bd060f2205c8d14cb2b0a500e30ef579a8c52a52af6592
+  data.tar.gz: d0921b1f65bc227f695f995f657732e38c549a53f89a4b967df89d2e669b99d30b88d392e8d0bb1a4b9535a747de3db5c22ee203cf76ac918e17875905f29210

data/config/initializers/tagged_logging.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module ActiveSupport
+  module TaggedLogging
+    # Patch to apply structured tags to Tagged Logs
+    module Formatter
+      def call(severity, timestamp, progname, data)
+        super(severity, timestamp, progname, merged_tags.merge!(data))
+      end
+
+      private
+
+      def merged_tags
+        tags = {}
+
+        current_tags.each do |tag|
+          tags.merge!(tag) if tag.is_a?(Hash)
+        end
+
+        tags
+      end
+    end
+  end
+end
+
+module Rails
+  module Rack
+    # Patch to compute structured tags for Tagged Logging
+    class Logger
+      private
+
+      def compute_tags(request)
+        {
+          trace_id: request.uuid
+        }
+      end
+    end
+  end
+end

data/lib/zuora_observability/engine.rb

@@ -15,6 +15,8 @@ module ZuoraObservability
 
         next unless ZuoraObservability.configuration.json_logging
 
+        config.logger = ActiveSupport::TaggedLogging.new(config.logger)
+
         require 'lograge'
         require 'zuora_observability/logging/custom_options'
 

data/lib/zuora_observability/logger.rb

@@ -59,6 +59,11 @@ module ZuoraObservability
       if type == :ougai
         logger = new($stdout, level: level, progname: name)
       else
+        ActiveSupport::Deprecation.warn(<<-MSG.squish)
+          Creating a non-ougai custom_logger is deprecated and will be removed
+          in a future version of zuora_observability.
+        MSG
+
         require 'mono_logger'
         logger = MonoLogger.new(STDOUT)
         logger.level = level

data/lib/zuora_observability/logging/custom_options.rb

@@ -25,7 +25,6 @@ module ZuoraObservability
           items = {
             msg: 'Rails Request',
             params: event.payload[:params].as_json(except: IGNORE_PARAMS).to_s,
-            trace_id: event.payload[:headers]['action_dispatch.request_id'],
             zuora_trace_id: event.payload[:headers]['HTTP_ZUORA_REQUEST_ID'],
             error: event.payload[:exception_object]
           }

data/lib/zuora_observability/logging/formatter.rb

@@ -155,6 +155,7 @@ module ZuoraObservability
         def base_fields(data)
           {
             cp_id: data[:zuora_track_id],
+            entity_ids: data[:entity_ids],
             environment: data[:environment],
             tenant_id: data[:tenant_ids],
             trace_id: data[:zuora_trace_id]
@@ -164,11 +165,12 @@ module ZuoraObservability
         # zuora.http
         def http_fields(data)
           z_http_request = {
-            headers: data[:headers],
+            headers: data[:headers] || data.dig(:request, :headers),
             headers_blob: data.dig(:request, :headers_blob)
           }.compact
 
           z_http_response = {
+            headers: data.dig(:response, :headers),
             headers_blob: data.dig(:response, :headers_blob)
           }.compact
 

data/lib/zuora_observability/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraObservability
-  VERSION = '0.3.0'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_observability
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Hartley McGuire
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lograge
@@ -247,11 +247,9 @@ files:
 - app/controllers/zuora_observability/application_controller.rb
 - app/controllers/zuora_observability/metrics_controller.rb
 - app/helpers/zuora_observability/application_helper.rb
-- app/jobs/zuora_observability/application_job.rb
-- app/mailers/zuora_observability/application_mailer.rb
-- app/models/zuora_observability/application_record.rb
 - app/views/layouts/zuora_observability/application.html.erb
 - config/initializers/loggers.rb
+- config/initializers/tagged_logging.rb
 - config/routes.rb
 - lib/tasks/zuora_observability_tasks.rake
 - lib/zuora_observability.rb
@@ -282,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Summary of ZuoraObservability.

data/app/jobs/zuora_observability/application_job.rb

@@ -1,4 +0,0 @@
-module ZuoraObservability
-  class ApplicationJob < ActiveJob::Base
-  end
-end

data/app/mailers/zuora_observability/application_mailer.rb

@@ -1,6 +0,0 @@
-module ZuoraObservability
-  class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
-  end
-end

data/app/models/zuora_observability/application_record.rb

@@ -1,5 +0,0 @@
-module ZuoraObservability
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end