Skip to content

Commit b612f42

Browse files
renovate[bot]opentelemetrybotandrzej-stencelsongy23
authored and
f7o
committed
Update All golang.org/x packages to v0.24.0 (open-telemetry#34639)
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | golang.org/x/sys | `v0.23.0` -> `v0.24.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2fsys/v0.24.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2fsys/v0.24.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2fsys/v0.23.0/v0.24.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2fsys/v0.23.0/v0.24.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | golang.org/x/tools | `v0.23.0` -> `v0.24.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2ftools/v0.24.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2ftools/v0.24.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2ftools/v0.23.0/v0.24.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2ftools/v0.23.0/v0.24.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yMC4xIiwidXBkYXRlZEluVmVyIjoiMzguMjAuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIiwicmVub3ZhdGVib3QiXX0=--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <[email protected]> Co-authored-by: Andrzej Stencel <[email protected]> Co-authored-by: Yang Song <[email protected]>
1 parent 807cce7 commit b612f42

File tree

65 files changed

+119
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+119
-120
lines changed

‎cmd/otelcontribcol/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ require (
237237
go.opentelemetry.io/collector/receiver v0.107.0
238238
go.opentelemetry.io/collector/receiver/nopreceiver v0.107.0
239239
go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.0
240-
golang.org/x/sys v0.23.0
240+
golang.org/x/sys v0.24.0
241241
)
242242

243243
require (

‎cmd/otelcontribcol/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/oteltestbedcol/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ require (
5555
go.opentelemetry.io/collector/receiver v0.107.0
5656
go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.0
5757
go.uber.org/goleak v1.3.0
58-
golang.org/x/sys v0.23.0
58+
golang.org/x/sys v0.24.0
5959
)
6060

6161
require (

‎cmd/oteltestbedcol/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎connector/datadogconnector/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ require (
263263
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
264264
golang.org/x/net v0.28.0 // indirect
265265
golang.org/x/oauth2 v0.21.0 // indirect
266-
golang.org/x/sys v0.23.0 // indirect
266+
golang.org/x/sys v0.24.0 // indirect
267267
golang.org/x/term v0.23.0 // indirect
268268
golang.org/x/text v0.17.0 // indirect
269269
golang.org/x/time v0.5.0 // indirect

‎connector/datadogconnector/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/datadogexporter/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ require (
355355
golang.org/x/net v0.28.0 // indirect
356356
golang.org/x/oauth2 v0.21.0 // indirect
357357
golang.org/x/sync v0.8.0 // indirect
358-
golang.org/x/sys v0.23.0 // indirect
358+
golang.org/x/sys v0.24.0 // indirect
359359
golang.org/x/term v0.23.0 // indirect
360360
golang.org/x/text v0.17.0 // indirect
361361
golang.org/x/time v0.5.0 // indirect

‎exporter/datadogexporter/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/datadogexporter/integrationtest/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ require (
331331
golang.org/x/net v0.28.0 // indirect
332332
golang.org/x/oauth2 v0.21.0 // indirect
333333
golang.org/x/sync v0.8.0 // indirect
334-
golang.org/x/sys v0.23.0 // indirect
334+
golang.org/x/sys v0.24.0 // indirect
335335
golang.org/x/term v0.23.0 // indirect
336336
golang.org/x/text v0.17.0 // indirect
337337
golang.org/x/time v0.5.0 // indirect

‎exporter/datadogexporter/integrationtest/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/elasticsearchexporter/integrationtest/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ require (
180180
go.uber.org/multierr v1.11.0 // indirect
181181
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
182182
golang.org/x/net v0.28.0 // indirect
183-
golang.org/x/sys v0.23.0 // indirect
183+
golang.org/x/sys v0.24.0 // indirect
184184
golang.org/x/text v0.17.0 // indirect
185185
gonum.org/v1/gonum v0.15.0 // indirect
186186
google.golang.org/genproto/googleapis/api v0.0.0-20240723171418-e6d459c13d2a // indirect

‎exporter/elasticsearchexporter/integrationtest/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/logzioexporter/logziospan_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
func TestTransformToLogzioSpanBytes(tester *testing.T) {
1616
inStr, err := os.ReadFile("./testdata/span.json")
1717
if err != nil {
18-
tester.Fatalf(fmt.Sprintf("error opening sample span file %s", err.Error()))
18+
tester.Fatalf("error opening sample span file %s", err.Error())
1919
}
2020

2121
var span model.Span
@@ -25,12 +25,12 @@ func TestTransformToLogzioSpanBytes(tester *testing.T) {
2525
}
2626
newSpan, err := transformToLogzioSpanBytes(&span)
2727
if err != nil {
28-
tester.Fatalf(err.Error())
28+
tester.Fatal(err.Error())
2929
}
3030
m := make(map[string]any)
3131
err = json.Unmarshal(newSpan, &m)
3232
if err != nil {
33-
tester.Fatalf(err.Error())
33+
tester.Fatal(err.Error())
3434
}
3535
if _, ok := m["JaegerTag"]; !ok {
3636
tester.Error("error converting span to logzioSpan, JaegerTag is not found")
@@ -40,7 +40,7 @@ func TestTransformToLogzioSpanBytes(tester *testing.T) {
4040
func TestTransformToDbModelSpan(tester *testing.T) {
4141
inStr, err := os.ReadFile("./testdata/span.json")
4242
if err != nil {
43-
tester.Fatalf(fmt.Sprintf("error opening sample span file %s", err.Error()))
43+
tester.Fatalf("error opening sample span file %s", err.Error())
4444
}
4545
var span model.Span
4646
err = json.Unmarshal(inStr, &span)
@@ -49,12 +49,12 @@ func TestTransformToDbModelSpan(tester *testing.T) {
4949
}
5050
newSpan, err := transformToLogzioSpanBytes(&span)
5151
if err != nil {
52-
tester.Fatalf(err.Error())
52+
tester.Fatal(err.Error())
5353
}
5454
var testLogzioSpan logzioSpan
5555
err = json.Unmarshal(newSpan, &testLogzioSpan)
5656
if err != nil {
57-
tester.Fatalf(err.Error())
57+
tester.Fatal(err.Error())
5858
}
5959
dbModelSpan := testLogzioSpan.transformToDbModelSpan()
6060
if len(dbModelSpan.References) != 3 {

‎exporter/signalfxexporter/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
go.uber.org/goleak v1.3.0
3131
go.uber.org/multierr v1.11.0
3232
go.uber.org/zap v1.27.0
33-
golang.org/x/sys v0.23.0
33+
golang.org/x/sys v0.24.0
3434
gopkg.in/yaml.v3 v3.0.1
3535
)
3636

‎exporter/signalfxexporter/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/aws/cwlogs/utils.go

+6-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package cwlogs // import "github.com/open-telemetry/opentelemetry-collector-cont
55

66
import (
77
"errors"
8-
"fmt"
98
"regexp"
109
)
1110

@@ -43,26 +42,26 @@ func ValidateRetentionValue(input int64) error {
4342
// Check if the tags input is valid
4443
func ValidateTagsInput(input map[string]*string) error {
4544
if input != nil && len(input) < 1 {
46-
return fmt.Errorf("invalid amount of items. Please input at least 1 tag or remove the tag field")
45+
return errors.New("invalid amount of items. Please input at least 1 tag or remove the tag field")
4746
}
4847
if len(input) > 50 {
49-
return fmt.Errorf("invalid amount of items. Please input at most 50 tags")
48+
return errors.New("invalid amount of items. Please input at most 50 tags")
5049
}
5150
// 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
5251
validKeyPattern := regexp.MustCompile(`^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`)
5352
validValuePattern := regexp.MustCompile(`^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`)
5453
for key, value := range input {
5554
if len(key) < 1 || len(key) > 128 {
56-
return fmt.Errorf("key - " + key + " has an invalid length. Please use keys with a length of 1 to 128 characters")
55+
return errors.New("key - " + key + " has an invalid length. Please use keys with a length of 1 to 128 characters")
5756
}
5857
if len(*value) < 1 || len(*value) > 256 {
59-
return fmt.Errorf("value - " + *value + " has an invalid length. Please use values with a length of 1 to 256 characters")
58+
return errors.New("value - " + *value + " has an invalid length. Please use values with a length of 1 to 256 characters")
6059
}
6160
if !validKeyPattern.MatchString(key) {
62-
return fmt.Errorf("key - " + key + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`)
61+
return errors.New("key - " + key + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`)
6362
}
6463
if !validValuePattern.MatchString(*value) {
65-
return fmt.Errorf("value - " + *value + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`)
64+
return errors.New("value - " + *value + " does not follow the regex pattern" + `^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`)
6665
}
6766
}
6867

‎internal/tools/go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
go.opentelemetry.io/collector/cmd/builder v0.107.0
1919
go.opentelemetry.io/collector/cmd/mdatagen v0.107.0
2020
go.uber.org/goleak v1.3.0
21-
golang.org/x/tools v0.23.0
21+
golang.org/x/tools v0.24.0
2222
golang.org/x/vuln v1.1.3
2323
gotest.tools/gotestsum v1.12.0
2424
)
@@ -240,16 +240,16 @@ require (
240240
go.uber.org/automaxprocs v1.5.3 // indirect
241241
go.uber.org/multierr v1.11.0 // indirect
242242
go.uber.org/zap v1.27.0 // indirect
243-
golang.org/x/crypto v0.25.0 // indirect
243+
golang.org/x/crypto v0.26.0 // indirect
244244
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
245245
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
246246
golang.org/x/mod v0.20.0 // indirect
247-
golang.org/x/net v0.27.0 // indirect
247+
golang.org/x/net v0.28.0 // indirect
248248
golang.org/x/oauth2 v0.21.0 // indirect
249249
golang.org/x/sync v0.8.0 // indirect
250-
golang.org/x/sys v0.22.0 // indirect
250+
golang.org/x/sys v0.23.0 // indirect
251251
golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect
252-
golang.org/x/term v0.22.0 // indirect
252+
golang.org/x/term v0.23.0 // indirect
253253
golang.org/x/text v0.17.0 // indirect
254254
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
255255
google.golang.org/grpc v1.65.0 // indirect

‎internal/tools/go.sum

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/stanza/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
go.uber.org/multierr v1.11.0
3535
go.uber.org/zap v1.27.0
3636
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
37-
golang.org/x/sys v0.23.0
37+
golang.org/x/sys v0.24.0
3838
golang.org/x/text v0.17.0
3939
gonum.org/v1/gonum v0.15.0
4040
gopkg.in/yaml.v2 v2.4.0

‎pkg/stanza/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/winperfcounters/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.0
55
require (
66
github.com/stretchr/testify v1.9.0
77
go.uber.org/goleak v1.3.0
8-
golang.org/x/sys v0.23.0
8+
golang.org/x/sys v0.24.0
99
)
1010

1111
require (

0 commit comments

Comments
 (0)