Skip to content

Add service name to dataset field#4674

Merged
jalvz merged 7 commits intoelastic:masterfrom
jalvz:dataset-service
Feb 16, 2021
Merged

Add service name to dataset field#4674
jalvz merged 7 commits intoelastic:masterfrom
jalvz:dataset-service

Conversation

@jalvz
Copy link
Copy Markdown
Contributor

@jalvz jalvz commented Feb 2, 2021

Motivation/summary

Implement the indexing strategy for APM data

Checklist

How to test these changes

Install APM package, send data to apm-server, and observe that data streams are created containing the ingested service names, and no legacy indices are created

Related issues

Closes #4492
Requires elastic/kibana#89870

@ghost
Copy link
Copy Markdown

ghost commented Feb 2, 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 #4674 updated

  • Start Time: 2021-02-16T11:44:51.095+0000

  • Duration: 43 min 39 sec

  • Commit: e4bca5e

Test stats 🧪

Test Results
Failed 0
Passed 4748
Skipped 124
Total 4872

Trends 🧪

Image of Build Times

Image of Tests

Steps errors 4

Expand to view the steps failures

Run Window tests
  • Took 11 min 58 sec . View more details on here
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
Test Sync
  • Took 3 min 28 sec . View more details on here
  • Description: ./.ci/scripts/sync.sh

@jalvz jalvz marked this pull request as ready for review February 15, 2021 14:52
@jalvz jalvz requested a review from a team February 15, 2021 14:55
fields[datastreams.DatasetField] = AppMetricsDataset
dataset = InternalMetricsDataset
}
dataset += "." + datastreams.NormalizeServiceName(me.Metadata.Service.Name)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: Could you also use fmt.Sprintf here as everywhere else; it would only create one new string, instead of two.

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #4674 (e4bca5e) into master (e662eb5) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #4674      +/-   ##
==========================================
+ Coverage   76.78%   76.79%   +0.01%     
==========================================
  Files         166      166              
  Lines       10232    10237       +5     
==========================================
+ Hits         7857     7862       +5     
  Misses       2375     2375              
Impacted Files Coverage Δ
datastreams/servicename.go 100.00% <ø> (ø)
model/error.go 98.59% <100.00%> (+<0.01%) ⬆️
model/metricset.go 95.16% <100.00%> (+0.07%) ⬆️
model/profile.go 100.00% <100.00%> (ø)
model/span.go 93.18% <100.00%> (+0.07%) ⬆️
model/transaction.go 96.22% <100.00%> (+0.07%) ⬆️

@jalvz jalvz merged commit 947e140 into elastic:master Feb 16, 2021
axw pushed a commit to axw/apm-server that referenced this pull request Feb 20, 2021
# Conflicts:
#	changelogs/head.asciidoc
axw pushed a commit to axw/apm-server that referenced this pull request Feb 20, 2021
# Conflicts:
#	changelogs/head.asciidoc
axw added a commit that referenced this pull request Feb 20, 2021
# Conflicts:
#	changelogs/head.asciidoc

Co-authored-by: Juan Álvarez <juan.alvarez@elastic.co>
axw added a commit that referenced this pull request Feb 20, 2021
# Conflicts:
#	changelogs/head.asciidoc

Co-authored-by: Juan Álvarez <juan.alvarez@elastic.co>
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)
  ...
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 76.79%. Comparing base (e662eb5) to head (e4bca5e).

❌ Your project status has failed because the head coverage (76.79%) is below the target coverage (80.00%). You can increase the head coverage or adjust the target coverage.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4674      +/-   ##
==========================================
+ Coverage   76.78%   76.79%   +0.01%     
==========================================
  Files         166      166              
  Lines       10232    10237       +5     
==========================================
+ Hits         7857     7862       +5     
  Misses       2375     2375              
Files with missing lines Coverage Δ
datastreams/servicename.go 100.00% <ø> (ø)
model/error.go 98.59% <100.00%> (+<0.01%) ⬆️
model/metricset.go 95.16% <100.00%> (+0.07%) ⬆️
model/profile.go 100.00% <100.00%> (ø)
model/span.go 93.18% <100.00%> (+0.07%) ⬆️
model/transaction.go 96.22% <100.00%> (+0.07%) ⬆️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

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.

[Fleet] Add service name to datasets

4 participants