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

Introduce new Rally track and tooling #6731

Merged
merged 3 commits into from
Mar 24, 2022
Merged

Introduce new Rally track and tooling #6731

merged 3 commits into from
Mar 24, 2022

Conversation

axw
Copy link
Member

@axw axw commented Nov 29, 2021

Motivation/summary

Remove outdated Rally track.

Introduce our own minimal Python requirements.txt. We install Rally (esrally) on-demand.

Introduce a new Rally track and tooling for generating Rally corpora, comprising:

  • rally/track.json, a Rally track that references generated and .gitignored corpora in rally/corpora.
  • script/cat_bulk.py, which runs apm-server configured to point at an in-memory fake Elasticsearch HTTP server that writes bulk requests out to stdout. Run this script, send events to the server as usual, and the resulting Elasticsearch documents will be sent to stdout.
  • rally/gencorpora, a Go program which provides a framework for generating Rally corpora using opentelemetry-go and script/cat_bulk.py.

The Rally track does not install templates or ingest pipelines. It is currently assumed that the APM integration package is installed before running Rally races.

Two new Makefile targets are added: make rally/corpora (generate Rally corpora), and make rally (install esrally and run a race).

Checklist

- [ ] Update CHANGELOG.asciidoc
- [ ] Update package changelog.yml (only if changes to apmpackage have been made)
- [ ] Documentation has been updated

How to test these changes

  1. docker-compose up -d
  2. make apm-server build-package
  3. Install APM integration package
  4. make rally

Related issues

See #6115

@axw axw added v8.0.0 backport-8.0 Automated backport with mergify labels Nov 29, 2021
@apmmachine
Copy link
Contributor

apmmachine commented Nov 29, 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 preview

Expand to view the summary

Build stats

  • Start Time: 2022-03-24T00:50:14.763+0000

  • Duration: 33 min 35 sec

Test stats 🧪

Test Results
Failed 0
Passed 3935
Skipped 13
Total 3948

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

@axw axw force-pushed the rally2 branch 4 times, most recently from 23d0b74 to 7c549eb Compare November 29, 2021 06:23
Copy link
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

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

LGTM

@mergify
Copy link
Contributor

mergify bot commented Feb 17, 2022

This pull request is now in conflicts. Could you fix it @axw? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b rally2 upstream/rally2
git merge upstream/main
git push upstream rally2

@axw
Copy link
Member Author

axw commented Mar 23, 2022

I'll update this and merge it. We don't have to use it as it is, but we weren't using the old stuff either. Let's iterate.

@axw axw marked this pull request as ready for review March 24, 2022 01:03
@axw axw enabled auto-merge (squash) March 24, 2022 01:03
@axw axw merged commit 40aafab into elastic:main Mar 24, 2022
mergify bot pushed a commit that referenced this pull request Mar 24, 2022
* Delete old stuff

* Introduce our own requirements.txt

* Introduce tooling for generating Rally corpora

(cherry picked from commit 40aafab)
@axw axw deleted the rally2 branch March 24, 2022 01:25
@axw axw added backport-8.1 Automated backport with mergify v8.2.0 and removed backport-8.0 Automated backport with mergify backport-8.1 Automated backport with mergify v8.0.0 labels Mar 24, 2022
@mergify
Copy link
Contributor

mergify bot commented Mar 24, 2022

This pull request does not have a backport label. Could you fix it @axw? 🙏
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 Mar 24, 2022
v1v added a commit to v1v/apm-server that referenced this pull request Mar 28, 2022
…ging

* upstream/main: (25 commits)
  Update to elastic/beats@cb7e33d0864e (elastic#7672)
  Update backporting docs (elastic#7639)
  [Automation] Update elastic stack version to 8.2.0-dcff22d7 for testing (elastic#7670)
  Update aws-lambda-extension.asciidoc (elastic#7664)
  modelindexer: Reduce locking on flushActive (elastic#7649)
  dra: run release-manager if branch is available (elastic#7631)
  [apmpackage] add quotes around {{this}} (elastic#7598)
  dra: enforce version (elastic#7636)
  Update magefile for universal Darwin binaries (elastic#7643)
  Update to elastic/beats@2443dbb9e892 (elastic#7640)
  Update go.mod (elastic#7638)
  Introduce new Rally track and tooling (elastic#6731)
  dra: slack/email with the branch (elastic#7630)
  model/modelindexer: close gzip writer (elastic#7624)
  [Automation] Update elastic stack version to 8.2.0-4509f321 for testing (elastic#7620)
  Fix asciidoc hyperlink syntax (elastic#7609)
  Update to elastic/beats@f2ce0a0f69a5 (elastic#7618)
  ci: packaging pipeline should not notify build status in github comments (elastic#7596)
  docs: add 8.1.1 release notes (elastic#7601)
  Always set timestamp on APMEvents for incoming http requests (elastic#7567)
  ...
@axw
Copy link
Member Author

axw commented Apr 11, 2022

Removing from the test plan, this is not user facing.

@axw axw removed the test-plan label Apr 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-skip Skip notification from the automated backport with mergify v8.2.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants