Merge #145549 #147769

145549: upgrades: add 25.3 migration for hot range logging job r=angles-n-daemons a=angles-n-daemons

upgrades: add 25.3 migration for hot range logging job

In #143775, we added a hot range logging job which is meant to run on multi-tenant clusters. Here we add the requisite migrations, to versions 25.3 and beyond to add the job to clusters.

Fixes: #143527
Epic: CRDB-43150

Release note (general change): Adds a migration to start the hot range logging job.

147769: log, server: Create new log.EventLog() API r=dhartunian a=kyle-a-wong

This PR introduces a new log.EventLog() API that gives
first class support for writing to the system.eventlog
table. This API lives in the log package and doesn't
have a dependency on the sql package, making it easy
to use across the repo.

This is implemented using a new set of interfaces in
the log package that allows the system and tenant
servers to register new event log writers. The logic
for writing to the event log table is the same as
that which is sql/event_log.go. For now the code is
duplicated, but it will be removed in a future commit
when this file is updated to use the new API.

Epic: [CRDB-42978](https://cockroachlabs.atlassian.net/browse/CRDB-42978)
Release note: None

Co-authored-by: Brian Dillmann <[email protected]>
Co-authored-by: Kyle Wong <[email protected]>

Author: 3 people

docs/generated/settings/settings-for-tenants.txt

@@ -418,4 +418,4 @@ trace.zipkin.collector	string		the address of a Zipkin instance to receive trace
 ui.database_locality_metadata.enabled	boolean	true	if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute	application
 ui.default_timezone	string		the default timezone used to format timestamps in the ui	application
 ui.display_timezone	enumeration	etc/utc	the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the 'ui.default_timezone' setting instead. 'ui.default_timezone' takes precedence over this setting. [etc/utc = 0, america/new_york = 1]	application
-version	version	1000025.2-upgrading-to-1000025.3-step-006	set the active cluster version in the format '<major>.<minor>'	application
+version	version	1000025.2-upgrading-to-1000025.3-step-008	set the active cluster version in the format '<major>.<minor>'	application

docs/generated/settings/settings.html

@@ -376,6 +376,6 @@
 <tr><td><div id="setting-ui-database-locality-metadata-enabled" class="anchored"><code>ui.database_locality_metadata.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-ui-default-timezone" class="anchored"><code>ui.default_timezone</code></div></td><td>string</td><td><code></code></td><td>the default timezone used to format timestamps in the ui</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-ui-display-timezone" class="anchored"><code>ui.display_timezone</code></div></td><td>enumeration</td><td><code>etc/utc</code></td><td>the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the &#39;ui.default_timezone&#39; setting instead. &#39;ui.default_timezone&#39; takes precedence over this setting. [etc/utc = 0, america/new_york = 1]</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
-<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.2-upgrading-to-1000025.3-step-006</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
+<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.2-upgrading-to-1000025.3-step-008</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 </tbody>
 </table>

pkg/BUILD.bazel

@@ -753,6 +753,7 @@ ALL_TESTS = [
     "//pkg/util/json:json_test",
     "//pkg/util/jsonpath/parser:parser_test",
     "//pkg/util/limit:limit_test",
+    "//pkg/util/log/eventlog:eventlog_test",
     "//pkg/util/log/eventpb:eventpb_test",
     "//pkg/util/log/logconfig:logconfig_test",
     "//pkg/util/log/logcrash:logcrash_test",
@@ -2624,6 +2625,8 @@ GO_TARGETS = [
     "//pkg/util/limit:limit",
     "//pkg/util/limit:limit_test",
     "//pkg/util/log/channel:channel",
+    "//pkg/util/log/eventlog:eventlog",
+    "//pkg/util/log/eventlog:eventlog_test",
     "//pkg/util/log/eventpb/eventpbgen:eventpbgen",
     "//pkg/util/log/eventpb/eventpbgen:eventpbgen_lib",
     "//pkg/util/log/eventpb:eventpb",

pkg/base/serverident/server_ident.go

@@ -50,6 +50,10 @@ type ServerIdentificationPayload interface {
 	ServerIdentityString(key ServerIdentificationKey) string
 }
 
+type ServerIdentifier interface {
+	GetServerIdentificationPayload() ServerIdentificationPayload
+}
+
 // ServerIdentificationKey represents a possible parameter to the
 // ServerIdentityString() method in ServerIdentificationPayload.
 type ServerIdentificationKey int

pkg/ccl/spanconfigccl/spanconfigsqltranslatorccl/BUILD.bazel

@@ -34,6 +34,7 @@ go_test(
         "//pkg/testutils/skip",
         "//pkg/testutils/sqlutils",
         "//pkg/testutils/testcluster",
+        "//pkg/upgrade/upgradebase",
         "//pkg/util/leaktest",
         "//pkg/util/log",
         "//pkg/util/randutil",

pkg/ccl/spanconfigccl/spanconfigsqltranslatorccl/datadriven_test.go

@@ -33,6 +33,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
+	"github.com/cockroachdb/cockroach/pkg/upgrade/upgradebase"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/syncutil"
@@ -120,6 +121,9 @@ func TestDataDriven(t *testing.T) {
 					GCJob:       gcTestingKnobs,
 					SpanConfig:  scKnobs,
 					SQLExecutor: sqlExecutorKnobs,
+					UpgradeManager: &upgradebase.TestingKnobs{
+						SkipHotRangesLoggerJobBootstrap: true,
+					},
 				},
 				StoreSpecs: []base.StoreSpec{
 					{InMemory: true, Attributes: []string{attr}},

pkg/ccl/telemetryccl/BUILD.bazel

@@ -30,6 +30,7 @@ go_test(
         "//pkg/testutils/testcluster",
         "//pkg/util/leaktest",
         "//pkg/util/log",
+        "//pkg/util/log/eventlog",
         "//pkg/util/log/eventpb",
         "//pkg/util/log/logpb",
         "//pkg/util/log/logtestutils",

pkg/ccl/telemetryccl/telemetry_logging_test.go

@@ -28,6 +28,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
+	"github.com/cockroachdb/cockroach/pkg/util/log/eventlog"
 	"github.com/cockroachdb/cockroach/pkg/util/log/eventpb"
 	"github.com/cockroachdb/cockroach/pkg/util/log/logpb"
 	"github.com/cockroachdb/cockroach/pkg/util/log/logtestutils"
@@ -218,7 +219,7 @@ func TestBulkJobTelemetryLogging(t *testing.T) {
 	testCluster := serverutils.StartCluster(t, 1, base.TestClusterArgs{
 		ServerArgs: base.TestServerArgs{
 			Knobs: base.TestingKnobs{
-				EventLog: &sql.EventLogTestingKnobs{
+				EventLog: &eventlog.EventLogTestingKnobs{
 					// The sampling checks below need to have a deterministic
 					// number of statements run by internal executor.
 					SyncWrites: true,

pkg/cli/testdata/doctor/test_examine_cluster

@@ -3,5 +3,5 @@ debug doctor examine cluster
 debug doctor examine cluster
 Examining 69 descriptors and 68 namespace entries...
   ParentID 100, ParentSchemaID 101: relation "foo" (105): expected matching namespace entry, found none
-Examining 12 jobs...
+Examining 13 jobs...
 ERROR: validation failed

pkg/cli/testdata/doctor/test_examine_cluster_dropped

@@ -2,5 +2,5 @@ debug doctor examine cluster
 ----
 debug doctor examine cluster
 Examining 68 descriptors and 68 namespace entries...
-Examining 10 jobs...
+Examining 11 jobs...
 No problems found!