-
Notifications
You must be signed in to change notification settings - Fork 302
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.
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
Add support for go 1.20 #617
Merged
+234
−37
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -95,6 +95,7 @@ workflows: | |
| matrix: | ||
| parameters: | ||
| go_version: | ||
| - "1.20" | ||
| - "1.21" | ||
| - "1.22" | ||
| - test-assets: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| module github.com/prometheus/common/assets | ||
|
|
||
| go 1.21 | ||
| go 1.20 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| module github.com/prometheus/common | ||
|
|
||
| go 1.21 | ||
| go 1.20 | ||
|
|
||
| require ( | ||
| github.com/alecthomas/kingpin/v2 v2.4.0 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| // Copyright 2024 The Prometheus Authors | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| //go:build !go1.21 | ||
|
|
||
| package model | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestUnmarshalJSONLabelSet(t *testing.T) { | ||
| type testConfig struct { | ||
| LabelSet LabelSet `yaml:"labelSet,omitempty"` | ||
| } | ||
|
|
||
| // valid LabelSet JSON | ||
| labelSetJSON := `{ | ||
| "labelSet": { | ||
| "monitor": "codelab", | ||
| "foo": "bar", | ||
| "foo2": "bar", | ||
| "abc": "prometheus", | ||
| "foo11": "bar11" | ||
| } | ||
| }` | ||
| var c testConfig | ||
| err := json.Unmarshal([]byte(labelSetJSON), &c) | ||
| if err != nil { | ||
| t.Errorf("unexpected error while marshalling JSON : %s", err.Error()) | ||
| } | ||
|
|
||
| labelSetString := c.LabelSet.String() | ||
|
|
||
| expected := `{abc="prometheus", foo="bar", foo11="bar11", foo2="bar", monitor="codelab"}` | ||
|
|
||
| if expected != labelSetString { | ||
| t.Errorf("expected %s but got %s", expected, labelSetString) | ||
| } | ||
|
|
||
| // invalid LabelSet JSON | ||
| invalidlabelSetJSON := `{ | ||
| "labelSet": { | ||
| "1nvalid_23name": "codelab", | ||
| "foo": "bar" | ||
| } | ||
| }` | ||
|
|
||
| NameValidationScheme = LegacyValidation | ||
| err = json.Unmarshal([]byte(invalidlabelSetJSON), &c) | ||
| expectedErr := `"1nvalid_23name" is not a valid label name` | ||
| if err == nil || err.Error() != expectedErr { | ||
| t.Errorf("expected an error with message '%s' to be thrown", expectedErr) | ||
| } | ||
| } | ||
|
|
||
| func TestLabelSetClone(t *testing.T) { | ||
| labelSet := LabelSet{ | ||
| "monitor": "codelab", | ||
| "foo": "bar", | ||
| "bar": "baz", | ||
| } | ||
|
|
||
| cloneSet := labelSet.Clone() | ||
|
|
||
| if len(labelSet) != len(cloneSet) { | ||
| t.Errorf("expected the length of the cloned Label set to be %d, but got %d", | ||
| len(labelSet), len(cloneSet)) | ||
| } | ||
|
|
||
| for ln, lv := range labelSet { | ||
| expected := cloneSet[ln] | ||
| if expected != lv { | ||
| t.Errorf("expected to get LabelValue %s, but got %s for LabelName %s", expected, lv, ln) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestLabelSetMerge(t *testing.T) { | ||
| labelSet := LabelSet{ | ||
| "monitor": "codelab", | ||
| "foo": "bar", | ||
| "bar": "baz", | ||
| } | ||
|
|
||
| labelSet2 := LabelSet{ | ||
| "monitor": "codelab", | ||
| "dolor": "mi", | ||
| "lorem": "ipsum", | ||
| } | ||
|
|
||
| expectedSet := LabelSet{ | ||
| "monitor": "codelab", | ||
| "foo": "bar", | ||
| "bar": "baz", | ||
| "dolor": "mi", | ||
| "lorem": "ipsum", | ||
| } | ||
|
|
||
| mergedSet := labelSet.Merge(labelSet2) | ||
|
|
||
| if len(mergedSet) != len(expectedSet) { | ||
| t.Errorf("expected the length of the cloned Label set to be %d, but got %d", | ||
| len(expectedSet), len(mergedSet)) | ||
| } | ||
|
|
||
| for ln, lv := range mergedSet { | ||
| expected := expectedSet[ln] | ||
| if expected != lv { | ||
| t.Errorf("expected to get LabelValue %s, but got %s for LabelName %s", expected, lv, ln) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Benchmark Results for LabelSet's String() method | ||
| // --------------------------------------------------------------------------------------------------------- | ||
| // goos: linux | ||
| // goarch: amd64 | ||
| // pkg: github.com/prometheus/common/model | ||
| // cpu: 11th Gen Intel(R) Core(TM) i5-1145G7 @ 2.60GHz | ||
| // BenchmarkLabelSetStringMethod-8 732376 1532 ns/op | ||
|
|
||
| func BenchmarkLabelSetStringMethod(b *testing.B) { | ||
| ls := make(LabelSet) | ||
| ls["monitor"] = "codelab" | ||
| ls["foo2"] = "bar" | ||
| ls["foo"] = "bar" | ||
| ls["abc"] = "prometheus" | ||
| ls["foo11"] = "bar11" | ||
| for i := 0; i < b.N; i++ { | ||
| _ = ls.String() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| // Copyright 2024 The Prometheus Authors | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| //go:build go1.21 | ||
|
|
||
| package model | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "sort" | ||
| "strconv" | ||
| ) | ||
|
|
||
| // String will look like `{foo="bar", more="less"}`. Names are sorted alphabetically. | ||
| func (l LabelSet) String() string { | ||
| var lna [32]string // On stack to avoid memory allocation for sorting names. | ||
| labelNames := lna[:0] | ||
| for name := range l { | ||
| labelNames = append(labelNames, string(name)) | ||
| } | ||
| sort.Strings(labelNames) | ||
| var bytea [1024]byte // On stack to avoid memory allocation while building the output. | ||
| b := bytes.NewBuffer(bytea[:0]) | ||
| b.WriteByte('{') | ||
| for i, name := range labelNames { | ||
| if i > 0 { | ||
| b.WriteString(", ") | ||
| } | ||
| b.WriteString(name) | ||
| b.WriteByte('=') | ||
| b.Write(strconv.AppendQuote(b.AvailableBuffer(), string(l[LabelName(name)]))) | ||
| } | ||
| b.WriteByte('}') | ||
| return b.String() | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // Copyright 2024 The Prometheus Authors | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| //go:build !go1.21 | ||
|
|
||
| package model | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "sort" | ||
| "strings" | ||
| ) | ||
|
|
||
| // String was optimized using functions not available for go 1.20 | ||
| // or lower. We keep the old implementation for compatibility with client_golang. | ||
| // Once client golang drops support for go 1.20 (scheduled for August 2024), this | ||
| // file can be removed. | ||
| func (l LabelSet) String() string { | ||
| labelNames := make([]string, 0, len(l)) | ||
| for name := range l { | ||
| labelNames = append(labelNames, string(name)) | ||
| } | ||
| sort.Strings(labelNames) | ||
| lstrs := make([]string, 0, len(l)) | ||
| for _, name := range labelNames { | ||
| lstrs = append(lstrs, fmt.Sprintf("%s=%q", name, l[LabelName(name)])) | ||
| } | ||
| return fmt.Sprintf("{%s}", strings.Join(lstrs, ", ")) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| module github.com/prometheus/common/sigv4 | ||
|
|
||
| go 1.21 | ||
| go 1.20 | ||
|
|
||
| replace github.com/prometheus/common => ../ | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note this was:
Which makes a difference to performance.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice catch, sorry for the copy paste mistake!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Really? Changing the type of
lnafromLabelNametostringlooks quite deliberate to me.