Skip to content

Commit 2ea3ba0

Browse files
rayzrayz
committed
Merge branch 'main' into rayz/otlp-use-stringbuilder
2 parents 08093a8 + f481f1f commit 2ea3ba0

File tree

65 files changed

+3890
-670
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3890
-670
lines changed

‎.datadog-agent-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.75.0
1+
7.75.1

‎.github/labeler.yml‎

Lines changed: 94 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
- changed-files:
4141
- any-glob-to-any-file:
4242
- "lib/saluki-io/**/*"
43-
- "lib/datadog-protos/**/*"
43+
- "lib/protos/**/*"
4444

4545
"area/memory":
4646
- changed-files:
@@ -60,6 +60,82 @@
6060
- any-glob-to-any-file:
6161
- "test/**/*"
6262

63+
# Decoders.
64+
"decoders/otlp":
65+
- changed-files:
66+
- any-glob-to-any-file:
67+
- "lib/saluki-components/src/decoders/otlp/**/*"
68+
69+
# Destinations.
70+
"destination/blackhole":
71+
- changed-files:
72+
- any-glob-to-any-file:
73+
- "lib/saluki-components/src/destinations/blackhole/**/*"
74+
75+
"destination/dogstatsd-stats":
76+
- changed-files:
77+
- any-glob-to-any-file:
78+
- "lib/saluki-components/src/destinations/dsd_stats/**/*"
79+
80+
"destination/prometheus":
81+
- changed-files:
82+
- any-glob-to-any-file:
83+
- "lib/saluki-components/src/destinations/prometheus/**/*"
84+
85+
# Encoders.
86+
"encoder/buffered-incremental":
87+
- changed-files:
88+
- any-glob-to-any-file:
89+
- "lib/saluki-components/src/encoders/buffered_incremental/**/*"
90+
91+
"encoder/datadog-events":
92+
- changed-files:
93+
- any-glob-to-any-file:
94+
- "lib/saluki-components/src/encoders/datadog/events/**/*"
95+
96+
"encoder/datadog-logs":
97+
- changed-files:
98+
- any-glob-to-any-file:
99+
- "lib/saluki-components/src/encoders/datadog/logs/**/*"
100+
101+
"encoder/datadog-metrics":
102+
- changed-files:
103+
- any-glob-to-any-file:
104+
- "lib/saluki-components/src/encoders/datadog/metrics/**/*"
105+
106+
"encoder/datadog-service-checks":
107+
- changed-files:
108+
- any-glob-to-any-file:
109+
- "lib/saluki-components/src/encoders/datadog/service_checks/**/*"
110+
111+
"encoder/datadog-stats":
112+
- changed-files:
113+
- any-glob-to-any-file:
114+
- "lib/saluki-components/src/encoders/datadog/stats/**/*"
115+
116+
"encoder/datadog-traces":
117+
- changed-files:
118+
- any-glob-to-any-file:
119+
- "lib/saluki-components/src/encoders/datadog/traces/**/*"
120+
121+
# Forwarders.
122+
"forwarder/datadog":
123+
- changed-files:
124+
- any-glob-to-any-file:
125+
- "lib/saluki-components/src/forwarders/datadog/**/*"
126+
127+
"forwarder/otlp":
128+
- changed-files:
129+
- any-glob-to-any-file:
130+
- "lib/saluki-components/src/forwarders/otlp/**/*"
131+
132+
# Relays.
133+
"relay/otlp":
134+
- changed-files:
135+
- any-glob-to-any-file:
136+
- "lib/saluki-components/src/relays/otlp/**/*"
137+
138+
# Sources.
63139
"source/checks":
64140
- changed-files:
65141
- any-glob-to-any-file:
@@ -80,11 +156,22 @@
80156
- any-glob-to-any-file:
81157
- "lib/saluki-components/src/sources/internal_metrics/**/*"
82158

159+
"source/otlp":
160+
- changed-files:
161+
- any-glob-to-any-file:
162+
- "lib/saluki-components/src/sources/otlp/**/*"
163+
164+
# Transforms.
83165
"transform/aggregate":
84166
- changed-files:
85167
- any-glob-to-any-file:
86168
- "lib/saluki-components/src/transforms/aggregate/**/*"
87169

170+
"transform/apm-stats":
171+
- changed-files:
172+
- any-glob-to-any-file:
173+
- "lib/saluki-components/src/transforms/apm_stats/**/*"
174+
88175
"transform/chained":
89176
- changed-files:
90177
- any-glob-to-any-file:
@@ -110,32 +197,17 @@
110197
- any-glob-to-any-file:
111198
- "lib/saluki-components/src/transforms/host_tags/**/*"
112199

113-
"destination/blackhole":
114-
- changed-files:
115-
- any-glob-to-any-file:
116-
- "lib/saluki-components/src/destinations/blackhole/**/*"
117-
118-
"destination/datadog":
200+
"transform/metric-router":
119201
- changed-files:
120202
- any-glob-to-any-file:
121-
- "lib/saluki-components/src/destinations/datadog/**/*"
203+
- "lib/saluki-components/src/transforms/metric_router/**/*"
122204

123-
"destination/datadog-events":
205+
"transform/trace-obfuscation":
124206
- changed-files:
125207
- any-glob-to-any-file:
126-
- "lib/saluki-components/src/destinations/datadog/events/**/*"
208+
- "lib/saluki-components/src/transforms/trace_obfuscation/**/*"
127209

128-
"destination/datadog-service-checks":
210+
"transform/trace-sampler":
129211
- changed-files:
130212
- any-glob-to-any-file:
131-
- "lib/saluki-components/src/destinations/datadog/service_checks/**/*"
132-
133-
"destination/datadog-metrics":
134-
- changed-files:
135-
- any-glob-to-any-file:
136-
- "lib/saluki-components/src/destinations/datadog/metrics/**/*"
137-
138-
"destination/prometheus":
139-
- changed-files:
140-
- any-glob-to-any-file:
141-
- "lib/saluki-components/src/destinations/prometheus/**/*"
213+
- "lib/saluki-components/src/transforms/trace_sampler/**/*"

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ test/k8s/charts/
55
test/build/
66
test/ddprof
77
test/lading
8+
test/one-off/__pycache__
89
dhat-heap.json
910
.DS_Store
1011
dist/

‎.gitlab-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ variables:
4444

4545
# Converged Datadog Agent-specific variables, which control how we build the converged Datadog Agent image that we
4646
# publicly publish.
47-
PUBLIC_DSD_VERSION: "7.75.0"
48-
PUBLIC_DD_AGENT_VERSION: "7.75.0-jmx"
47+
PUBLIC_DSD_VERSION: "7.75.1"
48+
PUBLIC_DD_AGENT_VERSION: "7.75.1-jmx"
4949

5050
# Base images to copy Agent Data Plane into, depending on whether the image is meant for our internal environment or
5151
# public registries.

‎.gitlab/build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ build-adp-image-amd64:
7373

7474
build-adp-image-arm64:
7575
extends: [.build-common-variables, .build-arm64-variables, .build-adp-definition]
76-
tags: ["docker-in-docker:microvm-arm64"]
76+
tags: ["docker-in-docker:arm64"]
7777
variables:
7878
APP_IMAGE: ${ADP_PUBLIC_BASE_IMAGE}
7979

@@ -94,7 +94,7 @@ build-adp-image-fips-amd64:
9494

9595
build-adp-image-fips-arm64:
9696
extends: [.build-common-variables, .build-arm64-variables, .build-adp-definition]
97-
tags: ["docker-in-docker:microvm-arm64"]
97+
tags: ["docker-in-docker:arm64"]
9898
variables:
9999
APP_IMAGE: ${ADP_PUBLIC_BASE_IMAGE}
100100
BUILD_FEATURES: "fips"
@@ -120,7 +120,7 @@ build-adp-image-internal-amd64:
120120

121121
build-adp-image-internal-arm64:
122122
extends: [.build-common-variables, .build-arm64-variables, .build-adp-definition]
123-
tags: ["docker-in-docker:microvm-arm64"]
123+
tags: ["docker-in-docker:arm64"]
124124
rules:
125125
- if: !reference [.on_mq_branch, rules, if]
126126
when: never
@@ -153,7 +153,7 @@ build-adp-image-fips-internal-amd64:
153153

154154
build-adp-image-fips-internal-arm64:
155155
extends: [.build-common-variables, .build-arm64-variables, .build-adp-definition]
156-
tags: ["docker-in-docker:microvm-arm64"]
156+
tags: ["docker-in-docker:arm64"]
157157
rules:
158158
- if: !reference [.on_mq_branch, rules, if]
159159
when: never
@@ -198,7 +198,7 @@ publish-adp-image-internal:
198198
strategy: depend
199199
variables:
200200
IMAGE_NAME: agent-data-plane
201-
IMAGE_VERSION: tmpl-v4
201+
IMAGE_VERSION: tmpl-v5
202202
TMPL_SRC_REPO: ${ADP_IMAGE_REPO_NAME}
203203
TMPL_SRC_IMAGE: ${ADP_IMAGE_VERSION}-internal
204204
RELEASE_TAG: ${ADP_IMAGE_VERSION}
@@ -222,7 +222,7 @@ publish-adp-image-internal-fips:
222222
strategy: depend
223223
variables:
224224
IMAGE_NAME: agent-data-plane
225-
IMAGE_VERSION: tmpl-v4
225+
IMAGE_VERSION: tmpl-v5
226226
TMPL_SRC_REPO: ${ADP_IMAGE_REPO_NAME}
227227
TMPL_SRC_IMAGE: ${ADP_IMAGE_VERSION_FIPS}-internal
228228
RELEASE_TAG: ${ADP_IMAGE_VERSION_FIPS}

‎Cargo.lock‎

Lines changed: 5 additions & 4 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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ argh = { version = "0.1", default-features = false }
209209
rmp-serde = { version = "1.3", default-features = false }
210210
serde_bytes = { version = "0.11.19", default-features = false }
211211
num-traits = { version = "0.2", default-features = false }
212+
lru-slab = { version = "0.1.2", default-features = false }
212213

213214
[patch.crates-io]
214215
# Forked version of `hyper-http-proxy` that removes an unused dependency on `rustls-native-certs`, which transitively depends

‎Makefile‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export CARGO_TOOL_VERSION_cargo-autoinherit ?= 0.1.5
4040
export CARGO_TOOL_VERSION_cargo-sort ?= 1.0.9
4141
export CARGO_TOOL_VERSION_dummyhttp ?= 1.1.0
4242
export CARGO_TOOL_VERSION_cargo-machete ?= 0.9.1
43+
export CARGO_TOOL_VERSION_rustfilt ?= 0.2.1
4344
export DDPROF_VERSION ?= 0.20.0
4445
export LADING_VERSION ?= 0.28.0
4546

@@ -652,6 +653,23 @@ emit-adp-build-metadata: ## Emits ADP build metadata shell variables suitable fo
652653
@echo "APP_VERSION=${ADP_APP_VERSION}"
653654
@echo "APP_BUILD_TIME=${ADP_APP_BUILD_TIME}"
654655

656+
.PHONY: bump-adp-version
657+
bump-adp-version: ## Creates a PR branch that bumps the ADP patch version
658+
$(eval CURRENT_VERSION := $(shell grep -E '^version = "' bin/agent-data-plane/Cargo.toml | head -n 1 | cut -d '"' -f 2))
659+
$(eval MAJOR := $(shell echo $(CURRENT_VERSION) | cut -d '.' -f 1))
660+
$(eval MINOR := $(shell echo $(CURRENT_VERSION) | cut -d '.' -f 2))
661+
$(eval PATCH := $(shell echo $(CURRENT_VERSION) | cut -d '.' -f 3))
662+
$(eval NEW_PATCH := $(shell echo $$(($(PATCH) + 1))))
663+
$(eval NEW_VERSION := $(MAJOR).$(MINOR).$(NEW_PATCH))
664+
@echo "[*] Bumping ADP from $(CURRENT_VERSION) to $(NEW_VERSION)"
665+
@git fetch origin main
666+
@git checkout -b bump-adp-version-$(NEW_VERSION) origin/main
667+
@sed -i 's/^version = "$(CURRENT_VERSION)"/version = "$(NEW_VERSION)"/' bin/agent-data-plane/Cargo.toml
668+
@cargo update -p agent-data-plane --quiet
669+
@git add bin/agent-data-plane/Cargo.toml Cargo.lock
670+
@git commit -m "chore(agent-data-plane): bump version to $(NEW_VERSION)"
671+
@echo "[*] Created branch 'bump-adp-version-$(NEW_VERSION)' with version bump commit."
672+
655673
##@ Docs
656674

657675
.PHONY: check-js-build-tools
@@ -714,7 +732,7 @@ sync-licenses: ## Synchronizes the third-party license file with the current cra
714732
.PHONY: cargo-preinstall
715733
cargo-preinstall: cargo-install-dd-rust-license-tool cargo-install-cargo-deny cargo-install-cargo-hack
716734
cargo-preinstall: cargo-install-cargo-nextest cargo-install-cargo-autoinherit cargo-install-cargo-sort
717-
cargo-preinstall: cargo-install-dummyhttp cargo-install-cargo-machete
735+
cargo-preinstall: cargo-install-dummyhttp cargo-install-cargo-machete cargo-install-rustfilt
718736
cargo-preinstall: ## Pre-installs all necessary Cargo tools (used for CI)
719737
@echo "[*] Pre-installed all necessary Cargo tools!"
720738

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "agent-data-plane"
3-
version = "0.1.30"
3+
version = "0.1.31"
44
edition = { workspace = true }
55
license = { workspace = true }
66
repository = { workspace = true }
@@ -26,6 +26,7 @@ http = { workspace = true }
2626
http-body-util = { workspace = true }
2727
memory-accounting = { workspace = true }
2828
papaya = { workspace = true }
29+
prost-types = { workspace = true }
2930
reqwest = { workspace = true, features = [
3031
"rustls-tls-native-roots-no-provider",
3132
"json",

0 commit comments

Comments
 (0)