From 41c633512b32e02d1672abdc8dab33d4d10c5aa4 Mon Sep 17 00:00:00 2001 From: Piotr Wasiak Date: Fri, 28 Jun 2024 13:31:19 +0200 Subject: [PATCH 1/3] Add missing level_override instance variable from logger 1.6.0 compatibility for most recent, included in ruby 3.3.3 logger. https://github.com/ruby/logger/commit/7aabb0b4aaabea3e3a226092bdf92b60bf1c9d60 --- lib/aws_lambda_ric/logger_patch.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/aws_lambda_ric/logger_patch.rb b/lib/aws_lambda_ric/logger_patch.rb index 35c78f0..d268b13 100644 --- a/lib/aws_lambda_ric/logger_patch.rb +++ b/lib/aws_lambda_ric/logger_patch.rb @@ -16,6 +16,7 @@ def initialize(logdev, shift_age = 0, shift_size = 1048576, level: 'debug', self.datetime_format = datetime_format self.formatter = formatter @logdev = AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.telemetry_log_sink + @level_override = {} end end end From 0e6ff7a88ebbcfb8921951760d00c36ef1a567d1 Mon Sep 17 00:00:00 2001 From: Piotr Wasiak Date: Fri, 28 Jun 2024 14:03:30 +0200 Subject: [PATCH 2/3] Simpified changes with manipulating only required params --- lib/aws_lambda_ric/logger_patch.rb | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/lib/aws_lambda_ric/logger_patch.rb b/lib/aws_lambda_ric/logger_patch.rb index d268b13..9978f1b 100644 --- a/lib/aws_lambda_ric/logger_patch.rb +++ b/lib/aws_lambda_ric/logger_patch.rb @@ -4,19 +4,14 @@ module LoggerPatch def initialize(logdev, shift_age = 0, shift_size = 1048576, level: 'debug', progname: nil, formatter: nil, datetime_format: nil, binmode: false, shift_period_suffix: '%Y%m%d') - # use unpatched constructor if logdev is a filename or an IO Object other than $stdout or $stderr - if logdev && logdev != $stdout && logdev != $stderr - super(logdev, shift_age, shift_size, level: level, progname: progname, - formatter: formatter, datetime_format: datetime_format, - binmode: binmode, shift_period_suffix: shift_period_suffix) - else - self.level = level - self.progname = progname + logdev_lambda_overwrite = logdev + if !logdev || logdev == $stdout || logdev == $stderr + logdev_lambda_overwrite = AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.telemetry_log_sink @default_formatter = LambdaLogFormatter.new - self.datetime_format = datetime_format - self.formatter = formatter - @logdev = AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.telemetry_log_sink - @level_override = {} end + + super(logdev_lambda_overwrite, shift_age, shift_size, level: level, progname: progname, + formatter: formatter, datetime_format: datetime_format, + binmode: binmode, shift_period_suffix: shift_period_suffix) end end From 8d7ab3faae8bda5cd84637663c1a5bb0508ad501 Mon Sep 17 00:00:00 2001 From: Piotr Wasiak Date: Fri, 28 Jun 2024 14:05:07 +0200 Subject: [PATCH 3/3] Update logger_patch.rb Add annotation what's going on --- lib/aws_lambda_ric/logger_patch.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/aws_lambda_ric/logger_patch.rb b/lib/aws_lambda_ric/logger_patch.rb index 9978f1b..6f1bc3b 100644 --- a/lib/aws_lambda_ric/logger_patch.rb +++ b/lib/aws_lambda_ric/logger_patch.rb @@ -5,6 +5,7 @@ def initialize(logdev, shift_age = 0, shift_size = 1048576, level: 'debug', progname: nil, formatter: nil, datetime_format: nil, binmode: false, shift_period_suffix: '%Y%m%d') logdev_lambda_overwrite = logdev + # use unpatched constructor if logdev is a filename or an IO Object other than $stdout or $stderr if !logdev || logdev == $stdout || logdev == $stderr logdev_lambda_overwrite = AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.telemetry_log_sink @default_formatter = LambdaLogFormatter.new