Update rally cmd to use corpora generated by agent data #8941
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Remove cat_bulk and old gencorpora api in favor of systemtest's gencorpora command which generates ES corpora based on agent data.
|
This pull request does not have a backport label. Could you fix it @lahsivjar? 🙏
NOTE: |
mergify
bot
added
the
backport-skip
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
🤖 GitHub commentsTo re-run your PR in the CI, just comment with:
|
lahsivjar
commented
Aug 24, 2022
| rally: $(PYTHON_BIN)/esrally rally/corpora | ||
| @$(PYTHON_BIN)/esrally race \ | ||
| --track-path=rally \ | ||
| --track-params=expected_cluster_health:yellow,bulk_size:$(RALLY_BULK_SIZE) \ |
There was a problem hiding this comment.
[For reviewers] The expected cluster health for local ES cluster will be yellow since APM integration requires 2 shards but we only launch 1 ES node in local. I plan to add a separate command to run rally for ESS that will have expected cluster health as green.
📚 Go benchmark reportDiff with the report generated with https://pkg.go.dev/golang.org/x/perf/cmd/benchstat |
axw
approved these changes
Aug 24, 2022
There was a problem hiding this comment.
LGTM!
I just ran make rally/corpora locally, and it failed:
$ make rally/corpora
2022/08/24 13:20:50 Building apm-server...
make[1]: Entering directory '/home/andrew/projects/apm-server'
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
/home/andrew/.gimme/versions/go1.18.5.linux.amd64/bin/go build -o build/apm-server-linux-amd64 -trimpath -buildmode=pie -ldflags "-s -X github.com/elastic/beats/v7/libbeat/version.commit=bbad2e2726fb002c131ed6a6437607c6f9ff3956 -X github.com/elastic/beats/v7/libbeat/version.buildTime=2022-08-24T11:44:28+08:00" ./x-pack/apm-server
make[1]: Leaving directory '/home/andrew/projects/apm-server'
2022/08/24 13:20:53 Built /home/andrew/projects/apm-server/build/apm-server-linux-amd64
2022-08-24T13:20:53.030+0800 ERROR kibana kibana/connecting_client.go:77 failed to obtain connection to Kibana: fail to get the Kibana version: HTTP GET request to http://localhost:5601/api/status fails: fail to execute the HTTP GET request: Get "http://localhost:5601/api/status": dial tcp 127.0.0.1:5601: connect: connection refused. Response: {"service.name": "apm-server", "ecs.version": "1.6.0"}
github.com/elastic/apm-server/systemtest/gencorpora.StreamAPMServerLogs
/home/andrew/projects/apm-server/systemtest/gencorpora/apmserver.go:65
main.run.func2
/home/andrew/projects/apm-server/systemtest/cmd/gencorpora/main.go:68
golang.org/x/sync/errgroup.(*Group).Go.func1
/home/andrew/go/pkg/mod/golang.org/x/[email protected]/errgroup/errgroup.go:57
2022-08-24T13:20:54.462+0800 ERROR kibana kibana/connecting_client.go:77 failed to obtain connection to Kibana: fail to get the Kibana version: HTTP GET request to http://localhost:5601/api/status fails: fail to execute the HTTP GET request: Get "http://localhost:5601/api/status": dial tcp 127.0.0.1:5601: connect: connection refused. Response: {"service.name": "apm-server", "ecs.version": "1.6.0"}
github.com/elastic/apm-server/systemtest/gencorpora.StreamAPMServerLogs
/home/andrew/projects/apm-server/systemtest/gencorpora/apmserver.go:65
main.run.func2
/home/andrew/projects/apm-server/systemtest/cmd/gencorpora/main.go:68
golang.org/x/sync/errgroup.(*Group).Go.func1
/home/andrew/go/pkg/mod/golang.org/x/[email protected]/errgroup/errgroup.go:57
That's because apm-server is configured with Kibana credentials, so it tries and fails to connect to Kibana. We should probably disable Kibana config:
diff --git a/systemtest/gencorpora/apmserver.go b/systemtest/gencorpora/apmserver.go
index ad782310b..18720e287 100644
--- a/systemtest/gencorpora/apmserver.go
+++ b/systemtest/gencorpora/apmserver.go
@@ -41,6 +41,7 @@ func NewAPMServer(ctx context.Context, esHost string) *apmservertest.Server {
waitForIntegration := false
srv.Config.WaitForIntegration = &waitForIntegration
srv.Config.Output.Elasticsearch.Hosts = []string{esHost}
+ srv.Config.Kibana = nil
return srv
}
Ah, thanks I will create a commit to fix this. I always run it with |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation/summary
Remove old
rally/gencorporacode in favor of systemtest'sgencorporacommand which generates ES corpora based on agent data. With this PRmake rallycommand can be executed to generate the required corpora and use it with rally to benchmark a local ES cluster.The PR also removes the
cat_bulk.pyscript. We don't have feature parity with the script as the script can be used to allow developers to run thecat_bulkserver independently and send traces to it using a custom code to generate ES corpora. The feature can be added as a new command in systemtest and all the building blocks for the same are already present however, I have not added it since there is no current use case for it.Checklist
- [ ] Update CHANGELOG.asciidoc- [ ] Update package changelog.yml (only if changes toapmpackagehave been made)dev_docs/rally.mdholds valid)How to test these changes
./testing/stack-monitoring.shmake rallyRelated issues
Part of #8754