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.14] Add support for dynamic histogram metrics (backport #5239) #5664

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 9, 2021

This is an automatic backport of pull request #5239 done by Mergify.
Cherry-pick of 91645bd has failed:

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

You are currently cherry-picking commit 91645bde.
  (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.2.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/default.json
	deleted by us:   apmpackage/apm/0.2.0/data_stream/error_logs/elasticsearch/ingest_pipeline/default.json
	deleted by us:   apmpackage/apm/0.2.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/default.json
	deleted by us:   apmpackage/apm/0.2.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/default.json
	deleted by us:   apmpackage/apm/0.2.0/data_stream/traces/elasticsearch/ingest_pipeline/default.json
	added by them:   apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
	added by them:   apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
	added by them:   apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
	added by them:   apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
	added by them:   apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
	deleted by us:   changelogs/head.asciidoc
	both modified:   include/fields.go
	both modified:   processor/otel/metrics.go
	both modified:   processor/otel/metrics_test.go

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

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/

* model/metricset: add "histogram" dynamic_template

* ingest/pipeline: handle metric descriptions

* model: add metric type and unit

* processor/otel: translate histogram metrics

* Update changelog

* processor/otel: fix histogram translation

Handle histogram bucket counts correctly, following the
approach taken by Prometheus.

* processor/otel: fix merge

* processor/otel: use appropriate slice cap

(cherry picked from commit 91645bd)

# Conflicts:
#	apmpackage/apm/0.2.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/default.json
#	apmpackage/apm/0.2.0/data_stream/error_logs/elasticsearch/ingest_pipeline/default.json
#	apmpackage/apm/0.2.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/default.json
#	apmpackage/apm/0.2.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/default.json
#	apmpackage/apm/0.2.0/data_stream/traces/elasticsearch/ingest_pipeline/default.json
#	apmpackage/apm/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
#	apmpackage/apm/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
#	apmpackage/apm/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
#	apmpackage/apm/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
#	apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
#	changelogs/head.asciidoc
#	include/fields.go
#	processor/otel/metrics.go
#	processor/otel/metrics_test.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 9, 2021
@mergify mergify bot assigned axw Jul 9, 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-07-09T16:56:29.880+0000

  • Duration: 3 min 29 sec

  • Commit: 632d3de

Trends 🧪

Image of Build Times

Steps errors 1

Expand to view the steps failures

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

Log output

Expand to view the last 100 lines of log output

[2021-07-09T16:59:35.324Z] go: downloading github.com/Masterminds/semver v1.5.0
[2021-07-09T16:59:35.324Z] go: downloading github.com/go-git/go-billy/v5 v5.0.0
[2021-07-09T16:59:35.324Z] go: downloading github.com/go-git/go-git/v5 v5.1.0
[2021-07-09T16:59:35.584Z] go: downloading github.com/jedib0t/go-pretty v4.3.0+incompatible
[2021-07-09T16:59:35.584Z] go: downloading github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
[2021-07-09T16:59:35.584Z] go: downloading github.com/google/go-querystring v1.0.0
[2021-07-09T16:59:35.584Z] go: downloading github.com/mitchellh/go-homedir v1.1.0
[2021-07-09T16:59:35.584Z] go: downloading github.com/sergi/go-diff v1.1.0
[2021-07-09T16:59:35.584Z] go: downloading github.com/aymerick/raymond v2.0.2+incompatible
[2021-07-09T16:59:35.584Z] go: downloading github.com/kylelemons/godebug v1.1.0
[2021-07-09T16:59:35.584Z] go: downloading github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
[2021-07-09T16:59:35.584Z] go: downloading github.com/Masterminds/semver/v3 v3.1.0
[2021-07-09T16:59:35.584Z] go: downloading github.com/creasty/defaults v1.5.1
[2021-07-09T16:59:35.584Z] go: downloading github.com/rakyll/statik v0.1.7
[2021-07-09T16:59:35.584Z] go: downloading github.com/xeipuuv/gojsonschema v1.2.0
[2021-07-09T16:59:35.584Z] go: downloading github.com/go-git/gcfg v1.5.0
[2021-07-09T16:59:35.584Z] go: downloading github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99
[2021-07-09T16:59:35.584Z] go: downloading github.com/emirpasic/gods v1.12.0
[2021-07-09T16:59:35.584Z] go: downloading github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415
[2021-07-09T16:59:35.584Z] go: downloading gopkg.in/warnings.v0 v0.1.2
[2021-07-09T16:59:35.584Z] go: downloading github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd
[2021-07-09T16:59:35.584Z] go: downloading github.com/xanzy/ssh-agent v0.2.1
[2021-07-09T16:59:35.584Z] go: downloading github.com/go-openapi/strfmt v0.20.1
[2021-07-09T16:59:35.584Z] go: downloading github.com/mattn/go-runewidth v0.0.9
[2021-07-09T16:59:35.584Z] go: downloading github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb
[2021-07-09T16:59:35.584Z] go: downloading github.com/oklog/ulid v1.3.1
[2021-07-09T16:59:35.584Z] go: downloading github.com/go-openapi/errors v0.20.0
[2021-07-09T16:59:35.584Z] go: downloading github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
[2021-07-09T16:59:35.584Z] go: downloading go.mongodb.org/mongo-driver v1.5.2
[2021-07-09T16:59:36.155Z] go: downloading github.com/go-stack/stack v1.8.0
[2021-07-09T16:59:48.405Z] elastic-package has been installed.
[2021-07-09T16:59:48.405Z] Format the package
[2021-07-09T16:59:48.405Z] Done
[2021-07-09T16:59:48.405Z] Build the package
[2021-07-09T16:59:48.405Z] Package built: /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5664/src/github.com/elastic/apm-server/build/integrations/apm/0.3.0
[2021-07-09T16:59:48.405Z] Done
[2021-07-09T16:59:48.405Z] 2021/07/09 16:59:47 exec: go list -m
[2021-07-09T16:59:48.405Z] >> Building apm-server.yml for linux/amd64
[2021-07-09T16:59:48.405Z] >> Building apm-server.docker.yml for linux/amd64
[2021-07-09T16:59:48.669Z] Generated fields.yml for apm-server to /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5664/src/github.com/elastic/apm-server/build/fields/fields.yml
[2021-07-09T16:59:49.615Z] Generated fields.yml for apm-server to /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5664/src/github.com/elastic/apm-server/build/fields/fields.all.yml
[2021-07-09T16:59:52.161Z] /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5664/.gvm/versions/go1.16.5.linux.amd64/bin/go build -o build/linux/goimports golang.org/x/tools/cmd/goimports
[2021-07-09T16:59:53.545Z] processor/otel/metrics.go:189:1: expected statement, found '<<'
[2021-07-09T16:59:53.546Z] processor/otel/metrics.go:197:43: expected '{', found histogram
[2021-07-09T16:59:53.546Z] processor/otel/metrics.go:197:62: illegal character U+0023 '#'
[2021-07-09T16:59:53.546Z] processor/otel/metrics.go:198:3: missing ',' in argument list
[2021-07-09T16:59:53.546Z] processor/otel/metrics.go:200:4: missing ',' in argument list
[2021-07-09T16:59:53.546Z] processor/otel/metrics.go:201:81: missing ',' before newline in composite literal
[2021-07-09T16:59:53.546Z] processor/otel/metrics.go:202:6: missing ',' in argument list
[2021-07-09T16:59:53.546Z] processor/otel/metrics.go:206:3: missing ',' in argument list
[2021-07-09T16:59:53.546Z] processor/otel/metrics.go:207:1: expected operand, found '<<'
[2021-07-09T16:59:53.546Z] processor/otel/metrics.go:211:31: missing ',' in argument list
[2021-07-09T16:59:53.546Z] processor/otel/metrics.go:211:62: illegal character U+0023 '#'
[2021-07-09T16:59:53.546Z] processor/otel/metrics_test.go:125:1: expected statement, found '<<'
[2021-07-09T16:59:53.546Z] processor/otel/metrics_test.go:131:43: expected '{', found histogram
[2021-07-09T16:59:53.546Z] processor/otel/metrics_test.go:131:62: illegal character U+0023 '#'
[2021-07-09T16:59:53.546Z] processor/otel/metrics_test.go:150:31: missing ',' in argument list
[2021-07-09T16:59:53.546Z] processor/otel/metrics_test.go:150:62: illegal character U+0023 '#'
[2021-07-09T16:59:53.546Z] processor/otel/metrics_test.go:164:31: missing ',' in argument list
[2021-07-09T16:59:53.546Z] processor/otel/metrics_test.go:164:62: illegal character U+0023 '#'
[2021-07-09T16:59:53.546Z] processor/otel/metrics_test.go:197:31: missing ',' in argument list
[2021-07-09T16:59:53.546Z] processor/otel/metrics_test.go:197:62: illegal character U+0023 '#'
[2021-07-09T16:59:53.546Z] processor/otel/metrics_test.go:256:3: missing ',' in argument list
[2021-07-09T16:59:53.546Z] processor/otel/metrics_test.go:257:2: expected operand, found '}'
[2021-07-09T16:59:54.486Z] Makefile:251: recipe for target 'check-gofmt' failed
[2021-07-09T16:59:54.486Z] make: *** [check-gofmt] Error 2
[2021-07-09T16:59:54.486Z] + cleanup
[2021-07-09T16:59:54.486Z] + rm -rf /tmp/tmp.OLUfrGjjDc
[2021-07-09T16:59:55.865Z] Stage "Build and Test" skipped due to earlier failure(s)
[2021-07-09T16:59:56.271Z] Stage "linux build" skipped due to earlier failure(s)
[2021-07-09T16:59:56.285Z] Stage "windows build-test" skipped due to earlier failure(s)
[2021-07-09T16:59:56.298Z] Stage "OSX build-test" skipped due to earlier failure(s)
[2021-07-09T16:59:56.312Z] Stage "Unit Test" skipped due to earlier failure(s)
[2021-07-09T16:59:56.326Z] Stage "System and Environment Tests" skipped due to earlier failure(s)
[2021-07-09T16:59:56.339Z] Stage "Benchmarking" skipped due to earlier failure(s)
[2021-07-09T16:59:56.352Z] Stage "Check kibana Obj. Updated" skipped due to earlier failure(s)
[2021-07-09T16:59:56.366Z] Stage "Hey-Apm" skipped due to earlier failure(s)
[2021-07-09T16:59:56.378Z] Stage "Package" skipped due to earlier failure(s)
[2021-07-09T16:59:56.385Z] Stage "APM Integration Tests" skipped due to earlier failure(s)
[2021-07-09T16:59:56.463Z] Stage "Package" skipped due to earlier failure(s)
[2021-07-09T16:59:56.789Z] Failed in branch linux build
[2021-07-09T16:59:56.799Z] Failed in branch windows build-test
[2021-07-09T16:59:56.810Z] Failed in branch OSX build-test
[2021-07-09T16:59:56.820Z] Failed in branch Unit Test
[2021-07-09T16:59:56.829Z] Failed in branch System and Environment Tests
[2021-07-09T16:59:56.839Z] Failed in branch Benchmarking
[2021-07-09T16:59:56.848Z] Failed in branch Check kibana Obj. Updated
[2021-07-09T16:59:56.858Z] Failed in branch Hey-Apm
[2021-07-09T16:59:56.867Z] Failed in branch APM Integration Tests
[2021-07-09T16:59:56.973Z] Stage "Package" skipped due to earlier failure(s)
[2021-07-09T16:59:57.216Z] Failed in branch Package
[2021-07-09T16:59:57.918Z] Running on Jenkins in /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-5664
[2021-07-09T16:59:58.080Z] [INFO] getVaultSecret: Getting secrets
[2021-07-09T16:59:58.140Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2021-07-09T16:59:59.187Z] + chmod 755 generate-build-data.sh
[2021-07-09T16:59:59.187Z] + ./generate-build-data.sh https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-5664/ https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-5664/runs/1 FAILURE 209033
[2021-07-09T16:59:59.187Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-5664/runs/1/steps/?limit=10000 -o steps-info.json
[2021-07-09T16:59:59.187Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-5664/runs/1/tests/?status=FAILED -o tests-errors.json
[2021-07-09T16:59:59.187Z] Retry 1/3 exited 22, retrying in 1 seconds...
[2021-07-09T17:00:00.530Z] Retry 2/3 exited 22, retrying in 2 seconds...

@simitt simitt closed this Jul 12, 2021
@mergify mergify bot deleted the mergify/bp/7.14/pr-5239 branch July 12, 2021 06:10
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