From 15258747e21ec9e9c7ad621389476a4f9140740d Mon Sep 17 00:00:00 2001 From: Rail Aliiev Date: Wed, 2 Feb 2022 11:08:19 -0500 Subject: [PATCH] build: address util.log.logcrash package rename After `util.log` was renamed to `util.log.logcrash`, the build system stopped updating the Sentry environment variable properly. Instead of setting it to the release version, it was falling back to the default "development" value. As a result, all Sentry reports went to the development environment bucket. This patch addresses the name change. Release note: None Release justification: fixes Sentry-to-GitHub crash reporting --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b0d979b18ae4..417d1ec6b634 100644 --- a/Makefile +++ b/Makefile @@ -986,7 +986,7 @@ $(go-targets): override LINKFLAGS += \ -X "github.com/cockroachdb/cockroach/pkg/build.rev=$(shell cat .buildinfo/rev)" \ -X "github.com/cockroachdb/cockroach/pkg/build.cgoTargetTriple=$(TARGET_TRIPLE)" \ $(if $(BUILDCHANNEL),-X "github.com/cockroachdb/cockroach/pkg/build.channel=$(BUILDCHANNEL)") \ - $(if $(BUILD_TAGGED_RELEASE),-X "github.com/cockroachdb/cockroach/pkg/util/log.crashReportEnv=$(if $(BUILDINFO_TAG),$(BUILDINFO_TAG),$(shell cat .buildinfo/tag))") + $(if $(BUILD_TAGGED_RELEASE),-X "github.com/cockroachdb/cockroach/pkg/util/log/logcrash.crashReportEnv=$(if $(BUILDINFO_TAG),$(BUILDINFO_TAG),$(shell cat .buildinfo/tag))") # The build.utcTime format must remain in sync with TimeFormat in # pkg/build/info.go. It is not installed in tests or in `buildshort` to avoid