public/atlantis
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/atlantis.git synced 2026-08-03 11:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Error when enabling prometheus metrics (#2379) (#2528)

Browse Source 
Prometheus metrics names have some restrictions that must match the regex `[a-zA-Z_:][a-zA-Z0-9_:]*`
This commit is contained in:
Alberto Llamas
2022-09-21 06:27:30 +02:00
committed by GitHub
parent 1bcf938644
commit 9829fa23c2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/controllers/events/events_controller.go
View File

@@ -158,7 +158,7 @@ func (e *VCSEventsController) handleGithubPost(w http.ResponseWriter, r *http.Re
githubReqID := "X-Github-Delivery=" + r.Header.Get("X-Github-Delivery")
logger := e.Logger.With("gh-request-id", githubReqID)
scope := e.Scope.SubScope("github.event")
scope := e.Scope.SubScope("github_event")
logger.Debug("request valid")
@@ -169,10 +169,10 @@ func (e *VCSEventsController) handleGithubPost(w http.ResponseWriter, r *http.Re
switch event := event.(type) {
case *github.IssueCommentEvent:
resp = e.HandleGithubCommentEvent(event, githubReqID, logger)
scope = scope.SubScope(fmt.Sprintf("comment.%s", *event.Action))
scope = scope.SubScope(fmt.Sprintf("comment_%s", *event.Action))
case *github.PullRequestEvent:
resp = e.HandleGithubPullRequestEvent(logger, event, githubReqID)
scope = scope.SubScope(fmt.Sprintf("pr.%s", *event.Action))
scope = scope.SubScope(fmt.Sprintf("pr_%s", *event.Action))
default:
resp = HTTPResponse{
body: fmt.Sprintf("Ignoring unsupported event %s", githubReqID),

2
server/events/instrumented_pull_closed_executor.go
View File

@@ -20,7 +20,7 @@ func NewInstrumentedPullClosedExecutor(
) PullCleaner {
return &InstrumentedPullClosedExecutor{
scope: scope.SubScope("pullclosed.cleanup"),
scope: scope.SubScope("pullclosed_cleanup"),
log: log,
cleaner: cleaner,
}