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

Add missing fields properties #4611

Merged
merged 5 commits into from
Jan 13, 2021
Merged

Add missing fields properties #4611

merged 5 commits into from
Jan 13, 2021

Conversation

jalvz
Copy link
Contributor

@jalvz jalvz commented Jan 12, 2021

Motivation/summary

Fixes #4610

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Once the 0.1.0-dev.4 version of the package is published, check that the templates installed are correct (with special attention to labels fields)

@jalvz jalvz added the bug label Jan 12, 2021
@apmmachine
Copy link
Contributor

apmmachine commented Jan 12, 2021

❕ Build Aborted

There is a new build on-going so the previous on-going builds have been aborted.

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts

Expand to view the summary

Build stats

  • Build Cause: Pull request #4611 updated

  • Reason: Aborted from #5

  • Start Time: 2021-01-13T10:14:18.397+0000

  • Duration: 3 min 26 sec

  • Commit: 1d2afea

Log output

Expand to view the last 100 lines of log output

[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.439Z] make: go: Command not found
[2021-01-13T10:17:03.806Z] + git diff --name-only origin/master...a772f0c91db59fb581ea9308555538ccdc972484
[2021-01-13T10:17:03.874Z] [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-01-13T10:17:04.210Z] + git diff --name-only origin/master...a772f0c91db59fb581ea9308555538ccdc972484
[2021-01-13T10:17:04.262Z] [INFO] isGitRegionMatch: not found with regex [.*\.asciidoc]
[2021-01-13T10:17:07.446Z] Running in /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/src/github.com/elastic/apm-server
[2021-01-13T10:17:07.757Z] + ./.ci/scripts/intake.sh
[2021-01-13T10:17:07.758Z] + source ./script/common.bash
[2021-01-13T10:17:07.758Z] ++++ dirname ./script/common.bash
[2021-01-13T10:17:07.758Z] +++ cd ./script
[2021-01-13T10:17:07.758Z] +++ pwd
[2021-01-13T10:17:07.758Z] ++ _sdir=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/src/github.com/elastic/apm-server/script
[2021-01-13T10:17:07.758Z] + jenkins_setup
[2021-01-13T10:17:07.758Z] + : /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611
[2021-01-13T10:17:07.758Z] + : /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611
[2021-01-13T10:17:07.758Z] + '[' -z 1.14.12 ']'
[2021-01-13T10:17:07.758Z] + export GOPATH=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611
[2021-01-13T10:17:07.758Z] + GOPATH=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611
[2021-01-13T10:17:07.758Z] + export PATH=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/bin
[2021-01-13T10:17:07.758Z] + PATH=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/bin
[2021-01-13T10:17:07.758Z] ++ gvm 1.14.12
[2021-01-13T10:17:13.041Z] + eval 'export GOROOT="/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/.gvm/versions/go1.14.12.linux.amd64"
[2021-01-13T10:17:13.041Z] export PATH="/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/.gvm/versions/go1.14.12.linux.amd64/bin:$PATH"'
[2021-01-13T10:17:13.041Z] ++ export GOROOT=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/.gvm/versions/go1.14.12.linux.amd64
[2021-01-13T10:17:13.041Z] ++ GOROOT=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/.gvm/versions/go1.14.12.linux.amd64
[2021-01-13T10:17:13.041Z] ++ export PATH=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/.gvm/versions/go1.14.12.linux.amd64/bin:/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/bin
[2021-01-13T10:17:13.041Z] ++ PATH=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/.gvm/versions/go1.14.12.linux.amd64/bin:/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/bin
[2021-01-13T10:17:13.041Z] ++ mktemp -d
[2021-01-13T10:17:13.041Z] + export TEMP_PYTHON_ENV=/tmp/tmp.ELUktfc1xJ
[2021-01-13T10:17:13.041Z] + TEMP_PYTHON_ENV=/tmp/tmp.ELUktfc1xJ
[2021-01-13T10:17:13.041Z] + export PYTHON_ENV=/tmp/tmp.ELUktfc1xJ/python-env
[2021-01-13T10:17:13.041Z] + PYTHON_ENV=/tmp/tmp.ELUktfc1xJ/python-env
[2021-01-13T10:17:13.041Z] + export MAGEFILE_CACHE=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/.magefile
[2021-01-13T10:17:13.041Z] + MAGEFILE_CACHE=/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/.magefile
[2021-01-13T10:17:13.041Z] + export MAGEFILE_VERBOSE=1
[2021-01-13T10:17:13.041Z] + MAGEFILE_VERBOSE=1
[2021-01-13T10:17:13.041Z] + trap cleanup EXIT
[2021-01-13T10:17:13.041Z] + make check-full
[2021-01-13T10:17:13.300Z] go build -o build/linux/bin/mage github.com/magefile/mage
[2021-01-13T10:17:14.240Z] go: downloading github.com/magefile/mage v1.10.0
[2021-01-13T10:17:15.620Z] ./build/linux/bin/mage -compile=build/linux/mage
[2021-01-13T10:17:40.838Z] Sending interrupt signal to process
[2021-01-13T10:17:42.177Z] go build golang.org/x/text/collate: /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/.gvm/versions/go1.14.12.linux.amd64/pkg/tool/linux_amd64/compile: signal: terminated
[2021-01-13T10:17:42.177Z] go build github.com/elastic/go-elasticsearch/v7/esapi: /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/.gvm/versions/go1.14.12.linux.amd64/pkg/tool/linux_amd64/compile: signal: terminated
[2021-01-13T10:17:42.177Z] go build github.com/elastic/go-elasticsearch/v8/esapi: /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611/.gvm/versions/go1.14.12.linux.amd64/pkg/tool/linux_amd64/compile: signal: terminated
[2021-01-13T10:17:42.177Z] Error: error compiling magefiles
[2021-01-13T10:17:42.177Z] Makefile:250: recipe for target 'build/linux/mage' failed
[2021-01-13T10:17:42.177Z] make: *** [build/linux/mage] Error 1
[2021-01-13T10:17:42.177Z] + cleanup
[2021-01-13T10:17:42.177Z] + rm -rf /tmp/tmp.ELUktfc1xJ
[2021-01-13T10:17:42.177Z] Terminated
[2021-01-13T10:17:42.184Z] script returned exit code 143
[2021-01-13T10:17:43.371Z] Stage "Build and Test" skipped due to earlier failure(s)
[2021-01-13T10:17:43.440Z] Stage "linux build" skipped due to earlier failure(s)
[2021-01-13T10:17:43.441Z] Stage "windows build-test" skipped due to earlier failure(s)
[2021-01-13T10:17:43.442Z] Stage "OSX build-test" skipped due to earlier failure(s)
[2021-01-13T10:17:43.443Z] Stage "Unit Test" skipped due to earlier failure(s)
[2021-01-13T10:17:43.444Z] Stage "System and Environment Tests" skipped due to earlier failure(s)
[2021-01-13T10:17:43.444Z] Stage "Benchmarking" skipped due to earlier failure(s)
[2021-01-13T10:17:43.445Z] Stage "Check kibana Obj. Updated" skipped due to earlier failure(s)
[2021-01-13T10:17:43.446Z] Stage "Hey-Apm" skipped due to earlier failure(s)
[2021-01-13T10:17:43.446Z] Stage "Package" skipped due to earlier failure(s)
[2021-01-13T10:17:43.447Z] Stage "APM Integration Tests" skipped due to earlier failure(s)
[2021-01-13T10:17:43.482Z] Stage "Package" skipped due to earlier failure(s)
[2021-01-13T10:17:43.621Z] Failed in branch linux build
[2021-01-13T10:17:43.621Z] Failed in branch windows build-test
[2021-01-13T10:17:43.622Z] Failed in branch OSX build-test
[2021-01-13T10:17:43.623Z] Failed in branch Unit Test
[2021-01-13T10:17:43.623Z] Failed in branch System and Environment Tests
[2021-01-13T10:17:43.624Z] Failed in branch Benchmarking
[2021-01-13T10:17:43.625Z] Failed in branch Check kibana Obj. Updated
[2021-01-13T10:17:43.625Z] Failed in branch Hey-Apm
[2021-01-13T10:17:43.626Z] Failed in branch APM Integration Tests
[2021-01-13T10:17:43.675Z] Stage "Package" skipped due to earlier failure(s)
[2021-01-13T10:17:43.736Z] Failed in branch Package
[2021-01-13T10:17:43.976Z] Running on Jenkins in /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4611
[2021-01-13T10:17:44.071Z] [INFO] getVaultSecret: Getting secrets
[2021-01-13T10:17:44.411Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2021-01-13T10:17:45.113Z] + chmod 755 generate-build-data.sh
[2021-01-13T10:17:45.114Z] + ./generate-build-data.sh https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-4611/ https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-4611/runs/4 ABORTED 206458
[2021-01-13T10:17:45.364Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-4611/runs/4/steps/?limit=10000 -o steps-info.json
[2021-01-13T10:17:45.915Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-4611/runs/4/tests/?status=FAILED -o tests-errors.json
[2021-01-13T10:17:45.915Z] Retry 1/3 exited 22, retrying in 1 seconds...
[2021-01-13T10:17:46.826Z] Retry 2/3 exited 22, retrying in 2 seconds...

@codecov-io
Copy link

codecov-io commented Jan 13, 2021

Codecov Report

Merging #4611 (a772f0c) into master (31c7a5f) will increase coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #4611      +/-   ##
==========================================
+ Coverage   75.91%   75.93%   +0.02%     
==========================================
  Files         161      161              
  Lines        9791     9791              
==========================================
+ Hits         7433     7435       +2     
+ Misses       2358     2356       -2     
Impacted Files Coverage Δ
beater/jaeger/common.go 82.14% <0.00%> (+7.14%) ⬆️

@jalvz jalvz merged commit 0cf2db4 into elastic:master Jan 13, 2021
@jalvz jalvz deleted the fix-labels-fields branch January 13, 2021 10:47
@apmmachine
Copy link
Contributor

💚 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 #4611 updated

  • Start Time: 2021-01-13T10:15:22.718+0000

  • Duration: 39 min 30 sec

Test stats 🧪

Test Results
Failed 0
Passed 4607
Skipped 124
Total 4731

Steps errors 2

Expand to view the steps failures

Compress
  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=coverage-files.tgz -czf coverage-files.tgz coverage
Compress
  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=system-tests-linux-files.tgz -czf system-tests-linux-files.tgz system-tests

axw pushed a commit to axw/apm-server that referenced this pull request Feb 18, 2021
axw added a commit that referenced this pull request Feb 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Templates installed from integration package are missing dynamic templates
4 participants