feat: add lambda ruby wrapper for layer (#1323)

* feat: add lambda ruby wrapper for layer

* double quote on env var

* feat: revision

* feat: change to dev

* feat: ensure version control

.github/workflows/release-layer-ruby.yml

@@ -78,6 +78,6 @@ jobs:
       layer-name: opentelemetry-ruby
       component-version: ${{needs.build-layer.outputs.RUBY_SDK_VERSION}}
       runtimes: ruby3.2
-      release-group: prod
+      release-group: dev
       aws_region: ${{ matrix.aws_region }}
     secrets: inherit

ruby/sample-apps/function/lambda_function.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'opentelemetry-sdk'
 
 def lambda_handler(event:, context:)
   if defined?(::OpenTelemetry::SDK)

ruby/sample-apps/template.yml

@@ -40,6 +40,7 @@ Resources:
             RestApiId: !Ref api
             Path: /
             Method: GET
+      Timeout: 60
       Environment:
         Variables:
           AWS_LAMBDA_EXEC_WRAPPER: /opt/otel-handler

ruby/src/layer/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'opentelemetry-sdk'
-gem 'opentelemetry-exporter-otlp'
-gem 'opentelemetry-instrumentation-all'
+gem 'opentelemetry-sdk', '~> 1.4.1'
+gem 'opentelemetry-exporter-otlp', '~> 0.26.3'
+gem 'opentelemetry-instrumentation-aws_lambda', '~> 0.1.0'

ruby/src/layer/Makefile

@@ -1,8 +1,10 @@
 
 build-OTelLayer:
-	mkdir -p ruby
 	mkdir -p $(ARTIFACTS_DIR)/ruby/gems/3.2.0
-	bundler install --path ruby
+	bundle config set --global silence_root_warning 1
+	bundle config set --local path 'ruby'
+	bundle install
 	cp -r ruby/ruby/3.2.0/* $(ARTIFACTS_DIR)/ruby/gems/3.2.0
 	cp otel-handler $(ARTIFACTS_DIR)/otel-handler
+	cp wrapper.rb $(ARTIFACTS_DIR)/wrapper.rb
 	rm -rf $(ARTIFACTS_DIR)/ruby/gems/3.2.0/cache

ruby/src/layer/otel-handler

@@ -1,14 +1,22 @@
 #!/bin/sh
 
+export ORIG_HANDLER="$_HANDLER";
+export _HANDLER="/opt/wrapper.otel_wrapper";
+
 if [ -z "${OTEL_SERVICE_NAME}" ]; then
     export OTEL_SERVICE_NAME="$AWS_LAMBDA_FUNCTION_NAME";
 fi
 
+# disable HTTP NET by default - otherwise, lambda runtime gets instrumented yielding noise
+if [ -z "${OTEL_RUBY_INSTRUMENTATION_NET_HTTP_ENABLED}" ]; then
+    export OTEL_RUBY_INSTRUMENTATION_NET_HTTP_ENABLED=false;
+fi
+
 export LAMBDA_RESOURCE_ATTRIBUTES="cloud.region=$AWS_REGION,cloud.provider=aws,faas.name=$AWS_LAMBDA_FUNCTION_NAME,faas.version=$AWS_LAMBDA_FUNCTION_VERSION";
 if [ -z "${OTEL_RESOURCE_ATTRIBUTES}" ]; then
     export OTEL_RESOURCE_ATTRIBUTES="$LAMBDA_RESOURCE_ATTRIBUTES";
 else
     export OTEL_RESOURCE_ATTRIBUTES="$LAMBDA_RESOURCE_ATTRIBUTES,$OTEL_RESOURCE_ATTRIBUTES";
 fi
 
-exec "$@"
+exec "$@"

ruby/src/layer/wrapper.rb

@@ -0,0 +1,12 @@
+require 'opentelemetry/sdk'
+require 'opentelemetry/exporter/otlp'
+require 'opentelemetry/instrumentation/aws_lambda'
+
+OpenTelemetry::SDK.configure do |c|
+  c.use 'OpenTelemetry::Instrumentation::AwsLambda'
+end
+
+def otel_wrapper(event:, context:)
+  otel_wrapper = OpenTelemetry::Instrumentation::AwsLambda::Handler.new()
+  otel_wrapper.call_wrapped(event: event, context: context)
+end

ruby/src/zip_ruby_layer.sh

@@ -35,6 +35,7 @@ main() {
 	cd .aws-sam/build/OTelLayer/
 	zip -qr ../../../"$layerName".zip ruby/
 	cd -
+	echo "Finished"
 }
 
 main "$@"