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.

Sign up for GitHub

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

Jump to bottom

Change opencensus recv/exp to use the new metrics internal structs #1686

Merged
merged 1 commit into from
Aug 31, 2020
Merged

Change opencensus recv/exp to use the new metrics internal structs #1686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions exporter/opencensusexporter/opencensus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"go.opentelemetry.io/collector/consumer/pdatautil"
"go.opentelemetry.io/collector/exporter/exportertest"
"go.opentelemetry.io/collector/internal/data/testdata"
"go.opentelemetry.io/collector/internal/dataold/testdataold"
"go.opentelemetry.io/collector/receiver/opencensusreceiver"
"go.opentelemetry.io/collector/testutil"
)
Expand Down Expand Up @@ -166,27 +165,27 @@ func TestSendMetrics(t *testing.T) {
assert.NoError(t, exp.Shutdown(context.Background()))
})

md := testdataold.GenerateMetricDataOneMetric()
assert.NoError(t, exp.ConsumeMetrics(context.Background(), pdatautil.MetricsFromOldInternalMetrics(md)))
md := testdata.GenerateMetricsOneMetric()
assert.NoError(t, exp.ConsumeMetrics(context.Background(), pdatautil.MetricsFromInternalMetrics(md)))
testutil.WaitFor(t, func() bool {
return len(sink.AllMetrics()) == 1
})
metrics := sink.AllMetrics()
require.Len(t, metrics, 1)
assert.Equal(t, md, pdatautil.MetricsToOldInternalMetrics(metrics[0]))
assert.Equal(t, md, pdatautil.MetricsToInternalMetrics(metrics[0]))

// Sending data no node.
sink.Reset()
pdata.NewResource().CopyTo(md.ResourceMetrics().At(0).Resource())
assert.NoError(t, exp.ConsumeMetrics(context.Background(), pdatautil.MetricsFromOldInternalMetrics(md)))
assert.NoError(t, exp.ConsumeMetrics(context.Background(), pdatautil.MetricsFromInternalMetrics(md)))
testutil.WaitFor(t, func() bool {
return len(sink.AllMetrics()) == 1
})
metrics = sink.AllMetrics()
require.Len(t, metrics, 1)
// The conversion will initialize the Resource
md.ResourceMetrics().At(0).Resource().InitEmpty()
assert.Equal(t, md, pdatautil.MetricsToOldInternalMetrics(metrics[0]))
assert.Equal(t, md, pdatautil.MetricsToInternalMetrics(metrics[0]))
}

func TestSendMetrics_NoBackend(t *testing.T) {
Expand All @@ -207,7 +206,7 @@ func TestSendMetrics_NoBackend(t *testing.T) {
assert.NoError(t, exp.Shutdown(context.Background()))
})

md := pdatautil.MetricsFromOldInternalMetrics(testdataold.GenerateMetricDataOneMetric())
md := pdatautil.MetricsFromInternalMetrics(testdata.GenerateMetricsOneMetric())
for i := 0; i < 10000; i++ {
assert.Error(t, exp.ConsumeMetrics(context.Background(), md))
}
Expand All @@ -229,6 +228,6 @@ func TestSendMetrics_AfterStop(t *testing.T) {
require.NoError(t, exp.Start(context.Background(), host))
assert.NoError(t, exp.Shutdown(context.Background()))

md := pdatautil.MetricsFromOldInternalMetrics(testdataold.GenerateMetricDataOneMetric())
md := pdatautil.MetricsFromInternalMetrics(testdata.GenerateMetricsOneMetric())
assert.Error(t, exp.ConsumeMetrics(context.Background(), md))
}
8 changes: 4 additions & 4 deletions receiver/opencensusreceiver/ocmetrics/opencensus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import (
"go.opentelemetry.io/collector/consumer/pdatautil"
"go.opentelemetry.io/collector/exporter/exportertest"
"go.opentelemetry.io/collector/exporter/opencensusexporter"
"go.opentelemetry.io/collector/internal/dataold/testdataold"
"go.opentelemetry.io/collector/internal/data/testdata"
"go.opentelemetry.io/collector/obsreport"
"go.opentelemetry.io/collector/testutil"
)
Expand All @@ -68,15 +68,15 @@ func TestReceiver_endToEnd(t *testing.T) {
require.NoError(t, oce.Shutdown(context.Background()))
}()

md := testdataold.GenerateMetricDataOneMetric()
assert.NoError(t, oce.ConsumeMetrics(context.Background(), pdatautil.MetricsFromOldInternalMetrics(md)))
md := testdata.GenerateMetricsOneMetric()
assert.NoError(t, oce.ConsumeMetrics(context.Background(), pdatautil.MetricsFromInternalMetrics(md)))

testutil.WaitFor(t, func() bool {
return len(metricSink.AllMetrics()) != 0
})
gotMetrics := metricSink.AllMetrics()
require.Len(t, gotMetrics, 1)
gotMd := pdatautil.MetricsToOldInternalMetrics(gotMetrics[0])
gotMd := pdatautil.MetricsToInternalMetrics(gotMetrics[0])
assert.Equal(t, md, gotMd)
}

Expand Down