run make generate in CI

.github/buildomat/jobs/lint.sh

@@ -9,8 +9,10 @@ set -o pipefail
 set -o xtrace
 
 source .github/buildomat/linux-setup.sh
-gmake -j"$(nproc)" lint
 
-# verify go.mod is up to date
-go mod tidy
-git diff --exit-code
+failed=0
+gmake -j"$(nproc)" lint || ((++failed))
+gmake -j"$(nproc)" generate || ((++failed))
+go mod tidy || ((++failed))
+git diff --exit-code || ((++failed))
+((!failed)) || exit

build/bazelutil/generate_redact_safe.sh

@@ -5,11 +5,11 @@ set -euo pipefail
 echo "The following types are considered always safe for reporting:"
 echo
 echo "File | Type"; echo "--|--"
-git grep --recurse-submodules -n '^func \(.*\) SafeValue\(\)' | \
+grep -r -n '^func \(.*\) SafeValue\(\)' | \
     grep -v '^vendor/github.com/cockroachdb/redact' | \
     sed -E -e 's/^([^:]*):[0-9]+:func \(([^ ]* )?(.*)\) SafeValue.*$$/\1 | \`\3\`/g' | \
     LC_ALL=C sort
-git grep --recurse-submodules -n 'redact\.RegisterSafeType' | \
+grep -r -n 'redact\.RegisterSafeType' | \
     grep -vE '^([^:]*):[0-9]+:[ 	]*//' | \
     grep -v '^vendor/github.com/cockroachdb/redact' | \
     sed -E -e 's/^([^:]*):[0-9]+:.*redact\.RegisterSafeType\((.*)\).*/\1 | \`\2\`/g' | \

docs/generated/redact_safe.md

@@ -47,7 +47,6 @@ pkg/storage/enginepb/mvcc.go | `TxnEpoch`
 pkg/storage/enginepb/mvcc.go | `TxnSeq`
 pkg/storage/enginepb/mvcc3.go | `*MVCCStats`
 pkg/storage/enginepb/mvcc3.go | `MVCCStatsDelta`
-pkg/streaming/api.go | `StreamID`
 pkg/util/hlc/timestamp.go | `ClockTimestamp`
 pkg/util/hlc/timestamp.go | `LegacyTimestamp`
 pkg/util/hlc/timestamp.go | `Timestamp`

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

@@ -11,8 +11,6 @@ cloudstorage.timeout	duration	10m0s	the timeout for import/export storage operat
 cluster.organization	string		organization name
 cluster.preserve_downgrade_option	string		disable (automatic or manual) cluster version upgrade from the specified version until reset
 diagnostics.forced_sql_stat_reset.interval	duration	2h0m0s	interval after which the reported SQL Stats are reset even if not collected by telemetry reporter. It has a max value of 24H.
-diagnostics.reporting.enabled	boolean	true	enable reporting diagnostic metrics to cockroach labs
-diagnostics.reporting.interval	duration	1h0m0s	interval at which diagnostics data should be reported
 external.graphite.endpoint	string		if nonempty, push server metrics to the Graphite or Carbon server at the specified host:port
 external.graphite.interval	duration	10s	the interval at which metrics are pushed to Graphite (if enabled)
 feature.export.enabled	boolean	true	set to true to enable exports, false to disable; default is true

docs/generated/settings/settings.html

@@ -17,8 +17,6 @@
 <tr><td><code>cluster.preserve_downgrade_option</code></td><td>string</td><td><code></code></td><td>disable (automatic or manual) cluster version upgrade from the specified version until reset</td></tr>
 <tr><td><code>diagnostics.active_query_dumps.enabled</code></td><td>boolean</td><td><code>true</code></td><td>experimental: enable dumping of anonymized active queries to disk when node is under memory pressure</td></tr>
 <tr><td><code>diagnostics.forced_sql_stat_reset.interval</code></td><td>duration</td><td><code>2h0m0s</code></td><td>interval after which the reported SQL Stats are reset even if not collected by telemetry reporter. It has a max value of 24H.</td></tr>
-<tr><td><code>diagnostics.reporting.enabled</code></td><td>boolean</td><td><code>true</code></td><td>enable reporting diagnostic metrics to cockroach labs</td></tr>
-<tr><td><code>diagnostics.reporting.interval</code></td><td>duration</td><td><code>1h0m0s</code></td><td>interval at which diagnostics data should be reported</td></tr>
 <tr><td><code>external.graphite.endpoint</code></td><td>string</td><td><code></code></td><td>if nonempty, push server metrics to the Graphite or Carbon server at the specified host:port</td></tr>
 <tr><td><code>external.graphite.interval</code></td><td>duration</td><td><code>10s</code></td><td>the interval at which metrics are pushed to Graphite (if enabled)</td></tr>
 <tr><td><code>feature.export.enabled</code></td><td>boolean</td><td><code>true</code></td><td>set to true to enable exports, false to disable; default is true</td></tr>

docs/generated/swagger/spec.json

@@ -1007,7 +1007,7 @@
       "x-go-package": "github.com/cockroachdb/cockroach/pkg/server/serverpb"
     },
     "GCPolicy": {
-      "description": "TODO(spencer): flesh this out to include maximum number of values\nas well as whether there's an intersection between max values\nand TTL or a union.",
+      "description": "TODO(spencer): flesh this out to include maximum number of values\n\nas well as whether there's an intersection between max values\nand TTL or a union.",
       "type": "object",
       "title": "GCPolicy defines garbage collection policies which apply to MVCC\nvalues within a zone.",
       "properties": {
@@ -1803,7 +1803,7 @@
           "$ref": "#/definitions/GCPolicy"
         },
         "global_reads": {
-          "description": "GlobalReads specifies whether transactions operating over the range(s)\nshould be configured to provide non-blocking behavior, meaning that reads\ncan be served consistently from all replicas and do not block on writes. In\nexchange, writes get pushed into the future and must wait on commit to\nensure linearizability. For more, see:\nhttps://github.com/cockroachdb/cockroach/blob/master/docs/RFCS/20200811_non_blocking_txns.md",
+          "description": "GlobalReads specifies whether transactions operating over the range(s)\nshould be configured to provide non-blocking behavior, meaning that reads\ncan be served consistently from all replicas and do not block on writes. In\nexchange, writes get pushed into the future and must wait on commit to\nensure linearizability. For more, see:\n\nhttps://github.com/cockroachdb/cockroach/blob/master/docs/RFCS/20200811_non_blocking_txns.md",
           "type": "boolean",
           "x-go-name": "GlobalReads"
         },