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

Revert #29031 #30197

Merged
merged 3 commits into from
Feb 4, 2022
Merged

Revert #29031 #30197

merged 3 commits into from
Feb 4, 2022

Conversation

ph
Copy link
Contributor

@ph ph commented Feb 3, 2022

This revert the code #29031 of the APM Instrumentation of the Elastic Agent.
To unblock the build of and the CI for other team. This would require
more investigation to really understand the problem.

Fixes elastic/fleet-server#1129

What does this PR do?

Why is it important?

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

This revert the code of the APM Instrumentation of the Elastic Agent.
To unblock the build of and the CI for other team. This would require
more investigation to really understand the problem.

Fixes elastic/fleet-server#1129
@ph ph added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Feb 3, 2022
@ph ph self-assigned this Feb 3, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Feb 3, 2022
@mergify
Copy link
Contributor

mergify bot commented Feb 3, 2022

This pull request does not have a backport label. Could you fix it @ph? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Feb 3, 2022
@ph ph added backport-v8.1.0 Automated backport with mergify backport-v8.2.0 Automated backport with mergify labels Feb 3, 2022
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Feb 3, 2022
@ph ph requested review from mtojek and kvch February 3, 2022 19:36
@elasticmachine
Copy link
Collaborator

elasticmachine commented Feb 3, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Reason: null

  • Start Time: 2022-02-03T20:26:00.986+0000

  • Duration: 364 min 47 sec

  • Commit: fd9d388

Test stats 🧪

Test Results
Failed 0
Passed 48115
Skipped 4292
Total 52407

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@ph
Copy link
Contributor Author

ph commented Feb 3, 2022

@kvch Adding you to this PR as well, because when I've reverted the code for the instrumentation I had conflict with the configuration loading change.

@ph
Copy link
Contributor Author

ph commented Feb 3, 2022

@michel-laterman I've fixed a linter issue from the diagnostic command, can you take a look at this specific part?

@ph ph requested a review from simitt February 3, 2022 21:07
@ph
Copy link
Contributor Author

ph commented Feb 3, 2022

@simitt fyi, I will check tomorrow with Stuart, but let's unblock people for now.

Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Tested this and it does fix the issue.

@ph ph merged commit 718c923 into elastic:main Feb 4, 2022
mergify bot pushed a commit that referenced this pull request Feb 4, 2022
* Revert #29031

This revert the code of the APM Instrumentation of the Elastic Agent.
To unblock the build of and the CI for other team. This would require
more investigation to really understand the problem.

Fixes elastic/fleet-server#1129

* fix make update

* fix linter

(cherry picked from commit 718c923)
ph added a commit that referenced this pull request Feb 9, 2022
Co-authored-by: Pier-Hugues Pellerin <[email protected]>
stuartnelson3 added a commit to stuartnelson3/beats that referenced this pull request Feb 14, 2022
stuartnelson3 added a commit to stuartnelson3/beats that referenced this pull request Feb 14, 2022
stuartnelson3 added a commit to stuartnelson3/beats that referenced this pull request Feb 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v8.1.0 Automated backport with mergify backport-v8.2.0 Automated backport with mergify Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[8.1.0-SNAPSHOT] Fleet Server can't enroll: FAILED: Missed two check-ins
3 participants