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

Jump to bottom

chore: refactor logger for Nats Jetstream scaler #3519

Merged
merged 1 commit into from
Aug 8, 2022
Merged

chore: refactor logger for Nats Jetstream scaler #3519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions pkg/scalers/nats_jetstream_scaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"net/http"
"strconv"

"github.com/go-logr/logr"
v2beta2 "k8s.io/api/autoscaling/v2beta2"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/metrics/pkg/apis/external_metrics"
logf "sigs.k8s.io/controller-runtime/pkg/log"

kedautil "github.com/kedacore/keda/v2/pkg/util"
)
Expand All @@ -23,13 +23,12 @@ const (
defaultJetStreamLagThreshold = 10
)

var jsLog = logf.Log.WithName("nats_jetstream_scaler")

type natsJetStreamScaler struct {
metricType v2beta2.MetricTargetType
stream *streamDetail
metadata natsJetStreamMetadata
httpClient *http.Client
logger logr.Logger
}

type natsJetStreamMetadata struct {
Expand Down Expand Up @@ -103,6 +102,7 @@ func NewNATSJetStreamScaler(config *ScalerConfig) (Scaler, error) {
stream: &streamDetail{},
metadata: jsMetadata,
httpClient: kedautil.CreateHTTPClient(config.GlobalHTTPTimeout, false),
logger: InitializeLogger(config, "nats_jetstream_scaler"),
}, nil
}

Expand Down Expand Up @@ -166,14 +166,14 @@ func (s *natsJetStreamScaler) IsActive(ctx context.Context) (bool, error) {

resp, err := s.httpClient.Do(req)
if err != nil {
jsLog.Error(err, "unable to access NATS JetStream monitoring endpoint", "natsServerMonitoringEndpoint", s.metadata.monitoringEndpoint)
s.logger.Error(err, "unable to access NATS JetStream monitoring endpoint", "natsServerMonitoringEndpoint", s.metadata.monitoringEndpoint)
return false, err
}

defer resp.Body.Close()
var jsAccountResp jetStreamEndpointResponse
if err = json.NewDecoder(resp.Body).Decode(&jsAccountResp); err != nil {
jsLog.Error(err, "unable to decode JetStream account response")
s.logger.Error(err, "unable to decode JetStream account response")
return false, err
}

Expand Down Expand Up @@ -223,14 +223,14 @@ func (s *natsJetStreamScaler) GetMetrics(ctx context.Context, metricName string,

resp, err := s.httpClient.Do(req)
if err != nil {
jsLog.Error(err, "unable to access NATS JetStream monitoring endpoint", "natsServerMonitoringEndpoint", s.metadata.monitoringEndpoint)
s.logger.Error(err, "unable to access NATS JetStream monitoring endpoint", "natsServerMonitoringEndpoint", s.metadata.monitoringEndpoint)
return []external_metrics.ExternalMetricValue{}, err
}

defer resp.Body.Close()
var jsAccountResp jetStreamEndpointResponse
if err = json.NewDecoder(resp.Body).Decode(&jsAccountResp); err != nil {
jsLog.Error(err, "unable to decode JetStream account details")
s.logger.Error(err, "unable to decode JetStream account details")
return []external_metrics.ExternalMetricValue{}, err
}

Expand All @@ -246,7 +246,7 @@ func (s *natsJetStreamScaler) GetMetrics(ctx context.Context, metricName string,
}

totalLag := s.getMaxMsgLag()
jsLog.V(1).Info("NATS JetStream Scaler: Providing metrics based on totalLag, threshold", "totalLag", totalLag, "lagThreshold", s.metadata.lagThreshold)
s.logger.V(1).Info("NATS JetStream Scaler: Providing metrics based on totalLag, threshold", "totalLag", totalLag, "lagThreshold", s.metadata.lagThreshold)

metric := external_metrics.ExternalMetricValue{
MetricName: metricName,
Expand Down