chore: fix private interface had exported methods (#17115)

pull/17112/head
George Robinson 2 months ago committed by GitHub
parent 75593e0ed7
commit bccededc44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      pkg/distributor/distributor.go
  2. 8
      pkg/distributor/ingest_limits.go
  3. 4
      pkg/distributor/ingest_limits_test.go

@ -722,7 +722,7 @@ func (d *Distributor) PushWithResolver(ctx context.Context, req *logproto.PushRe
}
if d.cfg.IngestLimitsEnabled {
exceedsLimits, _, err := d.ingestLimits.ExceedsLimits(ctx, tenantID, streams)
exceedsLimits, _, err := d.ingestLimits.exceedsLimits(ctx, tenantID, streams)
if err != nil {
level.Error(d.logger).Log("msg", "failed to check if request exceeds limits, request has been accepted", "err", err)
} else if exceedsLimits {

@ -17,7 +17,7 @@ import (
// ingestLimitsFrontendClient is used for tests.
type ingestLimitsFrontendClient interface {
ExceedsLimits(context.Context, *logproto.ExceedsLimitsRequest) (*logproto.ExceedsLimitsResponse, error)
exceedsLimits(context.Context, *logproto.ExceedsLimitsRequest) (*logproto.ExceedsLimitsResponse, error)
}
// ingestLimitsFrontendRingClient uses the ring to query ingest-limits frontends.
@ -34,7 +34,7 @@ func newIngestLimitsFrontendRingClient(ring ring.ReadRing, pool *ring_client.Poo
}
// Implements the ingestLimitsFrontendClient interface.
func (c *ingestLimitsFrontendRingClient) ExceedsLimits(ctx context.Context, req *logproto.ExceedsLimitsRequest) (*logproto.ExceedsLimitsResponse, error) {
func (c *ingestLimitsFrontendRingClient) exceedsLimits(ctx context.Context, req *logproto.ExceedsLimitsRequest) (*logproto.ExceedsLimitsResponse, error) {
// We use an FNV-1 of all stream hashes in the request to load balance requests
// to limits-frontends instances.
h := fnv.New32()
@ -102,12 +102,12 @@ func newIngestLimits(client ingestLimitsFrontendClient, r prometheus.Registerer)
// that exceeded the per-tenant limits, and for each stream the reasons it
// exceeded the limits. This slice can be nil. An error is returned if the
// limits could not be checked.
func (l *ingestLimits) ExceedsLimits(ctx context.Context, tenant string, streams []KeyedStream) (bool, []exceedsIngestLimitsResult, error) {
func (l *ingestLimits) exceedsLimits(ctx context.Context, tenant string, streams []KeyedStream) (bool, []exceedsIngestLimitsResult, error) {
req, err := newExceedsLimitsRequest(tenant, streams)
if err != nil {
return false, nil, err
}
resp, err := l.client.ExceedsLimits(ctx, req)
resp, err := l.client.exceedsLimits(ctx, req)
if err != nil {
return false, nil, err
}

@ -21,7 +21,7 @@ type mockIngestLimitsFrontendClient struct {
}
// Implements the ingestLimitsFrontendClient interface.
func (c *mockIngestLimitsFrontendClient) ExceedsLimits(_ context.Context, r *logproto.ExceedsLimitsRequest) (*logproto.ExceedsLimitsResponse, error) {
func (c *mockIngestLimitsFrontendClient) exceedsLimits(_ context.Context, r *logproto.ExceedsLimitsRequest) (*logproto.ExceedsLimitsResponse, error) {
require.Equal(c.t, c.expectedRequest, r)
if c.responseErr != nil {
return nil, c.responseErr
@ -109,7 +109,7 @@ func TestIngestLimits_ExceedsLimits(t *testing.T) {
l := newIngestLimits(&mockClient, prometheus.NewRegistry())
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
exceedsLimits, rejectedStreams, err := l.ExceedsLimits(ctx, test.tenant, test.streams)
exceedsLimits, rejectedStreams, err := l.exceedsLimits(ctx, test.tenant, test.streams)
if test.expectedErr != "" {
require.EqualError(t, err, test.expectedErr)
require.False(t, exceedsLimits)

Loading…
Cancel
Save