rebase fixes

Author: shreyamalpani

bottlecap/Cargo.lock

@@ -57,9 +57,9 @@ datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev =
 datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "8a49c7df2d9cbf05118bfd5b85772676f71b34f2" , features = ["mini_agent"] }
 datadog-trace-normalization = { git = "https://github.com/DataDog/libdatadog",  rev = "8a49c7df2d9cbf05118bfd5b85772676f71b34f2" }
 datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "8a49c7df2d9cbf05118bfd5b85772676f71b34f2"  }
-dogstatsd = { git = "https://github.com/DataDog/serverless-components", rev = "985120329d0ba96c1ec8d719cc38e1f7ce11a092", default-features = false }
-datadog-trace-agent = { git = "https://github.com/DataDog/serverless-components", rev = "c3d8ed4f90591c6958921145d485463860307f78" }
-datadog-fips = { git = "https://github.com/DataDog/serverless-components", rev = "c3d8ed4f90591c6958921145d485463860307f78", default-features = false }
+dogstatsd = { git = "https://github.com/DataDog/serverless-components", rev = "5b8d3d5837a563a23264862df2222aac3e60c583", default-features = false }
+datadog-trace-agent = { git = "https://github.com/DataDog/serverless-components", rev = "5b8d3d5837a563a23264862df2222aac3e60c583" }
+datadog-fips = { git = "https://github.com/DataDog/serverless-components", rev = "5b8d3d5837a563a23264862df2222aac3e60c583", default-features = false }
 axum = { version = "0.8.4", default-features = false, features = ["default"] }
 
 [dev-dependencies]

bottlecap/Cargo.toml

@@ -70,9 +70,7 @@ impl Agent {
         self.cancel_token.clone()
     }
 
-    // TODO (Yiming): Fix this lint
-    #[allow(clippy::ref_option)]
-    fn parse_port(endpoint: &Option<String>, default_port: u16) -> u16 {
+    fn parse_port(endpoint: Option<&String>, default_port: u16) -> u16 {
         if let Some(endpoint) = endpoint {
             let port = endpoint.split(':').nth(1);
             if let Some(port) = port {

bottlecap/src/otlp/agent.rs

@@ -110,9 +110,7 @@ async fn graceful_shutdown(tasks: Arc<Mutex<JoinSet<()>>>, shutdown_token: Cance
 /// If the LWA proxy lambda runtime API is not provided, the default Extension
 /// host and port will be used.
 ///
-// TODO (Yiming): Fix this lint
-#[allow(clippy::ref_option)]
-fn get_proxy_socket_address(aws_lwa_proxy_lambda_runtime_api: &Option<String>) -> SocketAddr {
+fn get_proxy_socket_address(aws_lwa_proxy_lambda_runtime_api: Option<&String>) -> SocketAddr {
     if let Some(socket_addr) = aws_lwa_proxy_lambda_runtime_api
         .and_then(|uri_str| lwa::get_lwa_proxy_socket_address(uri_str).ok())
     {