Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: EG loglevel error for admin and metrics module #4340

Merged
merged 3 commits into from
Sep 27, 2024
Merged

bugfix: EG loglevel error for admin and metrics module #4340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fcef99
bugfix: EG loglevel error for admin and metrics module
qicz Sep 26, 2024
ad5c6ed
fix ut
qicz Sep 26, 2024
4dcb615
polish
qicz Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions internal/admin/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@

"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()
Expand All @@ -34,6 +30,7 @@
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 {
Expand All @@ -57,7 +54,7 @@
// 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")

Check warning on line 57 in internal/admin/server.go

View check run for this annotation

Codecov / codecov/patch

internal/admin/server.go#L57 

Added line #L57 was not covered by tests
}
}()

Expand Down
3 changes: 3 additions & 0 deletions internal/admin/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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)
}
17 changes: 3 additions & 14 deletions internal/metrics/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -56,7 +45,7 @@ type Metadata struct {
Bounds []float64
}

// metrics stores stores metrics
// metrics stores metrics
type store struct {
started bool
mu sync.Mutex
Expand Down
6 changes: 6 additions & 0 deletions internal/metrics/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,20 @@

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)

Check warning on line 38 in internal/metrics/register.go

View check run for this annotation

Codecov / codecov/patch

internal/metrics/register.go#L37-L38 

Added lines #L37 - L38 were not covered by tests

options, err := newOptions(cfg)
if err != nil {
return err
Expand Down
Loading