propagate log record type generic

raphael-theriault-swi · raphael-theriault-swi · commit 6b36b4526b3e · 2026-02-11T18:04:53.000-05:00
diff --git a/lambda-extension/src/extension.rs b/lambda-extension/src/extension.rs
@@ -4,7 +4,7 @@ use hyper::{body::Incoming, server::conn::http1, service::service_fn};
 
 use hyper_util::rt::tokio::TokioIo;
 use lambda_runtime_api_client::Client;
-use serde::Deserialize;
+use serde::{de::DeserializeOwned, Deserialize};
 use std::{
     convert::Infallible,
     fmt,
@@ -83,14 +83,6 @@ where
     L::Error: Into<Error> + fmt::Debug,
     L::MakeError: Into<Error> + fmt::Debug,
     L::Future: Send,
-
-    // Fixme: 'static bound might be too restrictive
-    T: MakeService<(), Vec<LambdaTelemetry>, Response = ()> + Send + Sync + 'static,
-    T::Service: Service<Vec<LambdaTelemetry>, Response = ()> + Send + Sync,
-    <T::Service as Service<Vec<LambdaTelemetry>>>::Future: Send + 'a,
-    T::Error: Into<Error> + fmt::Debug,
-    T::MakeError: Into<Error> + fmt::Debug,
-    T::Future: Send,
 {
     /// Create a new [`Extension`] with a given extension name
     pub fn with_extension_name(self, extension_name: &'a str) -> Self {
@@ -232,7 +224,17 @@ where
     /// Lambda lifecycle operations to register the extension. When implementing an internal Lambda
     /// extension, it is safe to call `lambda_runtime::run` once the future returned by this
     /// function resolves.
-    pub async fn register(self) -> Result<RegisteredExtension<E>, Error> {
+    pub async fn register<TL>(self) -> Result<RegisteredExtension<E>, Error>
+    where
+        // Fixme: 'static bound might be too restrictive
+        T: MakeService<(), Vec<LambdaTelemetry<TL>>, Response = ()> + Send + Sync + 'static,
+        T::Service: Service<Vec<LambdaTelemetry<TL>>, Response = ()> + Send + Sync,
+        <T::Service as Service<Vec<LambdaTelemetry<TL>>>>::Future: Send + 'a,
+        T::Error: Into<Error> + fmt::Debug,
+        T::MakeError: Into<Error> + fmt::Debug,
+        T::Future: Send,
+        TL: DeserializeOwned + Send + 'static,
+    {
         let client = &Client::builder().build()?;
 
         let register_res = register(client, self.extension_name, self.events).await?;
@@ -340,7 +342,17 @@ where
     }
 
     /// Execute the given extension.
-    pub async fn run(self) -> Result<(), Error> {
+    pub async fn run<TL>(self) -> Result<(), Error>
+    where
+        // Fixme: 'static bound might be too restrictive
+        T: MakeService<(), Vec<LambdaTelemetry<TL>>, Response = ()> + Send + Sync + 'static,
+        T::Service: Service<Vec<LambdaTelemetry<TL>>, Response = ()> + Send + Sync,
+        <T::Service as Service<Vec<LambdaTelemetry<TL>>>>::Future: Send + 'a,
+        T::Error: Into<Error> + fmt::Debug,
+        T::MakeError: Into<Error> + fmt::Debug,
+        T::Future: Send,
+        TL: DeserializeOwned + Send + 'static,
+    {
         self.register().await?.run().await
     }
 }
diff --git a/lambda-extension/src/telemetry.rs b/lambda-extension/src/telemetry.rs
@@ -3,7 +3,7 @@ use http::{Request, Response};
 use http_body_util::BodyExt;
 use hyper::body::Incoming;
 use lambda_runtime_api_client::body::Body;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use std::{boxed::Box, fmt, sync::Arc};
 use tokio::sync::Mutex;
 use tower::Service;
@@ -269,14 +269,15 @@ pub struct RuntimeDoneMetrics {
 ///
 /// This takes an `hyper::Request` and transforms it into `Vec<LambdaTelemetry>` for the
 /// underlying `Service` to process.
-pub(crate) async fn telemetry_wrapper<S>(
+pub(crate) async fn telemetry_wrapper<S, L>(
     service: Arc<Mutex<S>>,
     req: Request<Incoming>,
 ) -> Result<Response<Body>, Box<dyn std::error::Error + Send + Sync>>
 where
-    S: Service<Vec<LambdaTelemetry>, Response = ()>,
+    S: Service<Vec<LambdaTelemetry<L>>, Response = ()>,
     S::Error: Into<Box<dyn std::error::Error + Send + Sync>> + fmt::Debug,
     S::Future: Send,
+    L: DeserializeOwned,
 {
     trace!("Received telemetry request");
     // Parse the request body as a Vec<LambdaTelemetry>
@@ -291,7 +292,7 @@ where
         }
     };
 
-    let telemetry: Vec<LambdaTelemetry> = match serde_json::from_slice(&body.to_bytes()) {
+    let telemetry: Vec<LambdaTelemetry<L>> = match serde_json::from_slice(&body.to_bytes()) {
         Ok(telemetry) => telemetry,
         Err(e) => {
             error!("Error parsing telemetry: {}", e);
