From acb5c678a840449af2d89a3ccc5436fdd3c99ad3 Mon Sep 17 00:00:00 2001 From: xuan-cao-swi Date: Fri, 30 Aug 2024 11:59:52 -0400 Subject: [PATCH 1/3] NH-89983: remove doc/ from lambda build; fix logging --- lambda/otel/Dockerfile_3_2 | 2 +- lambda/otel/Dockerfile_3_3 | 2 +- lambda/otel/layer/otel_wrapper.rb | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lambda/otel/Dockerfile_3_2 b/lambda/otel/Dockerfile_3_2 index bab3a57..0a548f7 100644 --- a/lambda/otel/Dockerfile_3_2 +++ b/lambda/otel/Dockerfile_3_2 @@ -20,7 +20,7 @@ RUN export gem_file=$(cat gem_file.txt) && \ bundle update; \ fi -RUN rm /build/layer/ruby/ruby/3.2.0/cache/* +RUN rm /build/layer/ruby/ruby/3.2.0/cache/* && rm /build/layer/ruby/ruby/3.2.0/doc/* WORKDIR /build/layer/ruby/ruby RUN zip -qr gems-3.2.0.zip 3.2.0/ diff --git a/lambda/otel/Dockerfile_3_3 b/lambda/otel/Dockerfile_3_3 index 5740c4a..cddb1b2 100644 --- a/lambda/otel/Dockerfile_3_3 +++ b/lambda/otel/Dockerfile_3_3 @@ -20,7 +20,7 @@ RUN export gem_file=$(cat gem_file.txt) && \ bundle update; \ fi -RUN rm /build/layer/ruby/ruby/3.3.0/cache/* +RUN rm /build/layer/ruby/ruby/3.3.0/cache/* && rm /build/layer/ruby/ruby/3.3.0/doc/* WORKDIR /build/layer/ruby/ruby RUN zip -qr gems-3.3.0.zip 3.3.0/ diff --git a/lambda/otel/layer/otel_wrapper.rb b/lambda/otel/layer/otel_wrapper.rb index e113de9..dce9af6 100644 --- a/lambda/otel/layer/otel_wrapper.rb +++ b/lambda/otel/layer/otel_wrapper.rb @@ -15,7 +15,7 @@ def preload_function_dependencies unless handler_file && File.exist?("#{default_task_location}/#{handler_file}.rb") OpenTelemetry.logger.warn { 'Could not find the original handler file to preload libraries.' } - return + return nil end libraries = File.read("#{default_task_location}/#{handler_file}.rb") @@ -27,11 +27,16 @@ def preload_function_dependencies rescue StandardError => e OpenTelemetry.logger.warn { "Could not load library #{lib}: #{e.message}" } end + handler_file end -unless ENV['SW_APM_LAMBDA_PRELOAD_DEPS'].to_s.downcase == 'false' +if ENV['SW_APM_LAMBDA_PRELOAD_DEPS'].to_s.downcase == 'false' OpenTelemetry.logger.warn { "SW_APM_LAMBDA_PRELOAD_DEPS set to #{ENV.fetch('SW_APM_LAMBDA_PRELOAD_DEPS', nil)}. No libraries will be preloaded." } - preload_function_dependencies +else + + handler_file = preload_function_dependencies + + OpenTelemetry.logger.info { "Libraries in #{handler_file} will be preloaded." } if handler_file require 'opentelemetry-registry' require 'opentelemetry-instrumentation-all' From 6c86bc6fbb2978aa451a8fd084d4efb7ee6288f9 Mon Sep 17 00:00:00 2001 From: Xuan <112967240+xuan-cao-swi@users.noreply.github.com> Date: Tue, 3 Sep 2024 14:45:49 -0400 Subject: [PATCH 2/3] Update lambda/otel/layer/otel_wrapper.rb Co-authored-by: Lin Lin --- lambda/otel/layer/otel_wrapper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda/otel/layer/otel_wrapper.rb b/lambda/otel/layer/otel_wrapper.rb index dce9af6..7af5809 100644 --- a/lambda/otel/layer/otel_wrapper.rb +++ b/lambda/otel/layer/otel_wrapper.rb @@ -36,7 +36,7 @@ def preload_function_dependencies handler_file = preload_function_dependencies - OpenTelemetry.logger.info { "Libraries in #{handler_file} will be preloaded." } if handler_file + OpenTelemetry.logger.info { "Libraries in #{handler_file} have been preloaded." } if handler_file require 'opentelemetry-registry' require 'opentelemetry-instrumentation-all' From afe2cfd0b46cd2114fa9bc9663e3154dbc708eba Mon Sep 17 00:00:00 2001 From: Lin Lin Date: Thu, 5 Sep 2024 16:11:31 -0700 Subject: [PATCH 3/3] fix docs dir removal --- lambda/otel/Dockerfile_3_2 | 2 +- lambda/otel/Dockerfile_3_3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lambda/otel/Dockerfile_3_2 b/lambda/otel/Dockerfile_3_2 index 0a548f7..04ea7b2 100644 --- a/lambda/otel/Dockerfile_3_2 +++ b/lambda/otel/Dockerfile_3_2 @@ -20,7 +20,7 @@ RUN export gem_file=$(cat gem_file.txt) && \ bundle update; \ fi -RUN rm /build/layer/ruby/ruby/3.2.0/cache/* && rm /build/layer/ruby/ruby/3.2.0/doc/* +RUN rm /build/layer/ruby/ruby/3.2.0/cache/* && rm -rf /build/layer/ruby/ruby/3.2.0/doc/* WORKDIR /build/layer/ruby/ruby RUN zip -qr gems-3.2.0.zip 3.2.0/ diff --git a/lambda/otel/Dockerfile_3_3 b/lambda/otel/Dockerfile_3_3 index cddb1b2..b271390 100644 --- a/lambda/otel/Dockerfile_3_3 +++ b/lambda/otel/Dockerfile_3_3 @@ -20,7 +20,7 @@ RUN export gem_file=$(cat gem_file.txt) && \ bundle update; \ fi -RUN rm /build/layer/ruby/ruby/3.3.0/cache/* && rm /build/layer/ruby/ruby/3.3.0/doc/* +RUN rm /build/layer/ruby/ruby/3.3.0/cache/* && rm -rf /build/layer/ruby/ruby/3.3.0/doc/* WORKDIR /build/layer/ruby/ruby RUN zip -qr gems-3.3.0.zip 3.3.0/