You've already forked opentelemetry-go
mirror of
https://github.com/open-telemetry/opentelemetry-go.git
synced 2026-06-03 18:35:08 +02:00
refactor: modernize code (#7850)
Enable the [`modernize`](https://golangci-lint.run/docs/linters/configuration/#modernize) linter in the golangci-lint configuration and fix the reported issues by running `golangci-lint run --enable-only modernize --fix`. The `modernize` linter is internally the same as [gopls modernize](https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/modernize). Similar to #7089.
This commit is contained in:
+2
-2
@@ -317,7 +317,7 @@ func parseMember(member string) (Member, error) {
|
||||
keyValue, properties, found := strings.Cut(member, propertyDelimiter)
|
||||
if found {
|
||||
// Parse the member properties.
|
||||
for _, pStr := range strings.Split(properties, propertyDelimiter) {
|
||||
for pStr := range strings.SplitSeq(properties, propertyDelimiter) {
|
||||
p, err := parseProperty(pStr)
|
||||
if err != nil {
|
||||
return newInvalidMember(), err
|
||||
@@ -480,7 +480,7 @@ func Parse(bStr string) (Baggage, error) {
|
||||
}
|
||||
|
||||
b := make(baggage.List)
|
||||
for _, memberStr := range strings.Split(bStr, listDelimiter) {
|
||||
for memberStr := range strings.SplitSeq(bStr, listDelimiter) {
|
||||
m, err := parseMember(memberStr)
|
||||
if err != nil {
|
||||
return Baggage{}, err
|
||||
|
||||
@@ -1148,9 +1148,8 @@ func BenchmarkNew(b *testing.B) {
|
||||
mem4, _ := NewMemberRaw("key4", "val4")
|
||||
|
||||
b.ReportAllocs()
|
||||
b.ResetTimer()
|
||||
|
||||
for i := 0; i < b.N; i++ {
|
||||
for b.Loop() {
|
||||
benchBaggage, _ = New(mem1, mem2, mem3, mem4)
|
||||
}
|
||||
}
|
||||
@@ -1160,7 +1159,7 @@ var benchMember Member
|
||||
func BenchmarkNewMemberRaw(b *testing.B) {
|
||||
b.ReportAllocs()
|
||||
|
||||
for i := 0; i < b.N; i++ {
|
||||
for b.Loop() {
|
||||
benchMember, _ = NewMemberRaw("key", "value")
|
||||
}
|
||||
}
|
||||
@@ -1168,7 +1167,7 @@ func BenchmarkNewMemberRaw(b *testing.B) {
|
||||
func BenchmarkParse(b *testing.B) {
|
||||
b.ReportAllocs()
|
||||
|
||||
for i := 0; i < b.N; i++ {
|
||||
for b.Loop() {
|
||||
benchBaggage, _ = Parse(
|
||||
"userId=alice,serverNode = DF28 , isProduction = false,hasProp=stuff;propKey;propWValue=value, invalidUtf8=pr%ffo%ffp%fcValue",
|
||||
)
|
||||
@@ -1192,9 +1191,8 @@ func BenchmarkString(b *testing.B) {
|
||||
require.NoError(b, err)
|
||||
|
||||
b.ReportAllocs()
|
||||
b.ResetTimer()
|
||||
|
||||
for i := 0; i < b.N; i++ {
|
||||
for b.Loop() {
|
||||
_ = bg.String()
|
||||
}
|
||||
}
|
||||
@@ -1229,8 +1227,8 @@ func BenchmarkMemberString(b *testing.B) {
|
||||
member, err := NewMember(alphabet, alphabet, props...)
|
||||
require.NoError(b, err)
|
||||
b.ReportAllocs()
|
||||
b.ResetTimer()
|
||||
for i := 0; i < b.N; i++ {
|
||||
|
||||
for b.Loop() {
|
||||
_ = member.String()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user