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

[8.x](backport #5556) Add pprofextension from the OTel-contrib #5577

Merged
merged 3 commits into from
Oct 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2024

What does this PR do?

This comit adds the pprofextension to the OTel collector.

Why is it important?

As part of running benchmarks for Elastic-Agent we need to be able to take diagnostic profiles and as we onboard the OTel collector to the framework we need to enable Pprof for the OTel collector.

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/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Once you have a packaged version of Elastic-Agent then you can start it with the following OTel config

#.... other stuff....
extensions:
    pprof:
        endpoint: localhost:5066
#... some other....
service:
    extensions:
        - pprof
    #.. other extensions

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

This is an automatic backport of pull request #5556 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner September 20, 2024 07:14
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 20, 2024
@mergify mergify bot requested review from blakerouse and andrzej-stencel and removed request for a team September 20, 2024 07:14
Copy link
Contributor Author

mergify bot commented Sep 20, 2024

Cherry-pick of aa56bc9 has failed:

On branch mergify/bp/8.x/pr-5556
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit aa56bc9622.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE.txt
	new file:   changelog/fragments/1726739016-otel-pprof-extension.yaml
	modified:   internal/pkg/otel/components.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/README.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Member

@mauri870 mauri870 left a comment

Choose a reason for hiding this comment

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

Looks like there are a couple git conflicts to be fixed.

Copy link
Contributor Author

mergify bot commented Sep 23, 2024

This pull request has not been merged yet. Could you please review and merge it @alexsapran? 🙏

@mauri870 mauri870 self-requested a review September 23, 2024 12:23
@pchila pchila force-pushed the mergify/bp/8.x/pr-5556 branch from afad4a7 to 8743cc9 Compare September 24, 2024 08:56
@pchila
Copy link
Member

pchila commented Sep 24, 2024

Cherry-picked the commit again, isolating the original change from all the version bumps that got in the automatic backport. If we want to bump otel dependencies we should either backport the original PR or use the automation also on 8.x

@mauri870 could you have another look ?

* Add pprofextension from the OTel-contrilib

This commit adds the pprofextension to the OTel collector.

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
@pchila pchila force-pushed the mergify/bp/8.x/pr-5556 branch from 8743cc9 to 74269be Compare September 24, 2024 09:01
@alexsapran alexsapran dismissed mauri870’s stale review September 24, 2024 09:05

updated the PR and kept only the original changes without the other version bumps

@alexsapran
Copy link
Contributor

/test

@pchila
Copy link
Member

pchila commented Sep 25, 2024

Failures in TestAPMConfig may be caused by #5615 (there are HTTP 502/503 errors coming from the APM agent in the logs), need to retest once that fix has been merged

Copy link
Contributor Author

mergify bot commented Sep 30, 2024

This pull request has not been merged yet. Could you please review and merge it @alexsapran? 🙏

@pchila
Copy link
Member

pchila commented Sep 30, 2024

/test

Copy link
Contributor Author

mergify bot commented Oct 7, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.x/pr-5556 upstream/mergify/bp/8.x/pr-5556
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-5556

Copy link
Contributor Author

mergify bot commented Oct 7, 2024

This pull request has not been merged yet. Could you please review and merge it @alexsapran? 🙏

@alexsapran alexsapran removed the conflicts There is a conflict in the backported pull request label Oct 8, 2024
Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
@alexsapran
Copy link
Contributor

/test

@alexsapran alexsapran enabled auto-merge (squash) October 8, 2024 14:17
@alexsapran alexsapran merged commit a136144 into 8.x Oct 8, 2024
14 checks passed
@alexsapran alexsapran deleted the mergify/bp/8.x/pr-5556 branch October 8, 2024 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants