Skip to content

Commit

Permalink
The SDK changes necessary to satasify the new api
Browse files Browse the repository at this point in the history
  • Loading branch information
@MadVikingGod
MadVikingGod committed Feb 7, 2022
1 parent f334454 commit cb9677b
Show file tree
Hide file tree
Showing 11 changed files with 391 additions and 398 deletions.
75 changes: 0 additions & 75 deletions internal/metric/go.mod
View file

This file was deleted.

18 changes: 0 additions & 18 deletions internal/metric/go.sum
View file

This file was deleted.

5 changes: 4 additions & 1 deletion sdk/metric/controller/basic/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
controllerTime "go.opentelemetry.io/otel/sdk/metric/controller/time"
"go.opentelemetry.io/otel/sdk/metric/export"
"go.opentelemetry.io/otel/sdk/metric/registry"
"go.opentelemetry.io/otel/sdk/metric/sdkapi"
"go.opentelemetry.io/otel/sdk/resource"
)

Expand Down Expand Up @@ -99,7 +100,7 @@ func (c *Controller) Meter(instrumentationName string, opts ...metric.MeterOptio
library: library,
}))
}
return metric.WrapMeterImpl(m.(*registry.UniqueInstrumentMeterImpl))
return sdkapi.WrapMeterImpl(m.(*registry.UniqueInstrumentMeterImpl))
}

type accumulatorCheckpointer struct {
Expand All @@ -108,6 +109,8 @@ type accumulatorCheckpointer struct {
library instrumentation.Library
}

var _ sdkapi.MeterImpl = &accumulatorCheckpointer{}

// New constructs a Controller using the provided checkpointer factory
// and options (including optional exporter) to configure a metric
// export pipeline.
Expand Down
98 changes: 58 additions & 40 deletions sdk/metric/controller/basic/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"go.opentelemetry.io/otel/attribute"
ottest "go.opentelemetry.io/otel/internal/internaltest"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/metric/instrument"
"go.opentelemetry.io/otel/sdk/instrumentation"
controller "go.opentelemetry.io/otel/sdk/metric/controller/basic"
"go.opentelemetry.io/otel/sdk/metric/controller/controllertest"
Expand Down Expand Up @@ -127,7 +127,7 @@ func TestControllerUsesResource(t *testing.T) {
ctx := context.Background()
require.NoError(t, cont.Start(ctx))

ctr := metric.Must(cont.Meter("named")).NewFloat64Counter("calls.sum")
ctr, _ := cont.Meter("named").SyncFloat64().Counter("calls.sum")
ctr.Add(context.Background(), 1.)

// Collect once
Expand All @@ -152,16 +152,19 @@ func TestStartNoExporter(t *testing.T) {
)
mock := controllertest.NewMockClock()
cont.SetClock(mock)
meter := cont.Meter("go.opentelemetry.io/otel/sdk/metric/controller/basic_test#StartNoExporter")

calls := int64(0)

_ = metric.Must(cont.Meter("named")).NewInt64CounterObserver("calls.lastvalue",
func(ctx context.Context, result metric.Int64ObserverResult) {
calls++
checkTestContext(t, ctx)
result.Observe(calls, attribute.String("A", "B"))
},
)
counterObserver, err := meter.AsyncInt64().Counter("calls.lastvalue")
require.NoError(t, err)

err = meter.RegisterCallback([]instrument.Asynchronous{counterObserver}, func(ctx context.Context) {
calls++
checkTestContext(t, ctx)
counterObserver.Observe(ctx, calls, attribute.String("A", "B"))
})
require.NoError(t, err)

// Collect() has not been called. The controller is unstarted.
expect := map[string]float64{}
Expand Down Expand Up @@ -220,18 +223,22 @@ func TestObserverCanceled(t *testing.T) {
controller.WithCollectTimeout(time.Millisecond),
controller.WithResource(resource.Empty()),
)
meter := cont.Meter("go.opentelemetry.io/otel/sdk/metric/controller/basic_test#ObserverCanceled")

calls := int64(0)

_ = metric.Must(cont.Meter("named")).NewInt64CounterObserver("done.lastvalue",
func(ctx context.Context, result metric.Int64ObserverResult) {
<-ctx.Done()
calls++
result.Observe(calls)
},
)
counterObserver, err := meter.AsyncInt64().Counter("done.lastvalue")
require.NoError(t, err)

err = meter.RegisterCallback([]instrument.Asynchronous{counterObserver}, func(ctx context.Context) {
<-ctx.Done()
calls++
counterObserver.Observe(ctx, calls)
})
require.NoError(t, err)

// This relies on the context timing out
err := cont.Collect(context.Background())
err = cont.Collect(context.Background())
require.Error(t, err)
require.True(t, errors.Is(err, context.DeadlineExceeded))

Expand All @@ -251,14 +258,18 @@ func TestObserverContext(t *testing.T) {
controller.WithCollectTimeout(0),
controller.WithResource(resource.Empty()),
)
meter := cont.Meter("go.opentelemetry.io/otel/sdk/metric/controller/basic_test#ObserverContext")

counterObserver, err := meter.AsyncInt64().Counter("done.lastvalue")
require.NoError(t, err)

err = meter.RegisterCallback([]instrument.Asynchronous{counterObserver}, func(ctx context.Context) {
time.Sleep(10 * time.Millisecond)
checkTestContext(t, ctx)
counterObserver.Observe(ctx, 1)
})
require.NoError(t, err)

_ = metric.Must(cont.Meter("named")).NewInt64CounterObserver("done.lastvalue",
func(ctx context.Context, result metric.Int64ObserverResult) {
time.Sleep(10 * time.Millisecond)
checkTestContext(t, ctx)
result.Observe(1)
},
)
ctx := testContext()

require.NoError(t, cont.Collect(ctx))
Expand Down Expand Up @@ -314,14 +325,17 @@ func TestExportTimeout(t *testing.T) {
)
mock := controllertest.NewMockClock()
cont.SetClock(mock)
meter := cont.Meter("go.opentelemetry.io/otel/sdk/metric/controller/basic_test#ExportTimeout")

calls := int64(0)
_ = metric.Must(cont.Meter("named")).NewInt64CounterObserver("one.lastvalue",
func(ctx context.Context, result metric.Int64ObserverResult) {
calls++
result.Observe(calls)
},
)
counterObserver, err := meter.AsyncInt64().Counter("one.lastvalue")
require.NoError(t, err)

err = meter.RegisterCallback([]instrument.Asynchronous{counterObserver}, func(ctx context.Context) {
calls++
counterObserver.Observe(ctx, calls)
})
require.NoError(t, err)

require.NoError(t, cont.Start(context.Background()))

Expand All @@ -332,7 +346,7 @@ func TestExportTimeout(t *testing.T) {
// Collect after 1s, timeout
mock.Add(time.Second)

err := testHandler.Flush()
err = testHandler.Flush()
require.Error(t, err)
require.True(t, errors.Is(err, context.DeadlineExceeded))

Expand Down Expand Up @@ -369,13 +383,17 @@ func TestCollectAfterStopThenStartAgain(t *testing.T) {
mock := controllertest.NewMockClock()
cont.SetClock(mock)

meter := cont.Meter("go.opentelemetry.io/otel/sdk/metric/controller/basic_test#CollectAfterStopThenStartAgain")

calls := 0
_ = metric.Must(cont.Meter("named")).NewInt64CounterObserver("one.lastvalue",
func(ctx context.Context, result metric.Int64ObserverResult) {
calls++
result.Observe(int64(calls))
},
)
counterObserver, err := meter.AsyncInt64().Counter("one.lastvalue")
require.NoError(t, err)

err = meter.RegisterCallback([]instrument.Asynchronous{counterObserver}, func(ctx context.Context) {
calls++
counterObserver.Observe(ctx, int64(calls))
})
require.NoError(t, err)

// No collections happen (because mock clock does not advance):
require.NoError(t, cont.Start(context.Background()))
Expand Down Expand Up @@ -403,7 +421,7 @@ func TestCollectAfterStopThenStartAgain(t *testing.T) {
// explicit collection should still fail.
require.NoError(t, cont.Start(context.Background()))
require.True(t, cont.IsRunning())
err := cont.Collect(context.Background())
err = cont.Collect(context.Background())
require.Error(t, err)
require.Equal(t, controller.ErrControllerStarted, err)

Expand Down Expand Up @@ -452,10 +470,10 @@ func TestRegistryFunction(t *testing.T) {
require.NotNil(t, m1)
require.Equal(t, m1, m2)

c1, err := m1.NewInt64Counter("counter.sum")
c1, err := m1.SyncInt64().Counter("counter.sum")
require.NoError(t, err)

c2, err := m1.NewInt64Counter("counter.sum")
c2, err := m1.SyncInt64().Counter("counter.sum")
require.NoError(t, err)

require.Equal(t, c1, c2)
Expand Down
8 changes: 4 additions & 4 deletions sdk/metric/controller/basic/pull_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ import (
"time"

"github.com/stretchr/testify/require"

"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric"
controller "go.opentelemetry.io/otel/sdk/metric/controller/basic"
"go.opentelemetry.io/otel/sdk/metric/controller/controllertest"
"go.opentelemetry.io/otel/sdk/metric/export/aggregation"
Expand All @@ -45,7 +43,8 @@ func TestPullNoCollect(t *testing.T) {

ctx := context.Background()
meter := puller.Meter("nocache")
counter := metric.Must(meter).NewInt64Counter("counter.sum")
counter, err := meter.SyncInt64().Counter("counter.sum")
require.NoError(t, err)

counter.Add(ctx, 10, attribute.String("A", "B"))

Expand Down Expand Up @@ -83,7 +82,8 @@ func TestPullWithCollect(t *testing.T) {

ctx := context.Background()
meter := puller.Meter("nocache")
counter := metric.Must(meter).NewInt64Counter("counter.sum")
counter, err := meter.SyncInt64().Counter("counter.sum")
require.NoError(t, err)

counter.Add(ctx, 10, attribute.String("A", "B"))

Expand Down
10 changes: 6 additions & 4 deletions sdk/metric/controller/basic/push_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric"
controller "go.opentelemetry.io/otel/sdk/metric/controller/basic"
"go.opentelemetry.io/otel/sdk/metric/controller/controllertest"
"go.opentelemetry.io/otel/sdk/metric/export"
Expand Down Expand Up @@ -117,7 +116,8 @@ func TestPushTicker(t *testing.T) {

ctx := context.Background()

counter := metric.Must(meter).NewInt64Counter("counter.sum")
counter, err := meter.SyncInt64().Counter("counter.sum")
require.NoError(t, err)

require.NoError(t, p.Start(ctx))

Expand Down Expand Up @@ -197,8 +197,10 @@ func TestPushExportError(t *testing.T) {
ctx := context.Background()

meter := p.Meter("name")
counter1 := metric.Must(meter).NewInt64Counter("counter1.sum")
counter2 := metric.Must(meter).NewInt64Counter("counter2.sum")
counter1, err := meter.SyncInt64().Counter("counter1.sum")
require.NoError(t, err)
counter2, err := meter.SyncInt64().Counter("counter2.sum")
require.NoError(t, err)

require.NoError(t, p.Start(ctx))
runtime.Gosched()
Expand Down
17 changes: 9 additions & 8 deletions sdk/metric/processor/basic/basic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/stretchr/testify/require"

"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/metric/instrument"
"go.opentelemetry.io/otel/sdk/instrumentation"
sdk "go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/metric/aggregator"
Expand Down Expand Up @@ -450,15 +450,16 @@ func TestCounterObserverEndToEnd(t *testing.T) {
eselector,
)
accum := sdk.NewAccumulator(proc)
meter := metric.WrapMeterImpl(accum)
meter := sdkapi.WrapMeterImpl(accum)

var calls int64
metric.Must(meter).NewInt64CounterObserver("observer.sum",
func(_ context.Context, result metric.Int64ObserverResult) {
calls++
result.Observe(calls)
},
)
ctr, err := meter.AsyncInt64().Counter("observer.sum")
require.NoError(t, err)
err = meter.RegisterCallback([]instrument.Asynchronous{ctr}, func(ctx context.Context) {
calls++
ctr.Observe(ctx, calls)
})
require.NoError(t, err)
reader := proc.Reader()

var startTime [3]time.Time
Expand Down

0 comments on commit cb9677b

Please sign in to comment.