Feat: Creating an independant feature flag for 'log' and making it enabled for both env_logger and tracing feature. This feature flag controls weither or not the generated code uses log::info!(...) and log::debug!(...) statements in the 'function_handler' and the 'appsync_handler'.

Author: JeremieRodon

lambda-appsync-proc/Cargo.toml

@@ -21,14 +21,15 @@ proc-macro2 = { workspace = true }
 graphql-parser = { workspace = true }
 
 [dev-dependencies]
-lambda-appsync = { path = "../lambda-appsync", default-features = false, features = ["env_logger", "tracing"] }
+lambda-appsync = { path = "../lambda-appsync", default-features = false, features = ["log", "env_logger", "tracing"] }
 tracing = { workspace = true }
 aws-sdk-s3 = { workspace = true }
 aws-sdk-dynamodb = { workspace = true }
 serde = { workspace = true }
 trybuild = { workspace = true }
 
 [features]
-default = ["env_logger", "tracing"]
+default = ["log", "env_logger", "tracing"]
+log = []
 env_logger = []
 tracing = []

lambda-appsync-proc/src/appsync_lambda_main/graphql.rs

@@ -976,14 +976,10 @@ impl GraphQLSchema {
 
         #[allow(unused_mut)]
         let mut log_lines = proc_macro2::TokenStream::new();
-        #[cfg(feature = "env_logger")]
+        #[cfg(feature = "log")]
         log_lines.extend(quote_spanned! {span=>
             ::lambda_appsync::log::error!("{e}");
         });
-        #[cfg(feature = "tracing")]
-        log_lines.extend(quote_spanned! {span=>
-            ::lambda_appsync::tracing::error!("{e}");
-        });
 
         tokens.extend(quote_spanned! {span=>
             impl Operation {

lambda-appsync-proc/src/appsync_lambda_main/mod.rs

@@ -70,6 +70,7 @@ enum OptionalParameter {
     ExcludeAppsyncOperations(bool),
     OnlyAppsyncOperations(bool),
     Hook(Ident),
+    #[cfg(feature = "log")]
     LogInit(Ident),
     TypeOverride(TypeOverride),
     NameOverride(NameOverride),
@@ -95,6 +96,7 @@ impl Parse for OptionalParameter {
                 input.parse::<LitBool>()?.value(),
             )),
             "hook" => Ok(Self::Hook(input.parse()?)),
+            #[cfg(feature = "log")]
             "log_init" => Ok(Self::LogInit(input.parse()?)),
             "type_override" => Ok(Self::TypeOverride(input.parse()?)),
             "name_override" => Ok(Self::NameOverride(input.parse()?)),
@@ -150,6 +152,7 @@ struct OptionalParameters {
     appsync_operations: bool,
     lambda_handler: bool,
     hook: Option<Ident>,
+    #[cfg(feature = "log")]
     log_init: Option<Ident>,
     tos: TypeOverrides,
     nos: NameOverrides,
@@ -162,6 +165,7 @@ impl Default for OptionalParameters {
             appsync_operations: true,
             lambda_handler: true,
             hook: None,
+            #[cfg(feature = "log")]
             log_init: None,
             tos: TypeOverrides::new(),
             nos: NameOverrides::new(),
@@ -193,6 +197,7 @@ impl OptionalParameters {
             OptionalParameter::Hook(ident) => {
                 self.hook.replace(ident);
             }
+            #[cfg(feature = "log")]
             OptionalParameter::LogInit(ident) => {
                 self.log_init.replace(ident);
             }
@@ -314,15 +319,11 @@ impl AppsyncLambdaMain {
     fn appsync_event_handler(&self, tokens: &mut TokenStream2) {
         #[allow(unused_mut)]
         let mut log_lines = proc_macro2::TokenStream::new();
-        #[cfg(feature = "env_logger")]
+        #[cfg(feature = "log")]
         log_lines.extend(quote! {
             ::lambda_appsync::log::info!("event={event:?}");
             ::lambda_appsync::log::info!("operation={:?}", event.info.operation);
         });
-        #[cfg(feature = "tracing")]
-        log_lines.extend(quote! {
-            ::lambda_appsync::tracing::info!("event={event:?}");
-        });
 
         let call_hook = if let Some(ref hook) = self.options.hook {
             quote_spanned! {hook.span()=>
@@ -434,16 +435,11 @@ impl AppsyncLambdaMain {
 
         #[allow(unused_mut)]
         let mut log_lines = proc_macro2::TokenStream::new();
-        #[cfg(feature = "env_logger")]
+        #[cfg(feature = "log")]
         log_lines.extend(quote! {
             ::lambda_appsync::log::debug!("{event:?}");
             ::lambda_appsync::log::info!("{}", ::lambda_appsync::serde_json::json!(event.payload));
         });
-        #[cfg(feature = "tracing")]
-        log_lines.extend(quote! {
-            ::lambda_appsync::tracing::debug!("{event:?}");
-            ::lambda_appsync::tracing::info!({payload = %::lambda_appsync::serde_json::json!(event.payload)});
-        });
 
         tokens.extend(quote! {
             async fn function_handler(
@@ -463,6 +459,7 @@ impl AppsyncLambdaMain {
         };
         let aws_client_getters = self.aws_clients.iter().map(|ac| ac.aws_client_getter());
 
+        #[cfg(feature = "log")]
         let log_init = if let Some(ref log_init) = self.options.log_init {
             quote_spanned! {log_init.span()=>
                 mod _check_sig {
@@ -484,6 +481,8 @@ impl AppsyncLambdaMain {
             // default_log_init.extend(Self::default_fastrace_init());
             default_log_init
         };
+        #[cfg(not(feature = "log"))]
+        let log_init = TokenStream2::new();
 
         #[allow(unused_mut)]
         let mut bing_in_scope = TokenStream2::new();

lambda-appsync-proc/src/lib.rs

@@ -29,7 +29,7 @@ use proc_macro::TokenStream;
 ///
 /// - `batch = bool`: Enable/disable batch request handling (default: true)
 /// - `hook = fn_name`: Add a custom hook function for request validation/auth
-/// - `log_init = fn_name`: Use a custom log initialization function instead of the default one
+/// - (feature: `log`) `log_init = fn_name`: Use a custom log initialization function instead of the default one
 /// - `exclude_lambda_handler = bool`: Skip generation of Lambda handler code
 /// - `only_lambda_handler = bool`: Only generate Lambda handler code
 /// - `exclude_appsync_types = bool`: Skip generation of GraphQL type definitions
@@ -239,7 +239,7 @@ use proc_macro::TokenStream;
 ///
 /// ### Feature `tracing`
 ///
-/// Alternatively, you can use the `tracing` feature so `lambda_appsync` exposes and uses `tracing` and `tracing-subscriber`
+/// Alternatively, you can use the `tracing` feature so `lambda_appsync` exposes and uses `log`, `tracing` and `tracing-subscriber`
 ///
 /// ```no_run
 /// # mod sub {

lambda-appsync/Cargo.toml

@@ -36,5 +36,6 @@ aws-sdk-dynamodb = { workspace = true }
 
 [features]
 default = ["env_logger"]
-env_logger = ["dep:log", "dep:env_logger", "lambda-appsync-proc/env_logger"]
-tracing = ["dep:tracing", "dep:tracing-subscriber", "lambda-appsync-proc/tracing"]
+env_logger = ["log", "dep:env_logger", "lambda-appsync-proc/env_logger"]
+tracing = ["log", "dep:tracing", "dep:tracing-subscriber", "lambda-appsync-proc/tracing"]
+log = ["dep:log", "lambda-appsync-proc/log"]

lambda-appsync/src/lib.rs

@@ -108,10 +108,11 @@ pub use serde;
 pub use serde_json;
 pub use tokio;
 
+#[cfg(feature = "log")]
+pub use log;
+
 #[cfg(feature = "env_logger")]
 pub use env_logger;
-#[cfg(feature = "env_logger")]
-pub use log;
 
 #[cfg(feature = "tracing")]
 pub use tracing;