Support prometheus metrics #73
+1,247
−10
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -47,6 +47,7 @@ import ( | |||||||||
| internalapi "github.com/cert-manager/csi-lib/internal/api" | ||||||||||
| internalapiutil "github.com/cert-manager/csi-lib/internal/api/util" | ||||||||||
| "github.com/cert-manager/csi-lib/metadata" | ||||||||||
| "github.com/cert-manager/csi-lib/metrics" | ||||||||||
| "github.com/cert-manager/csi-lib/storage" | ||||||||||
| ) | ||||||||||
|
|
||||||||||
|
|
@@ -89,6 +90,9 @@ type Options struct { | |||||||||
|
|
||||||||||
| // RenewalBackoffConfig configures the exponential backoff applied to certificate renewal failures. | ||||||||||
| RenewalBackoffConfig *wait.Backoff | ||||||||||
|
|
||||||||||
| // Metrics is used for exposing Prometheus metrics | ||||||||||
| Metrics *metrics.Metrics | ||||||||||
| } | ||||||||||
|
|
||||||||||
| // NewManager constructs a new manager used to manage volumes containing | ||||||||||
|
|
@@ -241,6 +245,7 @@ func NewManager(opts Options) (*Manager, error) { | |||||||||
| metadataReader: opts.MetadataReader, | ||||||||||
| clock: opts.Clock, | ||||||||||
| log: *opts.Log, | ||||||||||
| metrics: opts.Metrics, | ||||||||||
|
|
||||||||||
| generatePrivateKey: opts.GeneratePrivateKey, | ||||||||||
| generateRequest: opts.GenerateRequest, | ||||||||||
|
|
@@ -375,6 +380,9 @@ type Manager struct { | |||||||||
| // No thread safety is added around this field, and it MUST NOT be used for any implementation logic. | ||||||||||
| // It should not be used full-stop :). | ||||||||||
| doNotUse_CallOnEachIssue func() | ||||||||||
|
Member
There was a problem hiding this comment. Can/should this field be removed now, or is this a follow-up? Ref. Lines 382 to 385 in f3a2df0 |
||||||||||
|
|
||||||||||
| // metrics is used to expose Prometheus | ||||||||||
|
There was a problem hiding this comment. The comment is incomplete. It should be: 'metrics is used to expose Prometheus metrics' or 'metrics is used for Prometheus metrics collection'.
Suggested change
Member
There was a problem hiding this comment.
Suggested change
|
||||||||||
| metrics *metrics.Metrics | ||||||||||
| } | ||||||||||
|
|
||||||||||
| // issue will step through the entire issuance flow for a volume. | ||||||||||
|
|
@@ -387,6 +395,11 @@ func (m *Manager) issue(ctx context.Context, volumeID string) error { | |||||||||
| log := m.log.WithValues("volume_id", volumeID) | ||||||||||
| log.Info("Processing issuance") | ||||||||||
|
|
||||||||||
| // Increase issue count | ||||||||||
| if m.metrics != nil { | ||||||||||
| m.metrics.IncrementIssueCallCountTotal(m.nodeNameHash, volumeID) | ||||||||||
| } | ||||||||||
|
|
||||||||||
| if err := m.cleanupStaleRequests(ctx, log, volumeID); err != nil { | ||||||||||
| return fmt.Errorf("cleaning up stale requests: %w", err) | ||||||||||
| } | ||||||||||
|
|
@@ -756,6 +769,10 @@ func (m *Manager) ManageVolumeImmediate(ctx context.Context, volumeID string) (m | |||||||||
| // If issuance fails, immediately return without retrying so the caller can decide | ||||||||||
| // how to proceed depending on the context this method was called within. | ||||||||||
| if err := m.issue(ctx, volumeID); err != nil { | ||||||||||
| // Increase issue error count | ||||||||||
| if m.metrics != nil { | ||||||||||
| m.metrics.IncrementIssueErrorCountTotal(m.nodeNameHash, volumeID) | ||||||||||
| } | ||||||||||
| return true, err | ||||||||||
| } | ||||||||||
| } | ||||||||||
|
|
@@ -835,6 +852,10 @@ func (m *Manager) startRenewalRoutine(volumeID string) (started bool) { | |||||||||
| defer issueCancel() | ||||||||||
| if err := m.issue(issueCtx, volumeID); err != nil { | ||||||||||
| log.Error(err, "Failed to issue certificate, retrying after applying exponential backoff") | ||||||||||
| // Increase issue error count | ||||||||||
| if m.metrics != nil { | ||||||||||
| m.metrics.IncrementIssueErrorCountTotal(m.nodeNameHash, volumeID) | ||||||||||
| } | ||||||||||
| return false, nil | ||||||||||
| } | ||||||||||
| return true, nil | ||||||||||
|
|
||||||||||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.