[8.3] automate the ironbank generation (backport #8537) #8661

mergify · 2022-07-20T09:31:29Z

This is an automatic backport of pull request #8537 done by Mergify.
Cherry-pick of 682a0e5 has failed:

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

You are currently cherry-picking commit 682a0e5b.
  (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:
	new file:   packaging/ironbank/Dockerfile.tmpl
	new file:   packaging/ironbank/LICENSE
	new file:   packaging/ironbank/README.md.tmpl
	new file:   packaging/ironbank/hardening_manifest.yaml.tmpl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Makefile
	both modified:   magefile.go

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

(cherry picked from commit 682a0e5) # Conflicts: # Makefile # magefile.go

Makefile

apmmachine · 2022-07-20T09:40:29Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2022-07-20T09:59:00.979+0000
Duration: 30 min 47 sec

Test stats 🧪

Test	Results
Failed	0
Passed	4039
Skipped	13
Total	4052

🤖 GitHub comments

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

/test : Re-trigger the build.
/hey-apm : Run the hey-apm benchmark.
/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!)

v1v · 2022-07-20T09:58:26Z

/package

apmmachine · 2022-07-20T10:28:58Z

🌐 Coverage report

Name	Metrics % (`covered/total`)	Diff
Packages	100.0% (`42/42`)	💚
Files	91.96% (`183/199`)	👍
Classes	93.421% (`426/456`)	👍
Methods	89.145% (`1084/1216`)	👍
Lines	76.673% (`13207/17225`)	👎 -0.006
Conditionals	100.0% (`0/0`)	💚

apmmachine · 2022-07-20T10:28:59Z

📚 Go benchmark report

Diff with the 8.3 branch

name                                                                                            old time/op    new time/op     delta
pkg:github.com/elastic/apm-server/agentcfg goos:linux goarch:amd64
FetchAndAdd/FetchAndAddToCache-12                                                                 97.3ns ± 3%    102.2ns ± 5%    +5.09%  (p=0.032 n=5+5)
pkg:github.com/elastic/apm-server/decoder goos:linux goarch:amd64
pkg:github.com/elastic/apm-server/model/modelindexer goos:linux goarch:amd64
pkg:github.com/elastic/apm-server/processor/stream goos:linux goarch:amd64
BackendProcessor/errors_rum.ndjson-12                                                             15.3µs ±12%     12.8µs ± 7%   -16.08%  (p=0.008 n=5+5)
BackendProcessor/heavy.ndjson-12                                                                  23.2ms ± 5%     11.5ms ±57%   -50.43%  (p=0.008 n=5+5)
BackendProcessor/minimal.ndjson-12                                                                60.6µs ±13%     43.0µs ±10%   -29.03%  (p=0.008 n=5+5)
BackendProcessor/transactions_spans_rum_2.ndjson-12                                               18.6µs ±18%     14.5µs ±18%   -22.00%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel0/minimal.ndjson-12                     8.05µs ± 5%     7.52µs ± 5%    -6.52%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel0/optional-timestamps.ndjson-12         3.86µs ± 2%     3.79µs ± 2%    -1.84%  (p=0.024 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel2/errors_rum.ndjson-12                  7.14µs ± 7%     8.24µs ±27%   +15.50%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel2/invalid-event.ndjson-12               11.4µs ± 3%     12.4µs ±11%    +8.90%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel2/metadata.ndjson-12                    4.08µs ± 2%     4.33µs ± 4%    +6.08%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel2/optional-timestamps.ndjson-12         10.9µs ±13%      8.9µs ± 3%   -18.28%  (p=0.008 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel2/transactions.ndjson-12                51.0µs ±10%     44.6µs ±11%   -12.57%  (p=0.016 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel4/transactions.ndjson-12                34.1µs ± 6%     29.9µs ±10%   -12.47%  (p=0.008 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel8/invalid-json-event.ndjson-12          1.65µs ± 2%     1.69µs ± 3%    +2.22%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel8/minimal.ndjson-12                     9.65µs ± 5%     9.14µs ± 3%    -5.30%  (p=0.032 n=5+5)
pkg:github.com/elastic/apm-server/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
ReadEvents/json_codec/1_events-12                                                                 8.84µs ± 4%     9.21µs ± 3%    +4.19%  (p=0.016 n=5+5)
ReadEvents/json_codec/100_events-12                                                                681µs ± 0%      694µs ± 4%    +1.82%  (p=0.016 n=4+5)
ReadEvents/json_codec/1000_events-12                                                              6.49ms ± 0%     6.83ms ± 5%    +5.23%  (p=0.016 n=4+5)
IsTraceSampled/unknown-12                                                                          366ns ± 1%      358ns ± 1%    -2.19%  (p=0.008 n=5+5)

name                                                                                            old alloc/op   new alloc/op    delta
pkg:github.com/elastic/apm-server/agentcfg goos:linux goarch:amd64
pkg:github.com/elastic/apm-server/decoder goos:linux goarch:amd64
CompressedRequestReader/gzip_content_encoding-12                                                  45.6kB ± 0%     45.6kB ± 0%    -0.13%  (p=0.032 n=4+5)
CompressedRequestReader/deflate_sniff-12                                                          45.1kB ± 0%     45.0kB ± 0%    -0.23%  (p=0.016 n=5+5)
pkg:github.com/elastic/apm-server/model/modelindexer goos:linux goarch:amd64
pkg:github.com/elastic/apm-server/processor/stream goos:linux goarch:amd64
RUMV3Processor/rum_events.ndjson-12                                                               89.6kB ± 1%     91.4kB ± 2%    +1.93%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel2/invalid-metadata-2.ndjson-12          3.13kB ± 1%     3.18kB ± 2%    +1.74%  (p=0.048 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel4/errors.ndjson-12                      55.8kB ± 1%     55.2kB ± 1%    -1.07%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel4/optional-timestamps.ndjson-12         21.1kB ± 0%     21.2kB ± 1%    +0.66%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel4/transactions_spans.ndjson-12          57.7kB ± 1%     58.3kB ± 0%    +0.94%  (p=0.008 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel8/invalid-json-event.ndjson-12          6.74kB ± 1%     6.84kB ± 1%    +1.62%  (p=0.016 n=5+5)
pkg:github.com/elastic/apm-server/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                                                                    2.61kB ± 0%     2.61kB ± 0%    +0.04%  (p=0.016 n=4+5)

name                                                                                            old allocs/op  new allocs/op   delta
pkg:github.com/elastic/apm-server/agentcfg goos:linux goarch:amd64
pkg:github.com/elastic/apm-server/decoder goos:linux goarch:amd64
pkg:github.com/elastic/apm-server/model/modelindexer goos:linux goarch:amd64
pkg:github.com/elastic/apm-server/processor/stream goos:linux goarch:amd64
BackendProcessor/heavy.ndjson-12                                                                   24.8k ± 0%      24.8k ± 0%    -0.02%  (p=0.016 n=5+5)
pkg:github.com/elastic/apm-server/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/processor/stream goos:linux goarch:amd64
BackendProcessor/errors_rum.ndjson-12                                                            125MB/s ±11%    148MB/s ± 7%   +18.84%  (p=0.008 n=5+5)
BackendProcessor/heavy.ndjson-12                                                                17.2MB/s ± 5%   47.1MB/s ±70%  +173.81%  (p=0.008 n=5+5)
BackendProcessor/minimal.ndjson-12                                                              17.1MB/s ±12%   24.1MB/s ±10%   +40.71%  (p=0.008 n=5+5)
BackendProcessor/transactions_spans_rum_2.ndjson-12                                             61.3MB/s ±17%   77.8MB/s ±16%   +27.05%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel0/minimal.ndjson-12                    128MB/s ± 6%    137MB/s ± 5%    +6.93%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel0/optional-timestamps.ndjson-12        266MB/s ± 2%    271MB/s ± 2%    +1.86%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel2/errors_rum.ndjson-12                 266MB/s ± 6%    234MB/s ±22%   -12.01%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel2/invalid-event.ndjson-12             67.4MB/s ± 3%   62.1MB/s ±10%    -7.84%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel2/metadata.ndjson-12                   305MB/s ± 2%    287MB/s ± 4%    -5.66%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel2/optional-timestamps.ndjson-12       95.0MB/s ±13%  115.4MB/s ± 3%   +21.52%  (p=0.008 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel2/transactions.ndjson-12               111MB/s ± 9%    127MB/s ±12%   +14.49%  (p=0.016 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel4/transactions.ndjson-12               166MB/s ± 6%    190MB/s ±10%   +14.50%  (p=0.008 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel8/invalid-json-event.ndjson-12         356MB/s ± 2%    348MB/s ± 3%    -2.16%  (p=0.032 n=5+5)
BackendProcessorParallel/BenchmarkBackendProcessorParallel8/minimal.ndjson-12                    107MB/s ± 5%    113MB/s ± 3%    +5.49%  (p=0.032 n=5+5)

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

v1v · 2022-07-20T10:45:05Z

Test

➜  apm-server gsutil cp gs://apm-ci-artifacts/jobs/snapshots/apm-server-ironbank-8.3.3-SNAPSHOT-docker-build-context.tar.gz . 
Copying gs://apm-ci-artifacts/jobs/snapshots/apm-server-ironbank-8.3.3-SNAPSHOT-docker-build-context.tar.gz...
/ [1 files][  8.6 KiB/  8.6 KiB]                                                
Operation completed over 1 objects/8.6 KiB.                                      
➜  apm-server tar xvf apm-server-ironbank-8.3.3-SNAPSHOT-docker-build-context.tar.gz    
x ./
x Dockerfile
x LICENSE
x README.md
x hardening_manifest.yaml

➜  apm-server grep 8.3.3 *
Dockerfile:ARG ELASTIC_STACK=8.3.3
hardening_manifest.yaml:- "8.3.3"
hardening_manifest.yaml:  ELASTIC_STACK: "8.3.3"
hardening_manifest.yaml:  org.opencontainers.image.version: 8.3.3"
hardening_manifest.yaml:  - filename: "apm-server-8.3.3-linux-x86_64.tar.gz"
hardening_manifest.yaml:    url: "<artifact_path>/apm-server-8.3.3-linux-x86_64.tar.gz"

automate the ironbank generation (#8537)

36b4231

(cherry picked from commit 682a0e5) # Conflicts: # Makefile # magefile.go

mergify bot added the conflicts There is a conflict in the backported pull request label Jul 20, 2022

mergify bot assigned v1v Jul 20, 2022

v1v reviewed Jul 20, 2022

View reviewed changes

Makefile Outdated Show resolved Hide resolved

Update Makefile

549778c

resolve conflict

d029833

v1v removed the conflicts There is a conflict in the backported pull request label Jul 20, 2022

v1v approved these changes Jul 20, 2022

View reviewed changes

v1v merged commit 512298f into 8.3 Jul 20, 2022

v1v deleted the mergify/bp/8.3/pr-8537 branch July 20, 2022 10:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[8.3] automate the ironbank generation (backport #8537) #8661

[8.3] automate the ironbank generation (backport #8537) #8661

mergify bot commented Jul 20, 2022

apmmachine commented Jul 20, 2022 •

edited

Loading

Build stats

Test stats 🧪

v1v commented Jul 20, 2022

apmmachine commented Jul 20, 2022

apmmachine commented Jul 20, 2022

v1v commented Jul 20, 2022

[8.3] automate the ironbank generation (backport #8537) #8661

[8.3] automate the ironbank generation (backport #8537) #8661

Conversation

mergify bot commented Jul 20, 2022

apmmachine commented Jul 20, 2022 • edited Loading

💚 Build Succeeded

Build stats

Test stats 🧪

🤖 GitHub comments

v1v commented Jul 20, 2022

apmmachine commented Jul 20, 2022

🌐 Coverage report

apmmachine commented Jul 20, 2022

📚 Go benchmark report

v1v commented Jul 20, 2022

Test

apmmachine commented Jul 20, 2022 •

edited

Loading