Skip to content

Commit

Permalink
chore: remove plugin import from containerd
Browse files Browse the repository at this point in the history
  • Loading branch information
pgimalac committed Dec 27, 2024
1 parent 663520b commit 837fda0
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ retract (
// Internal deps fix version
replace (
github.com/cihub/seelog => github.com/cihub/seelog v0.0.0-20151216151435-d2c6e5aa9fbf // v2.6
// add a "containerd_no_plugins" tag to remove the "plugin" import, which makes binaries bigger
github.com/containerd/containerd => github.com/pgimalac/containerd v1.7.24-0.20241227111440-c29d9741a30e
github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20180202092358-40e2722dffea
github.com/spf13/cast => github.com/DataDog/cast v1.8.0
github.com/ugorji/go => github.com/ugorji/go v1.1.7
Expand Down
4 changes: 2 additions & 2 deletions go.sum

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

22 changes: 19 additions & 3 deletions tasks/build_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"clusterchecks",
"consul",
"containerd",
"containerd_no_plugins",
"cri",
"crio",
"docker",
Expand Down Expand Up @@ -58,6 +59,7 @@
AGENT_TAGS = {
"consul",
"containerd",
"containerd_no_plugins",
"cri",
"crio",
"datadog.no_waf",
Expand Down Expand Up @@ -85,6 +87,7 @@
AGENT_HEROKU_TAGS = AGENT_TAGS.difference(
{
"containerd",
"containerd_no_plugins",
"cri",
"crio",
"docker",
Expand All @@ -109,7 +112,7 @@
CLUSTER_AGENT_CLOUDFOUNDRY_TAGS = {"clusterchecks"}

# DOGSTATSD_TAGS lists the tags needed when building dogstatsd
DOGSTATSD_TAGS = {"containerd", "docker", "kubelet", "podman", "zlib", "zstd"}
DOGSTATSD_TAGS = {"containerd", "containerd_no_plugins", "docker", "kubelet", "podman", "zlib", "zstd"}

# IOT_AGENT_TAGS lists the tags needed when building the IoT agent
IOT_AGENT_TAGS = {"jetson", "otlp", "systemd", "zlib", "zstd"}
Expand All @@ -124,6 +127,7 @@
PROCESS_AGENT_HEROKU_TAGS = PROCESS_AGENT_TAGS.difference(
{
"containerd",
"containerd_no_plugins",
"cri",
"crio",
"docker",
Expand All @@ -143,6 +147,7 @@
"datadog.no_waf",
"docker",
"containerd",
"containerd_no_plugins",
"kubeapiserver",
"kubelet",
"podman",
Expand All @@ -168,12 +173,23 @@
}

# TRACE_AGENT_TAGS lists the tags that have to be added when the trace-agent
TRACE_AGENT_TAGS = {"docker", "containerd", "datadog.no_waf", "kubeapiserver", "kubelet", "otlp", "netcgo", "podman"}
TRACE_AGENT_TAGS = {
"docker",
"containerd",
"containerd_no_plugins",
"datadog.no_waf",
"kubeapiserver",
"kubelet",
"otlp",
"netcgo",
"podman",
}

# TRACE_AGENT_HEROKU_TAGS lists the tags necessary to build the trace-agent for Heroku
TRACE_AGENT_HEROKU_TAGS = TRACE_AGENT_TAGS.difference(
{
"containerd",
"containerd_no_plugins",
"docker",
"kubeapiserver",
"kubelet",
Expand All @@ -194,7 +210,7 @@
WINDOWS_EXCLUDE_TAGS = {"linux_bpf"}

# List of tags to always remove when building on Darwin/macOS
DARWIN_EXCLUDED_TAGS = {"docker", "containerd", "cri", "crio"}
DARWIN_EXCLUDED_TAGS = {"docker", "containerd", "containerd_no_plugins", "cri", "crio"}

# Unit test build tags
UNIT_TEST_TAGS = {"test"}
Expand Down

0 comments on commit 837fda0

Please sign in to comment.