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.

Sign up for GitHub

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

Jump to bottom

fix: correct smoke tests os #10829

Merged
merged 1 commit into from
May 17, 2023
Merged

fix: correct smoke tests os #10829

merged 1 commit into from
May 17, 2023

Conversation

amannocci
Copy link
Contributor

What is the change being made?

  • Add date suffix to ensure uniqueness regarding key pair creation.

Why is the change being made?

  • Smoke Tests OS fails from time to time when the key pair already exists.
  • The key pair already exists when the terraform destroy cleanup fails.
  • To avoid this issue, we can ensure name uniqueness.
  • A cleanup task will be added in cloud-reaper as a fallback.

How has this been tested?

  • Define EC_API_KEY and AWS_PROFILE environment variables.
  • Ensure you have a valid AWS profile setup.
  • Move to testing/smoke/supported-os and run ./test.sh 8.7.2-SNAPSHOT.

@amannocci amannocci requested a review from simitt May 17, 2023 11:26
@mergify
Copy link
Contributor

mergify bot commented May 17, 2023

This pull request does not have a backport label. Could you fix it @amannocci? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.x is the label to automatically backport to the 7.x branch.
  • backport-7./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label May 17, 2023
@amannocci amannocci changed the title fix: correct smoke tests os idempotency fix: correct smoke tests os May 17, 2023
@amannocci amannocci added backport-8.7 Automated backport with mergify backport-8.8 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels May 17, 2023
@apmmachine
Copy link
Contributor

💚 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: 2023-05-17T11:27:12.246+0000

  • Duration: 5 min 28 sec

🤖 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!)

@apmmachine
Copy link
Contributor

📚 Go benchmark report

Diff with the main branch

goos: linux
goarch: amd64
pkg: github.com/elastic/apm-server/internal/agentcfg
cpu: 12th Gen Intel(R) Core(TM) i5-12500
                                  │ build/main/bench.out │              bench.out              │
                                  │        sec/op        │    sec/op     vs base               │
FetchAndAdd/FetchFromCache-12                41.11n ± 0%    46.09n ± 0%  +12.12% (p=0.002 n=6)
FetchAndAdd/FetchAndAddToCache-12            91.78n ± 1%   104.15n ± 8%  +13.48% (p=0.002 n=6)
geomean                                      61.42n         69.28n       +12.79%

                                  │ build/main/bench.out │             bench.out              │
                                  │         B/op         │    B/op     vs base                │
geomean                                                ²               +0.00%               ²
¹ all samples are equal
² summaries must be >0 to compute geomean

                                  │ build/main/bench.out │             bench.out              │
                                  │      allocs/op       │ allocs/op   vs base                │
geomean                                                ²               +0.00%               ²
¹ all samples are equal
² summaries must be >0 to compute geomean

pkg: github.com/elastic/apm-server/internal/beater/request
                                             │ build/main/bench.out │              bench.out              │
                                             │        sec/op        │    sec/op     vs base               │
ContextReset/X-Real-IP_ipv6-12                         919.9n ± 31%   743.4n ± 15%  -19.19% (p=0.041 n=6)
ContextReset/Remote_Addr_ipv6-12                       862.9n ± 17%   527.6n ± 22%  -38.85% (p=0.002 n=6)
ContextResetContentEncoding/empty-12                   116.9n ±  2%   131.8n ±  1%  +12.65% (p=0.002 n=6)
ContextResetContentEncoding/uncompressed-12            140.1n ±  1%   157.0n ±  1%  +12.10% (p=0.002 n=6)
ContextResetContentEncoding/deflate-12                 4.040µ ±  4%   3.928µ ±  2%   -2.77% (p=0.041 n=6)
geomean                                                942.7n         902.8n         -4.23%

                                             │ build/main/bench.out │              bench.out               │
                                             │         B/op         │     B/op      vs base                │
geomean                                                           ²                 +0.00%               ²
¹ all samples are equal
² summaries must be >0 to compute geomean

                                             │ build/main/bench.out │             bench.out              │
                                             │      allocs/op       │ allocs/op   vs base                │
geomean                                                           ²               +0.00%               ²
¹ all samples are equal
² summaries must be >0 to compute geomean

pkg: github.com/elastic/apm-server/internal/publish
             │ build/main/bench.out │          bench.out          │
             │        sec/op        │   sec/op    vs base         │

             │ build/main/bench.out │           bench.out            │
             │         B/op         │     B/op       vs base         │

             │ build/main/bench.out │           bench.out           │
             │      allocs/op       │  allocs/op    vs base         │

pkg: github.com/elastic/apm-server/x-pack/apm-server/aggregation/spanmetrics
                 │ build/main/bench.out │          bench.out           │
                 │        sec/op        │   sec/op     vs base         │

                 │ build/main/bench.out │            bench.out            │
                 │         B/op         │     B/op      vs base           │
¹ all samples are equal

                 │ build/main/bench.out │           bench.out           │
                 │      allocs/op       │ allocs/op   vs base           │
¹ all samples are equal

pkg: github.com/elastic/apm-server/x-pack/apm-server/aggregation/txmetrics
                        │ build/main/bench.out │          bench.out           │
                        │        sec/op        │   sec/op     vs base         │

                        │ build/main/bench.out │           bench.out           │
                        │         B/op         │    B/op     vs base           │
¹ all samples are equal

                        │ build/main/bench.out │           bench.out           │
                        │      allocs/op       │ allocs/op   vs base           │
¹ all samples are equal

pkg: github.com/elastic/apm-server/x-pack/apm-server/sampling
               │ build/main/bench.out │             bench.out              │
               │        sec/op        │    sec/op     vs base              │
geomean                  593.3n         609.7n        +2.76%

               │ build/main/bench.out │              bench.out               │
               │         B/op         │     B/op      vs base                │
geomean                             ²                 +0.11%               ²
¹ all samples are equal
² summaries must be >0 to compute geomean

               │ build/main/bench.out │             bench.out              │
               │      allocs/op       │ allocs/op   vs base                │
geomean                             ²               +0.00%               ²
¹ all samples are equal
² summaries must be >0 to compute geomean

pkg: github.com/elastic/apm-server/x-pack/apm-server/sampling/eventstorage
                                            │ build/main/bench.out │               bench.out               │
                                            │        sec/op        │    sec/op      vs base                │
WriteTransaction/json_codec-12                       4.096µ ±  13%   12.209µ ± 64%  +198.07% (p=0.009 n=6)
WriteTransaction/json_codec_big_tx-12                5.070µ ±   3%   11.809µ ± 24%  +132.92% (p=0.002 n=6)
ReadEvents/json_codec/0_events-12                    304.3n ±  15%    351.0n ± 13%   +15.31% (p=0.015 n=6)
ReadEvents/json_codec_big_tx/0_events-12             308.4n ±   9%    352.1n ±  8%   +14.15% (p=0.004 n=6)
ReadEvents/json_codec_big_tx/1_events-12             11.54µ ±  10%    12.42µ ±  8%    +7.58% (p=0.037 n=6)
ReadEvents/nop_codec/0_events-12                     308.0n ±  14%    354.4n ±  9%   +15.10% (p=0.009 n=6)
ReadEvents/nop_codec/100_events-12                   141.8µ ±   5%    148.5µ ±  5%    +4.72% (p=0.002 n=6)
ReadEvents/nop_codec_big_tx/0_events-12              306.7n ±   5%    349.5n ±  7%   +13.97% (p=0.002 n=6)
IsTraceSampled/sampled-12                            70.46n ±   4%    79.60n ±  5%   +12.97% (p=0.002 n=6)
IsTraceSampled/unsampled-12                          71.97n ±   2%    80.20n ±  4%   +11.44% (p=0.002 n=6)
IsTraceSampled/unknown-12                            376.1n ±   3%    425.5n ±  2%   +13.13% (p=0.002 n=6)
geomean                                              28.77µ           31.26µ          +8.65%

                                            │ build/main/bench.out │               bench.out                │
                                            │         B/op         │      B/op       vs base                │
WriteTransaction/json_codec_big_tx-12                3.686Ki ±  0%    3.688Ki ±  0%  +0.05% (p=0.006 n=6)
geomean                                              31.37Ki          31.37Ki        -0.01%
¹ all samples are equal

                                            │ build/main/bench.out │              bench.out              │
                                            │      allocs/op       │  allocs/op   vs base                │
geomean                                                 144.7         144.7       -0.00%
¹ all samples are equal

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

@kruskall
Copy link
Member

sigh hashicorp/terraform-provider-aws#14394

kruskall
kruskall approved these changes May 17, 2023
View reviewed changes
Copy link
Member

@kruskall kruskall left a comment

Choose a reason for hiding this comment

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

LGTM!

@amannocci amannocci merged commit a86ea9e into main May 17, 2023
@amannocci amannocci deleted the hotfix/fix-smoke-tests-os branch May 17, 2023 13:20
mergify bot pushed a commit that referenced this pull request May 17, 2023
@amannocci @mergify
fix: correct smoke tests os idempotency (#10829)
31bdfca 
Signed-off-by: Adrien Mannocci <[email protected]>
(cherry picked from commit a86ea9e)

# Conflicts:
#	testing/smoke/test_supported_os.sh
@mergify mergify bot mentioned this pull request May 17, 2023
Merged
mergify bot pushed a commit that referenced this pull request May 17, 2023
@amannocci @mergify
fix: correct smoke tests os idempotency (#10829)
2ca50fa 
Signed-off-by: Adrien Mannocci <[email protected]>
(cherry picked from commit a86ea9e)

# Conflicts:
#	testing/smoke/test_supported_os.sh
@mergify mergify bot mentioned this pull request May 17, 2023
Merged
mergify bot added a commit that referenced this pull request May 17, 2023
@mergify @amannocci
fix: correct smoke tests os idempotency (#10829) (#10832)
578e8cb 
Signed-off-by: Adrien Mannocci <[email protected]>
(cherry picked from commit a86ea9e)

# Conflicts:
#	testing/smoke/test_supported_os.sh

Co-authored-by: Adrien Mannocci <[email protected]>
mergify bot added a commit that referenced this pull request May 17, 2023
@mergify @amannocci
fix: correct smoke tests os idempotency (#10829) (#10831)
0955af8 
Signed-off-by: Adrien Mannocci <[email protected]>
(cherry picked from commit a86ea9e)

# Conflicts:
#	testing/smoke/test_supported_os.sh

Co-authored-by: Adrien Mannocci <[email protected]>
@kruskall kruskall mentioned this pull request Jul 25, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kruskall kruskall kruskall approved these changes

@simitt simitt Awaiting requested review from simitt

Assignees
No one assigned
Labels
backport-8.7 Automated backport with mergify backport-8.8 Automated backport with mergify
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@amannocci @apmmachine @kruskall