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.x] Add support for Composite spans in the intake API (backport #5661) #5777

Merged
merged 10 commits into from
Jul 22, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 21, 2021

This is an automatic backport of pull request #5661 done by Mergify.
Cherry-pick of 93332d2 has failed:

On branch mergify/bp/7.x/pr-5661
Your branch is ahead of 'origin/7.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 93332d26.
  (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:   apmpackage/apm/data_stream/traces/fields/fields.yml
	modified:   apmpackage/apm/docs/README.md
	modified:   docs/fields.asciidoc
	modified:   model/span/_meta/fields.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fields.go

Cherry-pick of 3429db6 has failed:

On branch mergify/bp/7.x/pr-5661
Your branch is ahead of 'origin/7.x' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3429db69.
  (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

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

Cherry-pick of b827b2b has failed:

On branch mergify/bp/7.x/pr-5661
Your branch is ahead of 'origin/7.x' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b827b2b6.
  (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:   apmpackage/apm/data_stream/traces/fields/fields.yml
	modified:   apmpackage/apm/docs/README.md
	modified:   docs/fields.asciidoc
	modified:   model/span/_meta/fields.yml

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

(cherry picked from commit 93332d2)

# Conflicts:
#	include/fields.go
(cherry picked from commit 598e573)
(cherry picked from commit 3429db6)

# Conflicts:
#	changelogs/head.asciidoc
(cherry picked from commit b827b2b)

# Conflicts:
#	include/fields.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 21, 2021
@apmmachine
Copy link
Contributor

apmmachine commented Jul 21, 2021

💚 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: 2021-07-21T15:48:26.646+0000

  • Duration: 43 min 3 sec

  • Commit: 91b75e7

Test stats 🧪

Test Results
Failed 0
Passed 4541
Skipped 15
Total 4556

Trends 🧪

Image of Build Times

Image of Tests

@axw axw removed the conflicts There is a conflict in the backported pull request label Jul 22, 2021
@axw axw merged commit b722aa9 into 7.x Jul 22, 2021
@axw axw deleted the mergify/bp/7.x/pr-5661 branch July 22, 2021 01:57
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.

3 participants