Skip to content

Commit 14cdc63

Browse files
authored
Refactor: Replace emptyReporter with DiscardReporter (#218)
1 parent 41a6614 commit 14cdc63

File tree

3 files changed

+4
-33
lines changed

3 files changed

+4
-33
lines changed

plugins/core/reporter/discard_reporter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (r *discardReporter) SendLog(log *logv3.LogData) {
3939
}
4040
func (r *discardReporter) ConnectionStatus() ConnectionStatus {
4141
// do nothing
42-
return 0
42+
return ConnectionStatusDisconnect
4343
}
4444
func (r *discardReporter) Close() {
4545
// do nothing

plugins/core/reporter/discard_reporter_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ func TestDiscardReporter(t *testing.T) {
3131
r.SendTracing(nil)
3232
r.SendMetrics(nil)
3333
r.SendLog(nil)
34-
if status := r.ConnectionStatus(); status != 0 {
35-
t.Errorf("expect 0, actual is %d", status)
34+
if status := r.ConnectionStatus(); status != reporter.ConnectionStatusDisconnect {
35+
t.Errorf("expect 2, actual is %d", status)
3636
}
3737
r.Close()
3838
}

plugins/core/tracer.go

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import (
2727

2828
"github.com/apache/skywalking-go/plugins/core/operator"
2929
"github.com/apache/skywalking-go/plugins/core/reporter"
30-
31-
logv3 "skywalking.apache.org/repo/goapi/collect/logging/v3"
3230
)
3331

3432
// nolint
@@ -111,7 +109,7 @@ func NewEntity(service, instanceEnvName string) *reporter.Entity {
111109
func newTracer() *Tracer {
112110
return &Tracer{
113111
initFlag: 0,
114-
Reporter: &emptyReporter{},
112+
Reporter: reporter.NewDiscardReporter(),
115113
Sampler: NewConstSampler(false),
116114
Log: &LogWrapper{newDefaultLogger()},
117115
cdsWatchers: make([]reporter.AgentConfigChangeWatcher, 0),
@@ -129,33 +127,6 @@ func (t *Tracer) ChangeLogger(logger interface{}) {
129127
t.Log.ChangeLogger(logger.(operator.LogOperator))
130128
}
131129

132-
// nolint
133-
type emptyReporter struct{}
134-
135-
// nolint
136-
func (e *emptyReporter) Boot(entity *reporter.Entity, cdsWatchers []reporter.AgentConfigChangeWatcher) {
137-
}
138-
139-
// nolint
140-
func (e *emptyReporter) SendTracing(spans []reporter.ReportedSpan) {
141-
}
142-
143-
// nolint
144-
func (e *emptyReporter) SendMetrics(metrics []reporter.ReportedMeter) {
145-
}
146-
147-
// nolint
148-
func (e *emptyReporter) SendLog(log *logv3.LogData) {
149-
}
150-
151-
func (e *emptyReporter) ConnectionStatus() reporter.ConnectionStatus {
152-
return reporter.ConnectionStatusDisconnect
153-
}
154-
155-
// nolint
156-
func (e *emptyReporter) Close() {
157-
}
158-
159130
type LogWrapper struct {
160131
Logger operator.LogOperator
161132
}

0 commit comments

Comments
 (0)