Fix rebase issues

xmtp · Sep 26, 2023 · f12599e · f12599e
1 parent da7437b
commit f12599e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/pkg/authn/authn.pb.go b/pkg/authn/authn.pb.go
diff --git a/pkg/metrics/api-limits.go b/pkg/metrics/api-limits.go
@@ -3,7 +3,6 @@ package metrics
 import (
 	"context"
 
-	"github.com/xmtp/xmtp-node-go/pkg/logging"
 	"go.opencensus.io/stats"
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/tag"
@@ -21,10 +20,10 @@ var ratelimiterBucketsGaugeView = &view.View{
 	TagKeys:     []tag.Key{bucketsNameKey},
 }
 
-func EmitRatelimiterBucketsSize(ctx context.Context, name string, size int) {
+func EmitRatelimiterBucketsSize(ctx context.Context, log *zap.Logger, name string, size int) {
 	err := recordWithTags(ctx, []tag.Mutator{tag.Insert(bucketsNameKey, name)}, ratelimiterBucketsGaugeMeasure.M(int64(size)))
 	if err != nil {
-		logging.From(ctx).Warn("recording metric",
+		log.Warn("recording metric",
 			zap.String("metric", ratelimiterBucketsGaugeMeasure.Name()),
 			zap.Error(err))
 	}
@@ -39,10 +38,10 @@ var ratelimiterBucketsDeletedCounterView = &view.View{
 	TagKeys:     []tag.Key{bucketsNameKey},
 }
 
-func EmitRatelimiterDeletedEntries(ctx context.Context, name string, count int) {
+func EmitRatelimiterDeletedEntries(ctx context.Context, log *zap.Logger, name string, count int) {
 	err := recordWithTags(ctx, []tag.Mutator{tag.Insert(bucketsNameKey, name)}, ratelimiterBucketsDeletedCounterMeasure.M(int64(count)))
 	if err != nil {
-		logging.From(ctx).Warn("recording metric",
+		log.Warn("recording metric",
 			zap.String("metric", ratelimiterBucketsDeletedCounterMeasure.Name()),
 			zap.Error(err))
 	}

diff --git a/pkg/ratelimiter/rate_limiter.go b/pkg/ratelimiter/rate_limiter.go
@@ -156,8 +156,8 @@ func (rl *TokenBucketRateLimiter) Janitor(sweepInterval, expiresAfter time.Durat
 func (rl *TokenBucketRateLimiter) sweepAndSwap(expiresAfter time.Duration) (deletedEntries int) {
 	// Only the janitor writes to oldBuckets (the swap below), so we shouldn't need to rlock it here.
 	deletedEntries = rl.oldBuckets.deleteExpired(expiresAfter)
-	metrics.EmitRatelimiterDeletedEntries(rl.ctx, rl.oldBuckets.name, deletedEntries)
-	metrics.EmitRatelimiterBucketsSize(rl.ctx, rl.oldBuckets.name, len(rl.oldBuckets.buckets))
+	metrics.EmitRatelimiterDeletedEntries(rl.ctx, rl.log, rl.oldBuckets.name, deletedEntries)
+	metrics.EmitRatelimiterBucketsSize(rl.ctx, rl.log, rl.oldBuckets.name, len(rl.oldBuckets.buckets))
 	rl.mutex.Lock()
 	rl.newBuckets, rl.oldBuckets = rl.oldBuckets, rl.newBuckets
 	rl.mutex.Unlock()