Skip to content

Commit

Permalink
Merge branch 'main' into 4215-flaky-TestComponentBuildHashInDiagnostics
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndersonQ
AndersonQ authored Aug 28, 2024
2 parents 2b8f25b + 6bb6b1e commit bf01310
Show file tree
Hide file tree
Showing 12 changed files with 805 additions and 591 deletions.
720 changes: 466 additions & 254 deletions NOTICE.txt
View file

Large diffs are not rendered by default.

179 changes: 90 additions & 89 deletions go.mod
View file

Large diffs are not rendered by default.

410 changes: 206 additions & 204 deletions go.sum
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions internal/pkg/agent/application/upgrade/artifact/download/http/verifier_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package http
import (
"context"
"fmt"
"math/rand"
"math/rand/v2"
"net/http"
"net/http/httptest"
"net/url"
Expand Down Expand Up @@ -111,8 +111,8 @@ func runTests(t *testing.T, testCases []testCase, config *artifact.Config, log *
func getRandomTestCases() []testCase {
tt := getTestCases()

first := rand.Intn(len(tt))
second := rand.Intn(len(tt))
first := rand.IntN(len(tt))
second := rand.IntN(len(tt))

return []testCase{
tt[first],
Expand Down
4 changes: 2 additions & 2 deletions internal/pkg/agent/application/upgrade/marker_access_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"context"
"errors"
"fmt"
"math/rand"
"math/rand/v2"
"os"
"path/filepath"
"sync"
Expand Down Expand Up @@ -159,7 +159,7 @@ func randomBytes(length int) []byte {

var b []byte
for i := 0; i < length; i++ {
rune := chars[rand.Intn(len(chars))]
rune := chars[rand.IntN(len(chars))]
b = append(b, byte(rune))
}

Expand Down
4 changes: 2 additions & 2 deletions internal/pkg/agent/cmd/enroll_cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"context"
"fmt"
"io"
"math/rand"
"math/rand/v2"
"os"
"os/exec"
"strings"
Expand Down Expand Up @@ -704,7 +704,7 @@ func yamlToReader(in interface{}) (io.Reader, error) {
}

func delay(ctx context.Context, d time.Duration) {
t := time.NewTimer(time.Duration(rand.Int63n(int64(d))))
t := time.NewTimer(rand.N(d))
defer t.Stop()
select {
case <-ctx.Done():
Expand Down
6 changes: 3 additions & 3 deletions internal/pkg/core/backoff/equal_jitter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package backoff

import (
"math/rand"
"math/rand/v2"
"time"
)

Expand All @@ -30,7 +30,7 @@ func NewEqualJitterBackoff(done <-chan struct{}, init, max time.Duration) Backof
done: done,
init: init,
max: max,
nextRand: time.Duration(rand.Int63n(int64(init))), //nolint:gosec
nextRand: rand.N(init),
}
}

Expand All @@ -51,7 +51,7 @@ func (b *EqualJitterBackoff) Wait() bool {
backoff := b.NextWait()

// increase duration for next wait.
b.nextRand = time.Duration(rand.Int63n(int64(b.duration)))
b.nextRand = rand.N(b.duration)
b.duration *= 2
if b.duration > b.max {
b.duration = b.max
Expand Down
54 changes: 27 additions & 27 deletions internal/pkg/otel/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,51 +29,51 @@ This section provides a summary of components included in the Elastic Distributi

| Component | Version |
|---|---|
| [jaegerreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/jaegerreceiver/v0.106.1/receiver/jaegerreceiver/README.md) | v0.106.1 |
| [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/prometheusreceiver/v0.106.1/receiver/prometheusreceiver/README.md) | v0.106.1 |
| [zipkinreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/zipkinreceiver/v0.106.1/receiver/zipkinreceiver/README.md) | v0.106.1 |
| [filelogreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/filelogreceiver/v0.106.1/receiver/filelogreceiver/README.md) | v0.106.1 |
| [hostmetricsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/hostmetricsreceiver/v0.106.1/receiver/hostmetricsreceiver/README.md) | v0.106.1 |
| [httpcheckreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/httpcheckreceiver/v0.106.1/receiver/httpcheckreceiver/README.md) | v0.106.1 |
| [k8sclusterreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/k8sclusterreceiver/v0.106.1/receiver/k8sclusterreceiver/README.md) | v0.106.1 |
| [k8sobjectsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/k8sobjectsreceiver/v0.106.1/receiver/k8sobjectsreceiver/README.md) | v0.106.1 |
| [kubeletstatsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/kubeletstatsreceiver/v0.106.1/receiver/kubeletstatsreceiver/README.md) | v0.106.1 |
| [otlpreceiver](https://github.com/open-telemetry/opentelemetry-collector/blob/receiver/otlpreceiver/v0.106.1/receiver/otlpreceiver/README.md) | v0.106.1 |
| [jaegerreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/jaegerreceiver/v0.107.0/receiver/jaegerreceiver/README.md) | v0.107.0 |
| [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/prometheusreceiver/v0.107.0/receiver/prometheusreceiver/README.md) | v0.107.0 |
| [zipkinreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/zipkinreceiver/v0.107.0/receiver/zipkinreceiver/README.md) | v0.107.0 |
| [filelogreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/filelogreceiver/v0.107.0/receiver/filelogreceiver/README.md) | v0.107.0 |
| [hostmetricsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/hostmetricsreceiver/v0.107.0/receiver/hostmetricsreceiver/README.md) | v0.107.0 |
| [httpcheckreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/httpcheckreceiver/v0.107.0/receiver/httpcheckreceiver/README.md) | v0.107.0 |
| [k8sclusterreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/k8sclusterreceiver/v0.107.0/receiver/k8sclusterreceiver/README.md) | v0.107.0 |
| [k8sobjectsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/k8sobjectsreceiver/v0.107.0/receiver/k8sobjectsreceiver/README.md) | v0.107.0 |
| [kubeletstatsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/kubeletstatsreceiver/v0.107.0/receiver/kubeletstatsreceiver/README.md) | v0.107.0 |
| [otlpreceiver](https://github.com/open-telemetry/opentelemetry-collector/blob/receiver/otlpreceiver/v0.107.0/receiver/otlpreceiver/README.md) | v0.107.0 |

### Exporters

| Component | Version |
|---|---|
| [elasticsearchexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/elasticsearchexporter/v0.106.1/exporter/elasticsearchexporter/README.md) | v0.106.1 |
| [fileexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/fileexporter/v0.106.1/exporter/fileexporter/README.md) | v0.106.1 |
| [debugexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/debugexporter/v0.106.1/exporter/debugexporter/README.md) | v0.106.1 |
| [otlpexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/otlpexporter/v0.106.1/exporter/otlpexporter/README.md) | v0.106.1 |
| [otlphttpexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/otlphttpexporter/v0.106.1/exporter/otlphttpexporter/README.md) | v0.106.1 |
| [elasticsearchexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/elasticsearchexporter/v0.107.0/exporter/elasticsearchexporter/README.md) | v0.107.0 |
| [fileexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/fileexporter/v0.107.0/exporter/fileexporter/README.md) | v0.107.0 |
| [debugexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/debugexporter/v0.107.0/exporter/debugexporter/README.md) | v0.107.0 |
| [otlpexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/otlpexporter/v0.107.0/exporter/otlpexporter/README.md) | v0.107.0 |
| [otlphttpexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/otlphttpexporter/v0.107.0/exporter/otlphttpexporter/README.md) | v0.107.0 |

### Processors

| Component | Version |
|---|---|
| [elasticinframetricsprocessor](https://github.com/elastic/opentelemetry-collector-components/blob/processor/elasticinframetricsprocessor/v0.9.0/processor/elasticinframetricsprocessor/README.md) | v0.9.0 |
| [memorylimiterprocessor](https://github.com/open-telemetry/opentelemetry-collector/blob/processor/memorylimiterprocessor/v0.106.1/processor/memorylimiterprocessor/README.md) | v0.106.1 |
| [attributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/attributesprocessor/v0.106.1/processor/attributesprocessor/README.md) | v0.106.1 |
| [filterprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/filterprocessor/v0.106.1/processor/filterprocessor/README.md) | v0.106.1 |
| [k8sattributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/k8sattributesprocessor/v0.106.1/processor/k8sattributesprocessor/README.md) | v0.106.1 |
| [resourcedetectionprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/resourcedetectionprocessor/v0.106.1/processor/resourcedetectionprocessor/README.md) | v0.106.1 |
| [resourceprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/resourceprocessor/v0.106.1/processor/resourceprocessor/README.md) | v0.106.1 |
| [transformprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/transformprocessor/v0.106.1/processor/transformprocessor/README.md) | v0.106.1 |
| [batchprocessor](https://github.com/open-telemetry/opentelemetry-collector/blob/processor/batchprocessor/v0.106.1/processor/batchprocessor/README.md) | v0.106.1 |
| [memorylimiterprocessor](https://github.com/open-telemetry/opentelemetry-collector/blob/processor/memorylimiterprocessor/v0.107.0/processor/memorylimiterprocessor/README.md) | v0.107.0 |
| [attributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/attributesprocessor/v0.107.0/processor/attributesprocessor/README.md) | v0.107.0 |
| [filterprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/filterprocessor/v0.107.0/processor/filterprocessor/README.md) | v0.107.0 |
| [k8sattributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/k8sattributesprocessor/v0.107.0/processor/k8sattributesprocessor/README.md) | v0.107.0 |
| [resourcedetectionprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/resourcedetectionprocessor/v0.107.0/processor/resourcedetectionprocessor/README.md) | v0.107.0 |
| [resourceprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/resourceprocessor/v0.107.0/processor/resourceprocessor/README.md) | v0.107.0 |
| [transformprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/transformprocessor/v0.107.0/processor/transformprocessor/README.md) | v0.107.0 |
| [batchprocessor](https://github.com/open-telemetry/opentelemetry-collector/blob/processor/batchprocessor/v0.107.0/processor/batchprocessor/README.md) | v0.107.0 |

### Extensions

| Component | Version |
|---|---|
| [healthcheckextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/healthcheckextension/v0.106.1/extension/healthcheckextension/README.md) | v0.106.1 |
| [filestorage](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/storage/filestorage/v0.106.1/extension/storage/filestorage/README.md) | v0.106.1 |
| [memorylimiterextension](https://github.com/open-telemetry/opentelemetry-collector/blob/extension/memorylimiterextension/v0.106.1/extension/memorylimiterextension/README.md) | v0.106.1 |
| [healthcheckextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/healthcheckextension/v0.107.0/extension/healthcheckextension/README.md) | v0.107.0 |
| [filestorage](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/storage/filestorage/v0.107.0/extension/storage/filestorage/README.md) | v0.107.0 |
| [memorylimiterextension](https://github.com/open-telemetry/opentelemetry-collector/blob/extension/memorylimiterextension/v0.107.0/extension/memorylimiterextension/README.md) | v0.107.0 |

### Connectors

| Component | Version |
|---|---|
| [spanmetricsconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/connector/spanmetricsconnector/v0.106.1/connector/spanmetricsconnector/README.md) | v0.106.1 |
| [spanmetricsconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/connector/spanmetricsconnector/v0.107.0/connector/spanmetricsconnector/README.md) | v0.107.0 |
2 changes: 1 addition & 1 deletion internal/pkg/remote/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"errors"
"fmt"
"io"
"math/rand"
"math/rand/v2"
"net/http"
"net/url"
"sort"
Expand Down
5 changes: 2 additions & 3 deletions internal/pkg/scheduler/scheduler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package scheduler

import (
"math/rand"
"math/rand/v2"
"time"
)

Expand Down Expand Up @@ -129,6 +129,5 @@ func (p *PeriodicJitter) Stop() {
}

func (p *PeriodicJitter) delay() time.Duration {
t := int64(p.variance)
return time.Duration(rand.Int63n(t))
return rand.N(p.variance)
}
2 changes: 1 addition & 1 deletion magefile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"fmt"
"html/template"
"log"
"math/rand"
"math/rand/v2"
"net/http"
"os"
"os/exec"
Expand Down
4 changes: 2 additions & 2 deletions testing/integration/install_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package integration
import (
"context"
"fmt"
"math/rand"
"math/rand/v2"
"os"
"path/filepath"
"runtime"
Expand Down Expand Up @@ -338,7 +338,7 @@ func randStr(length int) string {

runes := make([]rune, length)
for i := range runes {
runes[i] = letters[rand.Intn(len(letters))]
runes[i] = letters[rand.IntN(len(letters))]
}

return string(runes)
Expand Down

0 comments on commit bf01310

Please sign in to comment.