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

[7.14] translate otel messaging.* to ecs (backport #5334) #5642

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 9, 2021

This is an automatic backport of pull request #5334 done by Mergify.
Cherry-pick of 16618f2 has failed:

On branch mergify/bp/7.14/pr-5334
Your branch is up to date with 'origin/7.14'.

You are currently cherry-picking commit 16618f2a.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelogs/head.asciidoc
	both modified:   processor/otel/consumer.go
	both modified:   processor/otel/consumer_test.go

no changes added to commit (use "git add" and/or "git commit -a")

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

Co-authored-by: Andrew Wilkins <axwalk@gmail.com>
(cherry picked from commit 16618f2)

# Conflicts:
#	changelogs/head.asciidoc
#	processor/otel/consumer.go
#	processor/otel/consumer_test.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 9, 2021
@axw axw closed this Jul 9, 2021
@axw axw deleted the mergify/bp/7.14/pr-5334 branch July 9, 2021 03:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants