zuora_observability 0.1.0.pre.f → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d31b6073ad9e3656c57f437c94ddd5d261f42debb578a6eb480178f458ea571
-  data.tar.gz: 919af15470a8e49809c140fa15b55bceccf3512d22f8d3470b72b94a9011649d
+  metadata.gz: f6d0f3a139bf8fb34c6d9eb5cda9f00e70454dca7eca5d5d805a1c5e3fd63db8
+  data.tar.gz: 0deaaad02637351504969a88c05156944aff6121f06af6ea092662591828911c
 SHA512:
-  metadata.gz: 379c96696127af1384c9d52e322665fcdfcc94a05c645258281b6e823420a314b2bf93629df28f6042bfe869789acea4463c11ee1b8f603db9914b0a1113a80c
-  data.tar.gz: c0c74096ef3088cce897ba8d912ac4ba4e8ddec29afb4821ad16bc2be6bc20f9984044413c045f5b26099ac3d7bff86310f46ba03ec183b9baf73ad71d5dda78
+  metadata.gz: 37bd27174e6e17457f24bdbecda6684de98a33a959403943ee02731cf763519b4cae6daa06ae1c58ca8f0ddb02924e1178c191a5170577f70e0112700a18cab9
+  data.tar.gz: 6c75b2300f11d99fc8f94e88cb618e6da59ee686c51fed7b78a1a8e0b12972a613422cba1ae21ed26d686279d9c7f0802fa52a6c53955172aca651cfe4794851

data/lib/zuora_observability/logging/custom_options.rb

@@ -13,6 +13,7 @@ module ZuoraObservability
         CONTENT_TYPE
         ORIGINAL_FULLPATH
         QUERY_STRING
+        HTTP_COOKIE
       ].freeze
 
       IGNORE_PARAMS = %w[controller action format].freeze

data/lib/zuora_observability/logging/formatter.rb

@@ -50,19 +50,28 @@ module ZuoraObservability
           ecs: { version: ECS_VERSION },
           log: { level: severity, logger: progname || @app_name },
           service: { name: Env.name, version: Env.version },
-          trace: { id: data[:trace_id] }
+          trace: { id: data[:trace_id] },
+          tags: ['zecs']
         }
       end
 
-      # error
+      # errors
       def error_fields(data)
-        return {} unless data[:error]
+        return {} unless data[:error] || data[:err]
 
-        {
-          message: data[:error].message,
-          stack_trace: data[:error].backtrace.join("\n"),
-          type: data[:error].class
-        }.compact
+        if data[:error]
+          {
+            message: data[:error].message,
+            stack_trace: data[:error].backtrace.join("\n"),
+            type: data[:error].class
+          }.compact
+        else
+          {
+            message: data.dig(:err, :message),
+            stack_trace: data.dig(:err, :stack),
+            type: data.dig(:err, :name)
+          }.compact
+        end
       end
 
       # http
@@ -81,7 +90,8 @@ module ZuoraObservability
       # http.response
       def response_fields(data)
         {
-          status_code: data[:status]
+          status_code: data[:status],
+          body: data[:response_body]
         }.compact
       end
 
@@ -107,6 +117,7 @@ module ZuoraObservability
       # user
       def user_fields(data)
         {
+          id: data[:user_id],
           email: data[:email]
         }.compact
       end
@@ -124,7 +135,7 @@ module ZuoraObservability
 
     # The Zuora Extension to ECS defined by ZECS
     module ZuoraFields
-      ZECS_VERSION = '1.0'
+      ZECS_VERSION = '1.1'
 
       class << self
         # zuora top level field
@@ -144,7 +155,6 @@ module ZuoraObservability
 
         def base_fields(data)
           {
-            apartment_id: data[:app_instance_id],
             cp_id: data[:zuora_track_id],
             environment: data[:environment],
             tenant_id: data[:tenant_ids],
@@ -163,7 +173,9 @@ module ZuoraObservability
 
         # Service's Custom Fields
         def service_fields(data)
-          data[:zecs_service].presence || {}
+          {
+            app_instance_id: data[:app_instance_id]
+          }.merge(data.fetch(:zecs_service, {})).compact
         end
       end
     end

data/lib/zuora_observability/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraObservability
-  VERSION = '0.1.0-f'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_observability
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.f
+  version: 0.2.2
 platform: ruby
 authors:
 - Hartley McGuire
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lograge
@@ -244,8 +244,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/config/zuora_observability_manifest.js
-- app/assets/stylesheets/zuora_observability/application.css
 - app/controllers/zuora_observability/application_controller.rb
 - app/controllers/zuora_observability/metrics_controller.rb
 - app/helpers/zuora_observability/application_helper.rb
@@ -280,11 +278,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Summary of ZuoraObservability.

data/app/assets/config/zuora_observability_manifest.js

@@ -1 +0,0 @@
-//= link_directory ../stylesheets/zuora_observability .css

data/app/assets/stylesheets/zuora_observability/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */