[chore] Update otelcol core dependency #38214
Merged
+19,527
−17,350
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dmitryax
requested review from
a team,
MovieStoreGuy,
andrzej-stencel,
crobert-1,
dashpole,
atoulme and
djaglowski
as code owners
dmitryax
requested review from
fatsheep9146,
dehaansa,
jpkrohling,
evan-bradley,
TylerHelmuth,
ChrsMark,
yurishkuro,
mwear,
codeboten,
mx-psi,
bogdandrutu,
songy23,
tigrannajaryan and
jsuereth
as code owners
|
Converting into draft since the test can be fixed in core first to avoid unnecessary breaking change open-telemetry/opentelemetry-collector#12496 |
dmitryax
force-pushed
the
update-otel-col
branch
from
7e20b5d to
971892f
Compare
dmitryax
force-pushed
the
update-otel-col
branch
from
9cc4a18 to
8b70b36
Compare
dmitryax
commented
Feb 26, 2025
Comment on lines
+260
to
+263
| replaces: | ||
| - go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77 | ||
| - go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77 | ||
| - go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77 |
There was a problem hiding this comment.
cc @mx-psi as the next releaser. These replaces need to be removed once these modules are released.
Currently, they are referenced by v0.0.0-00010101000000-000000000000 and v0.120.0 versions in core, which are invalid. So I've put replaces here instead of trying to fix it in core which would require a few commits pointing to versions from parent commits
dmitryax
commented
Feb 26, 2025
| @@ -93,11 +95,11 @@ func createDefaultConfig() component.Config { | |||
| }, | |||
| Batcher: BatcherConfig{ | |||
| FlushTimeout: 30 * time.Second, | |||
| MinSizeConfig: exporterbatcher.MinSizeConfig{ | |||
| MinSizeItems: 5000, | |||
| MinSizeConfig: exporterbatcher.MinSizeConfig{ //nolint:staticcheck | |||
There was a problem hiding this comment.
cc @carsonip, @lahsivjar, @axw. I'v'e added the nolint pragmas instead of migrating to the new interface because this exporter has its own BatcherConfig. Please address this separately. See open-telemetry/opentelemetry-collector#12303 and open-telemetry/opentelemetry-collector#12486
There was a problem hiding this comment.
Thanks for the ping, will look into it soon.
atoulme
approved these changes
Feb 26, 2025
codeboten
approved these changes
Feb 26, 2025
yiquanzhou
added a commit
to dash0hq/opentelemetry-collector-contrib
that referenced
this pull request
Feb 27, 2025
* main: (22 commits) [receiver/awsfirehose] Add support for encoding extensions (open-telemetry#37262) fix(deps): update module google.golang.org/api to v0.223.0 (open-telemetry#38181) [chore] skip TestSyslogComplementaryRFC3164 (open-telemetry#38240) fix(deps): update module github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common to v1.0.1106 (open-telemetry#38199) [provider/s3] Use mdatagen, promote to alpha (open-telemetry#38227) fix: fix flaky test in kafkatopicsobserver (open-telemetry#38218) [processor/resourcedetection] Add k8s.cluster.uid to kubeadm detector (open-telemetry#38216) Revert "Add issue generation from fkaly tests for all archs (open-telemetry#38191)" (open-telemetry#38230) Revert "Introduce issuegenerator to open issues when tests fail on main (open-telemetry#38177)" (open-telemetry#38231) [chore] Update otelcol core dependency (open-telemetry#38214) [pkg/stanza] Improve error logs produced by transformer processors (open-telemetry#37285) [receiver/statsd] Make full config structure public (open-telemetry#38186) processor/metricsstarttime: add ridwanmsharif as codeowner (open-telemetry#38193) fix(deps): update module github.com/huaweicloud/huaweicloud-sdk-go-v3 to v0.1.137 (open-telemetry#38154) [pkg/datadog] export StaticAPIKeyCheck (open-telemetry#38223) [chore][pkg/ottl] Move scope and resource PathGetSetters to internal ctx packages (open-telemetry#38225) fix(deps): update all github.com/datadog packages to v0.64.0-rc.3 (open-telemetry#38202) feat(telemetrygen): added support for delta temporality (open-telemetry#38146) [chore] Some more fixes of component IDs (open-telemetry#38221) [chore][pkg/ottl] Define PathGetSetter in ctxdatapoint (open-telemetry#38201) ...
songy23
reviewed
Feb 27, 2025
There was a problem hiding this comment.
You may have missed out genoteltestbedcol, testbed has been broken since this PR http://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/13551275104/job/37875212771
songy23
reviewed
Feb 27, 2025
Comment on lines
+66
to
+69
| replaces: | ||
| - go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77 | ||
| - go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77 | ||
| - go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77 |
There was a problem hiding this comment.
hmm weird that these work for make otelcontribcol but make oteltestbedcol failed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To fix contrib tests in core
Had to add replaces to the new modules to use latest main commit:
Can be removed once they are released