feat(mysqlreceiver)!: removing mysql.locked_connects metric which i…

…s replaced by `mysql.connection.errors` (#23990) Removing `mysql.locked_connects` metric according to the plan and log message **Link to tracking Issue:** #23211 Signed-off-by: Dominik Rosiek <[email protected]>
open-telemetry · Jul 6, 2023 · e5cd1ca · e5cd1ca
1 parent e4c3003
commit e5cd1ca
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 125 deletions.
diff --git a/.chloggen/drosiek-mysql-remove.yaml b/.chloggen/drosiek-mysql-remove.yaml
@@ -0,0 +1,20 @@
+# Use this changelog template to create an entry for release notes.
+# If your change doesn't affect end users, such as a test fix or a tooling change,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: mysqlreceiver
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "removing `mysql.locked_connects` metric which is replaced by `mysql.connection.errors`"
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [23211]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
diff --git a/receiver/mysqlreceiver/documentation.md b/receiver/mysqlreceiver/documentation.md
@@ -430,14 +430,6 @@ The number of joins that perform table scans.
 | ---- | ----------- | ------ |
 | kind | The kind of join. | Str: ``full``, ``full_range``, ``range``, ``range_check``, ``scan`` |
 
-### mysql.locked_connects
-
-[DEPRECATED] The number of attempts to connect to locked user accounts.
-
-| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
-| ---- | ----------- | ---------- | ----------------------- | --------- |
-| 1 | Sum | Int | Cumulative | true |
-
 ### mysql.mysqlx_worker_threads
 
 The number of worker threads available.

diff --git a/receiver/mysqlreceiver/internal/metadata/generated_config.go b/receiver/mysqlreceiver/internal/metadata/generated_config.go
diff --git a/receiver/mysqlreceiver/internal/metadata/generated_config_test.go b/receiver/mysqlreceiver/internal/metadata/generated_config_test.go
diff --git a/receiver/mysqlreceiver/internal/metadata/generated_metrics.go b/receiver/mysqlreceiver/internal/metadata/generated_metrics.go
diff --git a/receiver/mysqlreceiver/internal/metadata/generated_metrics_test.go b/receiver/mysqlreceiver/internal/metadata/generated_metrics_test.go
diff --git a/receiver/mysqlreceiver/internal/metadata/testdata/config.yaml b/receiver/mysqlreceiver/internal/metadata/testdata/config.yaml
@@ -31,8 +31,6 @@ all_set:
       enabled: true
     mysql.joins:
       enabled: true
-    mysql.locked_connects:
-      enabled: true
     mysql.locks:
       enabled: true
     mysql.log_operations:
@@ -124,8 +122,6 @@ none_set:
       enabled: false
     mysql.joins:
       enabled: false
-    mysql.locked_connects:
-      enabled: false
     mysql.locks:
       enabled: false
     mysql.log_operations:

diff --git a/receiver/mysqlreceiver/metadata.yaml b/receiver/mysqlreceiver/metadata.yaml
@@ -443,15 +443,6 @@ metrics:
       monotonic: false
       aggregation: cumulative
     attributes: [schema, table_name, write_lock_type]
-  mysql.locked_connects:
-    enabled: false
-    description: "[DEPRECATED] The number of attempts to connect to locked user accounts."
-    unit: 1
-    sum:
-      value_type: int
-      input_type: string
-      monotonic: true
-      aggregation: cumulative
   mysql.connection.count:
     enabled: false
     description: The number of connection attempts (successful or not) to the MySQL server.

diff --git a/receiver/mysqlreceiver/scraper.go b/receiver/mysqlreceiver/scraper.go
@@ -56,10 +56,6 @@ func (m *mySQLScraper) start(_ context.Context, _ component.Host) error {
 	}
 	m.sqlclient = sqlclient
 
-	if m.config.MetricsBuilderConfig.Metrics.MysqlLockedConnects.Enabled {
-		m.logger.Warn("`mysql.locked_connects` is deprecated and is going to be and removed in `v0.82.0`. Please use `mysql.connection.errors` instead")
-	}
-
 	return nil
 }
 
@@ -196,7 +192,6 @@ func (m *mySQLScraper) scrapeGlobalStats(now pcommon.Timestamp, errs *scrapererr
 			addPartialIfError(errs, m.mb.RecordMysqlConnectionErrorsDataPoint(now, v,
 				metadata.AttributeConnectionErrorAborted))
 		case "Locked_connects":
-			addPartialIfError(errs, m.mb.RecordMysqlLockedConnectsDataPoint(now, v))
 			addPartialIfError(errs, m.mb.RecordMysqlConnectionErrorsDataPoint(now, v,
 				metadata.AttributeConnectionErrorLocked))
 

diff --git a/receiver/mysqlreceiver/scraper_test.go b/receiver/mysqlreceiver/scraper_test.go
@@ -53,8 +53,6 @@ func TestScrape(t *testing.T) {
 
 		cfg.MetricsBuilderConfig.Metrics.MysqlConnectionCount.Enabled = true
 
-		cfg.MetricsBuilderConfig.Metrics.MysqlLockedConnects.Enabled = true
-
 		scraper := newMySQLScraper(receivertest.NewNopCreateSettings(), cfg)
 		scraper.sqlclient = &mockClient{
 			globalStatsFile:             "global_stats",

diff --git a/receiver/mysqlreceiver/testdata/scraper/expected.yaml b/receiver/mysqlreceiver/testdata/scraper/expected.yaml
@@ -622,16 +622,6 @@ resourceMetrics:
                   timeUnixNano: "1644862687825772000"
               isMonotonic: true
             unit: "1"
-          - description: "[DEPRECATED] The number of attempts to connect to locked user accounts."
-            name: mysql.locked_connects
-            sum:
-              aggregationTemporality: 2
-              dataPoints:
-                - asInt: "293"
-                  startTimeUnixNano: "1644862687825728000"
-                  timeUnixNano: "1644862687825772000"
-              isMonotonic: true
-            unit: "1"
           - description: The number of MySQL locks.
             name: mysql.locks
             sum: