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

Fix ordering of indexScanKeys after TraceID parsing, closes #1808 #1809

Merged
merged 3 commits into from
Oct 9, 2019
Merged
Changes from 1 commit
Commits
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
7 changes: 3 additions & 4 deletions plugin/storage/badger/spanstore/read_write_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import (
"testing"
"time"

assert "github.com/stretchr/testify/require"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/uber/jaeger-lib/metrics"
"go.uber.org/zap"

Expand Down Expand Up @@ -587,7 +588,7 @@ func BenchmarkServiceIndexLimitFetch(b *testing.B) {

// Opens a badger db and runs a test on it.
func runLargeFactoryTest(tb testing.TB, test func(tb testing.TB, sw spanstore.Writer, sr spanstore.Reader)) {
assert := assert.New(tb)
assert := require.New(tb)
burmanm marked this conversation as resolved.
Show resolved Hide resolved
f := badger.NewFactory()
opts := badger.NewOptions("badger")
v, command := config.Viperize(opts.AddFlags)
Expand Down Expand Up @@ -687,8 +688,6 @@ func TestRandomTraceID(t *testing.T) {
}
traces, err := sr.FindTraces(context.Background(), params)
assert.NoError(t, err)

// failed with `second` tag query, but success with `first`
burmanm marked this conversation as resolved.
Show resolved Hide resolved
assert.Equal(t, 1, len(traces))
})
}