sql: add identifiers to sampled query

docs/generated/eventlog.md

@@ -2459,6 +2459,10 @@ contains common SQL event/execution details.
 | `CostEstimate` | Cost of the query as estimated by the optimizer. | no |
 | `Distribution` | The distribution of the DistSQL query plan (local, full, or partial). | no |
 | `PlanGist` | The query's plan gist bytes as a base64 encoded string. | no |
+| `SessionID` | SessionID is the ID of the session that initiated the query. | no |
+| `Database` | Name of the database that initiated the query. | no |
+| `StatementID` | Statement ID of the query. | no |
+| `TransactionID` | Transaction ID of the query. | no |
 
 
 #### Common fields

pkg/sql/exec_log.go

@@ -390,6 +390,10 @@ func (p *planner) maybeLogStatementInternal(
 				CostEstimate:         p.curPlan.instrumentation.costEstimate,
 				Distribution:         p.curPlan.instrumentation.distribution.String(),
 				PlanGist:             p.curPlan.instrumentation.planGist.String(),
+				SessionID:            p.extendedEvalCtx.SessionID.String(),
+				Database:             p.CurrentDatabase(),
+				StatementID:          p.stmt.QueryID.String(),
+				TransactionID:        p.txn.ID().String(),
 			}})
 		} else {
 			telemetryMetrics.incSkippedQueryCount()

pkg/sql/telemetry_logging_test.go

@@ -92,7 +92,12 @@ func TestTelemetryLogging(t *testing.T) {
 
 	defer s.Stopper().Stop(context.Background())
 
+	var sessionID string
+	var databaseName string
+
 	db := sqlutils.MakeSQLRunner(sqlDB)
+	db.QueryRow(t, `SHOW session_id`).Scan(&sessionID)
+	db.QueryRow(t, `SHOW database`).Scan(&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();")
@@ -236,6 +241,16 @@ func TestTelemetryLogging(t *testing.T) {
 				if !planGist.MatchString(e.Message) {
 					t.Errorf("expected to find PlanGist but none was found in: %s", e.Message)
 				}
+				// Match StatementID on any non-empty string value.
+				stmtID := regexp.MustCompile("\"StatementID\":(\"\\S+\")")
+				if !stmtID.MatchString(e.Message) {
+					t.Errorf("expected to find StatementID but none was found in: %s", e.Message)
+				}
+				// Match TransactionID on any non-empty string value.
+				txnID := regexp.MustCompile("\"TransactionID\":(\"\\S+\")")
+				if !txnID.MatchString(e.Message) {
+					t.Errorf("expected to find TransactionID but none was found in: %s", e.Message)
+				}
 				for _, eTag := range tc.expectedUnredactedTags {
 					for _, tag := range strings.Split(e.Tags, ",") {
 						kv := strings.Split(tag, "=")
@@ -247,6 +262,12 @@ func TestTelemetryLogging(t *testing.T) {
 				if !strings.Contains(e.Message, "\"ApplicationName\":\""+tc.expectedApplicationName+"\"") {
 					t.Errorf("expected to find unredacted Application Name: %s", tc.expectedApplicationName)
 				}
+				if !strings.Contains(e.Message, "\"SessionID\":\""+sessionID+"\"") {
+					t.Errorf("expected to find sessionID: %s", sessionID)
+				}
+				if !strings.Contains(e.Message, "\"Database\":\""+databaseName+"\"") {
+					t.Errorf("expected to find Database: %s", databaseName)
+				}
 			}
 		}
 		if logCount != expectedLogCount {

pkg/util/log/eventpb/telemetry.proto

@@ -46,6 +46,18 @@ message SampledQuery {
 
   // The query's plan gist bytes as a base64 encoded string.
   string plan_gist = 7 [(gogoproto.jsontag) = ',omitempty', (gogoproto.moretags) = "redact:\"nonsensitive\""];
+
+  // SessionID is the ID of the session that initiated the query.
+  string session_id = 8 [(gogoproto.customname) = "SessionID", (gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""];
+
+  // Name of the database that initiated the query.
+  string database = 9 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""];
+
+  // Statement ID of the query.
+  string statement_id = 10 [(gogoproto.customname) = "StatementID", (gogoproto.jsontag) = ',omitempty', (gogoproto.moretags) = "redact:\"nonsensitive\""];
+
+  // Transaction ID of the query.
+  string transaction_id = 11 [(gogoproto.customname) = "TransactionID", (gogoproto.jsontag) = ',omitempty', (gogoproto.moretags) = "redact:\"nonsensitive\""];
 }
 
 // CapturedIndexUsageStats