Skip to content

Commit

Permalink
Fix: Error when enabling prometheus metrics (runatlantis#2379) (runat…
Browse files Browse the repository at this point in the history
…lantis#2528)

Prometheus metrics names have some restrictions that must match the regex `[a-zA-Z_:][a-zA-Z0-9_:]*`
  • Loading branch information
albertollamaso authored and krrrr38 committed Dec 16, 2022
1 parent 2d59b0d commit cf889e9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions server/controllers/events/events_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion server/events/instrumented_pull_closed_executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func NewInstrumentedPullClosedExecutor(
) PullCleaner {

return &InstrumentedPullClosedExecutor{
scope: scope.SubScope("pullclosed.cleanup"),
scope: scope.SubScope("pullclosed_cleanup"),
log: log,
cleaner: cleaner,
}
Expand Down

0 comments on commit cf889e9

Please sign in to comment.