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

Reverts: cockroachdb#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 |
 
 

pkg/sql/exec_log.go

@@ -387,23 +387,18 @@ 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),
 			}
-			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,11 +12,9 @@ package sql
 
 import (
 	"context"
-	gosql "database/sql"
 	"fmt"
 	"math"
 	"regexp"
-	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -97,14 +95,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();")
@@ -280,9 +274,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/telemetry.proto

@@ -59,11 +59,8 @@ 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'];
+  uint64 statement_fingerprint_id = 12 [(gogoproto.customname) = "StatementFingerprintID", (gogoproto.jsontag) = ',omitempty'];
 }
 
 // CapturedIndexUsageStats