Fix build errors

grafana · Aug 12, 2024 · 614f69d · 614f69d
1 parent cf9bd49
commit 614f69d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/rollout-operator/instrumentation.go b/cmd/rollout-operator/instrumentation.go
@@ -45,11 +45,11 @@ func newInstrumentedRouter(metrics *metrics) (*mux.Router, http.Handler) {
 	router := mux.NewRouter()
 
 	httpMiddleware := []middleware.Interface{
-		middleware.Tracer{
+		middleware.RouteInjector{
 			RouteMatcher: router,
 		},
+		middleware.Tracer{},
 		middleware.Instrument{
-			RouteMatcher:     router,
 			Duration:         metrics.RequestDuration,
 			RequestBodySize:  metrics.ReceivedMessageSize,
 			ResponseBodySize: metrics.SentMessageSize,

diff --git a/integration/k3t/cluster.go b/integration/k3t/cluster.go
@@ -88,7 +88,7 @@ func NewCluster(ctx context.Context, t *testing.T, opts ...Option) Cluster {
 		},
 	}
 
-	clusterConfig, err := config.TransformSimpleToClusterConfig(ctx, runtimes.SelectedRuntime, simpleCfg)
+	clusterConfig, err := config.TransformSimpleToClusterConfig(ctx, runtimes.SelectedRuntime, simpleCfg, "")
 	require.NoError(t, err, "Can't transform simple config to cluster config")
 
 	clusterConfig, err = config.ProcessClusterConfig(*clusterConfig)