Merge branch 'vitessio:main' into main

ansible/macrobench.yml

@@ -43,7 +43,7 @@
     gateway_targets: "{% set targets = [] -%}{% for host in groups['vtgate'] -%}{% for gateway in hostvars[host]['gateways'] -%}{{ targets.append( hostvars[host]['ansible_default_ipv4']['address']+':'+ (gateway.port | default(15001) | string )) }}{% endfor -%}{% endfor -%}{{ targets }}"
     vtctld_targets: "{% set targets = [] -%}{% for host in groups['vtctld'] -%}{{ targets.append( hostvars[host]['ansible_default_ipv4']['address']+':'+ (vtctld_port | default(15000) | string )) }}{% endfor -%}{{ targets }}"
     node_targets: "{% set targets= [] -%}{% for host in groups['all'] -%}{{ targets.append( hostvars[host]['ansible_default_ipv4']['address']+':9100' ) }}{% endfor -%}{{ targets }}"
-    prometheus_skip_install: true
+    prometheus_skip_install: false
     prometheus_targets:
       tablets:
         - targets: '{{ tablet_targets }}'

go/tools/macrobench/vtgate.go

@@ -19,9 +19,11 @@
 package macrobench
 
 import (
+	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"net/http"
 	"sort"
 	"strings"
@@ -42,6 +44,8 @@ type VTGateQueryPlanValue struct {
 	RowsReturned int // Total number of rows
 	RowsAffected int // Total number of rows
 	Errors       int // Total number of errors
+
+	TablesUsed interface{}
 }
 
 type VTGateQueryPlan struct {
@@ -158,8 +162,32 @@ func getVTGateQueryPlans(port string) (VTGateQueryPlanMap, error) {
 	}
 	defer resp.Body.Close()
 
+	respBytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	var response map[string]VTGateQueryPlanValue
+	err = json.NewDecoder(bytes.NewReader(respBytes)).Decode(&response)
+	if err != nil {
+		return getOldVTGateQueryPlans(respBytes)
+	}
+	for key, plan := range response {
+		// keeping only select statements
+		if strings.HasPrefix(key, "select") {
+			jsonPlan, err := json.MarshalIndent(plan.Instructions, "", "\t")
+			if err != nil {
+				return nil, err
+			}
+			plan.Instructions = string(jsonPlan)
+		}
+	}
+	return response, nil
+}
+
+func getOldVTGateQueryPlans(respBytes []byte) (VTGateQueryPlanMap, error) {
 	var response []VTGateQueryPlan
-	err = json.NewDecoder(resp.Body).Decode(&response)
+	err := json.NewDecoder(bytes.NewReader(respBytes)).Decode(&response)
 	if err != nil {
 		return nil, err
 	}
@@ -230,7 +258,7 @@ func GetVTGateSelectQueryPlansWithFilter(gitRef string, macroType Type, planner
 		case []byte:
 			plan.Value.Instructions = string(p)
 		}
-		
+
 		// Remove all comments from the query
 		// This prevents the query from not match across two versions
 		// of Vitess where we changed query hints and added comments