Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 28, 2022

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

On branch mergify/bp/8.6/pr-9901 Your branch is up to date with 'origin/8.6'. You are currently cherry-picking commit f6872f47. (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/cmd/genpackage/pipelines.go	modified: systemtest/approvals/TestOTLPGRPCTraces.approved.json	modified: systemtest/otlp_test.go Unmerged paths: (use "git add <file>..." to mark resolution)	both modified: apmpackage/apm/changelog.yml 

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.com

* fix: cast event.duration to long in event_duration pipeline The otel span start/end dates are used to compute the event duration of the APM event, stored as a time.Duration. The duration is converted to nanoseconds stored in an int64 field, however the values is casted to int in the event_duration pipeline leading to an overflow if the original 64 bit value cannot be casted safely to the 32-bit int. * test: update otlp system-test to validate duration overflow fix * changelog: add changelog entry (cherry picked from commit f6872f4) # Conflicts: #	apmpackage/apm/changelog.yml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 28, 2022
@kruskall kruskall removed the conflicts There is a conflict in the backported pull request label Dec 28, 2022
@ghost
Copy link

ghost commented Dec 28, 2022

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2022-12-29T08:58:59.128+0000

  • Duration: 26 min 56 sec

Test stats 🧪

Test Results
Failed 0
Passed 153
Skipped 0
Total 153

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate and publish the docker images.

  • /test windows : Build & tests on Windows.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@kruskall kruskall requested a review from simitt December 28, 2022 09:41
@mergify
Copy link
Contributor Author

mergify bot commented Dec 29, 2022

This pull request has not been merged yet. Could you please review and merge it @kruskall? 🙏

8.6 is not released yet, do not use the explicit version in the changelog file.
@kruskall kruskall removed the request for review from simitt December 29, 2022 08:59
@kruskall kruskall enabled auto-merge (squash) December 29, 2022 08:59
@ghost
Copy link

ghost commented Dec 29, 2022

📚 Go benchmark report

Diff with the 8.6 branch

name old time/op new time/op delta pkg:github.com/elastic/apm-server/internal/agentcfg goos:linux goarch:amd64 FetchAndAdd/FetchFromCache-12 46.1ns ± 0% 41.1ns ± 0% -10.84% (p=0.008 n=5+5) FetchAndAdd/FetchAndAddToCache-12 108ns ± 2% 96ns ± 2% -11.38% (p=0.008 n=5+5) pkg:github.com/elastic/apm-server/internal/beater/request goos:linux goarch:amd64 ContextResetContentEncoding/empty-12 134ns ± 1% 120ns ± 2% -10.51% (p=0.008 n=5+5) ContextResetContentEncoding/uncompressed-12 159ns ± 1% 142ns ± 1% -10.80% (p=0.008 n=5+5) ContextResetContentEncoding/deflate-12 3.94µs ± 2% 3.48µs ±29% -11.57% (p=0.032 n=5+5) pkg:github.com/elastic/apm-server/internal/model/modelindexer goos:linux goarch:amd64 ModelIndexer/DefaultCompressionScaling-12 3.36µs ± 4% 3.13µs ± 2% -6.62% (p=0.008 n=5+5) pkg:github.com/elastic/apm-server/internal/processor/stream goos:linux goarch:amd64 BackendProcessor/logs.ndjson-12 64.0µs ±10% 78.2µs ±22% +22.14% (p=0.032 n=5+5) BackendProcessor/minimal-service.ndjson-12 11.8µs ±20% 14.8µs ±14% +25.70% (p=0.016 n=5+5) BackendProcessor/transactions_spans_rum.ndjson-12 18.8µs ±23% 23.2µs ±21% +23.92% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel2/minimal-service.ndjson-12 3.56µs ± 6% 3.34µs ± 4% -6.43% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel4/metadata-null-values.ndjson-12 2.17µs ±12% 1.84µs ±10% -15.45% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/spans.ndjson-12 11.4µs ± 1% 10.9µs ± 2% -4.19% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/transactions-huge_traces.ndjson-12 5.66µs ± 1% 5.55µs ± 1% -1.82% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/transactions.ndjson-12 11.4µs ± 2% 10.9µs ± 0% -3.94% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/transactions_spans.ndjson-12 11.3µs ± 1% 10.8µs ± 1% -4.15% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/transactions_spans_rum.ndjson-12 2.07µs ± 1% 2.00µs ± 0% -3.75% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/transactions_spans_rum_2.ndjson-12 2.01µs ± 2% 1.93µs ± 1% -3.71% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/unknown-span-type.ndjson-12 7.41µs ± 1% 7.15µs ± 1% -3.52% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/events.ndjson-12 13.3µs ± 1% 13.1µs ± 1% -1.59% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/invalid-event-type.ndjson-12 818ns ± 1% 805ns ± 1% -1.53% (p=0.016 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/invalid-json-metadata.ndjson-12 1.89µs ± 1% 1.87µs ± 1% -0.92% (p=0.024 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/invalid-metadata-2.ndjson-12 476ns ± 1% 481ns ± 1% +1.09% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/invalid-metadata.ndjson-12 477ns ± 1% 485ns ± 1% +1.48% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/metricsets.ndjson-12 4.44µs ± 1% 4.37µs ± 1% -1.50% (p=0.016 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/minimal.ndjson-12 2.03µs ± 1% 1.97µs ± 1% -2.88% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/optional-timestamps.ndjson-12 1.49µs ± 4% 1.46µs ± 1% -2.51% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/transactions-huge_traces.ndjson-12 4.74µs ± 1% 4.62µs ± 2% -2.45% (p=0.016 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/transactions_spans.ndjson-12 9.56µs ± 2% 9.33µs ± 2% -2.32% (p=0.032 n=5+5) ReadBatch/events.ndjson-12 219µs ±20% 166µs ±17% -24.32% (p=0.032 n=5+5) pkg:github.com/elastic/apm-server/internal/publish goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/x-pack/apm-server/aggregation/spanmetrics goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/x-pack/apm-server/aggregation/txmetrics goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/x-pack/apm-server/sampling goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/x-pack/apm-server/sampling/eventstorage goos:linux goarch:amd64 WriteTransaction/json_codec-12 14.5µs ±39% 4.6µs ±27% -68.62% (p=0.008 n=5+5) WriteTransaction/json_codec_big_tx-12 8.31µs ±68% 5.13µs ± 4% -38.23% (p=0.008 n=5+5) WriteTransaction/nop_codec_big_tx-12 436ns ±50% 774ns ±19% +77.72% (p=0.008 n=5+5) ReadEvents/json_codec/0_events-12 352ns ± 6% 311ns ± 6% -11.58% (p=0.008 n=5+5) ReadEvents/json_codec/1_events-12 9.89µs ± 6% 9.12µs ± 6% -7.78% (p=0.016 n=5+5) ReadEvents/json_codec_big_tx/0_events-12 337ns ± 6% 307ns ± 7% -8.82% (p=0.016 n=5+5) ReadEvents/nop_codec/0_events-12 336ns ± 4% 307ns ± 3% -8.59% (p=0.008 n=5+5) ReadEvents/nop_codec_big_tx/0_events-12 343ns ± 6% 307ns ± 0% -10.61% (p=0.016 n=5+4) IsTraceSampled/sampled-12 76.6ns ± 3% 67.7ns ± 2% -11.71% (p=0.008 n=5+5) IsTraceSampled/unsampled-12 78.1ns ± 1% 70.0ns ± 1% -10.37% (p=0.008 n=5+5) IsTraceSampled/unknown-12 411ns ± 3% 371ns ± 3% -9.76% (p=0.008 n=5+5) name old alloc/op new alloc/op delta pkg:github.com/elastic/apm-server/internal/agentcfg goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/internal/beater/request goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/internal/model/modelindexer goos:linux goarch:amd64 ModelIndexer/BestCompression-12 2.61kB ± 1% 2.58kB ± 0% -1.04% (p=0.016 n=5+4) pkg:github.com/elastic/apm-server/internal/processor/stream goos:linux goarch:amd64 BackendProcessor/events.ndjson-12 39.9kB ± 1% 40.5kB ± 1% +1.32% (p=0.032 n=5+5) BackendProcessor/otel-bridge.ndjson-12 10.9kB ± 1% 11.3kB ± 3% +2.94% (p=0.008 n=5+5) BackendProcessor/transactions_spans_rum.ndjson-12 5.75kB ± 1% 5.84kB ± 1% +1.64% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel4/metricsets.ndjson-12 14.7kB ± 1% 14.9kB ± 1% +1.60% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel4/optional-timestamps.ndjson-12 5.29kB ± 1% 5.21kB ± 1% -1.49% (p=0.016 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/errors_2.ndjson-12 24.8kB ± 1% 25.0kB ± 1% +0.87% (p=0.032 n=5+5) ReadBatch/errors.ndjson-12 20.8kB ± 0% 20.8kB ± 0% +0.13% (p=0.008 n=5+5) ReadBatch/errors_rum.ndjson-12 6.86kB ± 0% 6.87kB ± 0% +0.10% (p=0.008 n=5+5) ReadBatch/invalid-event.ndjson-12 6.67kB ± 1% 6.71kB ± 0% +0.58% (p=0.040 n=5+5) ReadBatch/invalid-json-metadata.ndjson-12 8.37kB ± 0% 8.44kB ± 1% +0.76% (p=0.040 n=5+5) ReadBatch/spans.ndjson-12 27.5kB ± 0% 27.5kB ± 0% +0.04% (p=0.048 n=5+5) pkg:github.com/elastic/apm-server/internal/publish goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/x-pack/apm-server/aggregation/spanmetrics goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/x-pack/apm-server/aggregation/txmetrics goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/x-pack/apm-server/sampling goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/x-pack/apm-server/sampling/eventstorage goos:linux goarch:amd64 WriteTransaction/json_codec_big_tx-12 3.90kB ± 0% 3.90kB ± 0% -0.03% (p=0.048 n=5+5) ReadEvents/nop_codec_big_tx/10_events-12 25.7kB ± 0% 25.7kB ± 0% +0.11% (p=0.040 n=5+5) name old allocs/op new allocs/op delta pkg:github.com/elastic/apm-server/internal/agentcfg goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/internal/beater/request goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/internal/model/modelindexer goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/internal/processor/stream goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/internal/publish goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/x-pack/apm-server/aggregation/spanmetrics goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/x-pack/apm-server/aggregation/txmetrics goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/x-pack/apm-server/sampling goos:linux goarch:amd64 pkg:github.com/elastic/apm-server/x-pack/apm-server/sampling/eventstorage goos:linux goarch:amd64 name old speed new speed delta pkg:github.com/elastic/apm-server/internal/model/modelindexer goos:linux goarch:amd64 ModelIndexer/DefaultCompressionScaling-12 740MB/s ± 4% 792MB/s ± 2% +7.04% (p=0.008 n=5+5) pkg:github.com/elastic/apm-server/internal/processor/stream goos:linux goarch:amd64 BackendProcessor/events.ndjson-12 56.2MB/s ± 1% 47.7MB/s ± 3% -15.20% (p=0.029 n=4+4) BackendProcessor/logs.ndjson-12 55.2MB/s ±10% 45.9MB/s ±25% -16.80% (p=0.032 n=5+5) BackendProcessor/minimal-service.ndjson-12 37.0MB/s ±22% 29.0MB/s ±13% -21.65% (p=0.016 n=5+5) BackendProcessor/transactions_spans_rum.ndjson-12 62.6MB/s ±20% 50.3MB/s ±18% -19.64% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel2/minimal-service.ndjson-12 119MB/s ± 6% 128MB/s ± 4% +6.82% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel4/metadata-null-values.ndjson-12 244MB/s ±13% 288MB/s ±10% +18.11% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/spans.ndjson-12 705MB/s ± 1% 735MB/s ± 2% +4.38% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/transactions-huge_traces.ndjson-12 560MB/s ± 1% 570MB/s ± 1% +1.85% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/transactions.ndjson-12 496MB/s ± 2% 516MB/s ± 0% +4.09% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/transactions_spans.ndjson-12 517MB/s ± 1% 539MB/s ± 1% +4.33% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/transactions_spans_rum.ndjson-12 557MB/s ± 1% 579MB/s ± 0% +3.89% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/transactions_spans_rum_2.ndjson-12 557MB/s ± 2% 578MB/s ± 1% +3.84% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel8/unknown-span-type.ndjson-12 446MB/s ± 1% 463MB/s ± 1% +3.66% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/events.ndjson-12 557MB/s ± 1% 566MB/s ± 1% +1.63% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/invalid-event-type.ndjson-12 478MB/s ± 1% 486MB/s ± 1% +1.56% (p=0.016 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/invalid-json-metadata.ndjson-12 237MB/s ± 1% 239MB/s ± 1% +0.95% (p=0.016 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/invalid-metadata-2.ndjson-12 916MB/s ± 1% 906MB/s ± 1% -1.08% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/invalid-metadata.ndjson-12 934MB/s ± 1% 921MB/s ± 1% -1.46% (p=0.032 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/metricsets.ndjson-12 574MB/s ± 1% 582MB/s ± 1% +1.53% (p=0.016 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/minimal.ndjson-12 509MB/s ± 1% 524MB/s ± 1% +2.96% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/optional-timestamps.ndjson-12 688MB/s ± 4% 706MB/s ± 1% +2.53% (p=0.008 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/transactions-huge_traces.ndjson-12 668MB/s ± 1% 685MB/s ± 2% +2.51% (p=0.016 n=5+5) BackendProcessorParallel/BenchmarkBackendProcessorParallel200/transactions_spans.ndjson-12 609MB/s ± 2% 623MB/s ± 2% +2.37% (p=0.032 n=5+5) ReadBatch/events.ndjson-12 34.3MB/s ±24% 45.3MB/s ±20% +31.86% (p=0.032 n=5+5) 

report generated with https://pkg.go.dev/golang.org/x/perf/cmd/benchstat

@kruskall kruskall merged commit f990cce into 8.6 Dec 29, 2022
@kruskall kruskall deleted the mergify/bp/8.6/pr-9901 branch December 29, 2022 09:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3 participants