feat(logging): logging in libdatadog

Author: ganeshnj

.github/workflows/test.yml

@@ -138,7 +138,7 @@ jobs:
         env:
           RUSTFLAGS: "${{ matrix.flags }}"
         run: |
-          cargo run --bin release --features profiling,telemetry,data-pipeline,symbolizer,crashtracker,library-config --release -- --out $LIBDD_OUTPUT_FOLDER
+          cargo run --bin release --features profiling,telemetry,data-pipeline,symbolizer,crashtracker,library-config,log --release -- --out $LIBDD_OUTPUT_FOLDER
 
       - name: 'Publish libdatadog'
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1

Cargo.lock

@@ -41,6 +41,8 @@ members = [
   "ddsketch",
   "tinybytes",
   "dogstatsd-client",
+  "datadog-log",
+  "datadog-log-ffi"
 ]
 
 # https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2

Cargo.toml

@@ -1,4 +1,4 @@
-root_name: builder, build_common, tools, datadog-alloc, datadog-crashtracker, ddcommon, ddtelemetry, datadog-ddsketch, datadog-crashtracker-ffi, ddcommon-ffi, datadog-ipc, datadog-ipc-macros, tarpc, tarpc-plugins, tinybytes, spawn_worker, cc_utils, datadog-library-config, datadog-library-config-ffi, datadog-live-debugger, datadog-live-debugger-ffi, datadog-profiling, datadog-profiling-protobuf, datadog-profiling-ffi, data-pipeline-ffi, data-pipeline, datadog-trace-protobuf, datadog-trace-utils, datadog-trace-normalization, dogstatsd-client, ddtelemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-remote-config, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, datadog-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
+root_name: builder, build_common, tools, datadog-alloc, datadog-crashtracker, ddcommon, ddtelemetry, datadog-ddsketch, datadog-crashtracker-ffi, ddcommon-ffi, datadog-ipc, datadog-ipc-macros, tarpc, tarpc-plugins, tinybytes, spawn_worker, cc_utils, datadog-library-config, datadog-library-config-ffi, datadog-live-debugger, datadog-live-debugger-ffi, datadog-profiling, datadog-profiling-protobuf, datadog-profiling-ffi, data-pipeline-ffi, data-pipeline, datadog-trace-protobuf, datadog-trace-utils, datadog-trace-normalization, dogstatsd-client, datadog-log-ffi, datadog-log, ddtelemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-remote-config, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, datadog-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
 third_party_libraries:
 - package_name: addr2line
   package_version: 0.24.2
@@ -32012,7 +32012,39 @@ third_party_libraries:
       IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
       DEALINGS IN THE SOFTWARE.
 - package_name: tracing
-  package_version: 0.1.40
+  package_version: 0.1.41
+  repository: https://github.com/tokio-rs/tracing
+  license: MIT
+  licenses:
+  - license: MIT
+    text: |
+      Copyright (c) 2019 Tokio Contributors
+
+      Permission is hereby granted, free of charge, to any
+      person obtaining a copy of this software and associated
+      documentation files (the "Software"), to deal in the
+      Software without restriction, including without
+      limitation the rights to use, copy, modify, merge,
+      publish, distribute, sublicense, and/or sell copies of
+      the Software, and to permit persons to whom the Software
+      is furnished to do so, subject to the following
+      conditions:
+
+      The above copyright notice and this permission notice
+      shall be included in all copies or substantial portions
+      of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+      ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+      TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+      PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+      SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+      CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+      OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+      IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+      DEALINGS IN THE SOFTWARE.
+- package_name: tracing-appender
+  package_version: 0.2.3
   repository: https://github.com/tokio-rs/tracing
   license: MIT
   licenses:
@@ -32044,7 +32076,7 @@ third_party_libraries:
       IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
       DEALINGS IN THE SOFTWARE.
 - package_name: tracing-attributes
-  package_version: 0.1.27
+  package_version: 0.1.28
   repository: https://github.com/tokio-rs/tracing
   license: MIT
   licenses:
@@ -32076,7 +32108,7 @@ third_party_libraries:
       IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
       DEALINGS IN THE SOFTWARE.
 - package_name: tracing-core
-  package_version: 0.1.32
+  package_version: 0.1.33
   repository: https://github.com/tokio-rs/tracing
   license: MIT
   licenses:
@@ -32139,8 +32171,40 @@ third_party_libraries:
       OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
       IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
       DEALINGS IN THE SOFTWARE.
+- package_name: tracing-serde
+  package_version: 0.2.0
+  repository: https://github.com/tokio-rs/tracing
+  license: MIT
+  licenses:
+  - license: MIT
+    text: |
+      Copyright (c) 2019 Tokio Contributors
+
+      Permission is hereby granted, free of charge, to any
+      person obtaining a copy of this software and associated
+      documentation files (the "Software"), to deal in the
+      Software without restriction, including without
+      limitation the rights to use, copy, modify, merge,
+      publish, distribute, sublicense, and/or sell copies of
+      the Software, and to permit persons to whom the Software
+      is furnished to do so, subject to the following
+      conditions:
+
+      The above copyright notice and this permission notice
+      shall be included in all copies or substantial portions
+      of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+      ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+      TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+      PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+      SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+      CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+      OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+      IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+      DEALINGS IN THE SOFTWARE.
 - package_name: tracing-subscriber
-  package_version: 0.3.18
+  package_version: 0.3.19
   repository: https://github.com/tokio-rs/tracing
   license: MIT
   licenses:

LICENSE-3rdparty.yml

@@ -152,6 +152,7 @@ FEATURES=(
     "datadog-profiling-ffi/ddtelemetry-ffi"
     "datadog-profiling-ffi/demangler"
     "datadog-library-config-ffi"
+    "datadog-log-ffi"
 )
 if [[ "$symbolizer" -eq 1 ]]; then
     FEATURES+=("symbolizer")
@@ -236,7 +237,7 @@ echo "Generating $destdir/include/libdatadog headers..."
 rm -r $destdir/include/datadog/
 mkdir $destdir/include/datadog/
 
-CBINDGEN_HEADERS="common.h profiling.h telemetry.h crashtracker.h data-pipeline.h library-config.h"
+CBINDGEN_HEADERS="common.h profiling.h telemetry.h crashtracker.h data-pipeline.h library-config.h log.h"
 # When optional features are added, don't forget to also include the headers here
 case $ARG_FEATURES in
 esac

build-profiling-ffi.sh

@@ -14,6 +14,7 @@ telemetry = []
 data-pipeline = []
 symbolizer = []
 library-config = []
+log = []
 
 [lib]
 bench = false

builder/Cargo.toml

@@ -68,6 +68,8 @@ pub fn main() {
         f.push("symbolizer".to_string());
         #[cfg(feature = "library-config")]
         f.push("datadog-library-config-ffi".to_string());
+        #[cfg(feature = "log")]
+        f.push("datadog-log-ffi".to_string());
         f
     };
 

builder/src/bin/release.rs

@@ -53,6 +53,8 @@ impl Profiling {
         headers.push("blazesym.h");
         #[cfg(feature = "library-config")]
         headers.push("library-config.h");
+        #[cfg(feature = "log")]
+        headers.push("log.h");
 
         let mut origin_path: PathBuf = [&self.source_include, "dummy.h"].iter().collect();
         let mut target_path: PathBuf = [&self.target_include, "dummy.h"].iter().collect();

builder/src/profiling.rs

@@ -16,7 +16,7 @@ hyper = { version = "1.6", features = ["http1", "client"] }
 hyper-util = { version = "0.1", features = ["client", "client-legacy"] }
 http = "1.0"
 http-body-util = "0.1"
-log = "0.4"
+tracing = { version = "0.1", default-features = false }
 rmp-serde = "1.1.1"
 serde = "1.0.209"
 serde_json = "1.0.127"

data-pipeline/Cargo.toml

@@ -10,10 +10,10 @@ use ddcommon::hyper_migration;
 use ddcommon::Endpoint;
 use http_body_util::BodyExt;
 use hyper::{self, body::Buf, header::HeaderName};
-use log::{error, info};
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::time::sleep;
+use tracing::{error, info};
 
 #[allow(clippy::declare_interior_mutable_const)]
 const DATADOG_AGENT_STATE: HeaderName = HeaderName::from_static("datadog-agent-state");
@@ -157,7 +157,7 @@ impl AgentInfoFetcher {
                     info!("Agent info is up-to-date")
                 }
                 Err(err) => {
-                    error!("Error while fetching /info: {}", err);
+                    error!(?err, "Error while fetching /info");
                 }
             }
             sleep(self.refresh_interval).await;