Skip to content

Commit

Permalink
Merge branch 'main' into vianney/ddcommon/fetch-info-endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
VianneyRuhlmann committed Sep 25, 2024
2 parents d89b6e4 + 829e93d commit 1439225
Show file tree
Hide file tree
Showing 30 changed files with 1,052 additions and 693 deletions.
4 changes: 4 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ component_management:
name: ddtelemetry # this is a display name, and can be changed freely
paths:
- ddtelemetry
- component_id: dogstatsd-client # this is an identifier that should not be changed
name: dogstatsd-client # this is a display name, and can be changed freely
paths:
- dogstatsd-client
- component_id: ipc # this is an identifier that should not be changed
name: ipc # this is a display name, and can be changed freely
paths:
Expand Down
29 changes: 25 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ members = [
"data-pipeline-ffi",
"ddsketch",
"tinybytes",
"dogstatsd-client",
]

# https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2
Expand Down
6 changes: 3 additions & 3 deletions LICENSE-3rdparty.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
root_name: datadog-alloc, builder, build_common, datadog-profiling-ffi, data-pipeline-ffi, data-pipeline, datadog-ddsketch, datadog-trace-normalization, datadog-trace-protobuf, datadog-trace-obfuscation, datadog-trace-utils, ddcommon, tinybytes, ddcommon-ffi, datadog-crashtracker-ffi, datadog-crashtracker, ddtelemetry, datadog-profiling, ddtelemetry-ffi, symbolizer-ffi, tools, datadog-profiling-replayer, dogstatsd, datadog-ipc, datadog-ipc-macros, tarpc, tarpc-plugins, spawn_worker, cc_utils, datadog-sidecar, datadog-remote-config, datadog-dynamic-configuration, datadog-sidecar-macros, datadog-sidecar-ffi, sidecar_mockgen, test_spawn_from_lib, datadog-serverless-trace-mini-agent, datadog-trace-mini-agent
root_name: datadog-alloc, builder, build_common, datadog-profiling-ffi, data-pipeline-ffi, data-pipeline, datadog-ddsketch, datadog-trace-normalization, datadog-trace-protobuf, datadog-trace-obfuscation, datadog-trace-utils, ddcommon, tinybytes, dogstatsd-client, ddcommon-ffi, datadog-crashtracker-ffi, datadog-crashtracker, ddtelemetry, datadog-profiling, ddtelemetry-ffi, symbolizer-ffi, tools, datadog-profiling-replayer, dogstatsd, datadog-ipc, datadog-ipc-macros, tarpc, tarpc-plugins, spawn_worker, cc_utils, datadog-sidecar, datadog-remote-config, datadog-dynamic-configuration, datadog-sidecar-macros, datadog-sidecar-ffi, sidecar_mockgen, test_spawn_from_lib, datadog-serverless-trace-mini-agent, datadog-trace-mini-agent
third_party_libraries:
- package_name: addr2line
package_version: 0.21.0
Expand Down Expand Up @@ -10372,7 +10372,7 @@ third_party_libraries:
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- package_name: either
package_version: 1.10.0
package_version: 1.13.0
repository: https://github.com/rayon-rs/either
license: MIT OR Apache-2.0
licenses:
Expand Down Expand Up @@ -22247,7 +22247,7 @@ third_party_libraries:

END OF TERMS AND CONDITIONS
- package_name: regex
package_version: 1.10.4
package_version: 1.10.6
repository: https://github.com/rust-lang/regex
license: MIT OR Apache-2.0
licenses:
Expand Down
4 changes: 3 additions & 1 deletion data-pipeline/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ rmp-serde = "1.1.1"
serde = "1.0.209"
serde_json = "1.0.127"
bytes = "1.4"
either = "1.13.0"
tokio = { version = "1.23", features = ["rt", "test-util", "time"], default-features = false }

ddcommon = { path = "../ddcommon" }
datadog-trace-protobuf = { path = "../trace-protobuf" }
datadog-trace-utils = { path = "../trace-utils" }
datadog-trace-normalization = { path = "../trace-normalization" }
datadog-ddsketch = { path = "../ddsketch"}
dogstatsd-client = { path = "../dogstatsd-client"}
datadog-trace-obfuscation = { path = "../trace-obfuscation" }
datadog-ddsketch = { path = "../ddsketch" }
uuid = { version = "1.10.0", features = ["v4"] }
tokio-util = "0.7.11"

Expand Down
14 changes: 14 additions & 0 deletions data-pipeline/src/health_metrics.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
// SPDX-License-Identifier: Apache-2.0

/// health_metrics holds data to emit info about the health of the data-pipeline
pub(crate) const STAT_SEND_TRACES: &str = "datadog.libdatadog.send.traces";
pub(crate) const STAT_SEND_TRACES_ERRORS: &str = "datadog.libdatadog.send.traces.errors";
pub(crate) const STAT_DESER_TRACES: &str = "datadog.libdatadog.deser_traces";
pub(crate) const STAT_DESER_TRACES_ERRORS: &str = "datadog.libdatadog.deser_traces.errors";
pub(crate) const STAT_SER_TRACES_ERRORS: &str = "datadog.libdatadog.ser_traces.errors";

pub(crate) enum HealthMetric {
Count(&'static str, i64),
}
1 change: 1 addition & 0 deletions data-pipeline/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//! in different languages.
pub mod agent_info;
mod health_metrics;
#[allow(missing_docs)]
pub mod span_concentrator;
#[allow(missing_docs)]
Expand Down
Loading

0 comments on commit 1439225

Please sign in to comment.