diff --git a/bottlecap/src/lifecycle/invocation/span_inferrer.rs b/bottlecap/src/lifecycle/invocation/span_inferrer.rs
index 6c84cbe70..de2e3e31c 100644
--- a/bottlecap/src/lifecycle/invocation/span_inferrer.rs
+++ b/bottlecap/src/lifecycle/invocation/span_inferrer.rs
@@ -16,6 +16,8 @@ use crate::lifecycle::invocation::triggers::{
 };
 use crate::tags::lambda::tags::{INIT_TYPE, SNAP_START_VALUE};
 
+use super::triggers::s3_event::S3Record;
+
 pub struct SpanInferrer {
     pub inferred_span: Option<Span>,
     pub wrapped_inferred_span: Option<Span>,
@@ -102,6 +104,12 @@ impl SpanInferrer {
             if let Some(t) = SnsRecord::new(payload_value.clone()) {
                 t.enrich_span(&mut inferred_span);
 
+                trigger = Some(Box::new(t));
+            }
+        } else if S3Record::is_match(payload_value) {
+            if let Some(t) = S3Record::new(payload_value.clone()) {
+                t.enrich_span(&mut inferred_span);
+
                 trigger = Some(Box::new(t));
             }
         } else {
diff --git a/bottlecap/src/lifecycle/invocation/triggers/mod.rs b/bottlecap/src/lifecycle/invocation/triggers/mod.rs
index 6edbe5c07..66995999f 100644
--- a/bottlecap/src/lifecycle/invocation/triggers/mod.rs
+++ b/bottlecap/src/lifecycle/invocation/triggers/mod.rs
@@ -7,6 +7,7 @@ use serde_json::Value;
 
 pub mod api_gateway_http_event;
 pub mod api_gateway_rest_event;
+pub mod s3_event;
 pub mod sns_event;
 pub mod sqs_event;
 
diff --git a/bottlecap/src/lifecycle/invocation/triggers/s3_event.rs b/bottlecap/src/lifecycle/invocation/triggers/s3_event.rs
new file mode 100644
index 000000000..1e7fe5beb
--- /dev/null
+++ b/bottlecap/src/lifecycle/invocation/triggers/s3_event.rs
@@ -0,0 +1,240 @@
+use std::collections::HashMap;
+
+use chrono::{DateTime, Utc};
+use datadog_trace_protobuf::pb::Span;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use tracing::debug;
+
+use crate::lifecycle::invocation::{
+    processor::MS_TO_NS,
+    triggers::{Trigger, FUNCTION_TRIGGER_EVENT_SOURCE_TAG},
+};
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub struct S3Event {
+    #[serde(rename = "Records")]
+    pub records: Vec<S3Record>,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub struct S3Record {
+    #[serde(rename = "eventSource")]
+    pub event_source: String,
+    #[serde(rename = "eventTime")]
+    pub event_time: DateTime<Utc>,
+    #[serde(rename = "eventName")]
+    pub event_name: String,
+    pub s3: S3Entity,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub struct S3Entity {
+    pub bucket: S3Bucket,
+    pub object: S3Object,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub struct S3Bucket {
+    pub name: String,
+    pub arn: String,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub struct S3Object {
+    pub key: String,
+    pub size: i64,
+    #[serde(rename = "eTag")]
+    pub e_tag: String,
+}
+
+impl Trigger for S3Record {
+    fn new(payload: serde_json::Value) -> Option<Self> {
+        let records = payload.get("Records").and_then(Value::as_array);
+        match records {
+            Some(records) => match serde_json::from_value::<S3Record>(records[0].clone()) {
+                Ok(event) => Some(event),
+                Err(e) => {
+                    debug!("Failed to deserialize S3 Record: {e}");
+                    None
+                }
+            },
+            None => None,
+        }
+    }
+
+    fn is_match(payload: &serde_json::Value) -> bool {
+        if let Some(first_record) = payload
+            .get("Records")
+            .and_then(Value::as_array)
+            .and_then(|r| r.first())
+            .take()
+        {
+            first_record.get("s3").is_some()
+        } else {
+            false
+        }
+    }
+
+    #[allow(clippy::cast_possible_truncation)]
+    fn enrich_span(&self, span: &mut Span) {
+        debug!("Enriching an InferredSpan span with S3 event");
+        let bucket_name = self.s3.bucket.name.clone();
+        let start_time = self
+            .event_time
+            .timestamp_nanos_opt()
+            .unwrap_or((self.event_time.timestamp_millis() as f64 * MS_TO_NS) as i64);
+        // todo: service mapping
+        let service_name = "s3";
+
+        span.name = String::from("aws.s3");
+        span.service = service_name.to_string();
+        span.resource.clone_from(&bucket_name);
+        span.r#type = String::from("web");
+        span.start = start_time;
+        span.meta.extend(HashMap::from([
+            ("operation_name".to_string(), String::from("aws.s3")),
+            ("event_name".to_string(), self.event_name.clone()),
+            ("bucketname".to_string(), bucket_name),
+            ("bucket_arn".to_string(), self.s3.bucket.arn.clone()),
+            ("object_key".to_string(), self.s3.object.key.clone()),
+            ("object_size".to_string(), self.s3.object.size.to_string()),
+            ("object_etag".to_string(), self.s3.object.e_tag.clone()),
+        ]));
+    }
+
+    fn get_tags(&self) -> HashMap<String, String> {
+        HashMap::from([(
+            FUNCTION_TRIGGER_EVENT_SOURCE_TAG.to_string(),
+            "s3".to_string(),
+        )])
+    }
+
+    fn get_arn(&self, _region: &str) -> String {
+        self.event_source.clone()
+    }
+
+    fn get_carrier(&self) -> HashMap<String, String> {
+        HashMap::new()
+    }
+
+    fn is_async(&self) -> bool {
+        true
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::lifecycle::invocation::triggers::test_utils::read_json_file;
+
+    #[test]
+    fn test_new() {
+        let json = read_json_file("s3_event.json");
+        let payload = serde_json::from_str(&json).expect("Failed to deserialize into Value");
+        let result = S3Record::new(payload).expect("Failed to deserialize into Record");
+
+        let expected = S3Record {
+            event_source: String::from("aws:s3:sample:event:source"),
+            event_time: DateTime::parse_from_rfc3339("2023-01-07T00:00:00.000Z")
+                .unwrap()
+                .with_timezone(&Utc),
+            event_name: String::from("ObjectCreated:Put"),
+            s3: S3Entity {
+                bucket: S3Bucket {
+                    name: String::from("example-bucket"),
+                    arn: String::from("arn:aws:s3:::example-bucket"),
+                },
+                object: S3Object {
+                    key: String::from("test/key"),
+                    size: 1024,
+                    e_tag: String::from("0123456789abcdef0123456789abcdef"),
+                },
+            },
+        };
+
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_is_match() {
+        let json = read_json_file("s3_event.json");
+        let payload = serde_json::from_str(&json).expect("Failed to deserialize S3Record");
+
+        assert!(S3Record::is_match(&payload));
+    }
+
+    #[test]
+    fn test_is_not_match() {
+        let json = read_json_file("sqs_event.json");
+        let payload = serde_json::from_str(&json).expect("Failed to deserialize SqsRecord");
+        assert!(!S3Record::is_match(&payload));
+    }
+
+    #[test]
+    fn test_enrich_span() {
+        let json = read_json_file("s3_event.json");
+        let payload = serde_json::from_str(&json).expect("Failed to deserialize into Value");
+        let event = S3Record::new(payload).expect("Failed to deserialize S3Record");
+        let mut span = Span::default();
+        event.enrich_span(&mut span);
+        assert_eq!(span.name, "aws.s3");
+        assert_eq!(span.service, "s3");
+        assert_eq!(span.resource, "example-bucket");
+        assert_eq!(span.r#type, "web");
+
+        assert_eq!(
+            span.meta,
+            HashMap::from([
+                ("operation_name".to_string(), "aws.s3".to_string()),
+                ("event_name".to_string(), "ObjectCreated:Put".to_string()),
+                ("bucketname".to_string(), "example-bucket".to_string()),
+                (
+                    "bucket_arn".to_string(),
+                    "arn:aws:s3:::example-bucket".to_string()
+                ),
+                ("object_key".to_string(), "test/key".to_string()),
+                ("object_size".to_string(), "1024".to_string()),
+                (
+                    "object_etag".to_string(),
+                    "0123456789abcdef0123456789abcdef".to_string()
+                )
+            ])
+        );
+    }
+
+    #[test]
+    fn test_get_tags() {
+        let json = read_json_file("s3_event.json");
+        let payload = serde_json::from_str(&json).expect("Failed to deserialize into Value");
+        let event = S3Record::new(payload).expect("Failed to deserialize S3Record");
+        let tags = event.get_tags();
+
+        let expected = HashMap::from([(
+            "function_trigger.event_source".to_string(),
+            "s3".to_string(),
+        )]);
+
+        assert_eq!(tags, expected);
+    }
+
+    #[test]
+    fn test_get_arn() {
+        let json = read_json_file("s3_event.json");
+        let payload = serde_json::from_str(&json).expect("Failed to deserialize into Value");
+        let event = S3Record::new(payload).expect("Failed to deserialize S3Record");
+        assert_eq!(event.get_arn("us-east-1"), "aws:s3:sample:event:source");
+    }
+
+    #[test]
+    fn test_get_carrier() {
+        let json = read_json_file("s3_event.json");
+        let payload = serde_json::from_str(&json).expect("Failed to deserialize into Value");
+        let event = S3Record::new(payload).expect("Failed to deserialize SqsRecord");
+        let carrier = event.get_carrier();
+
+        let expected = HashMap::new();
+
+        assert_eq!(carrier, expected);
+    }
+}
diff --git a/bottlecap/tests/payloads/s3_event.json b/bottlecap/tests/payloads/s3_event.json
new file mode 100644
index 000000000..031dc8c3a
--- /dev/null
+++ b/bottlecap/tests/payloads/s3_event.json
@@ -0,0 +1,38 @@
+{
+  "Records": [
+    {
+      "eventVersion": "2.0",
+      "eventSource": "aws:s3:sample:event:source",
+      "awsRegion": "us-east-1",
+      "eventTime": "2023-01-07T00:00:00.000Z",
+      "eventName": "ObjectCreated:Put",
+      "userIdentity": {
+        "principalId": "EXAMPLE"
+      },
+      "requestParameters": {
+        "sourceIPAddress": "127.0.0.1"
+      },
+      "responseElements": {
+        "x-amz-request-id": "EXAMPLE123456789",
+        "x-amz-id-2": "EXAMPLE123/5678abcdefghijklambdaisawesome/mnopqrstuvwxyzABCDEFGH"
+      },
+      "s3": {
+        "s3SchemaVersion": "1.0",
+        "configurationId": "testConfigRule",
+        "bucket": {
+          "name": "example-bucket",
+          "ownerIdentity": {
+            "principalId": "EXAMPLE"
+          },
+          "arn": "arn:aws:s3:::example-bucket"
+        },
+        "object": {
+          "key": "test/key",
+          "size": 1024,
+          "eTag": "0123456789abcdef0123456789abcdef",
+          "sequencer": "0A1B2C3D4E5F678901"
+        }
+      }
+    }
+  ]
+}