Merge branch 'main' into dsn/crashtracker-many-signals

Author: danielsn

data-pipeline-ffi/src/trace_exporter.rs

@@ -901,7 +901,8 @@ mod tests {
             assert_eq!(response.assume_init().body.to_string_lossy(), response_body);
 
             ddog_trace_exporter_free(exporter);
-            mock_metrics.assert();
+            // It should receive 3 payloads: app-started, metrics and app-closing.
+            mock_metrics.assert_hits(3);
         }
     }
 }

data-pipeline/src/agent_info/fetcher.rs

@@ -36,7 +36,7 @@ pub async fn fetch_info_with_state(
     current_state_hash: Option<&str>,
 ) -> Result<FetchInfoStatus> {
     let req = info_endpoint
-        .into_request_builder(concat!("Libdatadog/", env!("CARGO_PKG_VERSION")))?
+        .to_request_builder(concat!("Libdatadog/", env!("CARGO_PKG_VERSION")))?
         .method(hyper::Method::GET)
         .body(hyper::Body::empty());
     let client = hyper::Client::builder().build(Connector::default());

data-pipeline/src/stats_exporter.rs

@@ -86,7 +86,7 @@ impl StatsExporter {
 
         let mut req_builder = self
             .endpoint
-            .into_request_builder(concat!("Libdatadog/", env!("CARGO_PKG_VERSION")))?
+            .to_request_builder(concat!("Libdatadog/", env!("CARGO_PKG_VERSION")))?
             .header(
                 hyper::header::CONTENT_TYPE,
                 ddcommon::header::APPLICATION_MSGPACK,

data-pipeline/src/telemetry/mod.rs

@@ -169,15 +169,18 @@ impl TelemetryClient {
             self.handle.abort();
         }
     }
+
     /// Shutdowns the telemetry client.
-    pub async fn shutdown(&self) {
+    pub async fn shutdown(self) {
         if let Err(_e) = self
             .worker
             .send_msg(TelemetryActions::Lifecycle(LifecycleAction::Stop))
             .await
         {
             self.handle.abort();
         }
+
+        let _ = self.handle.await;
     }
 }
 
@@ -264,7 +267,6 @@ mod tests {
         client.start().await;
         let _ = client.send(&data);
         client.shutdown().await;
-        let _ = client.handle.await;
         telemetry_srv.assert_hits_async(1).await;
     }
 
@@ -304,7 +306,6 @@ mod tests {
         client.start().await;
         let _ = client.send(&data);
         client.shutdown().await;
-        let _ = client.handle.await;
         telemetry_srv.assert_hits_async(1).await;
     }
 
@@ -344,7 +345,6 @@ mod tests {
         client.start().await;
         let _ = client.send(&data);
         client.shutdown().await;
-        let _ = client.handle.await;
         telemetry_srv.assert_hits_async(1).await;
     }
 
@@ -384,7 +384,6 @@ mod tests {
         client.start().await;
         let _ = client.send(&data);
         client.shutdown().await;
-        let _ = client.handle.await;
         telemetry_srv.assert_hits_async(1).await;
     }
 
@@ -424,7 +423,6 @@ mod tests {
         client.start().await;
         let _ = client.send(&data);
         client.shutdown().await;
-        let _ = client.handle.await;
         telemetry_srv.assert_hits_async(1).await;
     }
 
@@ -464,7 +462,6 @@ mod tests {
         client.start().await;
         let _ = client.send(&data);
         client.shutdown().await;
-        let _ = client.handle.await;
         telemetry_srv.assert_hits_async(1).await;
     }
 
@@ -504,7 +501,6 @@ mod tests {
         client.start().await;
         let _ = client.send(&data);
         client.shutdown().await;
-        let _ = client.handle.await;
         telemetry_srv.assert_hits_async(1).await;
     }
 
@@ -544,7 +540,6 @@ mod tests {
         client.start().await;
         let _ = client.send(&data);
         client.shutdown().await;
-        let _ = client.handle.await;
         telemetry_srv.assert_hits_async(1).await;
     }
 
@@ -577,8 +572,6 @@ mod tests {
 
         client.start().await;
         client.shutdown().await;
-        let _ = client.handle.await;
-
         // Check for 2 hits: app-started and app-closing.
         telemetry_srv.assert_hits_async(2).await;
     }

ddcommon/src/lib.rs

@@ -159,7 +159,7 @@ impl Endpoint {
     /// - User agent
     /// - Api key
     /// - Container Id/Entity Id
-    pub fn into_request_builder(&self, user_agent: &str) -> anyhow::Result<HttpRequestBuilder> {
+    pub fn to_request_builder(&self, user_agent: &str) -> anyhow::Result<HttpRequestBuilder> {
         let mut builder = hyper::Request::builder()
             .uri(self.url.clone())
             .header(hyper::header::USER_AGENT, user_agent);

ddtelemetry/src/worker/http_client.rs

@@ -33,7 +33,7 @@ pub trait HttpClient {
 
 pub fn request_builder(c: &Config) -> anyhow::Result<HttpRequestBuilder> {
     match &c.endpoint {
-        Some(e) => e.into_request_builder(concat!("telemetry/", env!("CARGO_PKG_VERSION"))),
+        Some(e) => e.to_request_builder(concat!("telemetry/", env!("CARGO_PKG_VERSION"))),
         None => Err(anyhow::Error::msg(
             "no valid endpoint found, can't build the request".to_string(),
         )),

live-debugger/src/sender.rs

@@ -150,7 +150,7 @@ impl PayloadSender {
         url = Uri::from_parts(parts)?;
 
         let mut req = endpoint
-            .into_request_builder(concat!("Tracer/", env!("CARGO_PKG_VERSION")))?
+            .to_request_builder(concat!("Tracer/", env!("CARGO_PKG_VERSION")))?
             .method(Method::POST)
             .uri(url);
 

profiling/src/exporter/mod.rs

@@ -273,7 +273,7 @@ impl ProfileExporter {
 
         let builder = self
             .endpoint
-            .into_request_builder(concat!("DDProf/", env!("CARGO_PKG_VERSION")))?
+            .to_request_builder(concat!("DDProf/", env!("CARGO_PKG_VERSION")))?
             .method(http::Method::POST)
             .header("Connection", "close")
             .header("DD-EVP-ORIGIN", self.profiling_library_name.as_ref())

remote-config/src/fetch/fetcher.rs

@@ -304,7 +304,7 @@ impl<S: FileStorage> ConfigFetcher<S> {
         let req = self
             .state
             .endpoint
-            .into_request_builder(concat!("Sidecar/", env!("CARGO_PKG_VERSION")))?
+            .to_request_builder(concat!("Sidecar/", env!("CARGO_PKG_VERSION")))?
             .method(http::Method::POST)
             .header(
                 http::header::CONTENT_TYPE,

ruby/README.md

@@ -29,7 +29,7 @@ Note: No Ruby needed to run this! It all runs inside docker :)
 Note: Publishing new releases to rubygems.org can only be done by Datadog employees.
 
 1. [ ] Locate the new libdatadog release on GitHub: <https://github.com/datadog/libdatadog/releases>
-2. [ ] Update the `LIB_VERSION_TO_PACKAGE` and `LIB_GITHUB_RELEASES` sections of the `Rakefile` with the new version
+2. [ ] Update the `LIB_GITHUB_RELEASES` section of the `Rakefile` with the hashes from the new version
 3. [ ] Update the <lib/libdatadog/version.rb> file with the `LIB_VERSION` and `VERSION` to use
 4. [ ] Commit change, open PR, get it merged
 5. [ ] Release by running `docker-compose run push_to_rubygems`.