zuora_observability 0.3.0 → 0.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/initializers/tagged_logging.rb +33 -0
- data/lib/zuora_observability/engine.rb +1 -1
- data/lib/zuora_observability/logger.rb +5 -0
- data/lib/zuora_observability/logging/custom_options.rb +0 -1
- data/lib/zuora_observability/logging/formatter.rb +2 -1
- data/lib/zuora_observability/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 31ace19d3c6b8092e6faaf50da3bc94e53383bb9fa34dafaee16bfa5d5d6e555
|
4
|
+
data.tar.gz: 0f1761ca1c3c27fa4e42e626e689b2af9acb9b574bd6a0ce35f7b373f5f67f60
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e03d3fbabf4b6547844b28be303feeae46ea0966b793824b7fcafd4371551de5b436490abdf192f4046ac7ff38450e51b87b401de9e160e450d734510dba87b5
|
7
|
+
data.tar.gz: c36453840bd493eb29a6f1220a3ab234079b2795d97f32a201ddda9d445fd37c6e640fc147b53e6cc303dac72112b3ac2326daa8005a6ba20a4711c85ef86ca3
|
@@ -0,0 +1,33 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module ActiveSupport
|
4
|
+
module TaggedLogging
|
5
|
+
# Patch to apply structured tags to Tagged Logs
|
6
|
+
module Formatter
|
7
|
+
def call(severity, timestamp, progname, data)
|
8
|
+
super(severity, timestamp, progname, merged_tags.merge(data))
|
9
|
+
end
|
10
|
+
|
11
|
+
private
|
12
|
+
|
13
|
+
def merged_tags
|
14
|
+
current_tags.reduce(:merge) || {}
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
module Rails
|
21
|
+
module Rack
|
22
|
+
# Patch to compute structured tags for Tagged Logging
|
23
|
+
class Logger
|
24
|
+
private
|
25
|
+
|
26
|
+
def compute_tags(request)
|
27
|
+
{
|
28
|
+
trace_id: request.uuid
|
29
|
+
}
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
@@ -11,7 +11,7 @@ module ZuoraObservability
|
|
11
11
|
|
12
12
|
initializer(:rails_stdout_logging, before: :initialize_logger) do
|
13
13
|
Rails.application.configure do
|
14
|
-
config.logger = ZuoraObservability::Logger.custom_logger(name: 'Rails')
|
14
|
+
config.logger = ActiveSupport::TaggedLogging.new(ZuoraObservability::Logger.custom_logger(name: 'Rails'))
|
15
15
|
|
16
16
|
next unless ZuoraObservability.configuration.json_logging
|
17
17
|
|
@@ -59,6 +59,11 @@ module ZuoraObservability
|
|
59
59
|
if type == :ougai
|
60
60
|
logger = new($stdout, level: level, progname: name)
|
61
61
|
else
|
62
|
+
ActiveSupport::Deprecation.warn(<<-MSG.squish)
|
63
|
+
Creating a non-ougai custom_logger is deprecated and will be removed
|
64
|
+
in a future version of zuora_observability.
|
65
|
+
MSG
|
66
|
+
|
62
67
|
require 'mono_logger'
|
63
68
|
logger = MonoLogger.new(STDOUT)
|
64
69
|
logger.level = level
|
@@ -25,7 +25,6 @@ module ZuoraObservability
|
|
25
25
|
items = {
|
26
26
|
msg: 'Rails Request',
|
27
27
|
params: event.payload[:params].as_json(except: IGNORE_PARAMS).to_s,
|
28
|
-
trace_id: event.payload[:headers]['action_dispatch.request_id'],
|
29
28
|
zuora_trace_id: event.payload[:headers]['HTTP_ZUORA_REQUEST_ID'],
|
30
29
|
error: event.payload[:exception_object]
|
31
30
|
}
|
@@ -164,11 +164,12 @@ module ZuoraObservability
|
|
164
164
|
# zuora.http
|
165
165
|
def http_fields(data)
|
166
166
|
z_http_request = {
|
167
|
-
headers: data[:headers],
|
167
|
+
headers: data[:headers] || data.dig(:request, :headers),
|
168
168
|
headers_blob: data.dig(:request, :headers_blob)
|
169
169
|
}.compact
|
170
170
|
|
171
171
|
z_http_response = {
|
172
|
+
headers: data.dig(:response, :headers),
|
172
173
|
headers_blob: data.dig(:response, :headers_blob)
|
173
174
|
}.compact
|
174
175
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: zuora_observability
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Hartley McGuire
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-05-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: lograge
|
@@ -252,6 +252,7 @@ files:
|
|
252
252
|
- app/models/zuora_observability/application_record.rb
|
253
253
|
- app/views/layouts/zuora_observability/application.html.erb
|
254
254
|
- config/initializers/loggers.rb
|
255
|
+
- config/initializers/tagged_logging.rb
|
255
256
|
- config/routes.rb
|
256
257
|
- lib/tasks/zuora_observability_tasks.rake
|
257
258
|
- lib/zuora_observability.rb
|