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] Service specific source maps (backport #5410) #5524

Merged
merged 3 commits into from
Jun 23, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 23, 2021

This is an automatic backport of pull request #5410 done by Mergify.
Cherry-pick of 9453fe2 has failed:

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

You are currently cherry-picking commit 9453fe24.
  (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:   _meta/beat.yml
	modified:   apm-server.docker.yml
	modified:   apm-server.yml
	modified:   beater/beater.go
	modified:   beater/beater_test.go
	modified:   beater/config/config_test.go
	modified:   beater/config/integration.go
	modified:   beater/config/rum.go
	new file:   beater/config/sourcemapping.go
	modified:   model/error_test.go
	modified:   model/sourcemap_test.go
	modified:   model/stacktrace_frame_test.go
	modified:   sourcemap/es_store.go
	new file:   sourcemap/fleet_store.go
	new file:   sourcemap/fleet_store_test.go
	modified:   sourcemap/store.go
	modified:   sourcemap/store_test.go
	modified:   tests/system/test_integration_sourcemap.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   apmpackage/apm/manifest.yml
	deleted by us:   changelogs/head.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

Serve service-specific sourcemaps from fleet-server

(cherry picked from commit 9453fe2)

# Conflicts:
#	apmpackage/apm/manifest.yml
#	changelogs/head.asciidoc
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 23, 2021
@apmmachine
Copy link
Contributor

apmmachine commented Jun 23, 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

Expand to view the summary

Build stats

  • Build Cause: Pull request #5524 updated

  • Start Time: 2021-06-23T11:45:09.945+0000

  • Duration: 53 min 26 sec

  • Commit: c2bf0b8

Test stats 🧪

Test Results
Failed 0
Passed 4705
Skipped 120
Total 4825

Trends 🧪

Image of Build Times

Image of Tests

@stuartnelson3 stuartnelson3 merged commit d071010 into 7.x Jun 23, 2021
@stuartnelson3 stuartnelson3 deleted the mergify/bp/7.x/pr-5410 branch June 23, 2021 12:41
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