Skip to content

[chore] Update otelcol core dependency#38214

Merged
dmitryax merged 11 commits into
open-telemetry:mainfrom
dmitryax:update-otel-col
Feb 26, 2025
Merged

[chore] Update otelcol core dependency#38214
dmitryax merged 11 commits into
open-telemetry:mainfrom
dmitryax:update-otel-col

Conversation

@dmitryax
Copy link
Copy Markdown
Member

@dmitryax dmitryax commented Feb 26, 2025

To fix contrib tests in core

Had to add replaces to the new modules to use latest main commit:

make for-all CMD="go mod edit -replace go.opentelemetry.io/collector/extension/extensionauth=go.opentelemetry.io/collector/extension/extensionauth@v0.0.0-20250226024140-8099e51f9a77"
make for-all CMD="go mod edit -replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest=go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest@v0.0.0-20250226024140-8099e51f9a77"
make for-all CMD="go mod edit -replace go.opentelemetry.io/collector/service/hostcapabilities=go.opentelemetry.io/collector/service/hostcapabilities@v0.0.0-20250226024140-8099e51f9a77"

Can be removed once they are released

@linux-foundation-easycla
Copy link
Copy Markdown

linux-foundation-easycla Bot commented Feb 26, 2025

CLA Signed

The committers listed above are authorized under a signed CLA.

@dmitryax
Copy link
Copy Markdown
Member Author

Converting into draft since the test can be fixed in core first to avoid unnecessary breaking change open-telemetry/opentelemetry-collector#12496

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
Copy link
Copy Markdown
Member Author

@dmitryax dmitryax Feb 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

FlushTimeout: 30 * time.Second,
MinSizeConfig: exporterbatcher.MinSizeConfig{
MinSizeItems: 5000,
MinSizeConfig: exporterbatcher.MinSizeConfig{ //nolint:staticcheck
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the ping, will look into it soon.

Copy link
Copy Markdown
Member

@songy23 songy23 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants