Clean up golangci-lint warnings, shadowing logger, deprecated Instrum…

…entRoutes
TykTechnologies · Dec 23, 2024 · f8b7d99 · f8b7d99
1 parent c7c7ef7
commit f8b7d99
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/gateway/server.go b/gateway/server.go
@@ -256,31 +256,31 @@ func NewGateway(config config.Config, ctx context.Context) *Gateway {
 	return gw
 }
 
-// SetupNewRelic creates new newrelic.Application instance
+// SetupNewRelic creates new newrelic.Application instance.
 func (gw *Gateway) SetupNewRelic() (app *newrelic.Application) {
 	var (
 		err      error
 		gwConfig = gw.GetConfig()
 	)
 
-	logger := log.WithFields(logrus.Fields{"prefix": "newrelic"})
-	logger.Info("Initializing NewRelic...")
+	log := log.WithFields(logrus.Fields{"prefix": "newrelic"})
+	log.Info("Initializing NewRelic...")
 
 	cfg := []newrelic.ConfigOption{
 		newrelic.ConfigAppName(gwConfig.NewRelic.AppName),
 		newrelic.ConfigLicense(gwConfig.NewRelic.LicenseKey),
 		newrelic.ConfigEnabled(gwConfig.NewRelic.AppName != ""),
 		newrelic.ConfigDistributedTracerEnabled(gwConfig.NewRelic.EnableDistributedTracing),
-		newrelic.ConfigLogger(newrelic.NewLogger(logger)),
+		newrelic.ConfigLogger(newrelic.NewLogger(log)),
 	}
 
 	if app, err = newrelic.NewApplication(cfg...); err != nil {
-		logger.Warn("Error initializing NewRelic, skipping... ", err)
+		log.Warn("Error initializing NewRelic, skipping... ", err)
 		return
 	}
 
 	instrument.AddSink(newrelic.NewSink(app))
-	logger.Info("NewRelic initialized")
+	log.Info("NewRelic initialized")
 
 	return
 }

diff --git a/internal/service/newrelic/newrelic.go b/internal/service/newrelic/newrelic.go
@@ -4,13 +4,14 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/TykTechnologies/tyk/internal/httpctx"
 	"github.com/newrelic/go-agent/v3/integrations/nrgorilla"
 	"github.com/newrelic/go-agent/v3/newrelic"
 
 	"github.com/gocraft/health"
 	"github.com/gorilla/mux"
 	"github.com/sirupsen/logrus"
+
+	"github.com/TykTechnologies/tyk/internal/httpctx"
 )
 
 type (
@@ -33,7 +34,7 @@ var (
 
 // AddNewRelicInstrumentation adds NewRelic instrumentation to the router
 func AddNewRelicInstrumentation(app *newrelic.Application, r *mux.Router) {
-	nrgorilla.InstrumentRoutes(r, app)
+	r.Use(nrgorilla.Middleware(app))
 }
 
 type Logger struct{ *logrus.Entry }