Skip to content

Main -> dev #196

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

Merged
Aleksandergreg merged 12 commits into from
Jun 24, 2025
Merged

Main -> dev #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c98bfdc
Merge pull request #179 from DevOpsDynamite/dev
Aleksandergreg May 5, 2025
6a11d11
Merge pull request #181 from DevOpsDynamite/dev
Aleksandergreg May 5, 2025
7624f00
Merge pull request #182 from DevOpsDynamite/feature/monitoring
Aleksandergreg May 5, 2025
9c12a52
Merge pull request #183 from DevOpsDynamite/feature/monitoring
Aleksandergreg May 5, 2025
d9cde57
Merge pull request #186 from DevOpsDynamite/dev
Aleksandergreg Jun 20, 2025
c2c4acc
Merge pull request #188 from DevOpsDynamite/dev
Aleksandergreg Jun 20, 2025
9f95327
Merge pull request #190 from DevOpsDynamite/dev
Luke3520 Jun 20, 2025
cccc295
Merge pull request #192 from DevOpsDynamite/dev
Aleksandergreg Jun 23, 2025
39b9709
Made our HTTP response total to track different HTTP responses
Jun 23, 2025
38ed8f5
Merge pull request #194 from DevOpsDynamite/feature/http-monitor
Aleksandergreg Jun 23, 2025
9ff6d3c
Bump rack from 3.1.12 to 3.1.16 in /sinatra
dependabot[bot] Jun 24, 2025
fb69a7f
Merge pull request #195 from DevOpsDynamite/dependabot/bundler/sinatr…
Luke3520 Jun 24, 2025
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
2 changes: 1 addition & 1 deletion sinatra/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ GEM
puma (6.6.0)
nio4r (~> 2.0)
racc (1.8.1)
rack (3.1.12)
rack (3.1.16)
rack-protection (4.1.1)
base64 (>= 0.1.0)
logger (>= 1.6.0)
Expand Down
9 changes: 5 additions & 4 deletions sinatra/app.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,10 @@
################################################################################

# Counter for total HTTP responses served
APP_HTTP_RESPONSES_TOTAL = PROMETHEUS.counter(
:app_http_responses_total,
docstring: 'Total number of HTTP responses sent by the application.'
HTTP_RESPONSES_TOTAL = PROMETHEUS.counter(
:http_responses_total,
docstring: 'Total number of HTTP responses sent.',
labels: [:code, :path]
)

# Histogram for request duration in seconds (or milliseconds)
Expand Down Expand Up @@ -225,7 +226,7 @@
pass if @skip_metrics

# Increment response counter regardless of duration calculation success
APP_HTTP_RESPONSES_TOTAL.increment
HTTP_RESPONSES_TOTAL.increment(labels: { code: response.status, path: request.path_info })

# Record duration if start time was captured
if @request_start_time
Expand Down