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

Moving fluentforwardreceiver to contrib repo. #2723

Merged

Conversation

paulosman
Copy link
Member

@paulosman paulosman commented Mar 17, 2021

Description:

This is one of two PRs intended to address #2675. This PR removes fluentforwardreceiver from this repo, the other adds it to the opentelemetry-collector-contrib repo.

Contrib repo PR: open-telemetry/opentelemetry-collector-contrib#2729

Link to tracking Issue:

#2675

Testing:

Confirmed that the project builds locally.

@paulosman paulosman requested a review from a team March 17, 2021 17:26
@codecov
Copy link

codecov bot commented Mar 17, 2021

Codecov Report

Merging #2723 (1d55ed2) into main (e7c74eb) will increase coverage by 0.13%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2723      +/-   ##
==========================================
+ Coverage   91.64%   91.77%   +0.13%     
==========================================
  Files         290      281       -9     
  Lines       15541    15131     -410     
==========================================
- Hits        14242    13886     -356     
+ Misses        889      852      -37     
+ Partials      410      393      -17     
Impacted Files Coverage Δ
service/defaultcomponents/defaults.go 84.00% <ø> (-0.32%) ⬇️
service/telemetry.go 85.45% <ø> (-0.26%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e7c74eb...1d55ed2. Read the comment docs.

@tigrannajaryan
Copy link
Member

@paulosman the E2E tests failed, I think you need to delete TestLog10kDPS/FluentBitToOTLP too.

@tigrannajaryan
Copy link
Member

Also, please fix the merge conflict.

@paulosman paulosman force-pushed the paul.remove_fluentforwardreceiver branch from 57c00e6 to 666755b Compare March 24, 2021 21:58
@paulosman
Copy link
Member Author

paulosman commented Mar 24, 2021

@paulosman the E2E tests failed, I think you need to delete TestLog10kDPS/FluentBitToOTLP too.

Thanks @tigrannajaryan . I moved the test, now it's failing in the contrib repo, unfortunately. I can try bumping the resourcespec and seeing if that fixes it.

Also seeing a deb package failure in the build now, but I think that might be transient. (confirmed: kicked the build and it passed this time)

@paulosman paulosman force-pushed the paul.remove_fluentforwardreceiver branch from 666755b to c807834 Compare March 25, 2021 00:24
@tigrannajaryan
Copy link
Member

Please also clean the CI config, remove these bits:


@paulosman
Copy link
Member Author

Please also clean the CI config, remove these bits:

Thanks, this is done. Looks like there are still two checks failing, (contrib_tests and check-links) but they appear to be failing all builds right now?

@bogdandrutu
Copy link
Member

Oh now... please rebase

@paulosman paulosman force-pushed the paul.remove_fluentforwardreceiver branch from 84a7618 to 1e32169 Compare March 26, 2021 16:45
@paulosman
Copy link
Member Author

Oh now... please rebase

Done, now there are new failures :-) Something to do with ports - I can try and debug later today.

@paulosman paulosman force-pushed the paul.remove_fluentforwardreceiver branch from 1e32169 to 27586fc Compare March 26, 2021 18:47
@paulosman paulosman force-pushed the paul.remove_fluentforwardreceiver branch from 27586fc to 1d55ed2 Compare March 26, 2021 19:38
@paulosman
Copy link
Member Author

Oh now... please rebase

Done, now there are new failures :-) Something to do with ports - I can try and debug later today.

Rebased again and they're passing - think I just got unlucky. @bogdandrutu there's a failure in contrib-tests that looks related to the rename of configmodels => config. Let me know if you want me to try and address that here, otherwise I think this is PR ready to go.

@bogdandrutu bogdandrutu merged commit 02d0f2f into open-telemetry:main Mar 26, 2021
hughesjj pushed a commit to hughesjj/opentelemetry-collector that referenced this pull request Apr 27, 2023
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.

3 participants