put back some renaming

Author: alexgallotta

bottlecap/src/lifecycle/invocation/processor.rs

@@ -310,11 +310,11 @@ impl Processor {
                 // - metrics tags (for asm)
 
                 if let Some(tracer_span) = &context.tracer_span {
-                    self.span.meta.extend(tracer_span.meta.clone());
-                    self.span
+                    self.aws_lambda_span.meta.extend(tracer_span.meta.clone());
+                    self.aws_lambda_span
                         .meta_struct
                         .extend(tracer_span.meta_struct.clone());
-                    self.span.metrics.extend(tracer_span.metrics.clone());
+                    self.aws_lambda_span.metrics.extend(tracer_span.metrics.clone());
                 }
 
                 if let Some(offsets) = &context.enhanced_metric_data {
@@ -435,7 +435,7 @@ impl Processor {
     /// If this method is called, it means that we are operating in a Universally Instrumented
     /// runtime. Therefore, we need to set the `tracer_detected` flag to `true`.
     ///
-    pub fn on_invocation_start(&mut self, headers: HashMap<String, String>, payload: Vec<u8>) {
+    pub fn universal_instrumentation_start(&mut self, headers: HashMap<String, String>, payload: Vec<u8>) {
         self.tracer_detected = true;
 
         let payload_value = serde_json::from_slice::<Value>(&payload).unwrap_or_else(|_| json!({}));
@@ -514,7 +514,7 @@ impl Processor {
 
     /// Given trace context information, set it to the current span.
     ///
-    pub fn on_invocation_end(&mut self, headers: HashMap<String, String>, payload: Vec<u8>) {
+    pub fn universal_instrumentation_end(&mut self, headers: HashMap<String, String>, payload: Vec<u8>) {
         let payload_value = serde_json::from_slice::<Value>(&payload).unwrap_or_else(|_| json!({}));
 
         // Tag the invocation span with the request payload
@@ -862,7 +862,7 @@ mod tests {
        }
        "#;
 
-        p.on_invocation_end(HashMap::new(), response.as_bytes().to_vec());
+        p.universal_instrumentation_end(HashMap::new(), response.as_bytes().to_vec());
 
         assert_eq!(
             p.aws_lambda_span

bottlecap/src/lifecycle/listener.rs

@@ -100,7 +100,7 @@ impl Listener {
 
                 let headers = Self::headers_to_map(headers);
 
-                processor.on_invocation_start(headers, body);
+                processor.universal_instrumentation_start(headers, body);
 
                 let mut response = Response::builder().status(200);
 
@@ -151,7 +151,7 @@ impl Listener {
                 let mut processor = invocation_processor.lock().await;
 
                 let headers = Self::headers_to_map(headers);
-                processor.on_invocation_end(headers, body);
+                processor.universal_instrumentation_end(headers, body);
                 drop(processor);
 
                 Response::builder()