errorutil: move SendReport to new sentryutil package

The `SendReport` function has been moved out of the errorutil package
and into a new sentryutil package. This avoids muddling the errorutil
package with a Sentry-specific function, and it breaks errorutil's
dependence on `pkg/settings` and `pkg/util/log/logcrash`.

Release note: None

pkg/BUILD.bazel

@@ -2419,6 +2419,7 @@ GO_TARGETS = [
     "//pkg/util/sdnotify:sdnotify_test",
     "//pkg/util/search:search",
     "//pkg/util/search:search_test",
+    "//pkg/util/sentryutil:sentryutil",
     "//pkg/util/shuffle:shuffle",
     "//pkg/util/shuffle:shuffle_test",
     "//pkg/util/slidingwindow:slidingwindow",

pkg/sql/BUILD.bazel

@@ -564,6 +564,7 @@ go_library(
         "//pkg/util/rangedesc",
         "//pkg/util/retry",
         "//pkg/util/ring",
+        "//pkg/util/sentryutil",
         "//pkg/util/startup",
         "//pkg/util/stop",
         "//pkg/util/syncutil",

pkg/sql/conn_executor.go

@@ -80,6 +80,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/log/severity"
 	"github.com/cockroachdb/cockroach/pkg/util/metric"
 	"github.com/cockroachdb/cockroach/pkg/util/mon"
+	"github.com/cockroachdb/cockroach/pkg/util/sentryutil"
 	"github.com/cockroachdb/cockroach/pkg/util/stop"
 	"github.com/cockroachdb/cockroach/pkg/util/syncutil"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
@@ -3776,7 +3777,7 @@ func (ex *connExecutor) txnStateTransitionsApplyWrapper(
 				errors.Safe(advInfo.txnEvent.eventType.String()),
 				res.Err())
 			log.Errorf(ex.Ctx(), "%v", err)
-			errorutil.SendReport(ex.Ctx(), &ex.server.cfg.Settings.SV, err)
+			sentryutil.SendReport(ex.Ctx(), &ex.server.cfg.Settings.SV, err)
 			return advanceInfo{}, err
 		}
 

pkg/sql/opt/norm/BUILD.bazel

@@ -57,6 +57,7 @@ go_library(
         "//pkg/util/errorutil",
         "//pkg/util/intsets",
         "//pkg/util/json",
+        "//pkg/util/sentryutil",
         "@com_github_cockroachdb_apd_v3//:apd",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_cockroachdb_redact//:redact",

pkg/sql/opt/norm/factory.go

@@ -27,6 +27,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/buildutil"
 	"github.com/cockroachdb/cockroach/pkg/util/errorutil"
 	"github.com/cockroachdb/cockroach/pkg/util/intsets"
+	"github.com/cockroachdb/cockroach/pkg/util/sentryutil"
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/redact"
 )
@@ -411,7 +412,7 @@ func (f *Factory) onMaxConstructorStackDepthExceeded() {
 	if buildutil.CrdbTestBuild {
 		panic(err)
 	}
-	errorutil.SendReport(f.ctx, &f.evalCtx.Settings.SV, err)
+	sentryutil.SendReport(f.ctx, &f.evalCtx.Settings.SV, err)
 }
 
 // onConstructRelational is called as a final step by each factory method that

pkg/sql/stats/BUILD.bazel

@@ -55,6 +55,7 @@ go_library(
         "//pkg/util/log/logcrash",
         "//pkg/util/mon",
         "//pkg/util/protoutil",
+        "//pkg/util/sentryutil",
         "//pkg/util/stop",
         "//pkg/util/syncutil",
         "//pkg/util/timeutil",

pkg/sql/stats/forecast.go

@@ -28,6 +28,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/errorutil"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/log/logcrash"
+	"github.com/cockroachdb/cockroach/pkg/util/sentryutil"
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/redact"
 )
@@ -343,7 +344,7 @@ func forecastColumnStatistics(
 					"forecasted histogram had first bucket with non-zero NumRange or DistinctRange: %s",
 					debugging,
 				)
-				errorutil.SendReport(ctx, sv, err)
+				sentryutil.SendReport(ctx, sv, err)
 				return nil, err
 			}
 			if bucket.UpperBound != tree.DNull {

pkg/util/errorutil/BUILD.bazel

@@ -12,9 +12,7 @@ go_library(
     importpath = "github.com/cockroachdb/cockroach/pkg/util/errorutil",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/settings",
         "//pkg/util/errorutil/unimplemented",
-        "//pkg/util/log/logcrash",
         "@com_github_cockroachdb_errors//:errors",
     ],
 )

pkg/util/errorutil/error.go

@@ -11,11 +11,8 @@
 package errorutil
 
 import (
-	"context"
 	"fmt"
 
-	"github.com/cockroachdb/cockroach/pkg/settings"
-	"github.com/cockroachdb/cockroach/pkg/util/log/logcrash"
 	"github.com/cockroachdb/errors"
 )
 
@@ -37,14 +34,3 @@ func UnexpectedWithIssueErrorf(issue int, format string, args ...interface{}) er
 			issue))
 	return err
 }
-
-// SendReport creates a Sentry report about the error, if the settings allow.
-// The format string will be reproduced ad litteram in the report; the arguments
-// will be sanitized.
-func SendReport(ctx context.Context, sv *settings.Values, err error) {
-	if !logcrash.ShouldSendReport(sv) {
-		return
-	}
-	event, extraDetails := errors.BuildSentryReport(err)
-	logcrash.SendReport(ctx, logcrash.ReportTypeError, event, extraDetails)
-}

pkg/util/sentryutil/BUILD.bazel

@@ -0,0 +1,13 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "sentryutil",
+    srcs = ["sentry.go"],
+    importpath = "github.com/cockroachdb/cockroach/pkg/util/sentryutil",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/settings",
+        "//pkg/util/log/logcrash",
+        "@com_github_cockroachdb_errors//:errors",
+    ],
+)

pkg/util/sentryutil/sentry.go

@@ -0,0 +1,30 @@
+// Copyright 2023 The Cockroach Authors.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+package sentryutil
+
+import (
+	"context"
+
+	"github.com/cockroachdb/cockroach/pkg/settings"
+	"github.com/cockroachdb/cockroach/pkg/util/log/logcrash"
+	"github.com/cockroachdb/errors"
+)
+
+// SendReport creates a Sentry report about the error, if the settings allow.
+// The format string will be reproduced ad litteram in the report; the arguments
+// will be sanitized.
+func SendReport(ctx context.Context, sv *settings.Values, err error) {
+	if !logcrash.ShouldSendReport(sv) {
+		return
+	}
+	event, extraDetails := errors.BuildSentryReport(err)
+	logcrash.SendReport(ctx, logcrash.ReportTypeError, event, extraDetails)
+}