Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore] update core #33308

Merged
merged 10 commits into from
May 30, 2024
Merged

[chore] update core #33308

merged 10 commits into from
May 30, 2024

Conversation

jpkrohling
Copy link
Member

  • [chore] multimod update stable modules
  • [chore] multimod update beta modules
  • [chore] update core

Ran "make generate" as well.

Signed-off-by: Juraci Paixão Kröhling [email protected]

@jpkrohling jpkrohling force-pushed the jpkrohling/update-otelcore-v0.101.1-0-eaab76e branch from cca686b to be1ff61 Compare May 30, 2024 12:46
songy23
songy23 reviewed May 30, 2024
View reviewed changes
Copy link
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.

Generated code is out of date, please run "make genotelcontribcol" and commit the changes in this PR.

@jpkrohling
Copy link
Member Author

I ran make genotelcontribcol, but my version of Go is different than CI's, resulting in go.mod to include a more recent toolchain, which got detected by CI as a drift from its own generated code. Hopefully it works now 🤞🏽

@jpkrohling
[chore] multimod update stable modules
2b12e0e 
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling
[chore] multimod update beta modules
04e860b 
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling
[chore] update core
e053f40 
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling
fixed things make update-otel didn't update
676b90c 
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling
go mod tidy on cmd/otelcontribcol
888cc20 
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling
make genotelcontribcol
fceefda 
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling
revert toolchain...
1c86f1b 
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling jpkrohling force-pushed the jpkrohling/update-otelcore-v0.101.1-0-eaab76e branch from ffaaa7a to 1c86f1b Compare May 30, 2024 13:15
@jpkrohling
revert toolchain... again
b81bb72 
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling
make genoteltestbedcol
008e572 
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling
update versions on builder-config, make genoteltestbedcol
76e696b 
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@codeboten codeboten merged commit f17d5cc into open-telemetry:main May 30, 2024
160 of 161 checks passed
@github-actions github-actions bot added this to the next release milestone May 30, 2024
cparkins pushed a commit to AmadeusITGroup/opentelemetry-collector-contrib that referenced this pull request Jul 11, 2024
@jpkrohling @cparkins
[chore] update core (open-telemetry#33308)
bb2cca6 
- **[chore] multimod update stable modules**
- **[chore] multimod update beta modules**
- **[chore] update core**

Ran "make generate" as well.

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

---------

Signed-off-by: Juraci Paixão Kröhling <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codeboten codeboten codeboten approved these changes

@songy23 songy23 songy23 approved these changes

@crobert-1 crobert-1 crobert-1 approved these changes

@djaglowski djaglowski Awaiting requested review from djaglowski djaglowski is a code owner

@MovieStoreGuy MovieStoreGuy Awaiting requested review from MovieStoreGuy MovieStoreGuy is a code owner

@andrzej-stencel andrzej-stencel Awaiting requested review from andrzej-stencel andrzej-stencel is a code owner

@dashpole dashpole Awaiting requested review from dashpole dashpole is a code owner

@atoulme atoulme Awaiting requested review from atoulme atoulme is a code owner

@jmacd jmacd Awaiting requested review from jmacd jmacd is a code owner

@dmitryax dmitryax Awaiting requested review from dmitryax dmitryax is a code owner

@fatsheep9146 fatsheep9146 Awaiting requested review from fatsheep9146 fatsheep9146 is a code owner

@Aneurysm9 Aneurysm9 Awaiting requested review from Aneurysm9

@TylerHelmuth TylerHelmuth Awaiting requested review from TylerHelmuth TylerHelmuth is a code owner

@yurishkuro yurishkuro Awaiting requested review from yurishkuro yurishkuro is a code owner

@mx-psi mx-psi Awaiting requested review from mx-psi mx-psi is a code owner

@bogdandrutu bogdandrutu Awaiting requested review from bogdandrutu bogdandrutu is a code owner

@evan-bradley evan-bradley Awaiting requested review from evan-bradley evan-bradley is a code owner

@tigrannajaryan tigrannajaryan Awaiting requested review from tigrannajaryan tigrannajaryan is a code owner

@jsuereth jsuereth Awaiting requested review from jsuereth jsuereth is a code owner

@bryan-aguilar bryan-aguilar Awaiting requested review from bryan-aguilar bryan-aguilar is a code owner

Assignees

@andrzej-stencel andrzej-stencel

Labels
cmd/configschema configschema command cmd/githubgen cmd/opampsupervisor cmd/otelcontribcol otelcontribcol command cmd/oteltestbedcol cmd/telemetrygen telemetrygen command confmap/provider/s3provider confmap/provider/secretsmanagerprovider connector/count connector/datadog connector/exceptions connector/failover connector/grafanacloud connector/roundrobin connector/routing connector/servicegraph connector/spanmetrics exporter/alertmanager exporter/alibabacloudlogservice Alibaba components exporter/awscloudwatchlogs awscloudwatchlogs exporter exporter/awsemf awsemf exporter exporter/awskinesis exporter/awss3 exporter/awsxray exporter/azuredataexplorer exporter/azuremonitor exporter/carbon exporter/cassandra exporter/clickhouse exporter/coralogix exporter/datadog Datadog components exporter/dataset exporter/elasticsearch exporter/file exporter/googlecloud
Projects
None yet
Milestone
v0.102.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jpkrohling @codeboten @songy23 @crobert-1 @andrzej-stencel