move dd_resource_key in the trigger

Author: e-n-0

bottlecap/src/lifecycle/invocation/span_inferrer.rs

@@ -6,7 +6,6 @@ use serde_json::Value;
 use tracing::debug;
 
 use crate::config::Config;
-use crate::config::aws::get_aws_partition_by_region;
 use crate::lifecycle::invocation::triggers::IdentifiedTrigger;
 use crate::traces::span_pointers::SpanPointer;
 use crate::traces::{context::SpanContext, propagation::Propagator};
@@ -210,8 +209,6 @@ impl SpanInferrer {
         };
 
         let identified_trigger = IdentifiedTrigger::from_value(payload_value);
-        let dd_resource_key =
-            Self::get_api_gateway_resource_key(&identified_trigger, &aws_config.region);
         let should_enrich_span = Self::should_enrich_span(&identified_trigger);
         let should_skip_inferred_span = Self::should_skip_inferred_span(&identified_trigger);
         let wrapped_inferred_span =
@@ -230,7 +227,7 @@ impl SpanInferrer {
                 );
             }
 
-            if let Some(dd_resource_key) = dd_resource_key {
+            if let Some(dd_resource_key) = t.get_dd_resource_key(&aws_config.region) {
                 inferred_span
                     .meta
                     .insert("dd_resource_key".to_string(), dd_resource_key);
@@ -335,32 +332,6 @@ impl SpanInferrer {
     pub fn get_trigger_tags(&self) -> Option<HashMap<String, String>> {
         self.trigger_tags.clone()
     }
-
-    #[must_use]
-    fn get_api_gateway_resource_key(trigger: &IdentifiedTrigger, region: &str) -> Option<String> {
-        match trigger {
-            IdentifiedTrigger::APIGatewayRestEvent(event) => {
-                Self::build_api_gateway_arn(&event.request_context.api_id, region, "restapis")
-            }
-            IdentifiedTrigger::APIGatewayHttpEvent(event) => {
-                Self::build_api_gateway_arn(&event.request_context.api_id, region, "apis")
-            }
-            _ => None,
-        }
-    }
-
-    #[must_use]
-    fn build_api_gateway_arn(api_id: &str, region: &str, path: &str) -> Option<String> {
-        if api_id.is_empty() {
-            return None;
-        }
-
-        let partition = get_aws_partition_by_region(region);
-
-        Some(format!(
-            "arn:{partition}:apigateway:{region}::/{path}/{api_id}",
-        ))
-    }
 }
 
 fn propagate_appsec(

bottlecap/src/lifecycle/invocation/triggers/api_gateway_http_event.rs

@@ -199,6 +199,20 @@ impl Trigger for APIGatewayHttpEvent {
         )
     }
 
+    fn get_dd_resource_key(&self, region: &str) -> Option<String> {
+        if self.request_context.api_id.is_empty() {
+            return None;
+        }
+
+        let partition = get_aws_partition_by_region(region);
+        Some(format!(
+            "arn:{partition}:apigateway:{region}::/apis/{api_id}",
+            partition = partition,
+            region = region,
+            api_id = self.request_context.api_id
+        ))
+    }
+
     fn is_async(&self) -> bool {
         self.headers
             .get("x-amz-invocation-type")

bottlecap/src/lifecycle/invocation/triggers/api_gateway_rest_event.rs

@@ -186,6 +186,20 @@ impl Trigger for APIGatewayRestEvent {
         )
     }
 
+    fn get_dd_resource_key(&self, region: &str) -> Option<String> {
+        if self.request_context.api_id.is_empty() {
+            return None;
+        }
+
+        let partition = get_aws_partition_by_region(region);
+        Some(format!(
+            "arn:{partition}:apigateway:{region}::/restapis/{api_id}",
+            partition = partition,
+            region = region,
+            api_id = self.request_context.api_id
+        ))
+    }
+
     fn is_async(&self) -> bool {
         self.headers
             .get("x-amz-invocation-type")

bottlecap/src/lifecycle/invocation/triggers/mod.rs

@@ -130,6 +130,10 @@ pub trait Trigger: ServiceNameResolver {
     fn get_carrier(&self) -> HashMap<String, String>;
     fn is_async(&self) -> bool;
 
+    fn get_dd_resource_key(&self, _region: &str) -> Option<String> {
+        None
+    }
+
     /// Default implementation for service name resolution
     fn resolve_service_name(
         &self,