Skip to content

Commit

Permalink
Merge pull request #84 from intergral/docs_build
Browse files Browse the repository at this point in the history
fix(docs): typo in docs
  • Loading branch information
Umaaz authored Feb 15, 2024
2 parents b54a6d1 + 1dac398 commit 33eadbe
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 10 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ jobs:
- name: Check out code
uses: actions/checkout@v4

- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
version: '3.11.2'
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Check vendor
run: make vendor-check

Expand Down
1 change: 1 addition & 0 deletions .idea/deep.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/docs/_sections/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Report Issues

If there are any errors that have been reported in the logs, or you are experiencing strange behaviour please create an
issue on the [Github](https://github.com/intergral/deep/issues/new/choose) project. This will allow us to improve Deep
issue on the [GitHub](https://github.com/intergral/deep/issues/new/choose) project. This will allow us to improve Deep
and hopefully help you resolve your issues.
2 changes: 1 addition & 1 deletion docs/docs/features/metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The specific supported providers is dependent on the client that is being used.
using the plugin architecture of the client. As a generalisation the following providers will be detected and used automatically:

- Prometheus
- Otel
- OpenTelemarty (OTel)

For more info on what providers are supported by which clients see the client docs.

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/features/traces.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ allows for '[method entry tracepoints](./method_entry.md)'
The specific supported providers is dependent on the client that is being used. In all cases custom providers can be set
using the plugin architecture of the client. As a generalisation the following providers will be detected and used automatically:

- Otel
- OpenTelemarty (OTel)

For more info on what providers are supported by which clients see the client docs.

Expand Down
2 changes: 2 additions & 0 deletions modules/ingester/ingester_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@ func TestFlush(t *testing.T) {
require.NoError(t, err, "unexpected error querying")
assert.True(t, proto.Equal(snapshots[i], foundSnapshot.Snapshot), "Snapshots not equal")
}
// Stop the ingester to stop it writing to disk between now and temp dir delete
require.NoError(t, ingester.stopping(nil))
}

func defaultIngesterModule(t testing.TB, tmpDir string) *Ingester {
Expand Down
5 changes: 5 additions & 0 deletions modules/ingester/instance_search_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"fmt"
"sort"
"strconv"
"sync"
"sync/atomic"
"testing"
"time"
Expand Down Expand Up @@ -333,8 +334,11 @@ func TestInstanceSearchDoesNotRace(t *testing.T) {
}

end := make(chan struct{})
group := sync.WaitGroup{}

concurrent := func(f func()) {
group.Add(1)
defer group.Done()
for {
select {
case <-end:
Expand Down Expand Up @@ -418,6 +422,7 @@ func TestInstanceSearchDoesNotRace(t *testing.T) {
close(end)
// Wait for go funcs to quit before
// exiting and cleaning up
group.Wait()
time.Sleep(2 * time.Second)
}

Expand Down
5 changes: 5 additions & 0 deletions modules/ingester/tenantBlockManager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"context"
crand "crypto/rand"
"encoding/binary"
"sync"
"testing"
"time"

Expand Down Expand Up @@ -173,8 +174,11 @@ func queryAll(t *testing.T, i *tenantBlockManager, ids [][]byte, snapshots []*de
func TestInstanceDoesNotRace(t *testing.T) {
i, ingester := defaultInstance(t)
end := make(chan struct{})
group := sync.WaitGroup{}

concurrent := func(f func()) {
group.Add(1)
defer group.Done()
for {
select {
case <-end:
Expand Down Expand Up @@ -225,6 +229,7 @@ func TestInstanceDoesNotRace(t *testing.T) {
close(end)
// Wait for go funcs to quit before
// exiting and cleaning up
group.Wait()
time.Sleep(2 * time.Second)
}

Expand Down

0 comments on commit 33eadbe

Please sign in to comment.