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.13] Introduce a configurable default service environment (backport #4861) #5143

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 27, 2021

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

Cherry-pick of 992699d has failed:

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

You are currently cherry-picking commit 992699dc8.
  (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:   apmpackage/apm/0.1.0/manifest.yml
	both modified:   apmpackage/apm/0.2.0/README.template.md
	both modified:   apmpackage/apm/0.2.0/docs/README.md
	both modified:   beater/api/config/agent/handler_test.go
	both modified:   beater/beater.go
	both modified:   beater/config/config.go
	deleted by us:   changelogs/head.asciidoc
	both added:      model/modelprocessor/environment.go
	both added:      model/modelprocessor/environment_test.go
	both modified:   transform/transform.go
	both modified:   x-pack/apm-server/main.go

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

To fixup this pull request, you can check out it 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/

* Add transform.Processor interface

* beater: add default service environment

* model/modelprocessor: update PprofProfile too

* apmpackage: update README about namespace

(cherry picked from commit 992699d)

# Conflicts:
#	apmpackage/apm/0.1.0/manifest.yml
#	apmpackage/apm/0.2.0/README.template.md
#	apmpackage/apm/0.2.0/docs/README.md
#	beater/api/config/agent/handler_test.go
#	beater/beater.go
#	beater/config/config.go
#	changelogs/head.asciidoc
#	model/modelprocessor/environment.go
#	model/modelprocessor/environment_test.go
#	transform/transform.go
#	x-pack/apm-server/main.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Apr 27, 2021
@mergify mergify bot assigned axw Apr 27, 2021
@apmmachine
Copy link
Contributor

💔 Build Failed

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 #5143 opened

  • Start Time: 2021-04-27T12:16:05.810+0000

  • Duration: 5 min 26 sec

  • Commit: d5a32a6

Trends 🧪

Image of Build Times

Steps errors 1

Expand to view the steps failures

Run intake
  • Took 1 min 58 sec . View more details on here
  • Description: ./.ci/scripts/intake.sh

Log output

Expand to view the last 100 lines of log output

[2021-04-27T12:19:57.429Z] Commit message: "Introduce a configurable default service environment (#4861)"
[2021-04-27T12:19:57.445Z]  > git --version # timeout=10
[2021-04-27T12:19:57.448Z]  > git --version # 'git version 2.17.1'
[2021-04-27T12:19:57.452Z] fatal: bad object ee5b12ceff46584c1a1cab2c0f501e16bdb05e7b
[2021-04-27T12:19:57.115Z]  > git rev-parse origin/PR-5143^{commit} # timeout=10
[2021-04-27T12:19:57.123Z]  > git config core.sparsecheckout # timeout=10
[2021-04-27T12:19:57.127Z]  > git checkout -f d5a32a68f2af6baa0447316e3f40fc5614b6e6b1 # timeout=10
[2021-04-27T12:19:59.397Z] Masking supported pattern matches of $GIT_USERNAME or $GIT_PASSWORD
[2021-04-27T12:20:00.478Z] + git fetch https://****:****@github.com/elastic/apm-server.git +refs/pull/*/head:refs/remotes/origin/pr/*
[2021-04-27T12:20:02.088Z] Running in /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/src/github.com/elastic/apm-server/.git
[2021-04-27T12:20:02.461Z] Archiving artifacts
[2021-04-27T12:20:03.338Z] + git rev-parse HEAD
[2021-04-27T12:20:03.705Z] + git rev-parse HEAD
[2021-04-27T12:20:04.030Z] + git rev-parse origin/pr/5143
[2021-04-27T12:20:04.112Z] [INFO] githubEnv: Found Git Build Cause: pr
[2021-04-27T12:20:04.370Z] Masking supported pattern matches of $GITHUB_TOKEN
[2021-04-27T12:20:05.660Z] [WARN] githubApiCall: The REST API call https://api.github.com/repos/elastic/apm-server/pulls/5143/reviews return 0 elements
[2021-04-27T12:20:05.770Z] [INFO] githubPrCheckApproved: Title: [7.13] Introduce a configurable default service environment (backport #4861) - User: mergify[bot] - Author Association: NONE
[2021-04-27T12:20:10.729Z] Stashed 10399 file(s)
[2021-04-27T12:20:10.809Z] Running in /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/src/github.com/elastic/apm-server
[2021-04-27T12:20:11.230Z] + make get-version
[2021-04-27T12:20:21.725Z] + git diff --name-only origin/7.13...d5a32a68f2af6baa0447316e3f40fc5614b6e6b1
[2021-04-27T12:20:21.875Z] [INFO] isGitRegionMatch: not found with regex [^_beats.*, ^apm-server.yml, ^apm-server.docker.yml, ^magefile.go, ^ingest.*, ^packaging.*, ^tests/packaging.*, ^vendor/github.com/elastic/beats.*]
[2021-04-27T12:20:22.267Z] + git diff --name-only origin/7.13...d5a32a68f2af6baa0447316e3f40fc5614b6e6b1
[2021-04-27T12:20:22.388Z] [INFO] isGitRegionMatch: not found with regex [.*\.asciidoc]
[2021-04-27T12:20:27.204Z] Running in /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/src/github.com/elastic/apm-server
[2021-04-27T12:20:27.552Z] + ./.ci/scripts/intake.sh
[2021-04-27T12:20:27.552Z] + source ./script/common.bash
[2021-04-27T12:20:27.552Z] ++++ dirname ./script/common.bash
[2021-04-27T12:20:27.552Z] +++ cd ./script
[2021-04-27T12:20:27.552Z] +++ pwd
[2021-04-27T12:20:27.552Z] ++ _sdir=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/src/github.com/elastic/apm-server/script
[2021-04-27T12:20:27.552Z] + jenkins_setup
[2021-04-27T12:20:27.552Z] + : /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143
[2021-04-27T12:20:27.552Z] + : /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143
[2021-04-27T12:20:27.552Z] + '[' -z 1.15.9 ']'
[2021-04-27T12:20:27.552Z] + export GOPATH=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143
[2021-04-27T12:20:27.552Z] + GOPATH=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143
[2021-04-27T12:20:27.552Z] + export PATH=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/bin
[2021-04-27T12:20:27.552Z] + PATH=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/bin
[2021-04-27T12:20:27.552Z] ++ gvm 1.15.9
[2021-04-27T12:20:32.862Z] + eval 'export GOROOT="/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/.gvm/versions/go1.15.9.linux.amd64"
[2021-04-27T12:20:32.862Z] export PATH="/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/.gvm/versions/go1.15.9.linux.amd64/bin:$PATH"'
[2021-04-27T12:20:32.862Z] ++ export GOROOT=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/.gvm/versions/go1.15.9.linux.amd64
[2021-04-27T12:20:32.862Z] ++ GOROOT=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/.gvm/versions/go1.15.9.linux.amd64
[2021-04-27T12:20:32.862Z] ++ export PATH=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/.gvm/versions/go1.15.9.linux.amd64/bin:/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/bin
[2021-04-27T12:20:32.862Z] ++ PATH=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/.gvm/versions/go1.15.9.linux.amd64/bin:/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/bin
[2021-04-27T12:20:32.862Z] ++ mktemp -d
[2021-04-27T12:20:32.862Z] + export TEMP_PYTHON_ENV=/tmp/tmp.ZGWp1iWRFs
[2021-04-27T12:20:32.862Z] + TEMP_PYTHON_ENV=/tmp/tmp.ZGWp1iWRFs
[2021-04-27T12:20:32.862Z] + export PYTHON_ENV=/tmp/tmp.ZGWp1iWRFs/python-env
[2021-04-27T12:20:32.862Z] + PYTHON_ENV=/tmp/tmp.ZGWp1iWRFs/python-env
[2021-04-27T12:20:32.862Z] + export MAGEFILE_CACHE=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/.magefile
[2021-04-27T12:20:32.862Z] + MAGEFILE_CACHE=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/.magefile
[2021-04-27T12:20:32.862Z] + trap cleanup EXIT
[2021-04-27T12:20:32.862Z] + make check-full
[2021-04-27T12:20:38.177Z] /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143/.gvm/versions/go1.15.9.linux.amd64/bin/go build -o build/linux/bin/mage github.com/magefile/mage
[2021-04-27T12:20:38.178Z] go: downloading github.com/magefile/mage v1.11.0
[2021-04-27T12:20:38.756Z] ./build/linux/bin/mage -compile=build/linux/mage
[2021-04-27T12:21:25.527Z] # github.com/elastic/apm-server/beater/config
[2021-04-27T12:21:25.527Z] beater/config/config.go:78:1: syntax error: unexpected <<, expecting field name or embedded type
[2021-04-27T12:21:25.527Z] beater/config/config.go:80:1: syntax error: unexpected ==, expecting field name or embedded type
[2021-04-27T12:21:25.527Z] beater/config/config.go:81:76: invalid character U+0023 '#'
[2021-04-27T12:21:25.527Z] Error: error compiling magefiles
[2021-04-27T12:21:25.527Z] Makefile:273: recipe for target 'build/linux/mage' failed
[2021-04-27T12:21:25.527Z] make: *** [build/linux/mage] Error 1
[2021-04-27T12:21:25.527Z] + cleanup
[2021-04-27T12:21:25.527Z] + rm -rf /tmp/tmp.ZGWp1iWRFs
[2021-04-27T12:21:27.071Z] Stage "Build and Test" skipped due to earlier failure(s)
[2021-04-27T12:21:27.630Z] Stage "linux build" skipped due to earlier failure(s)
[2021-04-27T12:21:27.648Z] Stage "windows build-test" skipped due to earlier failure(s)
[2021-04-27T12:21:27.666Z] Stage "OSX build-test" skipped due to earlier failure(s)
[2021-04-27T12:21:27.686Z] Stage "Unit Test" skipped due to earlier failure(s)
[2021-04-27T12:21:27.707Z] Stage "System and Environment Tests" skipped due to earlier failure(s)
[2021-04-27T12:21:27.728Z] Stage "Benchmarking" skipped due to earlier failure(s)
[2021-04-27T12:21:27.746Z] Stage "Check kibana Obj. Updated" skipped due to earlier failure(s)
[2021-04-27T12:21:27.765Z] Stage "Hey-Apm" skipped due to earlier failure(s)
[2021-04-27T12:21:27.786Z] Stage "Package" skipped due to earlier failure(s)
[2021-04-27T12:21:27.797Z] Stage "APM Integration Tests" skipped due to earlier failure(s)
[2021-04-27T12:21:27.897Z] Stage "Package" skipped due to earlier failure(s)
[2021-04-27T12:21:28.313Z] Failed in branch linux build
[2021-04-27T12:21:28.325Z] Failed in branch windows build-test
[2021-04-27T12:21:28.337Z] Failed in branch OSX build-test
[2021-04-27T12:21:28.350Z] Failed in branch Unit Test
[2021-04-27T12:21:28.362Z] Failed in branch System and Environment Tests
[2021-04-27T12:21:28.374Z] Failed in branch Benchmarking
[2021-04-27T12:21:28.386Z] Failed in branch Check kibana Obj. Updated
[2021-04-27T12:21:28.399Z] Failed in branch Hey-Apm
[2021-04-27T12:21:28.412Z] Failed in branch APM Integration Tests
[2021-04-27T12:21:28.536Z] Stage "Package" skipped due to earlier failure(s)
[2021-04-27T12:21:28.797Z] Failed in branch Package
[2021-04-27T12:21:30.509Z] Running on worker-1225339 in /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5143
[2021-04-27T12:21:30.678Z] [INFO] getVaultSecret: Getting secrets
[2021-04-27T12:21:30.750Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2021-04-27T12:21:33.347Z] + chmod 755 generate-build-data.sh
[2021-04-27T12:21:33.347Z] + ./generate-build-data.sh https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-5143/ https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-5143/runs/1 FAILURE 326124
[2021-04-27T12:21:33.347Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-5143/runs/1/steps/?limit=10000 -o steps-info.json
[2021-04-27T12:21:34.046Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-5143/runs/1/tests/?status=FAILED -o tests-errors.json
[2021-04-27T12:21:34.046Z] Retry 1/3 exited 22, retrying in 1 seconds...
[2021-04-27T12:21:35.533Z] Retry 2/3 exited 22, retrying in 2 seconds...

@jalvz jalvz closed this Apr 27, 2021
@mergify mergify bot deleted the mergify/bp/7.13/pr-4861 branch April 27, 2021 12:35
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.

3 participants