fix: make server name public since it is also used in downstream metr…

…ic middlewares;
riandyrn · Nov 26, 2024 · 46aeade · 46aeade
1 parent ef6d9f4
commit 46aeade
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/metric/config.go b/metric/config.go
@@ -18,10 +18,10 @@ const (
 type BaseConfig struct {
 	// for initialization
 	meterProvider otelmetric.MeterProvider
-	serverName    string
 
 	// actual config state
-	Meter otelmetric.Meter
+	Meter      otelmetric.Meter
+	ServerName string
 }
 
 // Option specifies instrumentation configuration options.
@@ -45,7 +45,9 @@ func WithMeterProvider(provider otelmetric.MeterProvider) Option {
 
 func NewBaseConfig(serverName string, opts ...Option) BaseConfig {
 	// init base config
-	cfg := BaseConfig{}
+	cfg := BaseConfig{
+		ServerName: serverName,
+	}
 	for _, opt := range opts {
 		opt.apply(&cfg)
 	}

diff --git a/metric/request_duration.go b/metric/request_duration.go
@@ -40,7 +40,7 @@ func NewRequestDurationMillis(cfg BaseConfig) func(next http.Handler) http.Handl
 				r.Context(),
 				int64(duration.Milliseconds()),
 				otelmetric.WithAttributes(
-					httpconv.ServerRequest(cfg.serverName, r)...,
+					httpconv.ServerRequest(cfg.ServerName, r)...,
 				),
 			)
 		})

diff --git a/metric/requests_inflight.go b/metric/requests_inflight.go
@@ -30,15 +30,15 @@ func NewRequestInFlight(cfg BaseConfig) func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			// increase the number of requests in flight
 			counter.Add(r.Context(), 1, otelmetric.WithAttributes(
-				httpconv.ServerRequest(cfg.serverName, r)...,
+				httpconv.ServerRequest(cfg.ServerName, r)...,
 			))
 
 			// execute next http handler
 			next.ServeHTTP(w, r)
 
 			// decrease the number of requests in flight
 			counter.Add(r.Context(), -1, otelmetric.WithAttributes(
-				httpconv.ServerRequest(cfg.serverName, r)...,
+				httpconv.ServerRequest(cfg.ServerName, r)...,
 			))
 		})
 	}

diff --git a/metric/response_size.go b/metric/response_size.go
@@ -39,7 +39,7 @@ func NewResponseSizeBytes(cfg BaseConfig) func(next http.Handler) http.Handler {
 				r.Context(),
 				int64(rrw.writtenBytes),
 				otelmetric.WithAttributes(
-					httpconv.ServerRequest(cfg.serverName, r)...,
+					httpconv.ServerRequest(cfg.ServerName, r)...,
 				),
 			)
 		})