Move agent-info to data-pipeline

Author: VianneyRuhlmann

Cargo.lock

@@ -34,7 +34,6 @@ members = [
   "data-pipeline-ffi",
   "ddsketch",
   "tinybytes",
-  "agent-info",
 ]
 
 default-members = [
@@ -70,7 +69,6 @@ default-members = [
   "data-pipeline-ffi",
   "ddsketch",
   "tinybytes",
-  "agent-info",
 ]
 
 # https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2

Cargo.toml

@@ -11,10 +11,13 @@ autobenches = false
 
 [dependencies]
 anyhow = { version = "1.0" }
+arc-swap = "1.7.1"
 futures = { version = "0.3", default-features = false }
 hyper = {version = "0.14", features = ["client"], default-features = false}
 log = "0.4"
 rmp-serde = "1.1.1"
+serde = "1.0.209"
+serde_json = "1.0.127"
 bytes = "1.4"
 tokio = {version = "1.23", features = ["rt"], default-features = false}
 
@@ -34,4 +37,7 @@ path = "benches/main.rs"
 
 [dev-dependencies]
 criterion = "0.5.1"
+datadog-trace-utils = { path = "../trace-utils", features = ["test-utils"] }
+httpmock = "0.7.0"
 rand = "0.8.5"
+tokio = {version = "1.23", features = ["rt", "time", "test-util"], default-features = false}

agent-info/Cargo.toml

@@ -3,7 +3,7 @@
 //! Provides utilities to fetch the agent /info endpoint and an automatic fetcher to keep info
 //! up-to-date
 
-use crate::{schema::AgentInfo, AgentInfoArc};
+use super::{schema::AgentInfo, AgentInfoArc};
 use anyhow::{anyhow, Result};
 use arc_swap::ArcSwapOption;
 use ddcommon::{connector::Connector, Endpoint};
@@ -66,7 +66,9 @@ async fn fetch_info_with_state(
 /// // Define the endpoint
 /// let endpoint = ddcommon::Endpoint::from_url("http://localhost:8126/info".parse().unwrap());
 /// // Fetch the info
-/// let agent_info = agent_info::fetch_info(&endpoint).await.unwrap();
+/// let agent_info = data_pipeline::agent_info::fetch_info(&endpoint)
+///     .await
+///     .unwrap();
 /// println!("Agent version is {}", agent_info.info.version.unwrap());
 /// # Ok(())
 /// # }
@@ -92,8 +94,10 @@ pub async fn fetch_info(info_endpoint: &Endpoint) -> Result<Box<AgentInfo>> {
 /// // Define the endpoint
 /// let endpoint = ddcommon::Endpoint::from_url("http://localhost:8126/info".parse().unwrap());
 /// // Create the fetcher
-/// let fetcher =
-///     agent_info::AgentInfoFetcher::new(endpoint, std::time::Duration::from_secs(5 * 60));
+/// let fetcher = data_pipeline::agent_info::AgentInfoFetcher::new(
+///     endpoint,
+///     std::time::Duration::from_secs(5 * 60),
+/// );
 /// // Get the Arc to access the info
 /// let agent_info_arc = fetcher.get_info();
 /// // Start the runner

data-pipeline/Cargo.toml

@@ -6,6 +6,7 @@
 //! project at this state is to provide a basic API in order to test its viability and integration
 //! in different languages.
 
+pub mod agent_info;
 #[allow(missing_docs)]
 pub mod span_concentrator;
 #[allow(missing_docs)]

agent-info/src/fetcher.rs renamed to data-pipeline/src/agent_info/fetcher.rs

@@ -4,7 +4,7 @@
 #[cfg(test)]
 mod require_test_agent {
     mod fetch_info_test {
-        use agent_info::fetch_info;
+        use data_pipeline::agent_info::fetch_info;
         use datadog_trace_utils::test_utils::datadog_test_agent::DatadogTestAgent;
         use ddcommon::Endpoint;
 
@@ -26,8 +26,8 @@ mod require_test_agent {
     }
 
     mod agent_info_fetcher_test {
-        use agent_info::AgentInfoFetcher;
         use arc_swap::access::Access;
+        use data_pipeline::agent_info::AgentInfoFetcher;
         use datadog_trace_utils::test_utils::datadog_test_agent::DatadogTestAgent;
         use ddcommon::Endpoint;
         use std::time::Duration;

agent-info/src/lib.rs renamed to data-pipeline/src/agent_info/mod.rs

@@ -20,7 +20,7 @@ ENV CARGO_HOME="/root/.cargo"
 WORKDIR /build
 
 RUN apk update \
-  && apk add --no-cache \
+    && apk add --no-cache \
     build-base \
     cargo \
     cmake \
@@ -33,7 +33,7 @@ RUN apk update \
     unzip \
     bash \
     clang16-libclang \
-  && mkdir /usr/local/src
+    && mkdir /usr/local/src
 
 # Tell docker to use bash as the default
 SHELL ["/bin/bash", "-c"]
@@ -45,7 +45,7 @@ SHELL ["/bin/bash", "-c"]
 
 FROM alpine_base as alpine_aws_cli
 RUN apk add --no-cache aws-cli \
-  && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 
 RUN aws --version   # Just to make sure its installed alright
 
@@ -69,7 +69,6 @@ RUN cargo search nothing --limit 1
 # create stubs to cache compilation of dependendencies
 COPY [ "Cargo.lock", "Cargo.toml", "./"]
 COPY "alloc/Cargo.toml" "alloc/"
-COPY "agent-info/Cargo.toml" "agent-info/"
 COPY "build-common/Cargo.toml" "build-common/"
 COPY "crashtracker/Cargo.toml" "crashtracker/"
 COPY "crashtracker-ffi/Cargo.toml" "crashtracker-ffi/"