Skip to content

Commit

Permalink
remove ErrorBusy, it essentially duplicates SpansDropped
Browse files Browse the repository at this point in the history
Signed-off-by: Callum Styan <[email protected]>
  • Loading branch information
cstyan committed Sep 28, 2018
1 parent d73db1e commit 4c9f271
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
3 changes: 0 additions & 3 deletions cmd/collector/app/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ type SpanProcessorMetrics struct {
BatchSize metrics.Gauge // size of span batch
// QueueLength measures the size of the internal span queue
QueueLength metrics.Gauge
// ErrorBusy counts number of return ErrServerBusy
ErrorBusy metrics.Counter
// SavedOkBySvc contains span and trace counts by service
SavedOkBySvc metricsBySvc // spans actually saved
SavedErrBySvc metricsBySvc // spans failed to save
Expand Down Expand Up @@ -87,7 +85,6 @@ func NewSpanProcessorMetrics(serviceMetrics metrics.Factory, hostMetrics metrics
SpansDropped: hostMetrics.Counter("spans.dropped", nil),
BatchSize: hostMetrics.Gauge("batch-size", nil),
QueueLength: hostMetrics.Gauge("queue-length", nil),
ErrorBusy: hostMetrics.Counter("error.busy", nil),
SavedOkBySvc: newMetricsBySvc(serviceMetrics.Namespace("", map[string]string{"result": "ok"}), "saved-by-svc"),
SavedErrBySvc: newMetricsBySvc(serviceMetrics.Namespace("", map[string]string{"result": "err"}), "saved-by-svc"),
spanCounts: spanCounts,
Expand Down
5 changes: 1 addition & 4 deletions cmd/collector/app/span_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package app
import (
"time"

"github.com/uber/tchannel-go"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer"
Expand Down Expand Up @@ -141,8 +140,6 @@ func (sp *spanProcessor) enqueueSpan(span *model.Span, originalFormat string) bo
span: span,
}
addedToQueue := sp.queue.Produce(item)
if !addedToQueue {
sp.metrics.ErrorBusy.Inc(1)
}

return addedToQueue
}

0 comments on commit 4c9f271

Please sign in to comment.