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 otel version #37808

Merged
merged 20 commits into from
Feb 11, 2025
Merged

[chore] Update otel version #37808

merged 20 commits into from
Feb 11, 2025

Conversation

sincejune
Copy link
Contributor

Description

This is a PR to verify the change in #37706: After running make update-otel, builder-config.yaml files are correctly updated in this PR.

Feel free to close this PR if it's too large to review. (I have no permission to run the update-otel GitHub action and have to run it manually).
cc @bogdandrutu @codeboten @mx-psi @songy23

Link to tracking issue

Relevant to #37703

Testing

n/a

Documentation

n/a

@sincejune
[chore] multimod update stable modules
a249f7e 
Signed-off-by: Chao <chao.weng@appdynamics.com>
@sincejune
[chore] multimod update beta modules
c113a4c 
Signed-off-by: Chao <chao.weng@appdynamics.com>
@sincejune
[chore] mod and toolchain tidy
bf0041f 
Signed-off-by: Chao <chao.weng@appdynamics.com>
@sincejune
Copy link
Contributor Author

#37623 is also a blocker of this issue cuz the function is already removed in core repo.

@sincejune
Copy link
Contributor Author

@sincejune @mx-psi should we "freeze" when the update otel PR is ready for review?

@bogdandrutu I'm OK to resolve conflicts at some time. But I need helps for #37623 and confirmation to the note.

@mx-psi
Copy link
Member

mx-psi commented Feb 10, 2025

@sincejune merged #37623

@mx-psi mx-psi merged commit b1ba0ef into open-telemetry:main Feb 11, 2025
162 checks passed
@sincejune
Copy link
Contributor Author

@mx-psi Thank you! I went out for dinner, haven't get a chance to fix the last make generate issue :(

@github-actions github-actions bot added this to the next release milestone Feb 11, 2025
@sincejune sincejune mentioned this pull request Feb 11, 2025
Merged
@mx-psi
Copy link
Member

mx-psi commented Feb 11, 2025

no problem!

mx-psi pushed a commit that referenced this pull request Feb 11, 2025
@sincejune
[chore] Update types used in extensiontest.NewNopSettingsWithType (#3…
d2723d6 
…7844)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
This PR replaced `extensiontest.NopType` with actual factory type if
it's created. cc @mx-psi

<!-- Issue number (e.g. #1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Follow up PR of #37808 

<!--Describe what testing was performed and which tests were added.-->
#### Testing
n/a

<!--Describe the documentation added.-->
#### Documentation
n/a

<!--Please delete paragraphs that you did not use before submitting.-->
@sincejune sincejune deleted the update-otel branch February 11, 2025 12:59
yiquanzhou added a commit to dash0hq/opentelemetry-collector-contrib that referenced this pull request Feb 11, 2025
@yiquanzhou
Merge branch 'main' into kafka-receiver-backoff
2c0d768 
* main: (76 commits)
  Update All OpenTelemetry Collector Contrib packages (open-telemetry#37839)
  [chore] fix codeowners allowlist (open-telemetry#37856)
  Update module github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp to v1.26.0 (open-telemetry#37841)
  Update module github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common to v1.0.1095 (open-telemetry#37825)
  Update module github.com/grpc-ecosystem/grpc-gateway/v2 to v2.26.1 (open-telemetry#37821)
  [chore][exporter/elasticsearch] Bump go-docappender to v2.5.0 (open-telemetry#37852)
  Update All github.com/aws packages (open-telemetry#37816)
  Update module google.golang.org/protobuf to v1.36.5 (open-telemetry#37827)
  Update module github.com/SAP/go-hdb to v1.12.12 (open-telemetry#37817)
  Update module github.com/huaweicloud/huaweicloud-sdk-go-v3 to v0.1.135 (open-telemetry#37822)
  Update module github.com/ClickHouse/clickhouse-go/v2 to v2.31.0 (open-telemetry#37835)
  [receiver/datadog] Implement support for span links (open-telemetry#37449)
  receiver/prometheusreceiver: allow cumulative resets when using the adjuster (open-telemetry#37718)
  Update README.md (open-telemetry#37826)
  [receiver/github] add workflow run event trace handling (open-telemetry#37578)
  Update All github.com/datadog packages to v0.62.2 (open-telemetry#37838)
  [chore] Update types used in extensiontest.NewNopSettingsWithType (open-telemetry#37844)
  [processor/redaction] introduce `allowed_values` parameter in processor config (open-telemetry#37638)
  [chore] Update otel version (open-telemetry#37808)
  [testbed] Include CPU and memory limits to benchmark results file (open-telemetry#36753)
  ...
khushijain21 pushed a commit to khushijain21/opentelemetry-collector-contrib that referenced this pull request Feb 14, 2025
@sincejune @mx-psi @khushijain21
[chore] Update otel version (open-telemetry#37808)
c73e663 
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
This is a PR to verify the change in open-telemetry#37706: After running `make
update-otel`, `builder-config.yaml` files are correctly updated in this
PR.

Feel free to close this PR if it's too large to review. (I have no
permission to run the `update-otel` GitHub action and have to run it
manually).
cc @bogdandrutu @codeboten @mx-psi @songy23 
<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Relevant to open-telemetry#37703 

<!--Describe what testing was performed and which tests were added.-->
#### Testing
n/a

<!--Describe the documentation added.-->
#### Documentation
n/a

<!--Please delete paragraphs that you did not use before submitting.-->

---------

Signed-off-by: Chao <chao.weng@appdynamics.com>
Co-authored-by: Pablo Baeyens <pablo.baeyens@datadoghq.com>
khushijain21 pushed a commit to khushijain21/opentelemetry-collector-contrib that referenced this pull request Feb 14, 2025
@sincejune @khushijain21
[chore] Update types used in extensiontest.NewNopSettingsWithType (op…
e24b646 
…en-telemetry#37844)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
This PR replaced `extensiontest.NopType` with actual factory type if
it's created. cc @mx-psi

<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Follow up PR of open-telemetry#37808 

<!--Describe what testing was performed and which tests were added.-->
#### Testing
n/a

<!--Describe the documentation added.-->
#### Documentation
n/a

<!--Please delete paragraphs that you did not use before submitting.-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mx-psi mx-psi mx-psi approved these changes

@songy23 songy23 songy23 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

@crobert-1 crobert-1 Awaiting requested review from crobert-1 crobert-1 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

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

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

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

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

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

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

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

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

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

@bogdandrutu bogdandrutu Awaiting requested review from bogdandrutu bogdandrutu 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

Assignees

@evan-bradley evan-bradley

Labels
cmd/githubgen cmd/opampsupervisor cmd/otelcontribcol otelcontribcol command cmd/oteltestbedcol cmd/telemetrygen telemetrygen command confmap/provider/aesprovider confmap/provider/s3provider confmap/provider/secretsmanagerprovider connector/count connector/datadog connector/exceptions connector/failover connector/grafanacloud connector/otlpjson connector/roundrobin connector/routing connector/servicegraph connector/signaltometrics connector/spanmetrics connector/sum 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/bmchelix exporter/carbon exporter/cassandra exporter/clickhouse exporter/coralogix exporter/datadog Datadog components
Projects
None yet
Milestone
v0.120.0
Development

Successfully merging this pull request may close these issues.
5 participants
@sincejune @mx-psi @songy23 @bogdandrutu @evan-bradley