Skip to content

Update All golang.org/x packages to v0.24.0 #34639

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

Merged
merged 4 commits into from
Aug 14, 2024
Merged

Update All golang.org/x packages to v0.24.0 #34639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
261f910
Update All golang.org/x packages to v0.24.0
renovate[bot] Aug 13, 2024
d0082f9
go mod tidy, make genotelcontribcol and make genoteltestbedcol
opentelemetrybot Aug 13, 2024
8b4a1a8
Merge branch 'main' into renovate/all-golang.orgx-packages
andrzej-stencel Aug 13, 2024
a0b954c
[chore] Fix linter errors (#34657)
songy23 Aug 13, 2024
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
2 changes: 1 addition & 1 deletion cmd/otelcontribcol/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ require (
go.opentelemetry.io/collector/receiver v0.107.0
go.opentelemetry.io/collector/receiver/nopreceiver v0.107.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.0
golang.org/x/sys v0.23.0
golang.org/x/sys v0.24.0
)

require (
Expand Down
4 changes: 2 additions & 2 deletions cmd/otelcontribcol/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion cmd/oteltestbedcol/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ require (
go.opentelemetry.io/collector/receiver v0.107.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.0
go.uber.org/goleak v1.3.0
golang.org/x/sys v0.23.0
golang.org/x/sys v0.24.0
)

require (
Expand Down
4 changes: 2 additions & 2 deletions cmd/oteltestbedcol/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion connector/datadogconnector/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ require (
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.5.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions connector/datadogconnector/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/datadogexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ require (
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.5.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/datadogexporter/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/datadogexporter/integrationtest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ require (
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.5.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/datadogexporter/integrationtest/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/elasticsearchexporter/integrationtest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240723171418-e6d459c13d2a // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/elasticsearchexporter/integrationtest/go.sum
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions exporter/logzioexporter/logziospan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
func TestTransformToLogzioSpanBytes(tester *testing.T) {
inStr, err := os.ReadFile("./testdata/span.json")
if err != nil {
tester.Fatalf(fmt.Sprintf("error opening sample span file %s", err.Error()))
tester.Fatalf("error opening sample span file %s", err.Error())
}

var span model.Span
Expand All @@ -25,12 +25,12 @@ func TestTransformToLogzioSpanBytes(tester *testing.T) {
}
newSpan, err := transformToLogzioSpanBytes(&span)
if err != nil {
tester.Fatalf(err.Error())
tester.Fatal(err.Error())
}
m := make(map[string]any)
err = json.Unmarshal(newSpan, &m)
if err != nil {
tester.Fatalf(err.Error())
tester.Fatal(err.Error())
}
if _, ok := m["JaegerTag"]; !ok {
tester.Error("error converting span to logzioSpan, JaegerTag is not found")
Expand All @@ -40,7 +40,7 @@ func TestTransformToLogzioSpanBytes(tester *testing.T) {
func TestTransformToDbModelSpan(tester *testing.T) {
inStr, err := os.ReadFile("./testdata/span.json")
if err != nil {
tester.Fatalf(fmt.Sprintf("error opening sample span file %s", err.Error()))
tester.Fatalf("error opening sample span file %s", err.Error())
}
var span model.Span
err = json.Unmarshal(inStr, &span)
Expand All @@ -49,12 +49,12 @@ func TestTransformToDbModelSpan(tester *testing.T) {
}
newSpan, err := transformToLogzioSpanBytes(&span)
if err != nil {
tester.Fatalf(err.Error())
tester.Fatal(err.Error())
}
var testLogzioSpan logzioSpan
err = json.Unmarshal(newSpan, &testLogzioSpan)
if err != nil {
tester.Fatalf(err.Error())
tester.Fatal(err.Error())
}
dbModelSpan := testLogzioSpan.transformToDbModelSpan()
if len(dbModelSpan.References) != 3 {
Expand Down
2 changes: 1 addition & 1 deletion exporter/signalfxexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
go.uber.org/goleak v1.3.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.23.0
golang.org/x/sys v0.24.0
gopkg.in/yaml.v3 v3.0.1
)

Expand Down
4 changes: 2 additions & 2 deletions exporter/signalfxexporter/go.sum
View file
Open in desktop

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

13 changes: 6 additions & 7 deletions internal/aws/cwlogs/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package cwlogs // import "github.com/open-telemetry/opentelemetry-collector-cont

import (
"errors"
"fmt"
"regexp"
)

Expand Down Expand Up @@ -43,26 +42,26 @@ func ValidateRetentionValue(input int64) error {
// Check if the tags input is valid
func ValidateTagsInput(input map[string]*string) error {
if input != nil && len(input) < 1 {
return fmt.Errorf("invalid amount of items. Please input at least 1 tag or remove the tag field")
return errors.New("invalid amount of items. Please input at least 1 tag or remove the tag field")
}
if len(input) > 50 {
return fmt.Errorf("invalid amount of items. Please input at most 50 tags")
return errors.New("invalid amount of items. Please input at most 50 tags")
}
// The regex for the Key and Value requires "alphanumerics, whitespace, and _.:/=+-!" as noted here: https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_CreateLogGroup.html#:~:text=%5E(%5B%5Cp%7BL%7D%5Cp%7BZ%7D%5Cp%7BN%7D_.%3A/%3D%2B%5C%2D%40%5D%2B)%24
validKeyPattern := regexp.MustCompile(`^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`)
validValuePattern := regexp.MustCompile(`^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`)
for key, value := range input {
if len(key) < 1 || len(key) > 128 {
return fmt.Errorf("key - " + key + " has an invalid length. Please use keys with a length of 1 to 128 characters")
return errors.New("key - " + key + " has an invalid length. Please use keys with a length of 1 to 128 characters")
}
if len(*value) < 1 || len(*value) > 256 {
return fmt.Errorf("value - " + *value + " has an invalid length. Please use values with a length of 1 to 256 characters")
return errors.New("value - " + *value + " has an invalid length. Please use values with a length of 1 to 256 characters")
}
if !validKeyPattern.MatchString(key) {
return fmt.Errorf("key - " + key + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`)
return errors.New("key - " + key + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`)
}
if !validValuePattern.MatchString(*value) {
return fmt.Errorf("value - " + *value + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`)
return errors.New("value - " + *value + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`)
}
}

Expand Down
10 changes: 5 additions & 5 deletions internal/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
go.opentelemetry.io/collector/cmd/builder v0.107.0
go.opentelemetry.io/collector/cmd/mdatagen v0.107.0
go.uber.org/goleak v1.3.0
golang.org/x/tools v0.23.0
golang.org/x/tools v0.24.0
golang.org/x/vuln v1.1.3
gotest.tools/gotestsum v1.12.0
)
Expand Down Expand Up @@ -240,16 +240,16 @@ require (
go.uber.org/automaxprocs v1.5.3 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/grpc v1.65.0 // indirect
Expand Down
20 changes: 10 additions & 10 deletions internal/tools/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion pkg/stanza/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ require (
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
golang.org/x/sys v0.23.0
golang.org/x/sys v0.24.0
golang.org/x/text v0.17.0
gonum.org/v1/gonum v0.15.0
gopkg.in/yaml.v2 v2.4.0
Expand Down
4 changes: 2 additions & 2 deletions pkg/stanza/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion pkg/winperfcounters/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21.0
require (
github.com/stretchr/testify v1.9.0
go.uber.org/goleak v1.3.0
golang.org/x/sys v0.23.0
golang.org/x/sys v0.24.0
)

require (
Expand Down
Loading
Loading