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 #5713) Add components for supporting APM functions #5763

Merged
merged 3 commits into from
Oct 14, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 11, 2024

What does this PR do?

Adds the following component to support https://github.com/elastic/opentelemetry-dev/issues/372:

Why is it important?

Required for https://github.com/elastic/opentelemetry-dev/issues/372

Related issues

Closes https://github.com/elastic/opentelemetry-dev/issues/390


This is an automatic backport of pull request #5713 done by Mergify.

(cherry picked from commit f560826)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
@mergify mergify bot requested a review from a team as a code owner October 11, 2024 16:08
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 11, 2024
@mergify mergify bot requested review from blakerouse and swiatekm and removed request for a team October 11, 2024 16:08
Copy link
Contributor Author

mergify bot commented Oct 11, 2024

Cherry-pick of f560826 has failed:

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

You are currently cherry-picking commit f560826112.
  (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:   internal/pkg/otel/components.go
	modified:   internal/pkg/otel/testdata/all-components.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	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

@lahsivjar
Copy link
Contributor

This PR is blocked by backport PR to bump up the version of other components from v0.110.0 to v0.111.0

Copy link
Contributor Author

mergify bot commented Oct 14, 2024

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

Copy link
Contributor Author

mergify bot commented Oct 14, 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-5713 upstream/mergify/bp/8.x/pr-5713
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-5713

@lahsivjar lahsivjar enabled auto-merge (squash) October 14, 2024 13:38
Copy link

@lahsivjar lahsivjar merged commit 8ec4004 into 8.x Oct 14, 2024
14 checks passed
@lahsivjar lahsivjar deleted the mergify/bp/8.x/pr-5713 branch October 14, 2024 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant