Skip to content
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

Cut v1.6.0 #554

Merged
merged 6 commits into from
May 25, 2023
Merged

Cut v1.6.0 #554

merged 6 commits into from
May 25, 2023

Conversation

beorn7
Copy link
Member

@beorn7 beorn7 commented May 24, 2023

No description provided.

Signed-off-by: beorn7 <beorn@grafana.com>
Signed-off-by: beorn7 <beorn@grafana.com>
Signed-off-by: beorn7 <beorn@grafana.com>
@beorn7
Copy link
Member Author

beorn7 commented May 24, 2023

@SuperQ Note the new verifyMetricFamily helper function, which I think touches an issue you have run into, too.

// MetricFamily and unmarshals it into a proto message object first. Then it
// marshals both the expected and the got proto message into a binary protobuf,
// which it then compares.
func verifyMetricFamily(t *testing.T, expText string, got *dto.MetricFamily) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should add this helper somewhere in common.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we should consider moving it up when it gets used there, too. However, I'm not quite sure yet if this is really the right way to do it… maybe some deep comparison without the final marshaling would be better?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oooof… two more dependencies instead of zero… I'd say we leave it as is in this PR and take some more time to consider our options for prometheus/common.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, I'm not a fan of what this change requires.

Copy link
Member

@SuperQ SuperQ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also recommend copying .github/workflows/golangci-lint.yml from node_exporter. We stopped syncing this from prometheus/prometheus.

Copy link
Member

@SuperQ SuperQ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also recommend copying .github/workflows/golangci-lint.yml from node_exporter. We stopped syncing this from prometheus/prometheus.

go.mod Show resolved Hide resolved
handler/handler_test.go Outdated Show resolved Hide resolved
Signed-off-by: beorn7 <beorn@grafana.com>
Signed-off-by: beorn7 <beorn@grafana.com>
@beorn7
Copy link
Member Author

beorn7 commented May 25, 2023

Thanks for all the hints. All done.

@beorn7
Copy link
Member Author

beorn7 commented May 25, 2023

@SuperQ I assume your comments are all addressed. I'll merge now and publish the release. You have 30 seconds to object. :->

@beorn7 beorn7 merged commit 2b1a354 into master May 25, 2023
5 checks passed
@beorn7 beorn7 deleted the beorn7/release branch May 25, 2023 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants