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.

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

Jump to bottom

Prometheus encoding #1525

Merged
merged 9 commits into from
Oct 3, 2024
Merged

Prometheus encoding #1525

merged 9 commits into from
Oct 3, 2024
+1,158 −21

Conversation

chris124567
Copy link
Member

@chris124567 chris124567 commented Sep 12, 2024 •
edited
Loading

Continuation of #1068

Addressed some of the concerns in the reviews:

  • Move PrometheusMetric method to original type where possible
  • Move writeResponse logic to api package
  • Improve handling slices of Prometheus marshallable types
  • Disable type checking in jape

@chris124567 chris124567 mentioned this pull request Sep 12, 2024
Merged
@chris124567 chris124567 marked this pull request as ready for review September 18, 2024 15:23
@ChrisSchinnerl ChrisSchinnerl modified the milestones: v1.2.0, v2.1.0, v2.0.0 Sep 19, 2024
ChrisSchinnerl
ChrisSchinnerl requested changes Sep 20, 2024
View reviewed changes
api/prometheus.go Outdated Show resolved Hide resolved
api/prometheus.go Show resolved Hide resolved
api/prometheus.go Outdated Show resolved Hide resolved
api/prometheus.go Show resolved Hide resolved
api/prometheus.go Show resolved Hide resolved
internal/prometheus/encoder.go Outdated Show resolved Hide resolved
internal/prometheus/encoder.go Outdated Show resolved Hide resolved
internal/prometheus/encoder.go Outdated Show resolved Hide resolved
internal/prometheus/encoder.go Show resolved Hide resolved
alerts/prometheus.go Outdated Show resolved Hide resolved
peterjan
peterjan reviewed Sep 23, 2024
View reviewed changes
api/prometheus.go Outdated Show resolved Hide resolved
api/prometheus.go Outdated Show resolved Hide resolved
api/prometheus.go Outdated Show resolved Hide resolved
api/prometheus.go Outdated Show resolved Hide resolved
api/utils.go Outdated Show resolved Hide resolved
api/utils.go Outdated Show resolved Hide resolved
api/utils.go Outdated Show resolved Hide resolved
@peterjan peterjan changed the base branch from dev to api-breakers October 2, 2024 11:39
peterjan
peterjan approved these changes Oct 2, 2024
View reviewed changes
Copy link
Member

@peterjan peterjan left a comment

Choose a reason for hiding this comment

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

looks good to me 👍

api/prometheus.go Outdated Show resolved Hide resolved
.github/workflows/test.yml Show resolved Hide resolved
@chris124567
Copy link
Member Author

Should be OK to merge?

@peterjan
Copy link
Member

peterjan commented Oct 3, 2024

Should be OK to merge?

Yes I re-approved. Chris does the merges as he is the merge master. I personally like having one person doing all of the merging to ensure we're not getting in each other's way too much. Now that we're 3 devs contributing though that might become increasingly annoying.

@n8maninger n8maninger merged commit b4e3df9 into api-breakers Oct 3, 2024
7 checks passed
@n8maninger n8maninger deleted the add-prometheus branch October 3, 2024 12:37
@peterjan
Copy link
Member

peterjan commented Oct 3, 2024

savage 😂

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChrisSchinnerl ChrisSchinnerl ChrisSchinnerl requested changes

@peterjan peterjan peterjan approved these changes

@n8maninger n8maninger Awaiting requested review from n8maninger

Assignees

@chris124567 chris124567

Labels
None yet
Projects
Sia
Status: Done
Milestone
v2.1.0
Development

Successfully merging this pull request may close these issues.
4 participants
@chris124567 @peterjan @ChrisSchinnerl @n8maninger