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

Unique instrument checking #580

Merged
merged 16 commits into from
Mar 24, 2020
Prev Previous commit
Next Next commit
Use proper require statement for errors
  • Loading branch information
jmacd committed Mar 23, 2020
commit 62638ad56f4a1be32e107a751bfc17f2790ca038
12 changes: 6 additions & 6 deletions api/global/internal/registry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ func TestRegistrySameInstruments(t *testing.T) {
inst1, err1 := nf("this", "meter")
inst2, err2 := nf("this", "meter")

require.Nil(t, err1)
require.Nil(t, err2)
require.NoError(t, err1)
require.NoError(t, err2)
require.Equal(t, inst1, inst2)
}
}
Expand All @@ -72,8 +72,8 @@ func TestRegistryDifferentNamespace(t *testing.T) {
inst1, err1 := nf("this", "meter1")
inst2, err2 := nf("this", "meter2")

require.Nil(t, err1)
require.Nil(t, err2)
require.NoError(t, err1)
require.NoError(t, err2)
require.NotEqual(t, inst1, inst2)
}
}
Expand All @@ -83,15 +83,15 @@ func TestRegistryDiffInstruments(t *testing.T) {
ResetForTest()

_, err := origf("this", "super")
require.Nil(t, err)
require.NoError(t, err)

for newName, nf := range allNew {
if newName == origName {
continue
}

other, err := nf("this", "super")
require.NotNil(t, err)
require.Error(t, err)
require.NotNil(t, other)
require.True(t, errors.Is(err, registry.ErrMetricKindMismatch))
require.Contains(t, err.Error(), "super")
Expand Down
12 changes: 6 additions & 6 deletions api/metric/registry/registry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ func TestRegistrySameInstruments(t *testing.T) {
inst1, err1 := nf(meter, "this")
inst2, err2 := nf(meter, "this")

require.Nil(t, err1)
require.Nil(t, err2)
require.NoError(t, err1)
require.NoError(t, err2)
require.Equal(t, inst1, inst2)
}
}
Expand All @@ -92,8 +92,8 @@ func TestRegistryDifferentNamespace(t *testing.T) {
inst1, err1 := nf(meter1, "this")
inst2, err2 := nf(meter2, "this")

require.Nil(t, err1)
require.Nil(t, err2)
require.NoError(t, err1)
require.NoError(t, err2)
require.NotEqual(t, inst1, inst2)
}
}
Expand All @@ -104,15 +104,15 @@ func TestRegistryDiffInstruments(t *testing.T) {
meter := provider.Meter("meter")

_, err := origf(meter, "this")
require.Nil(t, err)
require.NoError(t, err)

for newName, nf := range allNew {
if newName == origName {
continue
}

other, err := nf(meter, "this")
require.NotNil(t, err)
require.Error(t, err)
require.NotNil(t, other)
require.True(t, errors.Is(err, registry.ErrMetricKindMismatch))
}
Expand Down