Skip to content

chore: collect log and dump for flaky tests - do not merge ！！！ #6402

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

Closed
zhaohuabing wants to merge 3 commits into from
Closed

chore: collect log and dump for flaky tests - do not merge ！！！ #6402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b367ad
collect log and dump for flaky test
zhaohuabing Jun 25, 2025
95654ea
Merge branch 'main' into collect-log-and-dump
zhaohuabing Jul 4, 2025
81e8a3a
Merge branch 'main' into collect-log-and-dump
zhaohuabing Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions internal/troubleshoot/collect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,10 @@ func CollectResult(ctx context.Context, restConfig *rest.Config, opts CollectOpt
}
}()

collectors := []tbcollect.Collector{
// Collect the custom resources from Gateway API and EG
collect.CustomResource{
ClientConfig: restConfig,
BundlePath: opts.BundlePath,
IncludeGroups: []string{
"gateway.envoyproxy.io",
"gateway.networking.k8s.io",
},
},
}
collectors := []tbcollect.Collector{}
for _, ns := range opts.CollectedNamespaces {
bundlePath := opts.BundlePath
collectors = append(collectors,
// Collect resources from EnvoyGateway system namespace
collect.EnvoyGatewayResource{
ClientConfig: restConfig,
BundlePath: bundlePath,
Namespace: ns,
},
// Collect logs from EnvoyGateway system namespace
&tbcollect.CollectLogs{
Collector: &troubleshootv1b2.Logs{
Expand All @@ -64,12 +48,6 @@ func CollectResult(ctx context.Context, restConfig *rest.Config, opts CollectOpt
BundlePath: bundlePath,
Context: ctx,
},
// Collect prometheus metrics from EnvoyGateway system namespace
collect.PrometheusMetric{
BundlePath: bundlePath,
ClientConfig: restConfig,
Namespace: ns,
},
// Collect config dump from EnvoyGateway system namespace
collect.ConfigDump{
BundlePath: bundlePath,
Expand Down
5 changes: 0 additions & 5 deletions test/e2e/tests/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,11 +612,6 @@ type LokiQueryResponse struct {
// CollectAndDump collects and dumps the cluster data for troubleshooting and log.
// This function should be call within t.Cleanup.
func CollectAndDump(t *testing.T, rest *rest.Config) {
if os.Getenv("ACTIONS_STEP_DEBUG") != "true" {
tlog.Logf(t, "Skipping collecting and dumping cluster data, set ACTIONS_STEP_DEBUG=true to enable it")
return
}

dumpedNamespaces := []string{"envoy-gateway-system"}
if IsGatewayNamespaceMode() {
dumpedNamespaces = append(dumpedNamespaces, ConformanceInfraNamespace)
Expand Down
Loading