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] Only add data_streams.* fields when enabled (#4461) #4521

Merged
merged 2 commits into from
Dec 14, 2020

Conversation

jalvz
Copy link
Contributor

@jalvz jalvz commented Dec 10, 2020

Backports the following commits to 7.x:

Only add data_streams.* fields when apm-server.data_streams.enabled
is true. This avoids allocations when the feature is disabled, which
will be the default for some time yet.
@jalvz jalvz added the backport label Dec 10, 2020
@apmmachine
Copy link
Contributor

apmmachine commented Dec 10, 2020

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

  • Start Time: 2020-12-14T08:45:39.331+0000

  • Duration: 29 min 33 sec

Test stats 🧪

Test Results
Failed 0
Passed 4507
Skipped 140
Total 4647

Steps errors 3

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
Test Sync
  • Took 3 min 53 sec . View more details on here
  • Description: ./script/jenkins/sync.sh

@codecov-io
Copy link

codecov-io commented Dec 10, 2020

Codecov Report

Merging #4521 (6a0dbe5) into 7.x (85b27f9) will decrease coverage by 0.03%.
The diff coverage is 93.33%.

@@            Coverage Diff             @@
##              7.x    #4521      +/-   ##
==========================================
- Coverage   76.18%   76.14%   -0.04%     
==========================================
  Files         158      158              
  Lines        9783     9777       -6     
==========================================
- Hits         7453     7445       -8     
- Misses       2330     2332       +2     
Impacted Files Coverage Δ
publish/pub.go 73.80% <0.00%> (-2.10%) ⬇️
beater/beater.go 61.65% <100.00%> (-1.63%) ⬇️
model/error.go 98.60% <100.00%> (+<0.01%) ⬆️
model/metricset.go 94.91% <100.00%> (+0.08%) ⬆️
model/profile.go 100.00% <100.00%> (ø)
model/span.go 93.25% <100.00%> (+0.07%) ⬆️
model/transaction.go 85.18% <100.00%> (+0.27%) ⬆️
processor/otel/consumer.go 93.58% <0.00%> (-0.45%) ⬇️
...ack/apm-server/aggregation/txmetrics/aggregator.go 93.36% <0.00%> (ø)

@axw axw merged commit 83e5ab4 into elastic:7.x Dec 14, 2020
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.

4 participants