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

Introduce metricset.name #4857

Merged
merged 4 commits into from
Feb 22, 2021
Merged

Introduce metricset.name #4857

merged 4 commits into from
Feb 22, 2021

Conversation

axw
Copy link
Member

@axw axw commented Feb 22, 2021

Motivation/summary

Add an optional metricset.name field to metrics docs. Set it to "transaction" for transaction histogram metrics, and "service_destination" for service destination (span) metrics.

Checklist

How to test these changes

Enable transaction and service destination aggregation, check that metric documents have a metricset.name field with value equal to either "transaction" or "service_destination".

Related issues

Partially implements #4392. Still need to handle breakdown metrics, and "app" metrics.

@apmmachine
Copy link
Contributor

apmmachine commented Feb 22, 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 #4857 updated

  • Start Time: 2021-02-22T08:18:56.407+0000

  • Duration: 48 min 0 sec

  • Commit: 41404aa

Test stats 🧪

Test Results
Failed 0
Passed 4754
Skipped 124
Total 4878

Trends 🧪

Image of Build Times

Image of Tests

Steps errors 2

Expand to view the steps failures

Run Window tests
  • Took 11 min 37 sec . View more details on here
Test Sync
  • Took 4 min 44 sec . View more details on here
  • Description: ./.ci/scripts/sync.sh

@axw axw marked this pull request as ready for review February 22, 2021 09:14
@axw axw requested a review from a team February 22, 2021 09:14
@@ -1,7 +1,7 @@
Elastic APM Server
Copyright 2014-2021 Elasticsearch BV

This product includes software developed by The Apache Software
This product includes software developed by The Apache Software
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whitespaces are back :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dunno what's up, I just ran make update. I'll look closer if it happens again 🤷

@axw axw merged commit 5f72138 into elastic:master Feb 22, 2021
@axw axw deleted the metricset-name branch February 22, 2021 11:53
v1v added a commit to v1v/apm-server that referenced this pull request Feb 22, 2021
…chemas-to-agents

* upstream/master: (111 commits)
  Introduce metricset.name (elastic#4857)
  processor/otel: test service.version handling (elastic#4853)
  docs: Add PHP agent information to shared docs (elastic#4740)
  Script for faster development workflow (elastic#4731)
  Update to elastic/beats@1b31c26 (elastic#4763)
  backport: add 7.12 to .backportrc.json (elastic#4807)
  backport: enable auto-merge on backport PRs (elastic#4777)
  Support for Node.js profiles (elastic#4728)
  docs: readds .NET link (elastic#4764)
  [DOCS] Fixes URLs on Secure communication with APM Agents page (elastic#4746)
  ci: set proper parameters for the tar step (elastic#4696)
  docs: add 7.11.1 release notes (elastic#4727)
  Disable sourcemap upload endpoint when data streams enabled (elastic#4735)
  Add service name to dataset field (elastic#4674)
  Update to elastic/beats@ba423212a660 (elastic#4733)
  sampling: require a default policy (elastic#4729)
  processor/otel: add unit test for span status (elastic#4734)
  Add support for consuming OTLP/gRPC metrics (elastic#4722)
  [apmpackage] Add config options supported in ESS (elastic#4690)
  Use the apm-server version everywhere* (elastic#4725)
  ...
v1v added a commit to v1v/apm-server that referenced this pull request Feb 22, 2021
…te-schema-json-1

* upstream/master: (111 commits)
  Introduce metricset.name (elastic#4857)
  processor/otel: test service.version handling (elastic#4853)
  docs: Add PHP agent information to shared docs (elastic#4740)
  Script for faster development workflow (elastic#4731)
  Update to elastic/beats@1b31c26 (elastic#4763)
  backport: add 7.12 to .backportrc.json (elastic#4807)
  backport: enable auto-merge on backport PRs (elastic#4777)
  Support for Node.js profiles (elastic#4728)
  docs: readds .NET link (elastic#4764)
  [DOCS] Fixes URLs on Secure communication with APM Agents page (elastic#4746)
  ci: set proper parameters for the tar step (elastic#4696)
  docs: add 7.11.1 release notes (elastic#4727)
  Disable sourcemap upload endpoint when data streams enabled (elastic#4735)
  Add service name to dataset field (elastic#4674)
  Update to elastic/beats@ba423212a660 (elastic#4733)
  sampling: require a default policy (elastic#4729)
  processor/otel: add unit test for span status (elastic#4734)
  Add support for consuming OTLP/gRPC metrics (elastic#4722)
  [apmpackage] Add config options supported in ESS (elastic#4690)
  Use the apm-server version everywhere* (elastic#4725)
  ...
axw added a commit to axw/apm-server that referenced this pull request Mar 25, 2021
* Add metricset.name field to metrics docs

* aggregation/txmetrics: set metricset.name

* aggregation/spanmetrics: set metricset.name

* Add changelog entry
# Conflicts:
#	changelogs/7.12.asciidoc
#	include/fields.go
axw added a commit that referenced this pull request Mar 25, 2021
* Add metricset.name field to metrics docs

* aggregation/txmetrics: set metricset.name

* aggregation/spanmetrics: set metricset.name

* Add changelog entry
# Conflicts:
#	changelogs/7.12.asciidoc
#	include/fields.go
mergify bot pushed a commit that referenced this pull request Apr 27, 2021
* Add metricset.name field to metrics docs

* aggregation/txmetrics: set metricset.name

* aggregation/spanmetrics: set metricset.name

* Add changelog entry

(cherry picked from commit 5f72138)

# Conflicts:
#	changelogs/7.12.asciidoc
#	include/fields.go
#	x-pack/apm-server/aggregation/txmetrics/aggregator_test.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants