Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions receiver/awsxrayreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ require (
go.opentelemetry.io/collector/receiver v0.119.0
go.opentelemetry.io/collector/receiver/receivertest v0.119.0
go.opentelemetry.io/collector/semconv v0.119.0
go.opentelemetry.io/otel v1.34.0
go.opentelemetry.io/otel/sdk/metric v1.34.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
)
Expand Down Expand Up @@ -57,10 +59,8 @@ require (
go.opentelemetry.io/collector/featuregate v1.25.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
go.opentelemetry.io/otel/trace v1.34.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.34.0 // indirect
Expand Down
63 changes: 55 additions & 8 deletions receiver/awsxrayreceiver/internal/udppoller/poller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ import (
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/receiverhelper"
"go.opentelemetry.io/collector/receiver/receivertest"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
"go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"
Expand Down Expand Up @@ -145,7 +148,7 @@ func TestSuccessfullyPollPacket(t *testing.T) {
}
}, 10*time.Second, 5*time.Millisecond, "poller should return parsed segment")

assert.NoError(t, tt.CheckReceiverTraces(Transport, 2, 0))
assertReceiverTraces(t, tt, receiverID, 2, 0)
}

func TestIncompletePacketNoSeparator(t *testing.T) {
Expand Down Expand Up @@ -175,7 +178,7 @@ func TestIncompletePacketNoSeparator(t *testing.T) {
fmt.Sprintf("unable to split incoming data as header and segment, incoming bytes: %v", rawData)) == 0
}, 10*time.Second, 5*time.Millisecond, "poller should reject segment")

assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1))
assertReceiverTraces(t, tt, receiverID, 0, 1)
}

func TestIncompletePacketNoBody(t *testing.T) {
Expand All @@ -200,7 +203,7 @@ func TestIncompletePacketNoBody(t *testing.T) {
lastEntry.Context[1].Integer == 1
}, 10*time.Second, 5*time.Millisecond, "poller should log missing body")

assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1))
assertReceiverTraces(t, tt, receiverID, 0, 1)
}

func TestNonJsonHeader(t *testing.T) {
Expand Down Expand Up @@ -230,7 +233,7 @@ func TestNonJsonHeader(t *testing.T) {
"invalid character 'o'")
}, 10*time.Second, 5*time.Millisecond, "poller should reject segment")

assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1))
assertReceiverTraces(t, tt, receiverID, 0, 1)
}

func TestJsonInvalidHeader(t *testing.T) {
Expand Down Expand Up @@ -266,7 +269,7 @@ func TestJsonInvalidHeader(t *testing.T) {
)
}, 10*time.Second, 5*time.Millisecond, "poller should reject segment")

assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1))
assertReceiverTraces(t, tt, receiverID, 0, 1)
}

func TestSocketReadIrrecoverableNetError(t *testing.T) {
Expand Down Expand Up @@ -303,7 +306,7 @@ func TestSocketReadIrrecoverableNetError(t *testing.T) {
errors.Unwrap(lastEntry.Context[0].Interface.(error)).Error() == randErrStr.String()
}, 10*time.Second, 5*time.Millisecond, "poller should exit due to irrecoverable net read error")

assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1))
assertReceiverTraces(t, tt, receiverID, 0, 1)
}

func TestSocketReadTimeOutNetError(t *testing.T) {
Expand Down Expand Up @@ -341,7 +344,7 @@ func TestSocketReadTimeOutNetError(t *testing.T) {
errors.Unwrap(lastEntry.Context[0].Interface.(error)).Error() == randErrStr.String()
}, 10*time.Second, 5*time.Millisecond, "poller should encounter net read error")

assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1))
assertReceiverTraces(t, tt, receiverID, 0, 1)
}

func TestSocketGenericReadError(t *testing.T) {
Expand Down Expand Up @@ -377,7 +380,7 @@ func TestSocketGenericReadError(t *testing.T) {
errors.Unwrap(lastEntry.Context[0].Interface.(error)).Error() == randErrStr.String()
}, 10*time.Second, 5*time.Millisecond, "poller should encounter generic socket read error")

assert.NoError(t, tt.CheckReceiverTraces(Transport, 0, 1))
assertReceiverTraces(t, tt, receiverID, 0, 1)
}

type mockNetError struct {
Expand Down Expand Up @@ -486,3 +489,47 @@ func logSetup() (*zap.Logger, *observer.ObservedLogs) {
core, recorded := observer.New(zapcore.InfoLevel)
return zap.New(core), recorded
}

func assertReceiverTraces(t *testing.T, tt componenttest.TestTelemetry, id component.ID, accepted, refused int64) {
got, err := tt.GetMetric("otelcol_receiver_accepted_spans")
assert.NoError(t, err)
metricdatatest.AssertEqual(t,
metricdata.Metrics{
Name: "otelcol_receiver_accepted_spans",
Description: "Number of spans successfully pushed into the pipeline. [alpha]",
Unit: "{spans}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
IsMonotonic: true,
DataPoints: []metricdata.DataPoint[int64]{
{
Attributes: attribute.NewSet(
attribute.String("receiver", id.String()),
attribute.String("transport", Transport)),
Value: accepted,
},
},
},
}, got, metricdatatest.IgnoreTimestamp(), metricdatatest.IgnoreExemplars())

got, err = tt.GetMetric("otelcol_receiver_refused_spans")
assert.NoError(t, err)
metricdatatest.AssertEqual(t,
metricdata.Metrics{
Name: "otelcol_receiver_refused_spans",
Description: "Number of spans that could not be pushed into the pipeline. [alpha]",
Unit: "{spans}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
IsMonotonic: true,
DataPoints: []metricdata.DataPoint[int64]{
{
Attributes: attribute.NewSet(
attribute.String("receiver", id.String()),
attribute.String("transport", Transport)),
Value: refused,
},
},
},
}, got, metricdatatest.IgnoreTimestamp(), metricdatatest.IgnoreExemplars())
}
53 changes: 50 additions & 3 deletions receiver/awsxrayreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ import (
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/receivertest"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
"go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"
Expand Down Expand Up @@ -111,7 +114,7 @@ func TestSegmentsPassedToConsumer(t *testing.T) {
return len(got) == 1
}, 10*time.Second, 5*time.Millisecond, "consumer should eventually get the X-Ray span")

assert.NoError(t, tt.CheckReceiverTraces(udppoller.Transport, 18, 0))
assertReceiverTraces(t, tt, receiverID, 18, 0)
}

func TestTranslatorErrorsOut(t *testing.T) {
Expand All @@ -138,7 +141,7 @@ func TestTranslatorErrorsOut(t *testing.T) {
"X-Ray segment to OT traces conversion failed")
}, 10*time.Second, 5*time.Millisecond, "poller should log warning because consumer errored out")

assert.NoError(t, tt.CheckReceiverTraces(udppoller.Transport, 1, 1))
assertReceiverTraces(t, tt, receiverID, 1, 1)
}

func TestSegmentsConsumerErrorsOut(t *testing.T) {
Expand Down Expand Up @@ -168,7 +171,7 @@ func TestSegmentsConsumerErrorsOut(t *testing.T) {
"Trace consumer errored out")
}, 10*time.Second, 5*time.Millisecond, "poller should log warning because consumer errored out")

assert.NoError(t, tt.CheckReceiverTraces(udppoller.Transport, 1, 1))
assertReceiverTraces(t, tt, receiverID, 1, 1)
}

func TestPollerCloseError(t *testing.T) {
Expand Down Expand Up @@ -338,3 +341,47 @@ func logSetup() (*zap.Logger, *observer.ObservedLogs) {
core, recorded := observer.New(zapcore.InfoLevel)
return zap.New(core), recorded
}

func assertReceiverTraces(t *testing.T, tt componenttest.TestTelemetry, id component.ID, accepted, refused int64) {
got, err := tt.GetMetric("otelcol_receiver_accepted_spans")
assert.NoError(t, err)
metricdatatest.AssertEqual(t,
metricdata.Metrics{
Name: "otelcol_receiver_accepted_spans",
Description: "Number of spans successfully pushed into the pipeline. [alpha]",
Unit: "{spans}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
IsMonotonic: true,
DataPoints: []metricdata.DataPoint[int64]{
{
Attributes: attribute.NewSet(
attribute.String("receiver", id.String()),
attribute.String("transport", udppoller.Transport)),
Value: accepted,
},
},
},
}, got, metricdatatest.IgnoreTimestamp(), metricdatatest.IgnoreExemplars())

got, err = tt.GetMetric("otelcol_receiver_refused_spans")
assert.NoError(t, err)
metricdatatest.AssertEqual(t,
metricdata.Metrics{
Name: "otelcol_receiver_refused_spans",
Description: "Number of spans that could not be pushed into the pipeline. [alpha]",
Unit: "{spans}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
IsMonotonic: true,
DataPoints: []metricdata.DataPoint[int64]{
{
Attributes: attribute.NewSet(
attribute.String("receiver", id.String()),
attribute.String("transport", udppoller.Transport)),
Value: refused,
},
},
},
}, got, metricdatatest.IgnoreTimestamp(), metricdatatest.IgnoreExemplars())
}
4 changes: 2 additions & 2 deletions receiver/carbonreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ require (
go.opentelemetry.io/collector/pdata v1.25.0
go.opentelemetry.io/collector/receiver v0.119.0
go.opentelemetry.io/collector/receiver/receivertest v0.119.0
go.opentelemetry.io/otel v1.34.0
go.opentelemetry.io/otel/sdk v1.34.0
go.opentelemetry.io/otel/sdk/metric v1.34.0
go.opentelemetry.io/otel/trace v1.34.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
Expand Down Expand Up @@ -46,9 +48,7 @@ require (
go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect
go.opentelemetry.io/collector/pipeline v0.119.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.29.0 // indirect
Expand Down
52 changes: 50 additions & 2 deletions receiver/carbonreceiver/reporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ import (
"errors"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
"go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/internal/metadata"
)
Expand All @@ -31,12 +35,56 @@ func TestReporterObservability(t *testing.T) {

reporter.OnMetricsProcessed(ctx, 17, nil)

require.NoError(t, tt.CheckReceiverMetrics("tcp", 17, 0))
assertReceiverMetrics(t, tt, receiverID, 17, 0)

// Below just exercise the error paths.
err = errors.New("fake error for tests")
reporter.OnTranslationError(ctx, err)
reporter.OnMetricsProcessed(ctx, 10, err)

require.NoError(t, tt.CheckReceiverMetrics("tcp", 17, 10))
assertReceiverMetrics(t, tt, receiverID, 17, 10)
}

func assertReceiverMetrics(t *testing.T, tt componenttest.TestTelemetry, id component.ID, accepted, refused int64) {
got, err := tt.GetMetric("otelcol_receiver_accepted_metric_points")
assert.NoError(t, err)
metricdatatest.AssertEqual(t,
metricdata.Metrics{
Name: "otelcol_receiver_accepted_metric_points",
Description: "Number of metric points successfully pushed into the pipeline. [alpha]",
Unit: "{datapoints}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
IsMonotonic: true,
DataPoints: []metricdata.DataPoint[int64]{
{
Attributes: attribute.NewSet(
attribute.String("receiver", id.String()),
attribute.String("transport", "tcp")),
Value: accepted,
},
},
},
}, got, metricdatatest.IgnoreTimestamp(), metricdatatest.IgnoreExemplars())

got, err = tt.GetMetric("otelcol_receiver_refused_metric_points")
assert.NoError(t, err)
metricdatatest.AssertEqual(t,
metricdata.Metrics{
Name: "otelcol_receiver_refused_metric_points",
Description: "Number of metric points that could not be pushed into the pipeline. [alpha]",
Unit: "{datapoints}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
IsMonotonic: true,
DataPoints: []metricdata.DataPoint[int64]{
{
Attributes: attribute.NewSet(
attribute.String("receiver", id.String()),
attribute.String("transport", "tcp")),
Value: refused,
},
},
},
}, got, metricdatatest.IgnoreTimestamp(), metricdatatest.IgnoreExemplars())
}
2 changes: 1 addition & 1 deletion receiver/opencensusreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ require (
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0
go.opentelemetry.io/otel v1.34.0
go.opentelemetry.io/otel/sdk v1.34.0
go.opentelemetry.io/otel/sdk/metric v1.34.0
go.opentelemetry.io/otel/trace v1.34.0
go.uber.org/goleak v1.3.0
google.golang.org/grpc v1.70.0
Expand Down Expand Up @@ -74,7 +75,6 @@ require (
go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 // indirect
go.opentelemetry.io/collector/semconv v0.119.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.34.0 // indirect
Expand Down
Loading