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.

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

Update OTel fork components to dd840b7a79ba22aca7bda3af5cb925ea208c1dc6 #862

Merged

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 22, 2023

Description of the issue

An automated PR to update the OTel fork components to point to dd840b7a79ba22aca7bda3af5cb925ea208c1dc6.

Additional necessary changes

  1. upgraded to go 1.20
  2. updated unit tests for updated defaults in some components, like batch
  3. moved the replace in the go.mod to the top with the others
  4. removed cadvisor and k8sapiserver input plugins. This is dead code and the dead code was no longer building with the latest dependencies. Instead of fixing the build I deleted the dead code

License

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Tests

n/a

Requirements

Before commit the code, please do the following steps.

  1. Run make fmt and make fmt-sh
  2. Run make lint

@github-actions github-actions bot requested a review from a team as a code owner September 22, 2023 21:03
@chadpatel chadpatel requested review from mitali-salvi and sky333999 and removed request for sky333999 September 25, 2023 14:02
chadpatel
chadpatel previously approved these changes Sep 25, 2023
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230906164155-ced73ba61d63
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230922200107-dd840b7a79ba

replace github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20230922200107-dd840b7a79ba
Copy link
Contributor

Choose a reason for hiding this comment

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

I manually moved this here because the workflow put it at the bottom of the file

mitali-salvi
mitali-salvi previously approved these changes Sep 25, 2023
@chadpatel chadpatel dismissed stale reviews from mitali-salvi and themself via 8aa5423 September 25, 2023 18:00
@codecov-commenter
Copy link

Codecov Report

Attention: 37 lines in your changes are missing coverage. Please review.

Comparison is base (96d4763) 57.58% compared to head (d2ecfe1) 62.22%.
Report is 406 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #862      +/-   ##
==========================================
+ Coverage   57.58%   62.22%   +4.63%     
==========================================
  Files         370      339      -31     
  Lines       17548    17004     -544     
==========================================
+ Hits        10105    10580     +475     
+ Misses       6848     5871     -977     
+ Partials      595      553      -42     
Files Coverage Δ
cfg/commonconfig/commonconfig.go 8.00% <ø> (ø)
...md/amazon-cloudwatch-agent-config-wizard/wizard.go 59.55% <ø> (-8.51%) ⬇️
...amazon-cloudwatch-agent/amazon-cloudwatch-agent.go 2.68% <ø> (ø)
...oudwatch-agent/register_event_logger_notwindows.go 0.00% <ø> (ø)
...-cloudwatch-agent/register_event_logger_windows.go 0.00% <ø> (ø)
cmd/config-translator/translator.go 0.00% <ø> (ø)
cmd/xray-migration/commands_unix.go 42.50% <ø> (ø)
cmd/xray-migration/commands_windows.go 42.50% <ø> (ø)
cmd/xray-migration/xray-migration.go 30.28% <ø> (ø)
handlers/agentinfo/info.go 84.94% <ø> (ø)
... and 18 more

... and 210 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@chadpatel chadpatel requested review from mitali-salvi, chadpatel and zhihonl and removed request for chadpatel September 25, 2023 21:12
@sky333999 sky333999 force-pushed the otel-fork-replace-dd840b7a79ba22aca7bda3af5cb925ea208c1dc6 branch from 4006c92 to d9bd0cb Compare September 26, 2023 14:15
@chadpatel chadpatel merged commit 2be7788 into main Sep 26, 2023
5 of 6 checks passed
@chadpatel chadpatel deleted the otel-fork-replace-dd840b7a79ba22aca7bda3af5cb925ea208c1dc6 branch September 26, 2023 14:31
bhanuba pushed a commit that referenced this pull request Oct 2, 2023
Co-authored-by: Github Action <[email protected]>
Co-authored-by: Chad Patel <[email protected]>
rvasahu-amazon pushed a commit to rvasahu-amazon/amazon-cloudwatch-agent that referenced this pull request Nov 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants