fixes

grafana · Nov 25, 2024 · 36f503e · 36f503e
1 parent 51b632c
commit 36f503e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/internal/component/database_observability/mysql/collector/connection_info.go b/internal/component/database_observability/mysql/collector/connection_info.go
@@ -44,7 +44,11 @@ func (c *ConnectionInfo) Start(ctx context.Context) error {
 		return err
 	}
 
-	var providerName, providerRegion, dbInstanceIdentifier string
+	var (
+		providerName         = "unknown"
+		providerRegion       = "unknown"
+		dbInstanceIdentifier = "unknown"
+	)
 
 	host, _, err := net.SplitHostPort(cfg.Addr)
 	if err == nil && host != "" {

diff --git a/internal/component/database_observability/mysql/collector/connection_info_test.go b/internal/component/database_observability/mysql/collector/connection_info_test.go
@@ -29,7 +29,7 @@ func TestConnectionInfo(t *testing.T) {
 		{
 			name:            "generic dsn",
 			dsn:             "user:pass@tcp(localhost:3306)/db",
-			expectedMetrics: fmt.Sprintf(baseExpectedMetrics, "", "", ""),
+			expectedMetrics: fmt.Sprintf(baseExpectedMetrics, "unknown", "unknown", "unknown"),
 		},
 		{
 			name:            "AWS/RDS dsn",

diff --git a/internal/component/database_observability/mysql/collector/query_sample.go b/internal/component/database_observability/mysql/collector/query_sample.go
@@ -71,6 +71,7 @@ func (c *QuerySample) Start(ctx context.Context) error {
 		for {
 			if err := c.fetchQuerySamples(c.ctx); err != nil {
 				level.Error(c.logger).Log("msg", "collector stopping due to error", "err", err)
+				c.Stop()
 				break
 			}
 
@@ -83,7 +84,6 @@ func (c *QuerySample) Start(ctx context.Context) error {
 		}
 	}()
 
-	c.Stop()
 	return nil
 }
 

diff --git a/internal/component/database_observability/mysql/collector/schema_table.go b/internal/component/database_observability/mysql/collector/schema_table.go
@@ -102,6 +102,7 @@ func (c *SchemaTable) Start(ctx context.Context) error {
 		for {
 			if err := c.extractSchema(c.ctx); err != nil {
 				level.Error(c.logger).Log("msg", "collector stopping due to error", "err", err)
+				c.Stop()
 				break
 			}
 
@@ -114,7 +115,6 @@ func (c *SchemaTable) Start(ctx context.Context) error {
 		}
 	}()
 
-	c.Stop()
 	return nil
 }