rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-06-04 22:10:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Example

Browse Source
This commit is contained in:
Dmitrii Kovalkov
2025-04-03 16:28:59 +02:00
parent c179d098ef
commit 45a44c9826
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/http-utils/src/endpoint.rs
View File

@@ -30,6 +30,20 @@ static SERVE_METRICS_COUNT: Lazy<IntCounter> = Lazy::new(|| {
)
.expect("failed to define a metric")
});
static SERVE_METRICS_COUNT_2: Lazy<IntCounter> = Lazy::new(|| {
register_int_counter!(
"libmetrics_metric_handler_requests_2_total",
"Number of metric requests made"
)
.expect("failed to define a metric")
});
static SERVE_METRICS_COUNT_3: Lazy<IntCounter> = Lazy::new(|| {
register_int_counter!(
"libmetrics_metric_handler_requests_total_3",
"Number of metric requests made"
)
.expect("failed to define a metric")
});
static X_REQUEST_ID_HEADER_STR: &str = "x-request-id";
@@ -251,6 +265,8 @@ impl std::io::Write for ChannelWriter {
pub async fn prometheus_metrics_handler(_req: Request<Body>) -> Result<Response<Body>, ApiError> {
SERVE_METRICS_COUNT.inc();
SERVE_METRICS_COUNT_2.inc();
SERVE_METRICS_COUNT_3.inc();
let started_at = std::time::Instant::now();

28
test_runner/regress/test_ssl.py
View File

@@ -1,10 +1,12 @@
import os
import ssl
import time
import pytest
import requests
from fixtures.neon_fixtures import NeonEnvBuilder, StorageControllerApiException
from fixtures.utils import wait_until
from fixtures.log_helper import log
def test_pageserver_https_api(neon_env_builder: NeonEnvBuilder):
@@ -151,3 +153,29 @@ def test_certificate_rotation(neon_env_builder: NeonEnvBuilder):
requests.get(addr, verify=str(env.ssl_ca_file)).raise_for_status()
cur_cert = ssl.get_server_certificate(("localhost", port))
assert cur_cert == sk_cert
def test_metrics(neon_env_builder: NeonEnvBuilder):
env = neon_env_builder.init_start()
ps_metrics = env.pageserver.http_client().get_metrics();
h_count = int(
ps_metrics.query_one(
"libmetrics_metric_handler_requests_total"
).value
)
log.info(f"h_count: {h_count}")
h2_count = int(
ps_metrics.query_one(
"libmetrics_metric_handler_requests_2_total"
).value
)
log.info(f"h2_count: {h2_count}")
h3_count = int(
ps_metrics.query_one(
"libmetrics_metric_handler_requests_total_3"
).value
)
log.info(f"h2_count: {h3_count}")