Version 3 (#38)

* Version 3

* Update ruby version in CI

.github/workflows/test-on-push-and-pr.yml

@@ -15,6 +15,6 @@ jobs:
     - name: Set up ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.1
     - name: Run 'pr' target
       run: make pr

Makefile

@@ -13,7 +13,7 @@ setup-codebuild-agent:
 
 .PHONY: test-smoke
 test-smoke: setup-codebuild-agent
-	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.1.yml alpine 3.12 2.7
+	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.1.yml alpine 3.16 3.1
 
 .PHONY: test-unit
 test-unit:

README.md

@@ -19,7 +19,6 @@ First step is to choose the base image to be used. The supported Linux OS distri
 
  - Amazon Linux 2
  - Alpine
- - CentOS
  - Debian
  - Ubuntu
 

aws_lambda_ric.gemspec

@@ -1,5 +1,3 @@
-# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
 # frozen_string_literal: true
 
 lib = File.expand_path('lib', __dir__)
@@ -8,15 +6,15 @@ require './lib/aws_lambda_ric/version'
 
 Gem::Specification.new do |spec|
   spec.name                  = 'aws_lambda_ric'
-  spec.version               = AwsLambdaRuntimeInterfaceClient::VERSION
+  spec.version               = AwsLambdaRIC::VERSION
   spec.authors               = ['AWS Lambda']
 
   spec.summary               = 'AWS Lambda Runtime Interface Client for Ruby'
   spec.description           = 'The AWS Lambda Ruby Runtime Interface Client implements the Lambda programming model for Ruby.'
   spec.homepage              = 'https://github.com/aws/aws-lambda-ruby-runtime-interface-client'
 
   spec.license               = 'Apache-2.0'
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 3.0'
 
   # Specify which files should be added to the gem when it is released.
   spec.files                 = %w[
@@ -33,8 +31,9 @@ Gem::Specification.new do |spec|
   spec.executables           = 'aws_lambda_ric'
   spec.require_paths         = ['lib']
 
-  spec.add_development_dependency 'bundler', '>= 2.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'activesupport', '~> 6.0.1'
+  spec.add_development_dependency 'test-unit', '~> 3.5.5'
 end

bin/aws_lambda_ric

@@ -1,10 +1,9 @@
 #! /usr/bin/env ruby
-
-# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require_relative '../lib/aws_lambda_ric/bootstrap'
+require_relative '../lib/aws_lambda_ric'
+
+lambda_ric = AwsLambdaRIC::Bootstrap.new
 
-Bootstrap.start
+lambda_ric.start

buildspec.yml

@@ -0,0 +1,23 @@
+
+version: 0.2
+
+env:
+  shell: bash
+
+phases:
+  install:
+    commands:
+      - docker logout public.ecr.aws
+      - docker pull public.ecr.aws/amazonlinux/amazonlinux:2
+
+  pre_build:
+    commands:
+      - mkdir -p "${OUT_DIR:-build-artifacts}"
+
+  build:
+    commands:
+      - make build-all OUT_DIR="${OUT_DIR:-build-artifacts}"
+
+artifacts:
+  files:
+    - "build-artifacts/**"

lib/aws_lambda_ric.rb

@@ -1,5 +1,3 @@
-# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
 # frozen_string_literal: true
 
 require_relative 'aws_lambda_ric/lambda_errors'
@@ -17,17 +15,24 @@
 
 $stdout.sync = true # Ensures that logs are flushed promptly.
 
-module AwsLambdaRuntimeInterfaceClient
+module AwsLambdaRIC
 
   class Error < StandardError; end
 
+  def self.get_user_agent
+    ruby_version = RUBY_VERSION.to_s
+    version = AwsLambdaRIC::VERSION
+
+    "aws-lambda-ruby/#{ruby_version}-#{version}"
+  end
+
   # Loads the user code and runs it upon invocation
   class LambdaRunner
 
     ENV_VAR_RUNTIME_API = 'AWS_LAMBDA_RUNTIME_API'
 
     def initialize(runtime_server_addr, user_agent)
-      @lambda_server = LambdaServer.new(runtime_server_addr, user_agent)
+      @lambda_server = RapidClient.new(runtime_server_addr, user_agent)
       @runtime_loop_active = true # if false, we will exit the program
       @exit_code = 0
     end
@@ -45,7 +50,7 @@ def run(app_root, handler)
         @exit_code = -4
         send_init_error_to_server(e)
       ensure
-        TelemetryLoggingHelper.close
+        TelemetryLogger.close
       end
 
       exit(@exit_code)
@@ -121,7 +126,7 @@ def send_error_response(lambda_invocation, err, exit_code = nil, runtime_loop_ac
   end
 
   # Helper class to for mutating std logger with TelemetryLog
-  class TelemetryLoggingHelper
+  class TelemetryLogger
 
     ENV_VAR_TELEMETRY_LOG_FD = '_LAMBDA_TELEMETRY_LOG_FD'
 
@@ -133,19 +138,27 @@ def close
       end
     end
 
-    def initialize(telemetry_log_fd, path_to_fd='/proc/self/fd/')
-      fd = "#{path_to_fd}#{telemetry_log_fd}"
-      AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.telemetry_log_fd_file = File.open(fd, 'wb')
-      AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.telemetry_log_fd_file.sync = true
+    def initialize(telemetry_log_fd)
+      fd = telemetry_log_fd.to_i
+      AwsLambdaRIC::TelemetryLogger.telemetry_log_fd_file = IO.new(fd, 'wb')
+      AwsLambdaRIC::TelemetryLogger.telemetry_log_fd_file.sync = true
 
-      AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.telemetry_log_sink = TelemetryLogSink.new(file: AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.telemetry_log_fd_file)
+      AwsLambdaRIC::TelemetryLogger.telemetry_log_sink = TelemetryLogSink.new(file: AwsLambdaRIC::TelemetryLogger.telemetry_log_fd_file)
 
       mutate_std_logger
       mutate_kernel_puts
-    rescue Errno::ENOENT
+    rescue Errno::ENOENT, Errno::EBADF
       # If File.open() fails, then the mutation won't happen and the default behaviour (print to stdout) will prevail
     end
 
+    def self.from_env()
+      if ENV.key?(ENV_VAR_TELEMETRY_LOG_FD)
+        fd = ENV.fetch(AwsLambdaRIC::TelemetryLogger::ENV_VAR_TELEMETRY_LOG_FD)
+        ENV.delete(AwsLambdaRIC::TelemetryLogger::ENV_VAR_TELEMETRY_LOG_FD)
+        AwsLambdaRIC::TelemetryLogger.new(fd)
+      end
+    end
+
     private
 
     def mutate_std_logger
@@ -158,7 +171,11 @@ def mutate_kernel_puts
       Kernel.module_eval do
         def puts(*arg)
           msg = arg.flatten.collect { |a| a.to_s.encode('UTF-8') }.join("\n")
-          AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.telemetry_log_sink.write(msg)
+          if msg[-1] != "\n"
+            msg += "\n"
+          end
+          AwsLambdaRIC::TelemetryLogger.telemetry_log_sink.write(msg)
+          return nil
         end
       end
     end
@@ -176,4 +193,30 @@ def initialize(request_id, raw_request, request, trace_id)
       @trace_id = trace_id
     end
   end
+
+  class Bootstrap
+
+    def start
+      AwsLambdaRIC::TelemetryLogger::from_env()
+      bootstrap_handler
+    end
+
+    def fetch_runtime_server
+      ENV.fetch(AwsLambdaRIC::LambdaRunner::ENV_VAR_RUNTIME_API)
+    rescue KeyError
+      puts 'Failed to get runtime server address from AWS_LAMBDA_RUNTIME_API env variable'
+      exit(-2)
+    end
+
+    def bootstrap_handler
+      if ENV['_HANDLER'] == nil
+        puts 'No handler specified, exiting Runtime Interface Client.'
+        exit
+      end
+      app_root = Dir.pwd
+      handler = ENV['_HANDLER']
+      lambda_runner = AwsLambdaRIC::LambdaRunner.new(fetch_runtime_server, AwsLambdaRIC::get_user_agent)
+      lambda_runner.run(app_root, handler)
+    end
+  end
 end

lib/aws_lambda_ric/aws_lambda_marshaller.rb

@@ -1,5 +1,3 @@
-# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
 # frozen_string_literal: true
 
 require 'stringio'

lib/aws_lambda_ric/lambda_context.rb

@@ -1,5 +1,3 @@
-# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
 # frozen_string_literal: true
 
 class LambdaContext

lib/aws_lambda_ric/lambda_errors.rb

@@ -1,6 +1,5 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
 # frozen_string_literal: true
+
 module LambdaErrors
 
   class LambdaErrors::InvocationError < StandardError;
@@ -25,9 +24,9 @@ def runtime_error_type
 
     def to_lambda_response
       {
-          :errorMessage => @error_message,
-          :errorType => @error_type,
-          :stackTrace => @stack_trace
+        :errorMessage => @error_message,
+        :errorType => @error_type,
+        :stackTrace => @stack_trace
       }
     end
 
@@ -39,7 +38,7 @@ def _sanitize_stacktrace(stacktrace)
       if stacktrace
         stacktrace.first(100).each do |line|
           if safe_trace
-            if line.to_s.match(%r{^lib})
+            if line.to_s.match(%r{^/var/runtime/lib})
               safe_trace = false
             else
               ret << line

lib/aws_lambda_ric/lambda_handler.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# frozen_string_literal: true
 
 require_relative 'aws_lambda_marshaller'
 
@@ -19,8 +19,8 @@ def initialize(env_handler:)
 
   def call_handler(request:, context:)
     opts = {
-        event: request,
-        context: context
+      event: request,
+      context: context
     }
     if @handler_class
       response = Kernel.const_get(@handler_class).send(@handler_method_name, **opts)

lib/aws_lambda_ric/lambda_log_formatter.rb

@@ -1,11 +1,9 @@
-# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
 # frozen_string_literal: true
 
 require 'logger'
 
-class LambdaLogFormatter < Logger::Formatter
-  FORMAT = '%<sev>s, [%<datetime>s#%<process>d] %<severity>5s %<request_id>s -- %<progname>s: %<msg>s'
+class LogFormatter < Logger::Formatter
+  FORMAT = '%<sev>s, [%<datetime>s #%<process>d] %<severity>5s %<request_id>s -- %<progname>s: %<msg>s'
 
   def call(severity, time, progname, msg)
     (FORMAT % {sev: severity[0..0], datetime: format_datetime(time), process: $$, severity: severity,

lib/aws_lambda_ric/lambda_logger.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# frozen_string_literal: true
 
 class LambdaLogger
   class << self