From 6c5f9413189970d18752b728fa24d3c4d9850aad Mon Sep 17 00:00:00 2001 From: Whitney Lampkin <18070772+WhitneyLampkin@users.noreply.github.com> Date: Thu, 16 Jan 2025 09:27:12 -0600 Subject: [PATCH 1/5] Update probe_metrics_list.go --- probe_metrics_list.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/probe_metrics_list.go b/probe_metrics_list.go index 203801d..8d58531 100644 --- a/probe_metrics_list.go +++ b/probe_metrics_list.go @@ -12,6 +12,8 @@ import ( "github.com/webdevops/azure-metrics-exporter/config" "github.com/webdevops/azure-metrics-exporter/metrics" + + "go.uber.org/zap" ) func probeMetricsListHandler(w http.ResponseWriter, r *http.Request) { @@ -90,4 +92,11 @@ func probeMetricsListHandler(w http.ResponseWriter, r *http.Request) { h := promhttp.HandlerFor(registry, promhttp.HandlerOpts{}) h.ServeHTTP(w, r) + + latency := time.Since(startTime) + contextLogger.With( + zap.String("method", r.Method), + zap.Int("status", http.StatusOK), + zap.String("latency", latency.String()), + ).Info("Request handled for /probe/metrics/list") } From fc0e92d345af33c23aa119ac6d4fd0c0ec438164 Mon Sep 17 00:00:00 2001 From: Whitney Lampkin <18070772+WhitneyLampkin@users.noreply.github.com> Date: Thu, 16 Jan 2025 09:28:27 -0600 Subject: [PATCH 2/5] Update probe_metrics_resource.go with detailed logging for responses --- probe_metrics_resource.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/probe_metrics_resource.go b/probe_metrics_resource.go index 97e8dba..9733653 100644 --- a/probe_metrics_resource.go +++ b/probe_metrics_resource.go @@ -12,6 +12,8 @@ import ( "github.com/webdevops/azure-metrics-exporter/config" "github.com/webdevops/azure-metrics-exporter/metrics" + + "go.uber.org/zap" ) func probeMetricsResourceHandler(w http.ResponseWriter, r *http.Request) { @@ -101,4 +103,11 @@ func probeMetricsResourceHandler(w http.ResponseWriter, r *http.Request) { h := promhttp.HandlerFor(registry, promhttp.HandlerOpts{}) h.ServeHTTP(w, r) + + latency := time.Since(startTime) + contextLogger.With( + zap.String("method", r.Method), + zap.Int("status", http.StatusOK), + zap.String("latency", latency.String()), + ).Info("Request handled for /probe/metrics/resource") } From f2e4dfad9efbdaf54a61eabed9795d49c5783a6d Mon Sep 17 00:00:00 2001 From: Whitney Lampkin <18070772+WhitneyLampkin@users.noreply.github.com> Date: Thu, 16 Jan 2025 09:28:54 -0600 Subject: [PATCH 3/5] Update probe_metrics_resourcegraph.go with detailed logging for responses --- probe_metrics_resourcegraph.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/probe_metrics_resourcegraph.go b/probe_metrics_resourcegraph.go index 91485b5..18e9f3d 100644 --- a/probe_metrics_resourcegraph.go +++ b/probe_metrics_resourcegraph.go @@ -12,6 +12,8 @@ import ( "github.com/webdevops/azure-metrics-exporter/config" "github.com/webdevops/azure-metrics-exporter/metrics" + + "go.uber.org/zap" ) func probeMetricsResourceGraphHandler(w http.ResponseWriter, r *http.Request) { @@ -100,4 +102,11 @@ func probeMetricsResourceGraphHandler(w http.ResponseWriter, r *http.Request) { h := promhttp.HandlerFor(registry, promhttp.HandlerOpts{}) h.ServeHTTP(w, r) + + latency := time.Since(startTime) + contextLogger.With( + zap.String("method", r.Method), + zap.Int("status", http.StatusOK), + zap.String("latency", latency.String()), + ).Info("Request handled for /probe/metrics/resourcegraph") } From 22d104328713bcb9376f9961d1749d5bcff52948 Mon Sep 17 00:00:00 2001 From: Whitney Lampkin <18070772+WhitneyLampkin@users.noreply.github.com> Date: Thu, 16 Jan 2025 09:29:37 -0600 Subject: [PATCH 4/5] Update probe_metrics_scrape.go with detailed logging for responses --- probe_metrics_scrape.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/probe_metrics_scrape.go b/probe_metrics_scrape.go index fc5b814..3b17079 100644 --- a/probe_metrics_scrape.go +++ b/probe_metrics_scrape.go @@ -12,6 +12,8 @@ import ( "github.com/webdevops/azure-metrics-exporter/config" "github.com/webdevops/azure-metrics-exporter/metrics" + + "go.uber.org/zap" ) func probeMetricsScrapeHandler(w http.ResponseWriter, r *http.Request) { @@ -102,4 +104,11 @@ func probeMetricsScrapeHandler(w http.ResponseWriter, r *http.Request) { h := promhttp.HandlerFor(registry, promhttp.HandlerOpts{}) h.ServeHTTP(w, r) + + latency := time.Since(startTime) + contextLogger.With( + zap.String("method", r.Method), + zap.Int("status", http.StatusOK), + zap.String("latency", latency.String()), + ).Info("Request handled for /probe/metrics/scrape") } From 604e67a6fd2bf7f81f190910ea257f9601775ca9 Mon Sep 17 00:00:00 2001 From: Whitney Lampkin <18070772+WhitneyLampkin@users.noreply.github.com> Date: Thu, 16 Jan 2025 09:30:09 -0600 Subject: [PATCH 5/5] Update probe_metrics_subscription.go with detailed logging for responses --- probe_metrics_subscription.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/probe_metrics_subscription.go b/probe_metrics_subscription.go index 203144f..008b9a6 100644 --- a/probe_metrics_subscription.go +++ b/probe_metrics_subscription.go @@ -12,6 +12,8 @@ import ( "github.com/webdevops/azure-metrics-exporter/config" "github.com/webdevops/azure-metrics-exporter/metrics" + + "go.uber.org/zap" ) func probeMetricsSubscriptionHandler(w http.ResponseWriter, r *http.Request) { @@ -82,4 +84,11 @@ func probeMetricsSubscriptionHandler(w http.ResponseWriter, r *http.Request) { h := promhttp.HandlerFor(registry, promhttp.HandlerOpts{}) h.ServeHTTP(w, r) + + latency := time.Since(startTime) + contextLogger.With( + zap.String("method", r.Method), + zap.Int("status", http.StatusOK), + zap.String("latency", latency.String()), + ).Info("Request handled for /probe/metrics/subscription") }