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

feat(metrics): git checkout failure counter (issue #15658) #15657

Merged
merged 4 commits into from
Feb 19, 2024
Merged

feat(metrics): git checkout failure counter (issue #15658) #15657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5765d35
Count git checkout failures
mikolajpe Dec 4, 2023
afd73f1
Merge branch 'argoproj:master' into fetch-fail-metric
Dec 4, 2023
f8bdef2
Merge branch 'master' into fetch-fail-metric
blakepettersson Feb 14, 2024
96ba5df
Merge branch 'master' into fetch-fail-metric
Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/operator-manual/metrics.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ Scraped at the `argocd-repo-server:8084/metrics` endpoint.
|--------|:----:|-------------|
| `argocd_git_request_duration_seconds` | histogram | Git requests duration seconds. |
| `argocd_git_request_total` | counter | Number of git requests performed by repo server |
| `argocd_git_fetch_fail_total` | counter | Number of git fetch requests failures by repo server |
| `argocd_redis_request_duration_seconds` | histogram | Redis requests duration seconds. |
| `argocd_redis_request_total` | counter | Number of Kubernetes requests executed during application reconciliation. |
| `argocd_repo_pending_request_total` | gauge | Number of pending requests requiring repository lock |
Expand Down
15 changes: 15 additions & 0 deletions reposerver/metrics/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

type MetricsServer struct {
handler http.Handler
gitFetchFailCounter *prometheus.CounterVec
gitRequestCounter *prometheus.CounterVec
gitRequestHistogram *prometheus.HistogramVec
repoPendingRequestsGauge *prometheus.GaugeVec
Expand All @@ -32,6 +33,15 @@ func NewMetricsServer() *MetricsServer {
registry.MustRegister(collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}))
registry.MustRegister(collectors.NewGoCollector())

gitFetchFailCounter := prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "argocd_git_fetch_fail_total",
Help: "Number of git fetch requests failures by repo server",
},
[]string{"repo", "revision"},
)
registry.MustRegister(gitFetchFailCounter)

gitRequestCounter := prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "argocd_git_request_total",
Expand Down Expand Up @@ -81,6 +91,7 @@ func NewMetricsServer() *MetricsServer {

return &MetricsServer{
handler: promhttp.HandlerFor(registry, promhttp.HandlerOpts{}),
gitFetchFailCounter: gitFetchFailCounter,
gitRequestCounter: gitRequestCounter,
gitRequestHistogram: gitRequestHistogram,
repoPendingRequestsGauge: repoPendingRequestsGauge,
Expand All @@ -93,6 +104,10 @@ func (m *MetricsServer) GetHandler() http.Handler {
return m.handler
}

func (m *MetricsServer) IncGitFetchFail(repo string, revision string) {
m.gitFetchFailCounter.WithLabelValues(repo, revision).Inc()
}

// IncGitRequest increments the git requests counter
func (m *MetricsServer) IncGitRequest(repo string, requestType GitRequestType) {
m.gitRequestCounter.WithLabelValues(repo, string(requestType)).Inc()
Expand Down
6 changes: 5 additions & 1 deletion reposerver/repository/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2397,7 +2397,11 @@ func directoryPermissionInitializer(rootPath string) goio.Closer {
// nolint:unparam
func (s *Service) checkoutRevision(gitClient git.Client, revision string, submoduleEnabled bool) (goio.Closer, error) {
closer := s.gitRepoInitializer(gitClient.Root())
return closer, checkoutRevision(gitClient, revision, submoduleEnabled)
err := checkoutRevision(gitClient, revision, submoduleEnabled)
if err != nil {
s.metricsServer.IncGitFetchFail(gitClient.Root(), revision)
}
return closer, err
}

func checkoutRevision(gitClient git.Client, revision string, submoduleEnabled bool) error {
Expand Down
Loading