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 units to metric duration fields (backport #5395) #5409

Merged
merged 2 commits into from
Jun 8, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 3, 2021

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

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

You are currently cherry-picking commit fedc1db2.
  (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/0.3.0/data_stream/app_metrics/fields/fields.yml
	modified:   apmpackage/apm/0.3.0/data_stream/internal_metrics/fields/fields.yml
	modified:   apmpackage/apm/0.3.0/data_stream/profile_metrics/fields/fields.yml
	modified:   docs/fields.asciidoc
	modified:   model/metricset/_meta/fields.yml
	modified:   model/profile/_meta/fields.yml
	modified:   x-pack/apm-server/fields/_meta/fields.yml
	modified:   x-pack/apm-server/include/fields.go

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

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/

* add units to metric duration fields

* Apply suggestions from code review

Co-authored-by: Andrew Wilkins <[email protected]>

* make update

* Add changelog

Co-authored-by: Andrew Wilkins <[email protected]>
(cherry picked from commit fedc1db)

# Conflicts:
#	changelogs/head.asciidoc
#	include/fields.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 3, 2021
@mergify mergify bot assigned jalvz Jun 3, 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 #5409 opened

  • Start Time: 2021-06-03T10:19:55.760+0000

  • Duration: 8 min 19 sec

  • Commit: 30bf8c2

Trends 🧪

Image of Build Times

Steps errors 1

Expand to view the steps failures

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

Log output

Expand to view the last 100 lines of log output

[2021-06-03T10:26:13.384Z] go: downloading github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef
[2021-06-03T10:26:13.384Z] go: downloading github.com/go-openapi/errors v0.19.9
[2021-06-03T10:26:13.384Z] go: downloading github.com/go-stack/stack v1.8.0
[2021-06-03T10:26:19.968Z] Formatting apmpackage/apm/0.3.0
[2021-06-03T10:26:19.968Z] elastic-package has been installed.
[2021-06-03T10:26:19.968Z] Format the package
[2021-06-03T10:26:19.968Z] Done
[2021-06-03T10:26:19.968Z] Building apmpackage/apm/0.3.0
[2021-06-03T10:26:19.968Z] Build the package
[2021-06-03T10:26:19.968Z] Package built: /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5409/src/github.com/elastic/apm-server/build/integrations/apm/0.2.0
[2021-06-03T10:26:19.968Z] Done
[2021-06-03T10:26:19.968Z] 2021/06/03 10:26:19 exec: go list -m
[2021-06-03T10:26:20.228Z] >> Building apm-server.yml for linux/amd64
[2021-06-03T10:26:20.228Z] >> Building apm-server.docker.yml for linux/amd64
[2021-06-03T10:26:20.798Z] Generated fields.yml for apm-server to /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5409/src/github.com/elastic/apm-server/build/fields/fields.yml
[2021-06-03T10:26:21.746Z] Generated fields.yml for apm-server to /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5409/src/github.com/elastic/apm-server/build/fields/fields.all.yml
[2021-06-03T10:26:24.294Z] /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5409/.gvm/versions/go1.16.4.linux.amd64/bin/go build -o build/linux/goimports golang.org/x/tools/cmd/goimports
[2021-06-03T10:26:29.577Z] Checking apmpackage/apm/0.3.0
[2021-06-03T10:26:29.577Z] Format the package
[2021-06-03T10:26:29.577Z] Done
[2021-06-03T10:26:29.577Z] Lint the package
[2021-06-03T10:26:29.577Z] Done
[2021-06-03T10:26:29.577Z] Build the package
[2021-06-03T10:26:29.577Z] Package built: /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5409/src/github.com/elastic/apm-server/build/integrations/apm/0.2.0
[2021-06-03T10:26:29.577Z] Done
[2021-06-03T10:26:29.577Z] 2021/06/03 10:26:28 exec: go list -m
[2021-06-03T10:26:29.577Z] >> check: Checking source code for common problems
[2021-06-03T10:26:29.577Z] go: downloading github.com/stretchr/testify v1.7.0
[2021-06-03T10:26:29.577Z] go: downloading github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
[2021-06-03T10:26:29.577Z] go: downloading github.com/elastic/go-hdrhistogram v0.1.0
[2021-06-03T10:26:29.577Z] go: downloading github.com/dgraph-io/badger v1.6.2
[2021-06-03T10:26:29.577Z] go: downloading github.com/pmezard/go-difflib v1.0.0
[2021-06-03T10:26:29.577Z] go: downloading github.com/aws/aws-sdk-go-v2 v0.18.0
[2021-06-03T10:26:29.577Z] go: downloading github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b
[2021-06-03T10:26:32.878Z] go: downloading github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639
[2021-06-03T10:26:32.878Z] go: downloading github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de
[2021-06-03T10:26:32.878Z] go: downloading github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13
[2021-06-03T10:26:32.878Z] go: downloading github.com/hashicorp/nomad/api v0.0.0-20200303134319-e31695b5bbe6
[2021-06-03T10:26:32.878Z] go: downloading code.cloudfoundry.org/go-loggregator v7.4.0+incompatible
[2021-06-03T10:26:32.878Z] go: downloading github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f
[2021-06-03T10:26:32.878Z] go: downloading github.com/cloudfoundry/noaa v2.1.0+incompatible
[2021-06-03T10:26:32.878Z] go: downloading github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4
[2021-06-03T10:26:32.878Z] go: downloading github.com/DataDog/zstd v1.4.4
[2021-06-03T10:26:32.878Z] go: downloading github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75
[2021-06-03T10:26:32.878Z] go: downloading github.com/gorilla/websocket v1.4.2
[2021-06-03T10:26:32.878Z] go: downloading github.com/hashicorp/go-cleanhttp v0.5.1
[2021-06-03T10:26:32.878Z] go: downloading github.com/hashicorp/go-rootcerts v1.0.2
[2021-06-03T10:26:32.878Z] go: downloading code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a
[2021-06-03T10:26:32.878Z] go: downloading code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee
[2021-06-03T10:26:32.878Z] go: downloading github.com/ugorji/go v1.1.8
[2021-06-03T10:26:32.878Z] go: downloading github.com/jmespath/go-jmespath v0.4.0
[2021-06-03T10:26:32.878Z] go: downloading github.com/ugorji/go/codec v1.1.8
[2021-06-03T10:26:32.878Z] go: downloading github.com/mailru/easyjson v0.7.6
[2021-06-03T10:26:32.878Z] go: downloading code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f
[2021-06-03T10:26:32.878Z] go: downloading github.com/josharian/intern v1.0.0
[2021-06-03T10:28:09.765Z] Error: some files are not up-to-date. Run 'make fmt update' then review and commit the changes. Modified: [include/fields.go]
[2021-06-03T10:28:09.766Z] main.Check
[2021-06-03T10:28:09.766Z] 	/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5409/src/github.com/elastic/apm-server/magefile.go:482
[2021-06-03T10:28:09.766Z] main.main.func16
[2021-06-03T10:28:09.766Z] 	/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5409/src/github.com/elastic/apm-server/mage_output_file.go:613
[2021-06-03T10:28:09.766Z] main.main.func12.1
[2021-06-03T10:28:09.766Z] 	/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5409/src/github.com/elastic/apm-server/mage_output_file.go:284
[2021-06-03T10:28:09.766Z] runtime.goexit
[2021-06-03T10:28:09.766Z] 	/var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5409/.gvm/versions/go1.16.4.linux.amd64/src/runtime/asm_amd64.s:1371
[2021-06-03T10:28:09.766Z] Makefile:83: recipe for target 'check' failed
[2021-06-03T10:28:09.766Z] make: *** [check] Error 1
[2021-06-03T10:28:09.766Z] + cleanup
[2021-06-03T10:28:09.766Z] + rm -rf /tmp/tmp.ba8UgKdR91
[2021-06-03T10:28:11.285Z] Stage "Build and Test" skipped due to earlier failure(s)
[2021-06-03T10:28:11.718Z] Stage "linux build" skipped due to earlier failure(s)
[2021-06-03T10:28:11.734Z] Stage "windows build-test" skipped due to earlier failure(s)
[2021-06-03T10:28:11.748Z] Stage "OSX build-test" skipped due to earlier failure(s)
[2021-06-03T10:28:11.761Z] Stage "Unit Test" skipped due to earlier failure(s)
[2021-06-03T10:28:11.774Z] Stage "System and Environment Tests" skipped due to earlier failure(s)
[2021-06-03T10:28:11.787Z] Stage "Benchmarking" skipped due to earlier failure(s)
[2021-06-03T10:28:11.800Z] Stage "Check kibana Obj. Updated" skipped due to earlier failure(s)
[2021-06-03T10:28:11.814Z] Stage "Hey-Apm" skipped due to earlier failure(s)
[2021-06-03T10:28:11.827Z] Stage "Package" skipped due to earlier failure(s)
[2021-06-03T10:28:11.835Z] Stage "APM Integration Tests" skipped due to earlier failure(s)
[2021-06-03T10:28:11.912Z] Stage "Package" skipped due to earlier failure(s)
[2021-06-03T10:28:12.246Z] Failed in branch linux build
[2021-06-03T10:28:12.255Z] Failed in branch windows build-test
[2021-06-03T10:28:12.264Z] Failed in branch OSX build-test
[2021-06-03T10:28:12.274Z] Failed in branch Unit Test
[2021-06-03T10:28:12.283Z] Failed in branch System and Environment Tests
[2021-06-03T10:28:12.292Z] Failed in branch Benchmarking
[2021-06-03T10:28:12.301Z] Failed in branch Check kibana Obj. Updated
[2021-06-03T10:28:12.311Z] Failed in branch Hey-Apm
[2021-06-03T10:28:12.321Z] Failed in branch APM Integration Tests
[2021-06-03T10:28:12.424Z] Stage "Package" skipped due to earlier failure(s)
[2021-06-03T10:28:12.648Z] Failed in branch Package
[2021-06-03T10:28:13.390Z] Running on Jenkins in /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5409
[2021-06-03T10:28:13.558Z] [INFO] getVaultSecret: Getting secrets
[2021-06-03T10:28:13.622Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2021-06-03T10:28:14.670Z] + chmod 755 generate-build-data.sh
[2021-06-03T10:28:14.670Z] + ./generate-build-data.sh https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-5409/ https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-5409/runs/1 FAILURE 498630
[2021-06-03T10:28:14.670Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-5409/runs/1/steps/?limit=10000 -o steps-info.json
[2021-06-03T10:28:14.921Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-5409/runs/1/tests/?status=FAILED -o tests-errors.json
[2021-06-03T10:28:14.921Z] Retry 1/3 exited 22, retrying in 1 seconds...
[2021-06-03T10:28:15.832Z] Retry 2/3 exited 22, retrying in 2 seconds...

@axw axw removed the conflicts There is a conflict in the backported pull request label Jun 8, 2021
@axw axw merged commit a72c808 into 7.x Jun 8, 2021
@axw axw deleted the mergify/bp/7.x/pr-5395 branch June 8, 2021 04:11
@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 #5409 updated

  • Start Time: 2021-06-08T03:28:42.534+0000

  • Duration: 47 min 9 sec

  • Commit: 7c0bc82

Test stats 🧪

Test Results
Failed 0
Passed 4697
Skipped 121
Total 4818

Trends 🧪

Image of Build Times

Image of Tests

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