aws_lambda_ric 1.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33180932d42b43cbe38aaf19aca5a30c01212a209cec6eb577b62e8139f4d36
-  data.tar.gz: 64b49034a0cd70a4e974c8bb2c56c8e73cc607b36e66de08622f8daa3fba982f
+  metadata.gz: e7531514e0f2ab9ba840cdcd973a36cadb45e9887db24a7fa0337e6eaca16e8a
+  data.tar.gz: b1be16c96fdc08b4651e99a4eb20f17ca3af69dee48476e58b075b910863a72d
 SHA512:
-  metadata.gz: 0dd4f76dabca24fcae696e0780be387eee6bdff75d1bf9b7f95f1d9e5a37a10823bb9f24b521bb9d64e55bf718b36a5a7f9c84625b7bb25fd4cf88eedaf89498
-  data.tar.gz: 6a95a1763b7263a87201ac82153cb27344e96927a582e3bae95003f29e3dbf1f60089d5791526624cd863d2b17983cdf03c9074a39b8cb85617f082bd796d550
+  metadata.gz: 7a9d932188a665f2865a71c9e7d06a6864fd7728925589e587c3ef71926c20ae0345cb9b7879c7457f586f7956df3ec41260038464ef34d50af6a785c81cfd71
+  data.tar.gz: 2b00da39020716fda73d50954e74ec76013a2aa0548c363411d743c03e01b888ff59a123921cf8915bef617cae0ebde7a35743588a589ca56edb5649fb88a956

data/LICENSE

@@ -1,229 +1,175 @@
-Apache License
 
-Version 2.0, January 2004
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-http://www.apache.org/licenses/ TERMS
-AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
    1. Definitions.
 
-     
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-      "License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-      
-
-     
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-      
-
-      "Legal Entity" shall mean the
-union of the acting entity and all other entities that control, are controlled
-by, or are under common control with that entity. For the purposes of this
-definition, "control" means (i) the power, direct or indirect, to cause the
-direction or management of such entity, whether by contract or otherwise, or (ii)
-ownership of fifty percent (50%) or more of the outstanding shares, or (iii)
-beneficial ownership of such entity.
-
-      
-
-      "You" (or "Your") shall mean
-an individual or Legal Entity exercising permissions granted by this License.
-
-  
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
       "Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation source, and
-configuration files.
-
-      
-
-      "Object" form shall mean any form resulting
-from mechanical transformation or translation of a Source form, including but not
-limited to compiled object code, generated documentation, and conversions to
-other media types.
-
-      
-
-      "Work" shall mean the work of authorship,
-whether in Source or Object form, made available under the License, as indicated
-by a copyright notice that is included in or attached to the work (an example is
-provided in the Appendix below).
-
-      
-
-      "Derivative Works" shall mean any
-work, whether in Source or Object form, that is based on (or derived from) the
-Work and for which the editorial revisions, annotations, elaborations, or other
-modifications represent, as a whole, an original work of authorship. For the
-purposes of this License, Derivative Works shall not include works that remain
-separable from, or merely link (or bind by name) to the interfaces of, the Work
-and Derivative Works thereof.
-
-      
-
-      "Contribution" shall mean any work
-of authorship, including the original version of the Work and any modifications
-or additions to that Work or Derivative Works thereof, that is intentionally
-submitted to Licensor for inclusion in the Work by the copyright owner or by an
-individual or Legal Entity authorized to submit on behalf of the copyright owner.
-For the purposes of this definition, "submitted" means any form of electronic,
-verbal, or written communication sent to the Licensor or its representatives,
-including but not limited to communication on electronic mailing lists, source
-code control systems, and issue tracking systems that are managed by, or on
-behalf of, the Licensor for the purpose of discussing and improving the Work, but
-excluding communication that is conspicuously marked or otherwise designated in
-writing by the copyright owner as "Not a Contribution."
-
-      
-
-     
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of
-whom a Contribution has been received by Licensor and subsequently incorporated
-within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and
-conditions of this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license
-to reproduce, prepare Derivative Works of, publicly display, publicly perform,
-sublicense, and distribute the Work and such Derivative Works in Source or Object
-form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this
-section) patent license to make, have made, use, offer to sell, sell, import, and
-otherwise transfer the Work, where such license applies only to those patent
-claims licensable by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s) with the Work to
-which such Contribution(s) was submitted. If You institute patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Work or a Contribution incorporated within the Work constitutes
-direct or contributory patent infringement, then any patent licenses granted to
-You under this License for that Work shall terminate as of the date such
-litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute
-copies of the Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You meet the following
-conditions:
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
 
       (a) You must give any other recipients of the Work or
-Derivative Works a copy of this License; and
-
-      (b) You must cause any
-modified files to carry prominent notices stating that You changed the files;
-and
-
-      (c) You must retain, in the Source form of any Derivative Works that
-You distribute, all copyright, patent, trademark, and attribution notices from
-the Source form of the Work, excluding those notices that do not pertain to any
-part of the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text
-file as part of its distribution, then any Derivative Works that You distribute
-must include a readable copy of the attribution notices contained within such
-NOTICE file, excluding those notices that do not pertain to any part of the
-Derivative Works, in at least one of the following places: within a NOTICE text
-file distributed as part of the Derivative Works; within the Source form or
-documentation, if provided along with the Derivative Works; or, within a display
-generated by the Derivative Works, if and wherever such third-party notices
-normally appear. The contents of the NOTICE file are for informational purposes
-only and do not modify the License. You may add Your own attribution notices
-within Derivative Works that You distribute, alongside or as an addendum to the
-NOTICE text from the Work, provided that such additional attribution notices
-cannot be construed as modifying the License.
-
-      You may add Your own
-copyright statement to Your modifications and may provide additional or different
-license terms and conditions for use, reproduction, or distribution of Your
-modifications, or for any such Derivative Works as a whole, provided Your use,
-reproduction, and distribution of the Work otherwise complies with the conditions
-stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly
-state otherwise, any Contribution intentionally submitted for inclusion in the
-Work by You to the Licensor shall be under the terms and conditions of this
-License, without any additional terms or conditions. Notwithstanding the above,
-nothing herein shall supersede or modify the terms of any separate license
-agreement you may have executed with Licensor regarding such Contributions.
-
-  
-6. Trademarks. This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of the Licensor, except as required
-for reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless
-required by applicable law or agreed to in writing, Licensor provides the Work
-(and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
-without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible
-for determining the appropriateness of using or redistributing the Work and
-assume any risks associated with Your exercise of permissions under this
-License.
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
 
    8. Limitation of Liability. In no event and under no legal theory,
-whether in tort (including negligence), contract, or otherwise, unless required
-by applicable law (such as deliberate and grossly negligent acts) or agreed to in
-writing, shall any Contributor be liable to You for damages, including any
-direct, indirect, special, incidental, or consequential damages of any character
-arising as a result of this License or out of the use or inability to use the
-Work (including but not limited to damages for loss of goodwill, work stoppage,
-computer failure or malfunction, or any and all other commercial damages or
-losses), even if such Contributor has been advised of the possibility of such
-damages.
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
 
    9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer, and charge a fee
-for, acceptance of support, warranty, indemnity, or other liability obligations
-and/or rights consistent with this License. However, in accepting such
-obligations, You may act only on Your own behalf and on Your sole responsibility,
-not on behalf of any other Contributor, and only if You agree to indemnify,
-defend, and hold each Contributor harmless for any liability incurred by, or
-claims asserted against, such Contributor by reason of your accepting any such
-warranty or additional liability. END OF TERMS AND CONDITIONS
-
-APPENDIX: How to
-apply the Apache License to your work.
-
-To apply the Apache License to your work,
-attach the following boilerplate notice, with the fields enclosed by brackets
-"[]" replaced with your own identifying information. (Don't include the
-brackets!) The text should be enclosed in the appropriate comment syntax for the
-file format. We also recommend that a file or class name and description of
-purpose be included on the same "printed page" as the copyright notice for easier
-identification within third-party archives.
-
-Copyright [yyyy] Edgar
-Hernandez
-
-Licensed under the Apache License, Version 2.0 (the "License");
-
-you
-may not use this file except in compliance with the License.
-
-You may obtain a
-copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless
-required by applicable law or agreed to in writing, software
-
-distributed under
-the License is distributed on an "AS IS" BASIS,
-
-WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, either express or implied.
-
-See the License for the specific
-language governing permissions and
-
-limitations under the License.
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

data/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
 
@@ -113,7 +112,7 @@ This runs the image as a container and starts up an endpoint locally at `http://
 3) Post an event to the following endpoint using a curl command: 
 
 ```shell script
-curl -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{}'.
+curl -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{}'
 ```
 
 This command invokes the function running in the container image and returns a response.
@@ -137,15 +136,26 @@ Make sure the project is built:
 make init build
 ```
 Then,
-* to run unit tests: `make test`
+* to run unit tests: `make test-unit`
 * to run integration tests: `make test-integ`
 * to run smoke tests: `make test-smoke`
 
+### Troubleshooting
+While running integration tests, you might encounter the Docker Hub rate limit error with the following body:
+```
+You have reached your pull rate limit. You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limits
+```
+To fix the above issue, consider authenticating to a Docker Hub account by setting the Docker Hub credentials as below CodeBuild environment variables.
+```shell script
+DOCKERHUB_USERNAME=<dockerhub username>
+DOCKERHUB_PASSWORD=<dockerhub password>
+```
+Recommended way is to set the Docker Hub credentials in CodeBuild job by retrieving them from AWS Secrets Manager.
+
 ## Security
 
 If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
 
 ## License
 
-This project is licensed under the Apache-2.0 License.
-
+This project is licensed under the Apache-2.0 License.

data/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,7 +6,7 @@ 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'
@@ -16,7 +14,7 @@ Gem::Specification.new do |spec|
   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[
@@ -24,7 +22,6 @@ Gem::Specification.new do |spec|
     README.md
     Gemfile
     NOTICE
-    Gemfile.lock
     aws_lambda_ric.gemspec
     bin/aws_lambda_ric
   ] + Dir['lib/**/*']
@@ -34,7 +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

data/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

data/lib/aws_lambda_ric/aws_lambda_marshaller.rb

@@ -1,7 +1,7 @@
-# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
 # frozen_string_literal: true
 
+require 'stringio'
+
 module AwsLambda
   class Marshaller
     class << self

data/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
@@ -17,8 +15,8 @@ class LambdaContext
     @function_name = ENV['AWS_LAMBDA_FUNCTION_NAME']
     @memory_limit_in_mb = ENV['AWS_LAMBDA_FUNCTION_MEMORY_SIZE']
     @function_version = ENV['AWS_LAMBDA_FUNCTION_VERSION']
-    @identity = JSON.parse(request['Lambda-Runtime-Cognito-Identity']) if request['Lambda-Runtime-Cognito-Identity']
-    @client_context = JSON.parse(request['Lambda-Runtime-Client-Context']) if request['Lambda-Runtime-Client-Context']
+    @identity = JSON.parse(request['Lambda-Runtime-Cognito-Identity']) unless request['Lambda-Runtime-Cognito-Identity'].to_s.empty?
+    @client_context = JSON.parse(request['Lambda-Runtime-Client-Context']) unless request['Lambda-Runtime-Client-Context'].to_s.empty?
   end
 
   def get_remaining_time_in_millis

data/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 @@ module LambdaErrors
 
     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 @@ module LambdaErrors
       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

data/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 @@ class LambdaHandler
 
   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)

data/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,

data/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

data/lib/aws_lambda_ric/lambda_server.rb

@@ -1,37 +1,36 @@
-# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
 # frozen_string_literal: true
 
 require 'net/http'
 require 'json'
 require_relative 'lambda_errors'
 
-class LambdaServer
+class RapidClient
   LAMBDA_DEFAULT_SERVER_ADDRESS = '127.0.0.1:9001'
   LAMBDA_RUNTIME_API_VERSION = '2018-06-01'
 
-  MAX_HEADER_SIZE = 1024 * 1024
-  LONG_TIMEOUT = 1_000_000
+  MAX_HEADER_SIZE_BYTES = 1024 * 1024
+  LONG_TIMEOUT_MS = 1_000_000
 
-  def initialize(server_address)
+  def initialize(server_address, user_agent)
     server_address ||= LAMBDA_DEFAULT_SERVER_ADDRESS
-    @server_address = 'http://' + server_address + '/' + LAMBDA_RUNTIME_API_VERSION
+    @server_address = "http://#{server_address}/#{LAMBDA_RUNTIME_API_VERSION}"
+    @user_agent = user_agent
   end
 
   def next_invocation
     next_invocation_uri = URI(@server_address + '/runtime/invocation/next')
     begin
       http = Net::HTTP.new(next_invocation_uri.host, next_invocation_uri.port)
-      http.read_timeout = LONG_TIMEOUT
+      http.read_timeout = LONG_TIMEOUT_MS
       resp = http.start do |connection|
-        connection.get(next_invocation_uri.path)
+        connection.get(next_invocation_uri.path, { 'User-Agent' => @user_agent })
       end
       if resp.is_a?(Net::HTTPSuccess)
         request_id = resp['Lambda-Runtime-Aws-Request-Id']
         [request_id, resp]
       else
         raise LambdaErrors::InvocationError.new(
-            "Received #{resp.code} when waiting for next invocation."
+          "Received #{resp.code} when waiting for next invocation."
         )
       end
     rescue LambdaErrors::InvocationError => e
@@ -49,9 +48,9 @@ class LambdaServer
         response_object = response_object.read
       end
       Net::HTTP.post(
-          response_uri,
-          response_object,
-          { 'Content-Type' => content_type }
+        response_uri,
+        response_object,
+        { 'Content-Type' => content_type, 'User-Agent' => @user_agent }
       )
     rescue StandardError => e
       raise LambdaErrors::LambdaRuntimeError.new(e)
@@ -61,12 +60,12 @@ class LambdaServer
   def send_error_response(request_id:, error_object:, error:, xray_cause:)
     response_uri = URI(@server_address + "/runtime/invocation/#{request_id}/error")
     begin
-      headers = { 'Lambda-Runtime-Function-Error-Type' => error.runtime_error_type }
-      headers['Lambda-Runtime-Function-XRay-Error-Cause'] = xray_cause if xray_cause.bytesize < MAX_HEADER_SIZE
+      headers = { 'Lambda-Runtime-Function-Error-Type' => error.runtime_error_type, 'User-Agent' => @user_agent }
+      headers['Lambda-Runtime-Function-XRay-Error-Cause'] = xray_cause if xray_cause.bytesize < MAX_HEADER_SIZE_BYTES
       Net::HTTP.post(
-          response_uri,
-          error_object.to_json,
-          headers
+        response_uri,
+        error_object.to_json,
+        headers
       )
     rescue StandardError => e
       raise LambdaErrors::LambdaRuntimeError.new(e)
@@ -77,9 +76,9 @@ class LambdaServer
     uri = URI("#{@server_address}/runtime/init/error")
     begin
       Net::HTTP.post(
-          uri,
-          error_object.to_json,
-          { 'Lambda-Runtime-Function-Error-Type' => error.runtime_error_type }
+        uri,
+        error_object.to_json,
+        { 'Lambda-Runtime-Function-Error-Type' => error.runtime_error_type, 'User-Agent' => @user_agent }
       )
     rescue StandardError => e
       raise LambdaErrors::LambdaRuntimeInitError.new(e)

data/lib/aws_lambda_ric/logger_patch.rb

@@ -0,0 +1,22 @@
+# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+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
+      @default_formatter = LogFormatter.new
+      self.datetime_format = datetime_format
+      self.formatter = formatter
+      @logdev = AwsLambdaRIC::TelemetryLogger.telemetry_log_sink
+      @level_override = {}
+    end
+  end
+end

data/lib/aws_lambda_ric/telemetry_log_sink.rb

@@ -1,35 +1,38 @@
-# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
 # frozen_string_literal: true
 
 require 'logger'
+require 'time'
 
 class TelemetryLogSink < Logger::LogDevice
 
   # TelemetryLogSink implements the logging contract between runtimes and the platform. It implements a simple
   # framing protocol so message boundaries can be determined. Each frame can be visualized as follows:
   #
-  # +----------------------+------------------------+-----------------------+
-  # | Frame Type - 4 bytes | Length (len) - 4 bytes | Message - \'len\' bytes |
-  # +----------------------+------------------------+-----------------------+
+  # +----------------------+------------------------+---------------------+-------------------------+
+  # | Frame Type - 4 bytes | Length (len) - 4 bytes | Timestamp - 8 bytes | Message - \'len\' bytes |
+  # +----------------------+------------------------+---------------------+-------------------------+
   #
-  # The first 4 bytes indicate the type of the frame - log frames have a type defined as the hex value 0xa55a0001. The
-  # second 4 bytes should indicate the message\'s length. The next \'len\' bytes contain the message. The byte order is
-  # big-endian.
+  # The first 4 bytes indicate the type of the frame - log frames have a type defined as the hex value 0xa55a0003. The
+  # second 4 bytes should indicate the message\'s length. Next, the timestamp in microsecond precision, and finally
+  # \'len\' bytes contain the message. The byte order is big-endian.
 
   def initialize(file:)
     @file = file
   end
 
-  FRAME_BYTES = [0xa55a0001].pack('L>')
+  FRAME_BYTES = [0xa55a0003].pack('L>')
 
   def write(msg)
+    @semaphore ||= Mutex.new
     if @file.nil? || @file.closed?
       $stdout.write(msg)
     else
-      @file.write(FRAME_BYTES)
-      @file.write([msg.bytesize].pack('L>'))
-      @file.write(msg)
+      @semaphore.synchronize do
+        @file.write(FRAME_BYTES)
+        @file.write([msg.bytesize].pack('L>'))
+        @file.write([(Time.new.to_f*1000000).to_i].pack('Q>'))
+        @file.write(msg)
+      end
     end
   end
 

data/lib/aws_lambda_ric/version.rb

@@ -1,7 +1,5 @@
-# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
 # frozen_string_literal: true
 
-module AwsLambdaRuntimeInterfaceClient
-  VERSION = '1.0.1'
+module AwsLambdaRIC
+  VERSION = '3.0.0'
 end

data/lib/aws_lambda_ric/xray_cause.rb

@@ -1,4 +1,4 @@
-# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# frozen_string_literal: true
 
 require_relative 'lambda_errors'
 
@@ -15,8 +15,8 @@ class XRayCause
 
   def as_json
     @as_json ||= begin
-      JSON.dump(@cause)
-    end
+                   JSON.dump(@cause)
+                 end
   end
 
   private
@@ -39,4 +39,4 @@ class XRayCause
     end
     [exception]
   end
-end
+end

data/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'
@@ -8,6 +6,7 @@ require_relative 'aws_lambda_ric/lambda_handler'
 require_relative 'aws_lambda_ric/lambda_context'
 require_relative 'aws_lambda_ric/lambda_logger'
 require_relative 'aws_lambda_ric/lambda_log_formatter'
+require_relative 'aws_lambda_ric/logger_patch'
 require_relative 'aws_lambda_ric/telemetry_log_sink'
 require_relative 'aws_lambda_ric/aws_lambda_marshaller'
 require_relative 'aws_lambda_ric/xray_cause'
@@ -16,17 +15,24 @@ require 'logger'
 
 $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)
-      @lambda_server = LambdaServer.new(runtime_server_addr)
+    def initialize(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
@@ -44,7 +50,7 @@ module AwsLambdaRuntimeInterfaceClient
         @exit_code = -4
         send_init_error_to_server(e)
       ensure
-        TelemetryLoggingHelper.close
+        TelemetryLogger.close
       end
 
       exit(@exit_code)
@@ -105,7 +111,7 @@ module AwsLambdaRuntimeInterfaceClient
       @lambda_server.send_init_error(error_object: ex.to_lambda_response, error: ex)
     end
 
-    def send_error_response(lambda_invocation, err, exit_code = nil, runtime_loop_active: true)
+    def send_error_response(lambda_invocation, err, exit_code = nil, runtime_loop_active = true)
       error_object = err.to_lambda_response
       @lambda_server.send_error_response(
         request_id: lambda_invocation.request_id,
@@ -120,7 +126,7 @@ module AwsLambdaRuntimeInterfaceClient
   end
 
   # Helper class to for mutating std logger with TelemetryLog
-  class TelemetryLoggingHelper
+  class TelemetryLogger
 
     ENV_VAR_TELEMETRY_LOG_FD = '_LAMBDA_TELEMETRY_LOG_FD'
 
@@ -132,40 +138,32 @@ module AwsLambdaRuntimeInterfaceClient
       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
       Logger.class_eval do
-        alias_method :orig_initialize, :initialize
-        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
-            orig_initialize(logdev, shift_age, shift_size, level, progname,
-                            formatter, datetime_format, binmode, shift_period_suffix)
-          else
-            self.level = level
-            self.progname = progname
-            @default_formatter = LambdaLogFormatter.new
-            self.datetime_format = datetime_format
-            self.formatter = formatter
-            @logdev = AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.telemetry_log_sink
-          end
-        end
+        prepend LoggerPatch
       end
     end
 
@@ -173,7 +171,11 @@ module AwsLambdaRuntimeInterfaceClient
       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
@@ -191,4 +193,30 @@ module AwsLambdaRuntimeInterfaceClient
       @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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: aws_lambda_ric
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - AWS Lambda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.0.1
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.5
 description: The AWS Lambda Ruby Runtime Interface Client implements the Lambda programming
   model for Ruby.
 email: 
@@ -61,7 +89,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - NOTICE
 - README.md
@@ -69,13 +96,13 @@ files:
 - bin/aws_lambda_ric
 - lib/aws_lambda_ric.rb
 - lib/aws_lambda_ric/aws_lambda_marshaller.rb
-- lib/aws_lambda_ric/bootstrap.rb
 - lib/aws_lambda_ric/lambda_context.rb
 - lib/aws_lambda_ric/lambda_errors.rb
 - lib/aws_lambda_ric/lambda_handler.rb
 - lib/aws_lambda_ric/lambda_log_formatter.rb
 - lib/aws_lambda_ric/lambda_logger.rb
 - lib/aws_lambda_ric/lambda_server.rb
+- lib/aws_lambda_ric/logger_patch.rb
 - lib/aws_lambda_ric/telemetry_log_sink.rb
 - lib/aws_lambda_ric/version.rb
 - lib/aws_lambda_ric/xray_cause.rb
@@ -91,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Gemfile.lock

@@ -1,22 +0,0 @@
-PATH
-  remote: .
-  specs:
-    aws_lambda_ric (1.0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    minitest (5.14.2)
-    rake (13.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aws_lambda_ric!
-  bundler (>= 2.0)
-  minitest (~> 5.0)
-  rake (~> 13.0)
-
-BUNDLED WITH
-   2.2.0.rc.2

data/lib/aws_lambda_ric/bootstrap.rb

@@ -1,38 +0,0 @@
-require_relative '../aws_lambda_ric'
-
-# Bootstrap runtime
-module Bootstrap
-
-  def self.start
-    bootstrap_telemetry_log_sink
-    bootstrap_handler
-  end
-
-  def self.fetch_runtime_server
-    ENV.fetch(AwsLambdaRuntimeInterfaceClient::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 self.bootstrap_telemetry_log_sink(path_to_fd='/proc/self/fd/')
-    fd = ENV.fetch(AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper::ENV_VAR_TELEMETRY_LOG_FD)
-    ENV.delete(AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper::ENV_VAR_TELEMETRY_LOG_FD)
-    AwsLambdaRuntimeInterfaceClient::TelemetryLoggingHelper.new(fd, path_to_fd)
-  rescue KeyError
-    puts 'Skipped bootstraping TelemetryLog'
-  end
-
-  def self.bootstrap_handler
-    if ARGV.empty?
-      puts 'No handler specified, exiting Runtime Interface Client.'
-      exit
-    end
-    app_root = Dir.pwd
-    handler = ARGV[0]
-    lambda_runner = AwsLambdaRuntimeInterfaceClient::LambdaRunner.new(fetch_runtime_server)
-    puts "Executing '#{handler}' in function directory '#{app_root}'"
-    lambda_runner.run(app_root, handler)
-  end
-
-end