Skip to content

Commit 8c4a515

Browse files
tobztobz
authored
chore(dev): remove checks source and checks-related code (#1194)
1 parent a95decd commit 8c4a515

File tree

26 files changed

+8
-2204
lines changed

26 files changed

+8
-2204
lines changed

‎.ci/images/build/Dockerfile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
ARG DD_AGENT_VERSION=latest-jmx
2-
ARG DD_AGENT_IMAGE=datadog/agent:${DD_AGENT_VERSION}
3-
4-
FROM ${DD_AGENT_IMAGE} AS agent
5-
61
FROM registry.ddbuild.io/images/docker:27.3.1
72

8-
ARG RUST_VERSION=1.90.0
3+
ARG RUST_VERSION=1.93.0
94
ARG TARGETARCH
105

116
# Install the basics for building and compiling software projects.

‎.ci/images/general/Dockerfile‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
ARG DD_AGENT_VERSION=latest-jmx
2-
ARG DD_AGENT_IMAGE=datadog/agent:${DD_AGENT_VERSION}
3-
4-
FROM ${DD_AGENT_IMAGE} AS agent
5-
61
FROM registry.ddbuild.io/docker:20.10-py3
72

83
# Install datadog-ci.
@@ -16,13 +11,7 @@ RUN set -x \
1611
&& rm -rf /var/lib/apt/lists/* \
1712
&& npm install -g @datadog/datadog-ci@3.0.1 \
1813
&& datadog-ci version
19-
20-
# Import python bits from Agent image.
21-
# Do last in the pipeline to avoid polluting the builds of above protobuf/go etc from using these libs
22-
COPY --from=agent /opt/datadog-agent/embedded/ /opt/datadog-agent/embedded/
23-
ENV LD_LIBRARY_PATH="/opt/datadog-agent/embedded/lib:${LD_LIBRARY_PATH}"
24-
ENV PATH="/opt/datadog-agent/embedded/bin:${PATH}"
25-
14+
2615
COPY .ci/images/general/entrypoint.sh /
2716
RUN chmod +x /entrypoint.sh
2817
ENTRYPOINT [ "/entrypoint.sh" ]

‎.github/CODEOWNERS‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Agent Metric Pipelines has default ownership over everything.
22
* @DataDog/agent-metric-pipelines
33

4-
/lib/saluki-components/src/sources/checks/ @DataDog/agent-runtimes
5-
64
# We publish public standalone ADP container images based on CI triggered through this repository,
75
# and the code ownership arrangement is to ensure that Agent Delivery has a stake in the configuration
86
# on those CI jobs, such that any changes we make the image tags we're publishing, or how we build the

‎.gitlab-ci.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,12 @@ variables:
7070
# varied depending on where it's being pushed.
7171
ADP_IMAGE_TAG: "agent-data-plane:${ADP_IMAGE_VERSION}"
7272
ADP_IMAGE_TAG_FIPS: "agent-data-plane:${ADP_IMAGE_VERSION_FIPS}"
73-
ADP_CHECKS_TAG: "agent-data-plane-checks:${ADP_IMAGE_VERSION}"
7473

7574
# The full image path.
7675
#
7776
# Used to specifically reference the built ADP image in certain jobs.
7877
ADP_FULL_IMAGE_TAG: "${IMAGE_REGISTRY}/saluki/agent-data-plane:${ADP_IMAGE_VERSION}"
7978
ADP_FULL_IMAGE_TAG_FIPS: "${IMAGE_REGISTRY}/saluki/agent-data-plane:${ADP_IMAGE_VERSION_FIPS}"
80-
ADP_CHECKS_FULL_IMAGE_TAG: "${IMAGE_REGISTRY}/saluki/agent-data-plane-checks:${ADP_IMAGE_VERSION}"
8179

8280
default:
8381
tags: ["arch:amd64"]

‎Cargo.lock‎

Lines changed: 1 addition & 134 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,9 @@ fs4 = { version = "0.13.1", default-features = false }
199199
fnv = { version = "1", default-features = false }
200200
twox-hash = { version = "2", features = ["xxhash64"] }
201201
sha3 = { version = "0.10", default-features = false }
202-
pyo3 = { version = "0.25", default-features = false }
203202
test-strategy = { version = "0.4", default-features = false }
204203
opentelemetry-semantic-conventions = { version = "0.30.0", default-features = false }
205-
pyo3-ffi = { version = "0.25", default-features = false }
206-
comfy-table = "7.1.4"
204+
comfy-table = { version = "7", default-features = false }
207205
dtoa = { version = "1", default-features = false }
208206
itoa = { version = "1", default-features = false }
209207
ryu = { version = "1", default-features = false }

‎LICENSE-3rdparty.csv‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ crossbeam-epoch,https://github.com/crossbeam-rs/crossbeam,MIT OR Apache-2.0,The
5757
crossbeam-queue,https://github.com/crossbeam-rs/crossbeam,MIT OR Apache-2.0,The crossbeam-queue Authors
5858
crossbeam-utils,https://github.com/crossbeam-rs/crossbeam,MIT OR Apache-2.0,The crossbeam-utils Authors
5959
crossterm,https://github.com/crossterm-rs/crossterm,MIT,T. Post
60-
crossterm_winapi,https://github.com/crossterm-rs/crossterm-winapi,MIT,T. Post
6160
crunchy,https://github.com/eira-fransham/crunchy,MIT,Eira Fransham <jackefransham@gmail.com>
6261
crypto-common,https://github.com/RustCrypto/traits,MIT OR Apache-2.0,RustCrypto Developers
6362
darling,https://github.com/TedDriggs/darling,MIT,Ted Driggs <ted.driggs@outlook.com>
@@ -66,7 +65,6 @@ deranged,https://github.com/jhpratt/deranged,MIT OR Apache-2.0,Jacob Pratt <jaco
6665
derive-ex,https://github.com/frozenlib/derive-ex,MIT OR Apache-2.0,frozenlib
6766
digest,https://github.com/RustCrypto/traits,MIT OR Apache-2.0,RustCrypto Developers
6867
displaydoc,https://github.com/yaahc/displaydoc,MIT OR Apache-2.0,Jane Lusby <jlusby@yaah.dev>
69-
document-features,https://github.com/slint-ui/document-features,MIT OR Apache-2.0,Slint Developers <info@slint.dev>
7068
dyn-clone,https://github.com/dtolnay/dyn-clone,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
7169
either,https://github.com/rayon-rs/either,MIT OR Apache-2.0,bluss
7270
enum-as-inner,https://github.com/bluejekyll/enum-as-inner,MIT OR Apache-2.0,Benjamin Fry <benjaminfry@me.com>
@@ -147,7 +145,6 @@ libc,https://github.com/rust-lang/libc,MIT OR Apache-2.0,The Rust Project Develo
147145
libm,https://github.com/rust-lang/compiler-builtins,MIT,Jorge Aparicio <jorge@japaric.io>
148146
linux-raw-sys,https://github.com/sunfishcode/linux-raw-sys,Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT,Dan Gohman <dev@sunfishcode.online>
149147
litemap,https://github.com/unicode-org/icu4x,Unicode-3.0,The ICU4X Project Developers
150-
litrs,https://github.com/LukasKalbertodt/litrs,MIT OR Apache-2.0,Lukas Kalbertodt <lukas.kalbertodt@gmail.com>
151148
log,https://github.com/rust-lang/log,MIT OR Apache-2.0,The Rust Project Developers
152149
lru-slab,https://github.com/Ralith/lru-slab,MIT OR Apache-2.0 OR Zlib,Benjamin Saunders <ben.e.saunders@gmail.com>
153150
mach2,https://github.com/JohnTitor/mach2,BSD-2-Clause OR MIT OR Apache-2.0,The mach2 Authors
@@ -287,7 +284,6 @@ syn,https://github.com/dtolnay/syn,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail
287284
sync_wrapper,https://github.com/Actyx/sync_wrapper,Apache-2.0,Actyx AG <developer@actyx.io>
288285
synstructure,https://github.com/mystor/synstructure,MIT,Nika Layzell <nika@thelayzells.com>
289286
tagptr,https://github.com/oliver-giersch/tagptr,MIT OR Apache-2.0,Oliver Giersch
290-
target-lexicon,https://github.com/bytecodealliance/target-lexicon,Apache-2.0 WITH LLVM-exception,Dan Gohman <sunfish@mozilla.com>
291287
target-triple,https://github.com/dtolnay/target-triple,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
292288
tempfile,https://github.com/Stebalien/tempfile,MIT OR Apache-2.0,"Steven Allen <steven@stebalien.com>, The Rust Project Developers, Ashley Mannix <ashleymannix@live.com.au>, Jason White <me@jasonwhite.io>"
293289
termcolor,https://github.com/BurntSushi/termcolor,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>

‎bin/agent-data-plane/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ workspace = true
1111
[features]
1212
default = []
1313
fips = ["saluki-app/tls-fips"]
14-
python-checks = ["saluki-components/python-checks"]
1514

1615
[dependencies]
1716
argh = { workspace = true, features = ["help"] }

‎bin/agent-data-plane/src/cli/run.rs‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ use saluki_app::{
99
memory::{initialize_memory_bounds, MemoryBoundsConfiguration},
1010
metrics::emit_startup_metrics,
1111
};
12-
#[cfg(feature = "python-checks")]
13-
use saluki_components::sources::ChecksConfiguration;
1412
use saluki_components::{
1513
decoders::otlp::OtlpDecoderConfiguration,
1614
destinations::DogStatsDStatisticsConfiguration,
@@ -281,9 +279,6 @@ async fn create_topology(
281279
add_otlp_pipeline_to_blueprint(&mut blueprint, config, dp_config, env_provider)?;
282280
}
283281

284-
#[cfg(feature = "python-checks")]
285-
add_checks_to_blueprint(&mut blueprint, config, env_provider)?;
286-
287282
Ok(blueprint)
288283
}
289284

@@ -502,23 +497,6 @@ fn add_otlp_pipeline_to_blueprint(
502497
Ok(())
503498
}
504499

505-
#[cfg(feature = "python-checks")]
506-
fn add_checks_to_blueprint(
507-
blueprint: &mut TopologyBlueprint, config: &GenericConfiguration, env_provider: &ADPEnvironmentProvider,
508-
) -> Result<(), GenericError> {
509-
let checks_config = ChecksConfiguration::from_configuration(config)
510-
.error_context("Failed to configure checks source.")?
511-
.with_environment_provider(env_provider.clone());
512-
513-
blueprint
514-
.add_source("checks_in", checks_config)?
515-
.connect_component("dsd_agg", ["checks_in.metrics"])?
516-
.connect_component("dd_service_checks_encode", ["checks_in.service_checks"])?
517-
.connect_component("dd_events_encode", ["checks_in.events"])?;
518-
519-
Ok(())
520-
}
521-
522500
fn write_sizing_guide(bounds: ComponentBounds) -> Result<(), GenericError> {
523501
use std::{
524502
fs::File,

0 commit comments

Comments
 (0)