Merge branch 'awslabs:main' into readme-878

Author: rimutaka

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,10 @@
-*Issue #, if available:*
+📬 *Issue #, if available:*
 
-*Description of changes:*
+✍️ *Description of changes:*
 
-By submitting this pull request
+🔏 *By submitting this pull request*
 
-- [ ] I confirm that my contribution is made under the terms of the Apache 2.0 license.
+- [ ] I confirm that I've ran `cargo +nightly fmt`.
+- [ ] I confirm that I've ran `cargo clippy --fix`.
 - [ ] I confirm that I've made a best effort attempt to update all relevant documentation.
+- [ ] I confirm that my contribution is made under the terms of the Apache 2.0 license.

.github/workflows/format.yml

@@ -3,53 +3,29 @@ name: Formatting and Linting
 on: [push, pull_request]
 
 jobs:
-  check:
+  fmt:
+    name: Cargo fmt
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: rustfmt
       - uses: Swatinem/rust-cache@v2
-
       - name: Run fmt check
         id: cargoFmt
         shell: bash
-        run: cargo fmt --all -- --check
-      - name: Notify fmt check
-        if: failure() && steps.cargoFmt.outcome == 'failure'
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const message = `👋 It looks like your code is not formatted like we expect.
-              
-              Please run \`cargo fmt\` and push the code again.`;
-      
-            await github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: message,
-            });
-            core.setFailed('It looks like there are formatting errors');
-      
+        run: cargo +nightly fmt --all -- --check
+  clippy:
+    name: Cargo clippy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
       - name: Run clippy check
         id: cargoClippy
         shell: bash
         run: cargo clippy --workspace --all-features -- -D warnings
-      - name: Notify fmt check
-        if: failure() && steps.cargoClippy.outcome == 'failure'
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const message = `👋 It looks like your code has some linting issues.
-              
-              Please run \`cargo clippy --fix\` and push the code again.`;
-      
-            await github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: message,
-            });
-            core.setFailed('It looks like there are linting errors');
 
 

.rustfmt.toml

@@ -1,6 +1,14 @@
 edition = "2021"
-# imports_granularity is unstable
-# # https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#merge_imports
-# imports_granularity = "Crate"
+
 # https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#max_width
 max_width = 120
+
+#https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#reorder_imports
+reorder_imports = true
+
+#https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#unstable_features
+unstable_features = true
+
+# imports_granularity is unstable
+# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#merge_imports
+imports_granularity = "Crate"

examples/opentelemetry-tracing/Cargo.toml

@@ -4,33 +4,15 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-# Library dependencies
-lambda_runtime = { path = "../../lambda-runtime" }
-pin-project = "1"
+lambda_runtime = { path = "../../lambda-runtime", features = ["opentelemetry"] }
 opentelemetry-semantic-conventions = "0.14"
+opentelemetry = "0.22"
+opentelemetry_sdk = { version = "0.22", features = ["rt-tokio"] }
+opentelemetry-stdout = { version = "0.3", features = ["trace"] }
+pin-project = "1"
+serde_json = "1.0"
+tokio = "1"
 tower = "0.4"
 tracing = "0.1"
-
-# Binary dependencies
-opentelemetry = { version = "0.22", optional = true }
-opentelemetry_sdk = { version = "0.22", features = ["rt-tokio"], optional = true }
-opentelemetry-stdout = { version = "0.3", features = ["trace"], optional = true }
-serde_json = { version = "1.0", optional = true }
-tokio = { version = "1", optional = true }
-tracing-opentelemetry = { version = "0.23", optional = true }
-tracing-subscriber = { version = "0.3", optional = true }
-
-[features]
-build-binary = [
-    "opentelemetry",
-    "opentelemetry_sdk",
-    "opentelemetry-stdout",
-    "serde_json",
-    "tokio",
-    "tracing-opentelemetry",
-    "tracing-subscriber",
-]
-
-[[bin]]
-name = "opentelemetry-tracing"
-required-features = ["build-binary"]
+tracing-opentelemetry = "0.23"
+tracing-subscriber = "0.3"

examples/opentelemetry-tracing/src/main.rs

@@ -1,7 +1,6 @@
-use lambda_runtime::{LambdaEvent, Runtime};
+use lambda_runtime::{layers::OpenTelemetryLayer as OtelLayer, LambdaEvent, Runtime};
 use opentelemetry::trace::TracerProvider;
 use opentelemetry_sdk::{runtime, trace};
-use opentelemetry_tracing::OpenTelemetryLayer;
 use tower::{service_fn, BoxError};
 use tracing_subscriber::prelude::*;
 
@@ -25,7 +24,7 @@ async fn main() -> Result<(), BoxError> {
         .init();
 
     // Initialize the Lambda runtime and add OpenTelemetry tracing
-    let runtime = Runtime::new(service_fn(echo)).layer(OpenTelemetryLayer::new(|| {
+    let runtime = Runtime::new(service_fn(echo)).layer(OtelLayer::new(|| {
         // Make sure that the trace is exported before the Lambda runtime is frozen
         tracer_provider.force_flush();
     }));

lambda-events/src/custom_serde/codebuild_time.rs

@@ -1,7 +1,7 @@
 use chrono::{DateTime, NaiveDateTime, Utc};
-use serde::ser::Serializer;
 use serde::{
     de::{Deserializer, Error as DeError, Visitor},
+    ser::Serializer,
     Deserialize,
 };
 use std::fmt;

lambda-events/src/custom_serde/float_unix_epoch.rs

@@ -1,8 +1,7 @@
 use serde::{de, ser};
 use std::fmt;
 
-use chrono::offset::TimeZone;
-use chrono::{DateTime, LocalResult, Utc};
+use chrono::{offset::TimeZone, DateTime, LocalResult, Utc};
 
 enum SerdeError<V: fmt::Display, D: fmt::Display> {
     NonExistent { timestamp: V },

lambda-events/src/custom_serde/headers.rs

@@ -1,7 +1,8 @@
-use http::header::HeaderName;
-use http::{HeaderMap, HeaderValue};
-use serde::de::{self, Deserializer, Error as DeError, MapAccess, Unexpected, Visitor};
-use serde::ser::{Error as SerError, SerializeMap, Serializer};
+use http::{header::HeaderName, HeaderMap, HeaderValue};
+use serde::{
+    de::{self, Deserializer, Error as DeError, MapAccess, Unexpected, Visitor},
+    ser::{Error as SerError, SerializeMap, Serializer},
+};
 use std::{borrow::Cow, fmt};
 
 /// Serialize a http::HeaderMap into a serde str => Vec<str> map

lambda-events/src/custom_serde/http_method.rs

@@ -1,6 +1,8 @@
 use http::Method;
-use serde::de::{Deserialize, Deserializer, Error as DeError, Unexpected, Visitor};
-use serde::ser::Serializer;
+use serde::{
+    de::{Deserialize, Deserializer, Error as DeError, Unexpected, Visitor},
+    ser::Serializer,
+};
 use std::fmt;
 
 pub fn serialize<S: Serializer>(method: &Method, ser: S) -> Result<S::Ok, S::Error> {

lambda-events/src/custom_serde/mod.rs

@@ -1,6 +1,8 @@
 use base64::Engine;
-use serde::de::{Deserialize, Deserializer, Error as DeError};
-use serde::ser::Serializer;
+use serde::{
+    de::{Deserialize, Deserializer, Error as DeError},
+    ser::Serializer,
+};
 use std::collections::HashMap;
 
 #[cfg(feature = "codebuild")]

lambda-events/src/encodings/http.rs

@@ -1,8 +1,10 @@
 use base64::display::Base64Display;
 use bytes::Bytes;
 use http_body::{Body as HttpBody, SizeHint};
-use serde::de::{Deserialize, Deserializer, Error as DeError, Visitor};
-use serde::ser::{Error as SerError, Serialize, Serializer};
+use serde::{
+    de::{Deserialize, Deserializer, Error as DeError, Visitor},
+    ser::{Error as SerError, Serialize, Serializer},
+};
 use std::{borrow::Cow, mem::take, ops::Deref, pin::Pin, task::Poll};
 
 /// Representation of http request and response bodies as supported

lambda-events/src/encodings/mod.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use std::{ops::Deref, ops::DerefMut};
+use std::ops::{Deref, DerefMut};
 
 #[cfg(feature = "chrono")]
 mod time;

lambda-events/src/encodings/time.rs

@@ -1,7 +1,7 @@
 use chrono::{DateTime, TimeDelta, TimeZone, Utc};
-use serde::ser::Serializer;
 use serde::{
     de::{Deserializer, Error as DeError},
+    ser::Serializer,
     Deserialize, Serialize,
 };
 use std::ops::{Deref, DerefMut};

lambda-events/src/event/alb/mod.rs

@@ -1,7 +1,9 @@
-use crate::custom_serde::{
-    deserialize_headers, deserialize_nullish_boolean, http_method, serialize_headers, serialize_multi_value_headers,
+use crate::{
+    custom_serde::{
+        deserialize_headers, deserialize_nullish_boolean, http_method, serialize_headers, serialize_multi_value_headers,
+    },
+    encodings::Body,
 };
-use crate::encodings::Body;
 use http::{HeaderMap, Method};
 use query_map::QueryMap;
 use serde::{Deserialize, Serialize};

lambda-events/src/event/apigw/mod.rs

@@ -1,9 +1,11 @@
-use crate::custom_serde::{
-    deserialize_headers, deserialize_lambda_map, deserialize_nullish_boolean, http_method, serialize_headers,
-    serialize_multi_value_headers,
+use crate::{
+    custom_serde::{
+        deserialize_headers, deserialize_lambda_map, deserialize_nullish_boolean, http_method, serialize_headers,
+        serialize_multi_value_headers,
+    },
+    encodings::Body,
+    iam::IamPolicyStatement,
 };
-use crate::encodings::Body;
-use crate::iam::IamPolicyStatement;
 use http::{HeaderMap, Method};
 use query_map::QueryMap;
 use serde::{de::DeserializeOwned, ser::SerializeMap, Deserialize, Deserializer, Serialize, Serializer};

lambda-events/src/event/appsync/mod.rs

@@ -1,5 +1,4 @@
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
 

lambda-events/src/event/autoscaling/mod.rs

@@ -1,6 +1,5 @@
 use chrono::{DateTime, Utc};
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
 

lambda-events/src/event/cloudformation/mod.rs

@@ -102,8 +102,7 @@ pub enum CloudFormationCustomResourceResponseStatus {
 mod test {
     use std::collections::HashMap;
 
-    use super::CloudFormationCustomResourceRequest::*;
-    use super::*;
+    use super::{CloudFormationCustomResourceRequest::*, *};
 
     #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
     #[serde(rename_all = "PascalCase")]

lambda-events/src/event/cloudformation/provider.rs

@@ -90,8 +90,7 @@ where
 mod test {
     use std::collections::HashMap;
 
-    use super::CloudFormationCustomResourceRequest::*;
-    use super::*;
+    use super::{CloudFormationCustomResourceRequest::*, *};
 
     #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
     #[serde(rename_all = "PascalCase")]

lambda-events/src/event/cloudwatch_events/mod.rs

@@ -1,6 +1,5 @@
 use chrono::{DateTime, Utc};
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::Value;
 
 pub mod cloudtrail;

lambda-events/src/event/codebuild/mod.rs

@@ -1,8 +1,9 @@
-use crate::custom_serde::{codebuild_time, CodeBuildNumber};
-use crate::encodings::{MinuteDuration, SecondDuration};
+use crate::{
+    custom_serde::{codebuild_time, CodeBuildNumber},
+    encodings::{MinuteDuration, SecondDuration},
+};
 use chrono::{DateTime, Utc};
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::Value;
 
 pub type CodeBuildPhaseStatus = String;

lambda-events/src/event/cognito/mod.rs

@@ -1,5 +1,4 @@
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
 

lambda-events/src/event/dynamodb/mod.rs

@@ -1,6 +1,8 @@
-use crate::custom_serde::deserialize_lambda_dynamodb_item;
-use crate::time_window::*;
-use crate::{custom_serde::float_unix_epoch, streams::DynamoDbBatchItemFailure};
+use crate::{
+    custom_serde::{deserialize_lambda_dynamodb_item, float_unix_epoch},
+    streams::DynamoDbBatchItemFailure,
+    time_window::*,
+};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use std::fmt;

lambda-events/src/event/eventbridge/mod.rs

@@ -1,6 +1,5 @@
 use chrono::{DateTime, Utc};
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::Value;
 
 /// Parse EventBridge events.

lambda-events/src/event/iot/mod.rs

@@ -1,6 +1,4 @@
-use crate::custom_serde::serialize_headers;
-use crate::encodings::Base64Data;
-use crate::iam::IamPolicyDocument;
+use crate::{custom_serde::serialize_headers, encodings::Base64Data, iam::IamPolicyDocument};
 use http::HeaderMap;
 use serde::{Deserialize, Serialize};
 

lambda-events/src/event/kinesis/event.rs

@@ -1,5 +1,7 @@
-use crate::encodings::{Base64Data, SecondTimestamp};
-use crate::time_window::{TimeWindowEventResponseProperties, TimeWindowProperties};
+use crate::{
+    encodings::{Base64Data, SecondTimestamp},
+    time_window::{TimeWindowEventResponseProperties, TimeWindowProperties},
+};
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]

lambda-events/src/event/rabbitmq/mod.rs

@@ -1,5 +1,4 @@
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
 

lambda-events/src/event/s3/object_lambda.rs

@@ -1,6 +1,5 @@
 use http::HeaderMap;
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
 

lambda-events/src/event/sns/mod.rs

@@ -1,6 +1,5 @@
 use chrono::{DateTime, Utc};
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use std::collections::HashMap;
 
 use crate::custom_serde::{deserialize_lambda_map, deserialize_nullish_boolean};