merge master

command/operator_diagnose.go

@@ -11,6 +11,7 @@ import (
  log "github.com/hashicorp/go-hclog"
  "github.com/hashicorp/vault/internalshared/listenerutil"
  "github.com/hashicorp/vault/internalshared/reloadutil"
+ physconsul "github.com/hashicorp/vault/physical/consul"
  "github.com/hashicorp/vault/sdk/physical"
  "github.com/hashicorp/vault/sdk/version"
  srconsul "github.com/hashicorp/vault/serviceregistration/consul"

command/server.go

@@ -1154,7 +1154,7 @@ func (c *ServerCommand) Run(args []string) int {
  }
 
  // Prevent server startup if migration is active
- // TODO: Use logs with OpenTelemetry to Integrate this into Diagnose
+ // TODO: Use OpenTelemetry to integrate this into Diagnose
  if c.storageMigrationActive(backend) {
  return 1
  }