Consistently use oTelShutdown name

mcpherrinm · mcpherrinm · commit ca7cb186b0e5 · 2023-04-20T11:46:10.000-04:00
diff --git a/cmd/akamai-purger/main.go b/cmd/akamai-purger/main.go
@@ -293,8 +293,8 @@ func main() {
 		apc.DebugAddr = *debugAddr
 	}
 
-	scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, apc.DebugAddr)
-	defer shutdown(context.Background())
+	scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, apc.DebugAddr)
+	defer oTelShutdown(context.Background())
 	defer logger.AuditPanic()
 	logger.Info(cmd.VersionString())
 
diff --git a/cmd/bad-key-revoker/main.go b/cmd/bad-key-revoker/main.go
@@ -439,8 +439,8 @@ func main() {
 	err := cmd.ReadConfigFile(*configPath, &config)
 	cmd.FailOnError(err, "Failed reading config file")
 
-	scope, logger, shutdown := cmd.StatsAndLogging(config.Syslog, config.OpenTelemetry, config.BadKeyRevoker.DebugAddr)
-	defer shutdown(context.Background())
+	scope, logger, oTelShutdown := cmd.StatsAndLogging(config.Syslog, config.OpenTelemetry, config.BadKeyRevoker.DebugAddr)
+	defer oTelShutdown(context.Background())
 	clk := cmd.Clock()
 
 	scope.MustRegister(keysProcessed)
diff --git a/cmd/boulder-ca/main.go b/cmd/boulder-ca/main.go
@@ -171,8 +171,8 @@ func main() {
 		cmd.Fail("Error in CA config: MaxNames must not be 0")
 	}
 
-	scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.CA.DebugAddr)
-	defer shutdown(context.Background())
+	scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.CA.DebugAddr)
+	defer oTelShutdown(context.Background())
 	defer logger.AuditPanic()
 	logger.Info(cmd.VersionString())
 
diff --git a/cmd/boulder-publisher/main.go b/cmd/boulder-publisher/main.go
@@ -66,8 +66,8 @@ func main() {
 		c.Publisher.UserAgent = "certificate-transparency-go/1.0"
 	}
 
-	scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.Publisher.DebugAddr)
-	defer shutdown(context.Background())
+	scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.Publisher.DebugAddr)
+	defer oTelShutdown(context.Background())
 	defer logger.AuditPanic()
 	logger.Info(cmd.VersionString())
 
diff --git a/cmd/boulder-ra/main.go b/cmd/boulder-ra/main.go
@@ -123,8 +123,8 @@ func main() {
 		c.RA.DebugAddr = *debugAddr
 	}
 
-	scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.RA.DebugAddr)
-	defer shutdown(context.Background())
+	scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.RA.DebugAddr)
+	defer oTelShutdown(context.Background())
 	defer logger.AuditPanic()
 	logger.Info(cmd.VersionString())
 
diff --git a/cmd/boulder-sa/main.go b/cmd/boulder-sa/main.go
@@ -57,8 +57,8 @@ func main() {
 		c.SA.DebugAddr = *debugAddr
 	}
 
-	scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.SA.DebugAddr)
-	defer shutdown(context.Background())
+	scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.SA.DebugAddr)
+	defer oTelShutdown(context.Background())
 	defer logger.AuditPanic()
 	logger.Info(cmd.VersionString())
 
diff --git a/cmd/boulder-va/main.go b/cmd/boulder-va/main.go
@@ -75,8 +75,8 @@ func main() {
 		c.VA.DebugAddr = *debugAddr
 	}
 
-	scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.VA.DebugAddr)
-	defer shutdown(context.Background())
+	scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.VA.DebugAddr)
+	defer oTelShutdown(context.Background())
 	defer logger.AuditPanic()
 	logger.Info(cmd.VersionString())
 
diff --git a/cmd/crl-storer/main.go b/cmd/crl-storer/main.go
@@ -85,8 +85,8 @@ func main() {
 	tlsConfig, err := c.CRLStorer.TLS.Load()
 	cmd.FailOnError(err, "TLS config")
 
-	scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.CRLStorer.DebugAddr)
-	defer shutdown(context.Background())
+	scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.CRLStorer.DebugAddr)
+	defer oTelShutdown(context.Background())
 	defer logger.AuditPanic()
 	logger.Info(cmd.VersionString())
 	clk := cmd.Clock()
diff --git a/cmd/crl-updater/main.go b/cmd/crl-updater/main.go
@@ -118,8 +118,8 @@ func main() {
 	tlsConfig, err := c.CRLUpdater.TLS.Load()
 	cmd.FailOnError(err, "TLS config")
 
-	scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.CRLUpdater.DebugAddr)
-	defer shutdown(context.Background())
+	scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.CRLUpdater.DebugAddr)
+	defer oTelShutdown(context.Background())
 	defer logger.AuditPanic()
 	logger.Info(cmd.VersionString())
 	clk := cmd.Clock()
diff --git a/cmd/expiration-mailer/main.go b/cmd/expiration-mailer/main.go
@@ -800,8 +800,8 @@ func main() {
 	err = features.Set(c.Mailer.Features)
 	cmd.FailOnError(err, "Failed to set feature flags")
 
-	scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.Mailer.DebugAddr)
-	defer shutdown(context.Background())
+	scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.Mailer.DebugAddr)
+	defer oTelShutdown(context.Background())
 	defer logger.AuditPanic()
 	logger.Info(cmd.VersionString())
 
diff --git a/cmd/log-validator/main.go b/cmd/log-validator/main.go
@@ -151,8 +151,8 @@ func main() {
 	err = json.Unmarshal(configBytes, &config)
 	cmd.FailOnError(err, "failed to parse config file")
 
-	stats, logger, shutdown := cmd.StatsAndLogging(config.Syslog, config.OpenTelemetry, config.DebugAddr)
-	defer shutdown(context.Background())
+	stats, logger, oTelShutdown := cmd.StatsAndLogging(config.Syslog, config.OpenTelemetry, config.DebugAddr)
+	defer oTelShutdown(context.Background())
 	lineCounter := prometheus.NewCounterVec(prometheus.CounterOpts{
 		Name: "log_lines",
 		Help: "A counter of log lines processed, with status",
diff --git a/cmd/nonce-service/main.go b/cmd/nonce-service/main.go
@@ -100,8 +100,8 @@ func main() {
 		cmd.FailOnError(err, "Failed to derive nonce prefix")
 	}
 
-	scope, logger, shutdown := cmd.StatsAndLogging(c.NonceService.Syslog, c.NonceService.OpenTelemetry, c.NonceService.DebugAddr)
-	defer shutdown(context.Background())
+	scope, logger, oTelShutdown := cmd.StatsAndLogging(c.NonceService.Syslog, c.NonceService.OpenTelemetry, c.NonceService.DebugAddr)
+	defer oTelShutdown(context.Background())
 	defer logger.AuditPanic()
 	logger.Info(cmd.VersionString())
 
diff --git a/cmd/rocsp-tool/main.go b/cmd/rocsp-tool/main.go
@@ -95,8 +95,8 @@ func main2() error {
 		return fmt.Errorf("reading JSON config file: %w", err)
 	}
 
-	_, logger, shutdown := cmd.StatsAndLogging(conf.Syslog, conf.OpenTelemetry, conf.ROCSPTool.DebugAddr)
-	defer shutdown(context.Background())
+	_, logger, oTelShutdown := cmd.StatsAndLogging(conf.Syslog, conf.OpenTelemetry, conf.ROCSPTool.DebugAddr)
+	defer oTelShutdown(context.Background())
 	defer logger.AuditPanic()
 
 	clk := cmd.Clock()

Original file line number	Diff line number	Diff line change
`@@ -293,8 +293,8 @@ func main() {`
`293`	`293`	`apc.DebugAddr = *debugAddr`
`294`	`294`	`}`
`295`	`295`
`296`		`- scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, apc.DebugAddr)`
`297`		`- defer shutdown(context.Background())`
	`296`	`+ scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, apc.DebugAddr)`
	`297`	`+ defer oTelShutdown(context.Background())`
`298`	`298`	`defer logger.AuditPanic()`
`299`	`299`	`logger.Info(cmd.VersionString())`
`300`	`300`
Original file line number	Diff line number	Diff line change
`@@ -171,8 +171,8 @@ func main() {`
`171`	`171`	`cmd.Fail("Error in CA config: MaxNames must not be 0")`
`172`	`172`	`}`
`173`	`173`
`174`		`- scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.CA.DebugAddr)`
`175`		`- defer shutdown(context.Background())`
	`174`	`+ scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.CA.DebugAddr)`
	`175`	`+ defer oTelShutdown(context.Background())`
`176`	`176`	`defer logger.AuditPanic()`
`177`	`177`	`logger.Info(cmd.VersionString())`
`178`	`178`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ func main() {`
`66`	`66`	`c.Publisher.UserAgent = "certificate-transparency-go/1.0"`
`67`	`67`	`}`
`68`	`68`
`69`		`- scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.Publisher.DebugAddr)`
`70`		`- defer shutdown(context.Background())`
	`69`	`+ scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.Publisher.DebugAddr)`
	`70`	`+ defer oTelShutdown(context.Background())`
`71`	`71`	`defer logger.AuditPanic()`
`72`	`72`	`logger.Info(cmd.VersionString())`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,8 @@ func main() {`
`123`	`123`	`c.RA.DebugAddr = *debugAddr`
`124`	`124`	`}`
`125`	`125`
`126`		`- scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.RA.DebugAddr)`
`127`		`- defer shutdown(context.Background())`
	`126`	`+ scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.RA.DebugAddr)`
	`127`	`+ defer oTelShutdown(context.Background())`
`128`	`128`	`defer logger.AuditPanic()`
`129`	`129`	`logger.Info(cmd.VersionString())`
`130`	`130`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@ func main() {`
`57`	`57`	`c.SA.DebugAddr = *debugAddr`
`58`	`58`	`}`
`59`	`59`
`60`		`- scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.SA.DebugAddr)`
`61`		`- defer shutdown(context.Background())`
	`60`	`+ scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.SA.DebugAddr)`
	`61`	`+ defer oTelShutdown(context.Background())`
`62`	`62`	`defer logger.AuditPanic()`
`63`	`63`	`logger.Info(cmd.VersionString())`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,8 @@ func main() {`
`75`	`75`	`c.VA.DebugAddr = *debugAddr`
`76`	`76`	`}`
`77`	`77`
`78`		`- scope, logger, shutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.VA.DebugAddr)`
`79`		`- defer shutdown(context.Background())`
	`78`	`+ scope, logger, oTelShutdown := cmd.StatsAndLogging(c.Syslog, c.OpenTelemetry, c.VA.DebugAddr)`
	`79`	`+ defer oTelShutdown(context.Background())`
`80`	`80`	`defer logger.AuditPanic()`
`81`	`81`	`logger.Info(cmd.VersionString())`
`82`	`82`