Skip to content

Commit

Permalink
Replace weavework with dskit for recent merge (#2768)
Browse files Browse the repository at this point in the history 
* Replace weavework with dskit for recent merge

* Update modules/frontend/frontend.go

Co-authored-by: Koenraad Verheyden <[email protected]>

---------

Co-authored-by: Koenraad Verheyden <[email protected]>
  • Loading branch information
@zalegrala @yvrhdn
zalegrala and yvrhdn authored Aug 4, 2023
1 parent c90e8f4 commit 21fe98e
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion docs/sources/tempo/configuration/_index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ You can find more about other supported syntax [here](https://github.com/drone/e

## Server

Tempo uses the Weaveworks/common server. For more information on configuration options, see [here](https://github.com/weaveworks/common/blob/master/server/server.go#L54).
Tempo uses the server from `dskit/server`. For more information on configuration options, see [here](https://github.com/grafana/dskit/blob/main/server/server.go#L66).

```yaml
# Optional. Setting to true enables multitenancy and requires X-Scope-OrgID header on all requests.
Expand Down
8 changes: 4 additions & 4 deletions modules/distributor/forwarder/forwarder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"time"

"github.com/go-kit/log"
dslog "github.com/grafana/dskit/log"
zaplogfmt "github.com/jsternberg/zap-logfmt"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor"
"github.com/sirupsen/logrus"
"github.com/weaveworks/common/logging"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/extension"
Expand Down Expand Up @@ -46,7 +46,7 @@ func (l List) ForwardTraces(ctx context.Context, traces ptrace.Traces) error {
return multierr.Combine(errs...)
}

func New(cfg Config, logger log.Logger, logLevel logging.Level) (Forwarder, error) {
func New(cfg Config, logger log.Logger, logLevel dslog.Level) (Forwarder, error) {
if err := cfg.Validate(); err != nil {
return nil, fmt.Errorf("failed to validate config: %w", err)
}
Expand Down Expand Up @@ -84,7 +84,7 @@ type FilterForwarder struct {
fatalErrorMu sync.RWMutex
}

func NewFilterForwarder(cfg FilterConfig, next Forwarder, logLevel logging.Level) (*FilterForwarder, error) {
func NewFilterForwarder(cfg FilterConfig, next Forwarder, logLevel dslog.Level) (*FilterForwarder, error) {
factory := filterprocessor.NewFactory()

set := processor.CreateSettings{
Expand Down Expand Up @@ -191,7 +191,7 @@ func (c consumerToForwarderAdapter) Capabilities() consumer.Capabilities {
return consumer.Capabilities{MutatesData: false}
}

func newLogger(level logging.Level) *zap.Logger {
func newLogger(level dslog.Level) *zap.Logger {
zapLevel := zapcore.InfoLevel

switch level.Logrus {
Expand Down
12 changes: 6 additions & 6 deletions modules/distributor/forwarder/forwarder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"testing"

dslog "github.com/grafana/dskit/log"
"github.com/pkg/errors"
"github.com/stretchr/testify/require"
"github.com/weaveworks/common/logging"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/pdata/pcommon"
Expand Down Expand Up @@ -138,7 +138,7 @@ func TestFilterForwarder_ForwardTraces_ReturnsNoErrorAndCallsForwardTracesOnUnde

f := &mockCountingForwarder{next: &mockWorkingForwarder{}, forwardTracesCount: 0}
cfg := FilterConfig{}
ff, err := NewFilterForwarder(cfg, f, logging.Level{})
ff, err := NewFilterForwarder(cfg, f, dslog.Level{})
require.NoError(t, err)

// When
Expand All @@ -165,7 +165,7 @@ func TestFilterForwarder_ForwardTraces_ReturnsNoErrorAndCallsForwardTracesOnUnde
SpanEventConditions: nil,
},
}
ff, err := NewFilterForwarder(cfg, f, logging.Level{})
ff, err := NewFilterForwarder(cfg, f, dslog.Level{})
require.NoError(t, err)

// When
Expand Down Expand Up @@ -196,7 +196,7 @@ func TestFilterForwarder_ForwardTraces_ReturnsNoErrorAndDoesNotCallsForwardTrace
SpanEventConditions: nil,
},
}
ff, err := NewFilterForwarder(cfg, f, logging.Level{})
ff, err := NewFilterForwarder(cfg, f, dslog.Level{})
require.NoError(t, err)

// When
Expand All @@ -218,7 +218,7 @@ func TestFilterForwarder_ForwardTraces_ReturnsErrorAndDoesNotCallForwardTracesOn
SpanEventConditions: nil,
},
}
ff, err := NewFilterForwarder(cfg, f, logging.Level{})
ff, err := NewFilterForwarder(cfg, f, dslog.Level{})
require.NoError(t, err)

ff.fatalError = fatalErr
Expand Down Expand Up @@ -247,7 +247,7 @@ func TestFilterForwarder_ForwardTraces_ReturnsErrorWithFailingUnderlyingForwarde
SpanEventConditions: nil,
},
}
ff, err := NewFilterForwarder(cfg, f, logging.Level{})
ff, err := NewFilterForwarder(cfg, f, dslog.Level{})
require.NoError(t, err)

// When
Expand Down
4 changes: 2 additions & 2 deletions modules/distributor/forwarder/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/go-kit/log"
"github.com/go-kit/log/level"
dslog "github.com/grafana/dskit/log"
"github.com/grafana/dskit/services"
"github.com/weaveworks/common/logging"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.uber.org/multierr"

Expand Down Expand Up @@ -40,7 +40,7 @@ type Manager struct {
tenantToQueueListMu *sync.RWMutex
}

func NewManager(cfgs ConfigList, logger log.Logger, overrides Overrides, logLevel logging.Level) (*Manager, error) {
func NewManager(cfgs ConfigList, logger log.Logger, overrides Overrides, logLevel dslog.Level) (*Manager, error) {
if err := cfgs.Validate(); err != nil {
return nil, fmt.Errorf("failed to validate config list: %w", err)
}
Expand Down
8 changes: 4 additions & 4 deletions modules/distributor/forwarder/manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"

"github.com/go-kit/log"
dslog "github.com/grafana/dskit/log"
"github.com/stretchr/testify/require"
"github.com/weaveworks/common/logging"
"go.opentelemetry.io/collector/pdata/ptrace"
"golang.org/x/exp/slices"
)
Expand Down Expand Up @@ -64,7 +64,7 @@ func (m *mockChannelledInterceptorForwarder) Shutdown(ctx context.Context) error
func newManagerWithForwarders(t *testing.T, forwarderNameToForwarder map[string]Forwarder, logger log.Logger, o Overrides) *Manager {
t.Helper()

manager, err := NewManager(ConfigList{}, logger, o, logging.Level{})
manager, err := NewManager(ConfigList{}, logger, o, dslog.Level{})
require.NoError(t, err)
manager.forwarderNameToForwarder = forwarderNameToForwarder

Expand All @@ -83,7 +83,7 @@ func TestNewManager_ReturnsNoErrorAndNonNilManagerWithValidConfigList(t *testing
o := &mockWorkingOverrides{}

// When
got, err := NewManager(cfgs, logger, o, logging.Level{})
got, err := NewManager(cfgs, logger, o, dslog.Level{})

// Then
require.NoError(t, err)
Expand All @@ -99,7 +99,7 @@ func TestNewManager_ReturnsErrorAndNilManagerWithInvalidConfigList(t *testing.T)
o := &mockWorkingOverrides{}

// When
got, err := NewManager(cfgs, logger, o, logging.Level{})
got, err := NewManager(cfgs, logger, o, dslog.Level{})

// Then
require.Error(t, err)
Expand Down
4 changes: 2 additions & 2 deletions modules/frontend/frontend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ func newSpanMetricsMiddleware() Middleware {
}

// buildUpstreamRequestURI returns a uri based on the passed parameters
// we do this because weaveworks/common uses the RequestURI field to translate from http.Request to httpgrpc.Request
// https://github.com/weaveworks/common/blob/47e357f4e1badb7da17ad74bae63e228bdd76e8f/httpgrpc/server/server.go#L48
// we do this because dskit/common uses the RequestURI field to translate from http.Request to httpgrpc.Request
// https://github.com/grafana/dskit/blob/740f56bd293423c5147773ce97264519f9fddc58/httpgrpc/server/server.go#L59
func buildUpstreamRequestURI(originalURI string, params url.Values) string {
const queryDelimiter = "?"

Expand Down

0 comments on commit 21fe98e

Please sign in to comment.