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.0] processor/otel: clone shared labels for log events (backport #7358) #7360

Merged
merged 3 commits into from
Feb 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 21, 2022

This is an automatic backport of pull request #7358 done by Mergify.
Cherry-pick of afdd45e has failed:

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

You are currently cherry-picking commit afdd45ef.
  (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:   processor/otel/logs.go

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

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.com

(cherry picked from commit afdd45e)

# Conflicts:
#	changelogs/head.asciidoc
#	processor/otel/logs_test.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Feb 21, 2022
@mergify mergify bot assigned axw Feb 21, 2022
@apmmachine
Copy link
Collaborator

apmmachine commented Feb 21, 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

  • Start Time: 2022-02-21T12:45:41.309+0000

  • Duration: 62 min 59 sec

Test stats 🧪

Test Results
Failed 0
Passed 5629
Skipped 20
Total 5649

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /hey-apm : Run the hey-apm benchmark.

  • /package : Generate and publish the docker images.

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

@axw axw removed the conflicts There is a conflict in the backported pull request label Feb 21, 2022
@axw axw enabled auto-merge (squash) February 21, 2022 12:48
@axw axw merged commit 7d458fe into 8.0 Feb 21, 2022
@axw axw deleted the mergify/bp/8.0/pr-7358 branch February 21, 2022 13:47
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.

None yet

2 participants