zookeeper: Rename label to be less ambiguous (#1553)

asuresh4 · Nov 12, 2020 · 69d4d7f · 69d4d7f
1 parent 6b974a8
commit 69d4d7f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/receiver/zookeeperreceiver/internal/metadata/generated_metrics.go b/receiver/zookeeperreceiver/internal/metadata/generated_metrics.go
diff --git a/receiver/zookeeperreceiver/metadata.yaml b/receiver/zookeeperreceiver/metadata.yaml
@@ -3,7 +3,7 @@ name: zookeeperreceiver
 labels:
  server.state:
  description: State of the Zookeeper server (leader, standalone or follower).
- version:
+ zk.version:
  description: Zookeeper version of the instance.
 
 metrics:
@@ -97,4 +97,4 @@ metrics:
  data:
  type: int sum
  monotonic: true
- aggregation: cumulative
+ aggregation: cumulative
diff --git a/receiver/zookeeperreceiver/metrics.go b/receiver/zookeeperreceiver/metrics.go
@@ -45,9 +45,6 @@ const (
  serverStateKey = "zk_server_state"
  zkVersionKey = "zk_version"
 
- serverStateResourceLabel = "server.state"
- zkVersionResourceLabel = "version"
-
  metricsLen = 17
 )
 

diff --git a/receiver/zookeeperreceiver/scraper.go b/receiver/zookeeperreceiver/scraper.go
@@ -162,10 +162,10 @@ func (z *zookeeperMetricsScraper) getMetricsAndAttributes(scanner *bufio.Scanner
  metricValue := parts[2]
  switch metricKey {
  case zkVersionKey:
- attributes[zkVersionResourceLabel] = metricValue
+ attributes[metadata.Labels.ZkVersion] = metricValue
  continue
  case serverStateKey:
- attributes[serverStateResourceLabel] = metricValue
+ attributes[metadata.Labels.ServerState] = metricValue
  continue
  default:
  // Skip metric if there is no descriptor associated with it.

diff --git a/receiver/zookeeperreceiver/scraper_test.go b/receiver/zookeeperreceiver/scraper_test.go
@@ -81,7 +81,7 @@ func TestZookeeperMetricsScraperScrape(t *testing.T) {
  expectedMetrics: metricsV3414,
  expectedResourceAttributes: map[string]string{
  "server.state": "standalone",
- "version":  "3.4.14-4c25d480e66aadd371de8bd2fd8da255ac140bcf",
+ "zk.version": "3.4.14-4c25d480e66aadd371de8bd2fd8da255ac140bcf",
  },
  expectedNumResourceMetrics: 1,
  },
@@ -101,7 +101,7 @@ func TestZookeeperMetricsScraperScrape(t *testing.T) {
  }(),
  expectedResourceAttributes: map[string]string{
  "server.state": "leader",
- "version":  "3.5.5-390fe37ea45dee01bf87dc1c042b5e3dcce88653",
+ "zk.version": "3.5.5-390fe37ea45dee01bf87dc1c042b5e3dcce88653",
  },
  expectedNumResourceMetrics: 1,
  },
@@ -150,7 +150,7 @@ func TestZookeeperMetricsScraperScrape(t *testing.T) {
  expectedMetrics: metricsV3414,
  expectedResourceAttributes: map[string]string{
  "server.state": "standalone",
- "version":  "3.4.14-4c25d480e66aadd371de8bd2fd8da255ac140bcf",
+ "zk.version": "3.4.14-4c25d480e66aadd371de8bd2fd8da255ac140bcf",
  },
  expectedNumResourceMetrics: 1,
  setConnectionDeadline: func(conn net.Conn, t time.Time) error {
@@ -169,7 +169,7 @@ func TestZookeeperMetricsScraperScrape(t *testing.T) {
  expectedMetrics: metricsV3414,
  expectedResourceAttributes: map[string]string{
  "server.state": "standalone",
- "version":  "3.4.14-4c25d480e66aadd371de8bd2fd8da255ac140bcf",
+ "zk.version": "3.4.14-4c25d480e66aadd371de8bd2fd8da255ac140bcf",
  },
  expectedNumResourceMetrics: 1,
  closeConnection: func(conn net.Conn) error {