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

Refactor the SDK helpers, create MeterImpl #560

Merged
merged 25 commits into from
Mar 19, 2020
Merged

Refactor the SDK helpers, create MeterImpl #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4b86364
Create MeterImpl interface
Mar 13, 2020
064a21c
Upstream merge
Mar 13, 2020
e56173a
Checkpoint w/ sdk.go building
Mar 13, 2020
d8f286c
Checkpoint working on global
Mar 14, 2020
88a4ee3
api/global builds (test fails)
Mar 16, 2020
9f14868
Test fix
Mar 16, 2020
2535fc1
All tests pass
Mar 16, 2020
8be1dca
Comments
Mar 16, 2020
53effab
Add two tests
Mar 16, 2020
46f017a
Comments and uncomment tests
Mar 16, 2020
2fe455a
Precommit part 1
Mar 17, 2020
91e9bd0
Still working on tests
Mar 17, 2020
a80b743
Lint
Mar 17, 2020
6891d03
Add a test and a TODO
Mar 17, 2020
58879a0
Merge upstream
Mar 17, 2020
56a5be7
Cleanup
Mar 17, 2020
ee020b7
Lint
Mar 17, 2020
0065c54
Upstream
Mar 17, 2020
058266a
Interface()->Implementation()
Mar 17, 2020
ec88789
Apply some feedback
Mar 17, 2020
4f810b8
From feedback
Mar 19, 2020
315602c
(A)Synchronous -> (A)Sync
Mar 19, 2020
68c82dd
Add a missing comment
Mar 19, 2020
03a0d2d
Apply suggestions from code review
jmacd Mar 19, 2020
2a401ec
Rename a variable
Mar 19, 2020
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
14 changes: 8 additions & 6 deletions api/global/internal/benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ var Must = metric.Must
// benchFixture is copied from sdk/metric/benchmark_test.go.
// TODO refactor to share this code.
type benchFixture struct {
sdk *sdk.SDK
B *testing.B
sdk *sdk.SDK
meter metric.Meter
B *testing.B
}

var _ metric.Provider = &benchFixture{}
Expand All @@ -35,14 +36,15 @@ func newFixture(b *testing.B) *benchFixture {
B: b,
}
bf.sdk = sdk.New(bf, sdk.NewDefaultLabelEncoder())
bf.meter = metric.WrapMeterImpl(bf.sdk)
return bf
}

func (*benchFixture) AggregatorFor(descriptor *export.Descriptor) export.Aggregator {
func (*benchFixture) AggregatorFor(descriptor *metric.Descriptor) export.Aggregator {
switch descriptor.MetricKind() {
case export.CounterKind:
case metric.CounterKind:
return sum.New()
case export.MeasureKind:
case metric.MeasureKind:
if strings.HasSuffix(descriptor.Name(), "minmaxsumcount") {
return minmaxsumcount.New(descriptor)
} else if strings.HasSuffix(descriptor.Name(), "ddsketch") {
Expand All @@ -66,7 +68,7 @@ func (*benchFixture) FinishedCollection() {
}

func (fix *benchFixture) Meter(name string) metric.Meter {
return fix.sdk
return fix.meter
}

func BenchmarkGlobalInt64CounterAddNoSDK(b *testing.B) {
Expand Down
Loading