Changes requested in PR

- rename metric to sqlserver.database.count - Add more info to err log
open-telemetry · May 16, 2024 · 20d536b · 20d536b
1 parent 7edd6c7
commit 20d536b
Show file tree

Hide file tree

Showing 11 changed files with 121 additions and 121 deletions.
diff --git a/receiver/sqlserverreceiver/documentation.md b/receiver/sqlserverreceiver/documentation.md
@@ -226,6 +226,22 @@ metrics:
     enabled: true
 ```
 
+### sqlserver.database.count
+
+The number of databases
+
+This metric is only available when the receiver is configured to directly connect to SQL Server.
+
+| Unit | Metric Type | Value Type |
+| ---- | ----------- | ---------- |
+| {databases} | Gauge | Int |
+
+#### Attributes
+
+| Name | Description | Values |
+| ---- | ----------- | ------ |
+| database.status | The current status of a database | Str: ``online``, ``restoring``, ``recovering``, ``pending_recovery``, ``suspect``, ``offline`` |
+
 ### sqlserver.database.io.read_latency
 
 Total time that the users waited for reads issued on this file.
@@ -254,22 +270,6 @@ This metric is only available when the receiver is configured to directly connec
 | ---- | ----------- | ---------- |
 | {processes} | Gauge | Int |
 
-### sqlserver.properties.db.status
-
-The number of databases that are in a given state.
-
-This metric is only available when the receiver is configured to directly connect to SQL Server.
-
-| Unit | Metric Type | Value Type |
-| ---- | ----------- | ---------- |
-| {databases} | Gauge | Int |
-
-#### Attributes
-
-| Name | Description | Values |
-| ---- | ----------- | ------ |
-| database.status | The current status of a database | Str: ``online``, ``restoring``, ``recovering``, ``pending_recovery``, ``suspect``, ``offline`` |
-
 ### sqlserver.resource_pool.disk.throttled.read.rate
 
 The number of read operations that were throttled in the last second

diff --git a/receiver/sqlserverreceiver/factory.go b/receiver/sqlserverreceiver/factory.go
@@ -51,7 +51,7 @@ func setupQueries(cfg *Config) []string {
 		queries = append(queries, getSQLServerPerformanceCounterQuery(cfg.InstanceName))
 	}
 
-	if cfg.MetricsBuilderConfig.Metrics.SqlserverPropertiesDbStatus.Enabled {
+	if cfg.MetricsBuilderConfig.Metrics.SqlserverDatabaseCount.Enabled {
 		queries = append(queries, getSQLServerPropertiesQuery(cfg.InstanceName))
 	}
 

diff --git a/receiver/sqlserverreceiver/internal/metadata/generated_config.go b/receiver/sqlserverreceiver/internal/metadata/generated_config.go
diff --git a/receiver/sqlserverreceiver/internal/metadata/generated_config_test.go b/receiver/sqlserverreceiver/internal/metadata/generated_config_test.go
diff --git a/receiver/sqlserverreceiver/internal/metadata/generated_metrics.go b/receiver/sqlserverreceiver/internal/metadata/generated_metrics.go