backport VAULT-672

vault/external_tests/metrics/core_metrics_int_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
-	"github.com/hashicorp/vault/helper/metricsutil"
+	"github.com/hashicorp/shared-secure-libs/metricsutil"
 	vaulthttp "github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/vault"
 )

vault/testing.go

@@ -1465,8 +1465,6 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
 		coreConfig.CounterSyncInterval = base.CounterSyncInterval
 		coreConfig.RecoveryMode = base.RecoveryMode
 
-		coreConfig.ActivityLogConfig = base.ActivityLogConfig
-
 		testApplyEntBaseConfig(coreConfig, base)
 	}