Skip to content

Commit

Permalink
fix quote code
Browse files Browse the repository at this point in the history
  • Loading branch information
hanyuancheung committed Jul 14, 2022
1 parent 8f5f501 commit 14392d1
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 32 deletions.
10 changes: 5 additions & 5 deletions sdk/metric/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ import (
"github.com/stretchr/testify/require"

"go.opentelemetry.io/otel/sdk/metric/aggregation"
"go.opentelemetry.io/otel/sdk/metric/export"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
"go.opentelemetry.io/otel/sdk/resource"
)

type reader struct {
producer producer
temporalityFunc func(InstrumentKind) export.Temporality
temporalityFunc func(InstrumentKind) metricdata.Temporality
aggregationFunc AggregationSelector
collectFunc func(context.Context) (export.ResourceMetrics, error)
collectFunc func(context.Context) (metricdata.ResourceMetrics, error)
forceFlushFunc func(context.Context) error
shutdownFunc func(context.Context) error
}
Expand All @@ -46,8 +46,8 @@ func (r *reader) aggregation(kind InstrumentKind) aggregation.Aggregation { // n
}

func (r *reader) register(p producer) { r.producer = p }
func (r *reader) temporality(kind InstrumentKind) export.Temporality { return r.temporalityFunc(kind) }
func (r *reader) Collect(ctx context.Context) (export.ResourceMetrics, error) {
func (r *reader) temporality(kind InstrumentKind) metricdata.Temporality { return r.temporalityFunc(kind) }
func (r *reader) Collect(ctx context.Context) (metricdata.ResourceMetrics, error) {
return r.collectFunc(ctx)
}
func (r *reader) ForceFlush(ctx context.Context) error { return r.forceFlushFunc(ctx) }
Expand Down
8 changes: 4 additions & 4 deletions sdk/metric/manual_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"go.opentelemetry.io/otel/internal/global"
"go.opentelemetry.io/otel/sdk/metric/aggregation"
"go.opentelemetry.io/otel/sdk/metric/export"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
)

// manualReader is a a simple Reader that allows an application to
Expand Down Expand Up @@ -90,10 +90,10 @@ func (mr *manualReader) Shutdown(context.Context) error {

// Collect gathers all metrics from the SDK, calling any callbacks necessary.
// Collect will return an error if called after shutdown.
func (mr *manualReader) Collect(ctx context.Context) (export.ResourceMetrics, error) {
func (mr *manualReader) Collect(ctx context.Context) (metricdata.ResourceMetrics, error) {
p := mr.producer.Load()
if p == nil {
return export.ResourceMetrics{}, ErrReaderNotRegistered
return metricdata.ResourceMetrics{}, ErrReaderNotRegistered
}

ph, ok := p.(produceHolder)
Expand All @@ -103,7 +103,7 @@ func (mr *manualReader) Collect(ctx context.Context) (export.ResourceMetrics, er
// happen, return an error instead of panicking so a users code does
// not halt in the processes.
err := fmt.Errorf("manual reader: invalid producer: %T", p)
return export.ResourceMetrics{}, err
return metricdata.ResourceMetrics{}, err
}

return ph.produce(ctx)
Expand Down
8 changes: 4 additions & 4 deletions sdk/metric/periodic_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/internal/global"
"go.opentelemetry.io/otel/sdk/metric/aggregation"
"go.opentelemetry.io/otel/sdk/metric/export"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
)

// Default periodic reader timing.
Expand Down Expand Up @@ -199,10 +199,10 @@ func (r *periodicReader) aggregation(kind InstrumentKind) aggregation.Aggregatio
// exporter, it is left to the caller to handle that if desired.
//
// An error is returned if this is called after Shutdown.
func (r *periodicReader) Collect(ctx context.Context) (export.ResourceMetrics, error) {
func (r *periodicReader) Collect(ctx context.Context) (metricdata.ResourceMetrics, error) {
p := r.producer.Load()
if p == nil {
return export.ResourceMetrics{}, ErrReaderNotRegistered
return metricdata.ResourceMetrics{}, ErrReaderNotRegistered
}

ph, ok := p.(produceHolder)
Expand All @@ -212,7 +212,7 @@ func (r *periodicReader) Collect(ctx context.Context) (export.ResourceMetrics, e
// happen, return an error instead of panicking so a users code does
// not halt in the processes.
err := fmt.Errorf("periodic reader: invalid producer: %T", p)
return export.ResourceMetrics{}, err
return metricdata.ResourceMetrics{}, err
}
return ph.produce(ctx)
}
Expand Down
10 changes: 5 additions & 5 deletions sdk/metric/periodic_reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/stretchr/testify/suite"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/sdk/metric/export"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
)

const testDur = time.Second * 2
Expand Down Expand Up @@ -56,14 +56,14 @@ func TestWithInterval(t *testing.T) {
}

type fnExporter struct {
exportFunc func(context.Context, export.ResourceMetrics) error
exportFunc func(context.Context, metricdata.ResourceMetrics) error
flushFunc func(context.Context) error
shutdownFunc func(context.Context) error
}

var _ Exporter = (*fnExporter)(nil)

func (e *fnExporter) Export(ctx context.Context, m export.ResourceMetrics) error {
func (e *fnExporter) Export(ctx context.Context, m metricdata.ResourceMetrics) error {
if e.exportFunc != nil {
return e.exportFunc(ctx, m)
}
Expand Down Expand Up @@ -94,7 +94,7 @@ func (ts *periodicReaderTestSuite) SetupTest() {
ts.readerTestSuite.SetupTest()

e := &fnExporter{
exportFunc: func(context.Context, export.ResourceMetrics) error { return assert.AnError },
exportFunc: func(context.Context, metricdata.ResourceMetrics) error { return assert.AnError },
flushFunc: func(context.Context) error { return assert.AnError },
shutdownFunc: func(context.Context) error { return assert.AnError },
}
Expand Down Expand Up @@ -163,7 +163,7 @@ func TestPeriodicReaderRun(t *testing.T) {
otel.SetErrorHandler(eh)

exp := &fnExporter{
exportFunc: func(_ context.Context, m export.ResourceMetrics) error {
exportFunc: func(_ context.Context, m metricdata.ResourceMetrics) error {
// The testProducer produces testMetrics.
assert.Equal(t, testMetrics, m)
return assert.AnError
Expand Down
12 changes: 6 additions & 6 deletions sdk/metric/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"go.opentelemetry.io/otel/internal/global"
"go.opentelemetry.io/otel/sdk/metric/aggregation"
"go.opentelemetry.io/otel/sdk/metric/export"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
)

// errDuplicateRegister is logged by a Reader when an attempt to registered it
Expand Down Expand Up @@ -65,7 +65,7 @@ type Reader interface {

// Collect gathers and returns all metric data related to the Reader from
// the SDK. An error is returned if this is called after Shutdown.
Collect(context.Context) (export.ResourceMetrics, error)
Collect(context.Context) (metricdata.ResourceMetrics, error)

// ForceFlush flushes all metric measurements held in an export pipeline.
//
Expand Down Expand Up @@ -93,21 +93,21 @@ type producer interface {
// produce returns aggregated metrics from a single collection.
//
// This method is safe to call concurrently.
produce(context.Context) (export.ResourceMetrics, error)
produce(context.Context) (metricdata.ResourceMetrics, error)
}

// produceHolder is used as an atomic.Value to wrap the non-concrete producer
// type.
type produceHolder struct {
produce func(context.Context) (export.ResourceMetrics, error)
produce func(context.Context) (metricdata.ResourceMetrics, error)
}

// shutdownProducer produces an ErrReaderShutdown error always.
type shutdownProducer struct{}

// produce returns an ErrReaderShutdown error.
func (p shutdownProducer) produce(context.Context) (export.ResourceMetrics, error) {
return export.ResourceMetrics{}, ErrReaderShutdown
func (p shutdownProducer) produce(context.Context) (metricdata.ResourceMetrics, error) {
return metricdata.ResourceMetrics{}, ErrReaderShutdown
}

// ReaderOption applies a configuration option value to either a ManualReader or
Expand Down
16 changes: 8 additions & 8 deletions sdk/metric/reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/suite"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/sdk/metric/export"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
)

type readerTestSuite struct {
Expand Down Expand Up @@ -69,7 +69,7 @@ func (ts *readerTestSuite) TestCollectAfterShutdown() {

m, err := ts.Reader.Collect(ctx)
ts.ErrorIs(err, ErrReaderShutdown)
ts.Equal(export.ResourceMetrics{}, m)
ts.Equal(metricdata.ResourceMetrics{}, m)
}

func (ts *readerTestSuite) TestShutdownTwice() {
Expand All @@ -88,7 +88,7 @@ func (ts *readerTestSuite) TestMultipleForceFlush() {

func (ts *readerTestSuite) TestMultipleRegister() {
p0 := testProducer{
produceFunc: func(ctx context.Context) (export.ResourceMetrics, error) {
produceFunc: func(ctx context.Context) (metricdata.ResourceMetrics, error) {
// Differentiate this producer from the second by returning an
// error.
return testMetrics, assert.AnError
Expand Down Expand Up @@ -143,18 +143,18 @@ func (ts *readerTestSuite) TestShutdownBeforeRegister() {

m, err := ts.Reader.Collect(ctx)
ts.ErrorIs(err, ErrReaderShutdown)
ts.Equal(export.ResourceMetrics{}, m)
ts.Equal(metricdata.ResourceMetrics{}, m)
}

var testMetrics = export.ResourceMetrics{
var testMetrics = metricdata.ResourceMetrics{
// TODO: test with actual data.
}

type testProducer struct {
produceFunc func(context.Context) (export.ResourceMetrics, error)
produceFunc func(context.Context) (metricdata.ResourceMetrics, error)
}

func (p testProducer) produce(ctx context.Context) (export.ResourceMetrics, error) {
func (p testProducer) produce(ctx context.Context) (metricdata.ResourceMetrics, error) {
if p.produceFunc != nil {
return p.produceFunc(ctx)
}
Expand All @@ -168,7 +168,7 @@ func benchReaderCollectFunc(r Reader) func(*testing.B) {
// Store bechmark results in a closure to prevent the compiler from
// inlining and skipping the function.
var (
collectedMetrics export.ResourceMetrics
collectedMetrics metricdata.ResourceMetrics
err error
)

Expand Down

0 comments on commit 14392d1

Please sign in to comment.