Commit 986816d
* feat: Update OTel Collector components to v0.135.0 (#9858)
* feat: Update OTel Collector components to v0.135.0
* chore: update Elastic OTel components
go get github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector
go get github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension
go get github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension
go get github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor
go get github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver
* test: fix test after upstream change
Logging was changed in open-telemetry/opentelemetry-collector#13606
* test: update gotestsum to latest
Not sure why it got downgraded to v1.7.0
* use Beats from branch to verify CI
This commit must be reverted before merging this PR.
It temporarily replaces Beats dependency with elastic/beats#46464 to see if CI is happy with it,
and to fix any remaining failures without waiting for that PR to be merged.
* test: fix unit test
* revert "use Beats from branch to verify CI"
This reverts 4813ce3.
* update Beats to 16c4d9a1aa8c
This Beats commit has the update to OTel v0.135.0.
* fix collector's metric names
Without this replacement, some of the collector's internal metric names are broken.
This has been broken since:
- v9.1.3 in v9.1.x
- v8.19.3 in v8.19.x
See open-telemetry/opentelemetry-go#7039.
See https://cloud-native.slack.com/archives/C01N6P7KR6W/p1757442690145329.
* update go-mod-replace allowlist
* mage notice
---------
Co-authored-by: Christos Markou <[email protected]>
(cherry picked from commit ecb0e06)
# Conflicts:
# NOTICE-fips.txt
# NOTICE.txt
# go.mod
# go.sum
# internal/pkg/otel/README.md
* Fix conflicts
* Fix unit tests
* Fix an api change in mockes
* Revert "Fix unit tests"
This reverts commit 81ea886.
* Bump beats dependency and fix tests
* mage notice
---------
Co-authored-by: Andrzej Stencel <[email protected]>
Co-authored-by: Mikołaj Świątek <[email protected]>
1 parent ae007ca commit 986816d
File tree
13 files changed
+3738
-5689
lines changed- .ci/scripts
- changelog/fragments
- internal/pkg/otel
- manager
- translate
- testing/integration
- wrapper/windows/archive-proxy
13 files changed
+3738
-5689
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | | - | |
| 55 | + | |
56 | 56 | | |
57 | 57 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
| 62 | + | |
62 | 63 | | |
63 | 64 | | |
64 | 65 | | |
| |||
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Lines changed: 32 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
273 | 273 | | |
274 | 274 | | |
275 | 275 | | |
276 | | - | |
| 276 | + | |
277 | 277 | | |
278 | 278 | | |
279 | 279 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
292 | 292 | | |
293 | 293 | | |
294 | 294 | | |
295 | | - | |
296 | | - | |
297 | | - | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
298 | 299 | | |
299 | 300 | | |
300 | 301 | | |
301 | 302 | | |
302 | 303 | | |
303 | | - | |
304 | | - | |
305 | 304 | | |
306 | 305 | | |
307 | 306 | | |
308 | | - | |
309 | | - | |
310 | | - | |
311 | | - | |
312 | 307 | | |
313 | 308 | | |
314 | 309 | | |
| |||
0 commit comments