Revert "sql: Add database ID to sampled query log"

Reverts: #84195
This reverts commit 307817e.

Release note (sql change): Removes the DatabaseID field from the
`SampledQuery` telemetry log due to the potential of indefinite blocking
in the case of a lease acquisition failure.

docs/generated/eventlog.md

@@ -2463,7 +2463,6 @@ contains common SQL event/execution details.
 | `Database` | Name of the database that initiated the query. | no |
 | `StatementID` | Statement ID of the query. | no |
 | `TransactionID` | Transaction ID of the query. | no |
-| `DatabaseID` | Database ID of the query. | no |
 | `StatementFingerprintID` | Statement fingerprint ID of the query. | no |
 | `MaxFullScanRowsEstimate` | Maximum number of rows scanned by a full scan, as estimated by the optimizer. | no |
 | `TotalScanRowsEstimate` | Total number of rows read by all scans in the query, as estimated by the optimizer. | no |

pkg/sql/exec_log.go

@@ -389,15 +389,14 @@ func (p *planner) maybeLogStatementInternal(
 		}
 		if telemetryMetrics.maybeUpdateLastEmittedTime(telemetryMetrics.timeNow(), requiredTimeElapsed) {
 			skippedQueries := telemetryMetrics.resetSkippedQueryCount()
-			databaseName := p.CurrentDatabase()
 			sampledQuery := eventpb.SampledQuery{
 				CommonSQLExecDetails:     execDetails,
 				SkippedQueries:           skippedQueries,
 				CostEstimate:             p.curPlan.instrumentation.costEstimate,
 				Distribution:             p.curPlan.instrumentation.distribution.String(),
 				PlanGist:                 p.curPlan.instrumentation.planGist.String(),
 				SessionID:                p.extendedEvalCtx.SessionID.String(),
-				Database:                 databaseName,
+				Database:                 p.CurrentDatabase(),
 				StatementID:              p.stmt.QueryID.String(),
 				TransactionID:            p.txn.ID().String(),
 				StatementFingerprintID:   uint64(stmtFingerprintID),
@@ -410,10 +409,6 @@ func (p *planner) maybeLogStatementInternal(
 				RowsRead:                 queryStats.rowsRead,
 				RowsWritten:              queryStats.rowsWritten,
 			}
-			db, _ := p.Descriptors().GetImmutableDatabaseByName(ctx, p.txn, databaseName, tree.DatabaseLookupFlags{Required: true})
-			if db != nil {
-				sampledQuery.DatabaseID = uint32(db.GetID())
-			}
 			p.logOperationalEventsOnlyExternally(ctx, eventLogEntry{event: &sampledQuery})
 		} else {
 			telemetryMetrics.incSkippedQueryCount()

pkg/sql/telemetry_logging_test.go

@@ -12,7 +12,6 @@ package sql
 
 import (
 	"context"
-	gosql "database/sql"
 	"fmt"
 	"math"
 	"regexp"
@@ -97,14 +96,10 @@ func TestTelemetryLogging(t *testing.T) {
 
 	var sessionID string
 	var databaseName string
-	var dbID uint32
 
 	db := sqlutils.MakeSQLRunner(sqlDB)
-	conn := db.DB.(*gosql.DB)
-
 	db.QueryRow(t, `SHOW session_id`).Scan(&sessionID)
 	db.QueryRow(t, `SHOW database`).Scan(&databaseName)
-	dbID = sqlutils.QueryDatabaseID(t, conn, databaseName)
 	db.Exec(t, `SET application_name = 'telemetry-logging-test'`)
 	db.Exec(t, `SET CLUSTER SETTING sql.telemetry.query_sampling.enabled = true;`)
 	db.Exec(t, "CREATE TABLE t();")
@@ -345,9 +340,6 @@ func TestTelemetryLogging(t *testing.T) {
 				if !strings.Contains(e.Message, "\"Database\":\""+databaseName+"\"") {
 					t.Errorf("expected to find Database: %s", databaseName)
 				}
-				if !strings.Contains(e.Message, "\"DatabaseID\":"+strconv.Itoa(int(dbID))) {
-					t.Errorf("expected to find DatabaseID: %v", dbID)
-				}
 				stmtFingerprintID := roachpb.ConstructStatementFingerprintID(tc.queryNoConstants, false, true, databaseName)
 				if !strings.Contains(e.Message, "\"StatementFingerprintID\":"+strconv.FormatUint(uint64(stmtFingerprintID), 10)) {
 					t.Errorf("expected to find StatementFingerprintID: %v", stmtFingerprintID)

pkg/util/log/eventpb/gen.go

@@ -343,6 +343,11 @@ func readInput(
 				return errors.Newf("field definition must not span multiple lines: %q", line)
 			}
 
+			// Skip reserved fields.
+			if reservedDefRe.MatchString(line) {
+				continue
+			}
+
 			// A field.
 			if strings.HasPrefix(line, "repeated") {
 				line = "array_of_" + strings.TrimSpace(strings.TrimPrefix(line, "repeated"))
@@ -448,6 +453,8 @@ var fieldDefRe = regexp.MustCompile(`\s*(?P<typ>[a-z._A-Z0-9]+)` +
 	`(.*"redact:\\"safeif:(?P<safeif>([^\\]|\\[^"])+)\\"")?` +
 	`).*$`)
 
+var reservedDefRe = regexp.MustCompile(`\s*(reserved ([1-9][0-9]*);)`)
+
 func camelToSnake(typeName string) string {
 	var res strings.Builder
 	res.WriteByte(typeName[0] + 'a' - 'A')

pkg/util/log/eventpb/telemetry.proto

@@ -59,9 +59,6 @@ message SampledQuery {
   // Transaction ID of the query.
   string transaction_id = 11 [(gogoproto.customname) = "TransactionID", (gogoproto.jsontag) = ',omitempty', (gogoproto.moretags) = "redact:\"nonsensitive\""];
 
-  // Database ID of the query.
-  uint32 database_id = 12 [(gogoproto.customname) = "DatabaseID", (gogoproto.jsontag) = ",omitempty"];
-
   // Statement fingerprint ID of the query.
   uint64 statement_fingerprint_id = 13 [(gogoproto.customname) = "StatementFingerprintID", (gogoproto.jsontag) = ',omitempty'];
 
@@ -92,6 +89,8 @@ message SampledQuery {
 
   // The number of rows written.
   int64 rows_written = 21 [(gogoproto.jsontag) = ",omitempty"];
+
+  reserved 12;
 }
 
 // CapturedIndexUsageStats