Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a61d49c
feat: Update OTel Collector components to v0.135.0
andrzej-stencel Sep 10, 2025
e3b3d2a
chore: update Elastic OTel components
andrzej-stencel Sep 10, 2025
f8b4739
Merge remote-tracking branch 'upstream/main' into update-otel-to-v0.1…
andrzej-stencel Sep 10, 2025
d5730a8
Merge branch 'main' into update-otel-to-v0.135.0
ChrsMark Sep 11, 2025
d03e068
test: fix test after upstream change
andrzej-stencel Sep 12, 2025
87af7a5
Merge branch 'main' into update-otel-to-v0.135.0
andrzej-stencel Sep 12, 2025
ff7cb14
Merge remote-tracking branch 'upstream/main' into update-otel-to-v0.1…
andrzej-stencel Sep 14, 2025
9530a00
test: update gotestsum to latest
andrzej-stencel Sep 15, 2025
4813ce3
use Beats from branch to verify CI
andrzej-stencel Sep 15, 2025
6532fb6
test: fix unit test
andrzej-stencel Sep 15, 2025
79af700
Merge remote-tracking branch 'upstream/main' into update-otel-to-v0.1…
andrzej-stencel Sep 16, 2025
b5c81a5
Merge branch 'main' into update-otel-to-v0.135.0
ChrsMark Sep 16, 2025
765b587
Merge remote-tracking branch 'upstream/main' into update-otel-to-v0.1…
andrzej-stencel Sep 18, 2025
d442cc9
revert "use Beats from branch to verify CI"
andrzej-stencel Sep 18, 2025
7276923
update Beats to 16c4d9a1aa8c
andrzej-stencel Sep 18, 2025
6a2bedf
fix collector's metric names
andrzej-stencel Sep 18, 2025
a39dc1d
update go-mod-replace allowlist
andrzej-stencel Sep 18, 2025
d7461e5
mage notice
andrzej-stencel Sep 18, 2025
fd618a9
Merge remote-tracking branch 'upstream/main' into update-otel-to-v0.1…
andrzej-stencel Sep 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/scripts/update-otel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ else
fi
elastic-agent-changelog-tool new "$changelog_fragment_name"
sed -i.bak "s/^kind:.*$/kind: enhancement/" ./changelog/fragments/*-"${changelog_fragment_name}".yaml
sed -i.bak "s/^summary:.*$/summary: Update OTel components to ${next_contrib}/" ./changelog/fragments/*-"${changelog_fragment_name}".yaml
sed -i.bak "s/^summary:.*$/summary: Update OTel Collector components to ${next_contrib}/" ./changelog/fragments/*-"${changelog_fragment_name}".yaml
Comment thread
ChrsMark marked this conversation as resolved.
Comment thread
andrzej-stencel marked this conversation as resolved.
sed -i.bak "s/^component:.*$/component: elastic-agent/" ./changelog/fragments/*-"${changelog_fragment_name}".yaml
rm ./changelog/fragments/*-"${changelog_fragment_name}".yaml.bak
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ linters:
- github.com/google/gopacket
- github.com/insomniacslk/dhcp
- github.com/meraki/dashboard-api-go/v3
- go.opentelemetry.io/otel/exporters/prometheus
replace-local: false
gomodguard:
blocked:
Expand Down
1,240 changes: 892 additions & 348 deletions NOTICE-fips.txt

Large diffs are not rendered by default.

3,257 changes: 1,885 additions & 1,372 deletions NOTICE.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Kind can be one of:
# - breaking-change: a change to previously-documented behavior
# - deprecation: functionality that is being removed in a later release
# - bug-fix: fixes a problem in a previous version
# - enhancement: extends functionality but does not break or fix existing behavior
# - feature: new functionality
# - known-issue: problems that we are aware of in a given version
# - security: impacts on the security of a product or a user’s deployment.
# - upgrade: important information for someone upgrading from a prior version
# - other: does not fit into any of the other categories
kind: enhancement

# Change summary; a 80ish characters long description of the change.
summary: Update OTel Collector components to v0.135.0

# Long description; in case the summary is not enough to describe the change
# this field accommodate a description without length limits.
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
#description:

# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
component: elastic-agent

# PR URL; optional; the PR number that added the changeset.
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
# Please provide it if you are adding a fragment for a different PR.
#pr: https://github.com/owner/repo/1234

# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
# If not present is automatically filled by the tooling with the issue linked to the PR number.
#issue: https://github.com/owner/repo/1234
382 changes: 195 additions & 187 deletions go.mod

Large diffs are not rendered by default.

839 changes: 425 additions & 414 deletions go.sum

Large diffs are not rendered by default.

110 changes: 55 additions & 55 deletions internal/pkg/otel/README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/pkg/otel/manager/manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ func TestOTelManager_Logging(t *testing.T) {
logs := obs.All()
require.NotEmpty(collect, logs, "Logs should not be empty")
firstMessage := logs[0].Message
assert.Equal(collect, firstMessage, "Setting up own telemetry...")
assert.Equal(collect, "Internal metrics telemetry disabled", firstMessage)
}, time.Second*10, time.Second)
}

Expand Down
7 changes: 4 additions & 3 deletions internal/pkg/otel/translate/otelconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,10 @@ func TestGetOtelConfig(t *testing.T) {
"block_on_overflow": true,
"wait_for_result": true,
"batch": map[string]any{
"max_size": 1600,
"min_size": 0,
"sizer": "items",
"flush_timeout": "10s",
"max_size": 1600,
"min_size": 0,
"sizer": "items",
},
},
"logs_dynamic_id": map[string]any{
Expand Down
Loading