Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] [receiver/receivercreator] Remove OC data model usage from tests #20758

Merged
merged 1 commit into from
Apr 7, 2023
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
5 changes: 0 additions & 5 deletions receiver/receivercreator/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ go 1.19

require (
github.com/antonmedv/expr v1.12.5
github.com/census-instrumentation/opencensus-proto v0.4.1
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.75.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.75.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.75.0
github.com/spf13/cast v1.5.0
github.com/stretchr/testify v1.8.2
go.opentelemetry.io/collector v0.75.0
Expand Down Expand Up @@ -45,7 +43,6 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.75.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.75.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
Expand Down Expand Up @@ -85,8 +82,6 @@ require (

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer => ../../extension/observer

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
Expand Down
4 changes: 0 additions & 4 deletions receiver/receivercreator/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 10 additions & 30 deletions receiver/receivercreator/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ import (
"testing"
"time"

commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1"
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
Expand All @@ -33,12 +30,13 @@ import (
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/otelcol/otelcoltest"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/receiver/receivertest"
semconv "go.opentelemetry.io/collector/semconv/v1.18.0"
"go.uber.org/zap"
zapObserver "go.uber.org/zap/zaptest/observer"

"github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer"
internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

func TestCreateDefaultConfig(t *testing.T) {
Expand Down Expand Up @@ -113,32 +111,14 @@ func TestMockedEndToEnd(t *testing.T) {
// Test that we can send metrics.
for _, receiver := range dyn.observerHandler.receiversByEndpointID.Values() {
example := receiver.(*nopWithEndpointReceiver)
md := internaldata.OCToMetrics(
&commonpb.Node{
ServiceInfo: &commonpb.ServiceInfo{Name: "dynamictest"},
LibraryInfo: &commonpb.LibraryInfo{},
Identifier: &commonpb.ProcessIdentifier{},
Attributes: map[string]string{
"attr": "1",
},
},
&resourcepb.Resource{Type: "test"},
[]*metricspb.Metric{
{
MetricDescriptor: &metricspb.MetricDescriptor{
Name: "my-metric",
Description: "My metric",
Type: metricspb.MetricDescriptor_GAUGE_INT64,
},
Timeseries: []*metricspb.TimeSeries{
{
Points: []*metricspb.Point{
{Value: &metricspb.Point_Int64Value{Int64Value: 123}},
},
},
},
},
})
md := pmetric.NewMetrics()
rm := md.ResourceMetrics().AppendEmpty()
rm.Resource().Attributes().PutStr("attr", "1")
rm.Resource().Attributes().PutStr(semconv.AttributeServiceName, "dynamictest")
m := rm.ScopeMetrics().AppendEmpty().Metrics().AppendEmpty()
m.SetName("my-metric")
m.SetDescription("My metric")
m.SetEmptyGauge().DataPoints().AppendEmpty().SetIntValue(123)
assert.NoError(t, example.ConsumeMetrics(context.Background(), md))
}

Expand Down