Merge branch 'main' into gateway-api-upgrade

internal/admin/server.go

@@ -12,13 +12,9 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 
-	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
 	"github.com/envoyproxy/gateway/internal/envoygateway/config"
-	"github.com/envoyproxy/gateway/internal/logging"
 )
 
-var adminLogger = logging.DefaultLogger(egv1a1.LogLevelInfo).WithName("admin")
-
 func Init(cfg *config.Server) error {
 	if cfg.EnvoyGateway.GetEnvoyGatewayAdmin().EnableDumpConfig {
 		spewConfig := spew.NewDefaultConfig()
@@ -34,6 +30,7 @@ func start(cfg *config.Server) error {
 	address := cfg.EnvoyGateway.GetEnvoyGatewayAdminAddress()
 	enablePprof := cfg.EnvoyGateway.GetEnvoyGatewayAdmin().EnablePprof
 
+	adminLogger := cfg.Logger.WithName("admin")
 	adminLogger.Info("starting admin server", "address", address, "enablePprof", enablePprof)
 
 	if enablePprof {
@@ -57,7 +54,7 @@ func start(cfg *config.Server) error {
 	// Listen And Serve Admin Server.
 	go func() {
 		if err := adminServer.ListenAndServe(); err != nil {
-			cfg.Logger.Error(err, "start admin server failed")
+			adminLogger.Error(err, "start admin server failed")
 		}
 	}()
 

internal/admin/server_test.go

@@ -12,6 +12,7 @@ import (
 
 	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
 	"github.com/envoyproxy/gateway/internal/envoygateway/config"
+	"github.com/envoyproxy/gateway/internal/logging"
 )
 
 func TestInitAdminServer(t *testing.T) {
@@ -20,6 +21,8 @@ func TestInitAdminServer(t *testing.T) {
 			EnvoyGatewaySpec: egv1a1.EnvoyGatewaySpec{},
 		},
 	}
+
+	svrConfig.Logger = logging.NewLogger(egv1a1.DefaultEnvoyGatewayLogging())
 	err := Init(svrConfig)
 	require.NoError(t, err)
 }

internal/metrics/metadata.go

@@ -12,21 +12,10 @@ import (
 	"go.opentelemetry.io/otel"
 	api "go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/sdk/metric"
-
-	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
-	log "github.com/envoyproxy/gateway/internal/logging"
-)
-
-var (
-	meter = func() api.Meter {
-		return otel.GetMeterProvider().Meter("envoy-gateway")
-	}
-
-	metricsLogger = log.DefaultLogger(egv1a1.LogLevelInfo).WithName("metrics")
 )
 
-func init() {
-	otel.SetLogger(metricsLogger.Logger)
+var meter = func() api.Meter {
+	return otel.GetMeterProvider().Meter("envoy-gateway")
 }
 
 // MetricType is the type of a metric.
@@ -56,7 +45,7 @@ type Metadata struct {
 	Bounds      []float64
 }
 
-// metrics stores stores metrics
+// metrics stores metrics
 type store struct {
 	started bool
 	mu      sync.Mutex

internal/metrics/register.go

@@ -23,14 +23,20 @@ import (
 
 	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
 	"github.com/envoyproxy/gateway/internal/envoygateway/config"
+	log "github.com/envoyproxy/gateway/internal/logging"
 )
 
 const (
 	defaultEndpoint = "/metrics"
 )
 
+var metricsLogger log.Logger
+
 // Init initializes and registers the global metrics server.
 func Init(cfg *config.Server) error {
+	metricsLogger = cfg.Logger.WithName("metrics")
+	otel.SetLogger(metricsLogger.Logger)
+
 	options, err := newOptions(cfg)
 	if err != nil {
 		return err

internal/provider/kubernetes/status_updater.go

@@ -56,15 +56,13 @@ func (m MutatorFunc) Mutate(old client.Object) client.Object {
 type UpdateHandler struct {
 	log           logr.Logger
 	client        client.Client
-	sendUpdates   chan struct{}
 	updateChannel chan Update
 }
 
 func NewUpdateHandler(log logr.Logger, client client.Client) *UpdateHandler {
 	return &UpdateHandler{
 		log:           log,
 		client:        client,
-		sendUpdates:   make(chan struct{}),
 		updateChannel: make(chan Update, 100),
 	}
 }
@@ -129,9 +127,6 @@ func (u *UpdateHandler) Start(ctx context.Context) error {
 	u.log.Info("started status update handler")
 	defer u.log.Info("stopped status update handler")
 
-	// Enable Updaters to start sending updates to this handler.
-	close(u.sendUpdates)
-
 	for {
 		select {
 		case <-ctx.Done():
@@ -148,7 +143,6 @@ func (u *UpdateHandler) Start(ctx context.Context) error {
 // Writer retrieves the interface that should be used to write to the UpdateHandler.
 func (u *UpdateHandler) Writer() Updater {
 	return &UpdateWriter{
-		enabled:       u.sendUpdates,
 		updateChannel: u.updateChannel,
 	}
 }
@@ -160,18 +154,13 @@ type Updater interface {
 
 // UpdateWriter takes status updates and sends these to the UpdateHandler via a channel.
 type UpdateWriter struct {
-	enabled       <-chan struct{}
 	updateChannel chan<- Update
 }
 
 // Send sends the given Update off to the update channel for writing by the UpdateHandler.
 func (u *UpdateWriter) Send(update Update) {
 	// Non-blocking receive to see if we should pass along update.
-	select {
-	case <-u.enabled:
-		u.updateChannel <- update
-	default:
-	}
+	u.updateChannel <- update
 }
 
 // isStatusEqual checks if two objects have equivalent status.