code review changes

open-telemetry · Dec 7, 2022 · e1d0b31 · e1d0b31
1 parent a455b9a
commit e1d0b31
Show file tree

Hide file tree

Showing 6 changed files with 320 additions and 215 deletions.
diff --git a/receiver/oracledbreceiver/factory.go b/receiver/oracledbreceiver/factory.go
@@ -64,22 +64,23 @@ func createReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clientPr
 		consumer consumer.Metrics,
 	) (component.MetricsReceiver, error) {
 		sqlCfg := cfg.(*Config)
-		var opts []scraperhelper.ScraperControllerOption
-		metricsBuilder := metadata.NewMetricsBuilder(sqlCfg.MetricsSettings, settings.BuildInfo)
+		metricsBuilder := metadata.NewMetricsBuilder(sqlCfg.MetricsSettings, settings)
 		datasourceURL, _ := url.Parse(sqlCfg.DataSource)
 		instanceName := datasourceURL.Host
 
-		mp := newScraper(settings.ID, metricsBuilder, sqlCfg.MetricsSettings, sqlCfg.ScraperControllerSettings, settings.TelemetrySettings.Logger, func() (*sql.DB, error) {
+		mp, err := newScraper(settings.ID, metricsBuilder, sqlCfg.MetricsSettings, sqlCfg.ScraperControllerSettings, settings.TelemetrySettings.Logger, func() (*sql.DB, error) {
 			return sqlOpenerFunc(sqlCfg.DataSource)
 		}, clientProviderFunc, instanceName)
+		if err != nil {
+			return nil, err
+		}
 		opt := scraperhelper.AddScraper(mp)
-		opts = append(opts, opt)
 
 		return scraperhelper.NewScraperControllerReceiver(
 			&sqlCfg.ScraperControllerSettings,
 			settings,
 			consumer,
-			opts...,
+			opt,
 		)
 	}
 }
diff --git a/receiver/oracledbreceiver/internal/metadata/generated_metrics.go b/receiver/oracledbreceiver/internal/metadata/generated_metrics.go