feat: Add ADM resource name dimensions (#435)

* feat: Added ADM name dimensions
nginx · Aug 15, 2023 · 3b83243 · 3b83243
1 parent 29985e7
commit 3b83243
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/src/extensions/advanced_metrics.go b/src/extensions/advanced_metrics.go
@@ -76,6 +76,12 @@ const (
 	proxiedProtocolDimension           = "proxied_protocol"
 	bytesRcvdMetric                    = "bytes_rcvd"
 	bytesSentMetric                    = "bytes_sent"
+	environmentNameDimension           = "environment_name"
+	appNameDimension                   = "app_name"
+	componentNameDimension             = "component_name"
+	gatewayNameDimension               = "gateway_name"
+	siteDimension                      = "site"
+	siteNameDimension                  = "site_name"
 )
 
 var maxOnlyMetrics = map[string]struct{}{
@@ -172,7 +178,13 @@ func NewAdvancedMetrics(env core.Environment, conf *config.Config, advancedMetri
 		NewDimension(familyDimension, 4).
 		NewDimension(proxiedProtocolDimension, 4).
 		NewMetric(bytesRcvdMetric).
-		NewMetric(bytesSentMetric)
+		NewMetric(bytesSentMetric).
+		NewDimension(environmentNameDimension, 256).
+		NewDimension(appNameDimension, 256).
+		NewDimension(componentNameDimension, 256).
+		NewDimension(gatewayNameDimension, 256).
+		NewDimension(siteDimension, 32).
+		NewDimension(siteNameDimension, 256)
 
 	advancedMetricsConfig := advancedMetricsDefaults
 

diff --git a/test/performance/advanced-metrics/fake_agent/agent.go b/test/performance/advanced-metrics/fake_agent/agent.go
@@ -63,6 +63,12 @@ const (
 	proxiedProtocolDimension           = "proxied_protocol"
 	bytesRcvdMetric                    = "bytes_rcvd"
 	bytesSentMetric                    = "bytes_sent"
+	environmentNameDimension           = "environment_name"
+	appNameDimension                   = "app_name"
+	componentNameDimension             = "component_name"
+	gatewayNameDimension               = "gateway_name"
+	siteDimension                      = "site"
+	siteNameDimension                  = "site_name"
 )
 
 var (
@@ -141,7 +147,13 @@ func main() {
 		NewDimension(familyDimension, 4).
 		NewDimension(proxiedProtocolDimension, 4).
 		NewMetric(bytesRcvdMetric).
-		NewMetric(bytesSentMetric)
+		NewMetric(bytesSentMetric).
+		NewDimension(environmentNameDimension, 256).
+		NewDimension(appNameDimension, 256).
+		NewDimension(componentNameDimension, 256).
+		NewDimension(gatewayNameDimension, 256).
+		NewDimension(siteDimension, 32).
+		NewDimension(siteNameDimension, 256)
 
 	config := advanced_metrics.Config{
 		Address: cfg.AdvancedMetricsSocket,

diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/extensions/advanced_metrics.go b/test/performance/vendor/github.com/nginx/agent/v2/src/extensions/advanced_metrics.go