Skip to content

Commit

Permalink
rename files
Browse files Browse the repository at this point in the history
  • Loading branch information
LukeWinikates committed Aug 23, 2023
1 parent 66bfa91 commit dea0173
Show file tree
Hide file tree
Showing 10 changed files with 81 additions and 82 deletions.
59 changes: 0 additions & 59 deletions senders/client_noop.go

This file was deleted.

4 changes: 2 additions & 2 deletions senders/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func TestEndToEndWithInternalMetrics(t *testing.T) {
sender, err := NewSender(testServer.URL, SendInternalMetrics(true))
require.NoError(t, err)
require.NoError(t, sender.SendMetric("my metric", 20, 0, "localhost", nil))
sender.(*wavefrontSender).internalRegistry.Flush()
sender.(*realSender).internalRegistry.Flush()
require.NoError(t, sender.Flush())
metricLines := testServer.MetricLines

Expand All @@ -71,7 +71,7 @@ func TestEndToEndWithoutInternalMetrics(t *testing.T) {
sender, err := NewSender(testServer.URL, SendInternalMetrics(false))
require.NoError(t, err)
require.NoError(t, sender.SendMetric("my metric", 20, 0, "localhost", nil))
sender.(*wavefrontSender).internalRegistry.Flush()
sender.(*realSender).internalRegistry.Flush()
require.NoError(t, sender.Flush())
metricLines := testServer.MetricLines

Expand Down
File renamed without changes.
5 changes: 2 additions & 3 deletions senders/client_factory.go → senders/new_sender.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func NewSender(wfURL string, setters ...Option) (Sender, error) {
metricsReporter := internal.NewReporter(cfg.metricsURL(), tokenService, client)
tracesReporter := internal.NewReporter(cfg.tracesURL(), tokenService, client)

sender := &wavefrontSender{
sender := &realSender{
defaultSource: internal.GetHostname("wavefront_direct_sender"),
proxy: !cfg.Direct(),
}
Expand Down Expand Up @@ -201,7 +201,7 @@ func (c *configuration) metricsURL() string {
return fmt.Sprintf("%s:%d%s", c.Server, c.MetricsPort, c.Path)
}

func (sender *wavefrontSender) realInternalRegistry(cfg *configuration) sdkmetrics.Registry {
func (sender *realSender) realInternalRegistry(cfg *configuration) sdkmetrics.Registry {
var setters []sdkmetrics.RegistryOption

setters = append(setters, sdkmetrics.SetPrefix(cfg.MetricPrefix()))
Expand All @@ -216,7 +216,6 @@ func (sender *wavefrontSender) realInternalRegistry(cfg *configuration) sdkmetri
sender,
setters...,
)

}

func copyTags(orig map[string]string) map[string]string {
Expand Down
File renamed without changes.
59 changes: 59 additions & 0 deletions senders/noop.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package senders

import (
"github.com/wavefronthq/wavefront-sdk-go/event"
"github.com/wavefronthq/wavefront-sdk-go/histogram"
)

type noOpSender struct {
}

var (
defaultNoopClient Sender = &noOpSender{}
)

// NewWavefrontNoOpClient returns a Wavefront Client instance for which all operations are no-ops.
func NewWavefrontNoOpClient() (Sender, error) {
return defaultNoopClient, nil
}

func (sender *noOpSender) private() {
}

func (sender *noOpSender) Start() {
// no-op
}

func (sender *noOpSender) SendMetric(name string, value float64, ts int64, source string, tags map[string]string) error {
return nil
}

func (sender *noOpSender) SendDeltaCounter(name string, value float64, source string, tags map[string]string) error {
return nil
}

func (sender *noOpSender) SendDistribution(name string, centroids []histogram.Centroid,
hgs map[histogram.Granularity]bool, ts int64, source string, tags map[string]string) error {
return nil
}

func (sender *noOpSender) SendSpan(name string, startMillis, durationMillis int64, source, traceId, spanId string,
parents, followsFrom []string, tags []SpanTag, spanLogs []SpanLog) error {
return nil
}

func (sender *noOpSender) SendEvent(name string, startMillis, endMillis int64, source string, tags map[string]string, setters ...event.Option) error {
return nil
}

func (sender *noOpSender) Close() {
// no-op
}

func (sender *noOpSender) Flush() error {
return nil
}

func (sender *noOpSender) GetFailureCount() int64 {
return 0
}
File renamed without changes.
22 changes: 11 additions & 11 deletions senders/client.go → senders/real_sender.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type Sender interface {
private()
}

type wavefrontSender struct {
type realSender struct {
reporter internal.Reporter
defaultSource string
pointHandler internal.LineHandler
Expand All @@ -46,7 +46,7 @@ func newLineHandler(reporter internal.Reporter, cfg *configuration, format, pref
return internal.NewLineHandler(reporter, format, cfg.FlushInterval, batchSize, cfg.MaxBufferSize, opts...)
}

func (sender *wavefrontSender) Start() {
func (sender *realSender) Start() {
sender.pointHandler.Start()
sender.histoHandler.Start()
sender.spanHandler.Start()
Expand All @@ -55,10 +55,10 @@ func (sender *wavefrontSender) Start() {
sender.eventHandler.Start()
}

func (sender *wavefrontSender) private() {
func (sender *realSender) private() {
}

func (sender *wavefrontSender) SendMetric(name string, value float64, ts int64, source string, tags map[string]string) error {
func (sender *realSender) SendMetric(name string, value float64, ts int64, source string, tags map[string]string) error {
line, err := metric.Line(name, value, ts, source, tags, sender.defaultSource)
return trySendWith(
line,
Expand All @@ -68,7 +68,7 @@ func (sender *wavefrontSender) SendMetric(name string, value float64, ts int64,
)
}

func (sender *wavefrontSender) SendDeltaCounter(name string, value float64, source string, tags map[string]string) error {
func (sender *realSender) SendDeltaCounter(name string, value float64, source string, tags map[string]string) error {
if name == "" {
sender.internalRegistry.PointsTracker().IncInvalid()
return fmt.Errorf("empty metric name")
Expand All @@ -82,7 +82,7 @@ func (sender *wavefrontSender) SendDeltaCounter(name string, value float64, sour
return nil
}

func (sender *wavefrontSender) SendDistribution(
func (sender *realSender) SendDistribution(
name string,
centroids []histogram.Centroid,
hgs map[histogram.Granularity]bool,
Expand Down Expand Up @@ -113,7 +113,7 @@ func trySendWith(line string, err error, handler internal.LineHandler, tracker s
return err
}

func (sender *wavefrontSender) SendSpan(
func (sender *realSender) SendSpan(
name string,
startMillis, durationMillis int64,
source, traceId, spanId string,
Expand Down Expand Up @@ -172,7 +172,7 @@ func makeSpanLogs(logs []SpanLog) []span.Log {
return spanLogs
}

func (sender *wavefrontSender) SendEvent(
func (sender *realSender) SendEvent(
name string,
startMillis, endMillis int64,
source string,
Expand All @@ -195,7 +195,7 @@ func (sender *wavefrontSender) SendEvent(
)
}

func (sender *wavefrontSender) Close() {
func (sender *realSender) Close() {
sender.pointHandler.Stop()
sender.histoHandler.Stop()
sender.spanHandler.Stop()
Expand All @@ -204,7 +204,7 @@ func (sender *wavefrontSender) Close() {
sender.eventHandler.Stop()
}

func (sender *wavefrontSender) Flush() error {
func (sender *realSender) Flush() error {
errStr := ""
err := sender.pointHandler.Flush()
if err != nil {
Expand Down Expand Up @@ -232,7 +232,7 @@ func (sender *wavefrontSender) Flush() error {
return nil
}

func (sender *wavefrontSender) GetFailureCount() int64 {
func (sender *realSender) GetFailureCount() int64 {
return sender.pointHandler.GetFailureCount() +
sender.histoHandler.GetFailureCount() +
sender.spanHandler.GetFailureCount() +
Expand Down
File renamed without changes.
14 changes: 7 additions & 7 deletions senders/wavefront_sender_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func TestWavefrontSender_SendMetric(t *testing.T) {
spanHandler := &mockHandler{}
spanLogHandler := &mockHandler{}
eventHandler := &mockHandler{}
sender := wavefrontSender{
sender := realSender{
reporter: nil,
defaultSource: "test",
pointHandler: pointHandler,
Expand Down Expand Up @@ -50,7 +50,7 @@ func TestWavefrontSender_SendDeltaCounter(t *testing.T) {
spanHandler := &mockHandler{}
spanLogHandler := &mockHandler{}
eventHandler := &mockHandler{}
sender := wavefrontSender{
sender := realSender{
reporter: nil,
defaultSource: "test",
pointHandler: pointHandler,
Expand Down Expand Up @@ -90,7 +90,7 @@ func TestWavefrontSender_SendDistribution(t *testing.T) {
spanHandler := &mockHandler{}
spanLogHandler := &mockHandler{}
eventHandler := &mockHandler{}
sender := wavefrontSender{
sender := realSender{
reporter: nil,
defaultSource: "test",
pointHandler: pointHandler,
Expand Down Expand Up @@ -135,7 +135,7 @@ func TestWavefrontSender_SendSpan(t *testing.T) {
spanHandler := &mockHandler{}
spanLogHandler := &mockHandler{}
eventHandler := &mockHandler{}
sender := wavefrontSender{
sender := realSender{
reporter: nil,
defaultSource: "test",
pointHandler: pointHandler,
Expand Down Expand Up @@ -202,7 +202,7 @@ func TestWavefrontSender_SendSpan_SpanLogs(t *testing.T) {
spanHandler := &mockHandler{}
spanLogHandler := &mockHandler{}
eventHandler := &mockHandler{}
sender := wavefrontSender{
sender := realSender{
reporter: nil,
defaultSource: "test",
pointHandler: pointHandler,
Expand Down Expand Up @@ -268,7 +268,7 @@ func TestWavefrontSender_SendEventWithProxyFalse(t *testing.T) {
spanHandler := &mockHandler{}
spanLogHandler := &mockHandler{}
eventHandler := &mockHandler{}
sender := wavefrontSender{
sender := realSender{
reporter: nil,
defaultSource: "test",
pointHandler: pointHandler,
Expand Down Expand Up @@ -299,7 +299,7 @@ func TestWavefrontSender_SendEventWithProxyTrue(t *testing.T) {
spanHandler := &mockHandler{}
spanLogHandler := &mockHandler{}
eventHandler := &mockHandler{}
sender := wavefrontSender{
sender := realSender{
reporter: nil,
defaultSource: "test",
pointHandler: pointHandler,
Expand Down

0 comments on commit dea0173

Please sign in to comment.