zuora_observability 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52240e5716643d75479140930fd29ed88b154af9c01511fcceea92338b399ae2
-  data.tar.gz: 20fa0460d7e665ee83b6265f69d928ed74b90fef9231e7211dac287d0e0475f0
+  metadata.gz: 664115d7965e1d549ab2bb227565f51379a7ba3cc4ca0205d80523024918e0f4
+  data.tar.gz: 2ce847ad2f5ed52a267c2cbf2ea5496a1d700d78240b3680fc25f037c5fd0d8a
 SHA512:
-  metadata.gz: 0246f0a9836504bbd5fb8ed0e0ec909664a6848cca592a4756c47dff3153eeb763e3f7e179fe031fe65161b9bf01ffbbc396f995738501f625dcbdf9b824436e
-  data.tar.gz: b7da319f502643521f8b229e2f33b889d9fbb6823b38b948b51d38f073f348d59affc8f84fca734635294627225766ab1ea7f2d49ac91b7b71a71c2b9e396518
+  metadata.gz: dd64817b0143ae8213875a024da8c3546d4b70fba916ca930860dab84a66522ae25733657f3a929a1d12161ce7d24dc7c305a4df98a13576c9d10e55f1116bef
+  data.tar.gz: ece638c0238dd314be5cdc3ed5a62317f44c3eb15f75bdf63a6443024cbd7a5f89619cf7d0ed7d7c282e7a9cdb4201259ac1c15e1eddd4d1cbc00c4cbb3f8e65

data/lib/zuora_observability/env.rb

@@ -43,7 +43,7 @@ module ZuoraObservability
       private
 
       def app_parent_name
-        if Rails::VERSION::MAJOR >= 6 && Rails::VERSION::MINOR >= 1
+        if Rails::VERSION::MAJOR >= 6
           Rails.application.class.module_parent_name
         else
           Rails.application.class.parent_name

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,18 +50,21 @@ 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]
+
+        error = data[:err] || serialize_exc(data[:error])
 
         {
-          message: data[:error].message,
-          stack_trace: data[:error].backtrace.join("\n"),
-          type: data[:error].class
+          message: error[:message],
+          stack_trace: error[:stack],
+          type: error[:name]
         }.compact
       end
 
@@ -72,16 +75,21 @@ module ZuoraObservability
 
       # http.request
       def request_fields(data)
+        request = data.slice(:method, :params).merge(data.fetch(:request, {}))
+
         {
-          method: data[:method],
-          body: ({ content: data[:params] } if data.key? :params)
+          method: request[:method],
+          body: ({ content: request[:params] } if request.key? :params)
         }.compact
       end
 
       # http.response
       def response_fields(data)
+        response = data.slice(:status).merge(data.fetch(:response, {}))
+
         {
-          status_code: data[:status]
+          status_code: response[:status],
+          body: ({ content: response[:params] } if response.key? :params),
         }.compact
       end
 
@@ -100,6 +108,7 @@ module ZuoraObservability
       # url
       def url_fields(data)
         {
+          full: data.dig(:url, :full),
           path: data[:path]
         }.compact
       end
@@ -107,6 +116,7 @@ module ZuoraObservability
       # user
       def user_fields(data)
         {
+          id: data[:user_id],
           email: data[:email]
         }.compact
       end
@@ -144,7 +154,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],
@@ -154,16 +163,26 @@ module ZuoraObservability
 
         # zuora.http
         def http_fields(data)
-          z_http_request = { headers: data[:headers] }.compact
+          z_http_request = {
+            headers: data[:headers],
+            headers_blob: data.dig(:request, :headers_blob)
+          }.compact
+
+          z_http_response = {
+            headers_blob: data.dig(:response, :headers_blob)
+          }.compact
 
           {
-            request: (z_http_request unless z_http_request.empty?)
+            request: (z_http_request unless z_http_request.empty?),
+            response: (z_http_response unless z_http_response.empty?)
           }.compact
         end
 
         # 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'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_observability
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Hartley McGuire
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-04-19 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
@@ -284,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       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
- */