Skip to content

Commit

Permalink
[receiver/oracledb] use metadata.Type for scraper ID (open-telemetry#…
Browse files Browse the repository at this point in the history
…31504)

**Description:** 
Use metadata.Type for the scraper id to avoid invalid scraper IDs.

**Link to tracking Issue:**
Fixes
open-telemetry#31457
  • Loading branch information
atoulme authored and XinRanZhAWS committed Mar 13, 2024
1 parent 98a8e32 commit b128bf7
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 3 deletions.
27 changes: 27 additions & 0 deletions .chloggen/oracledb_scraper_id.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: oracledbreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Use metadata.Type for the scraper id to avoid invalid scraper IDs.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [31457]

# (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:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
2 changes: 1 addition & 1 deletion receiver/oracledbreceiver/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func createReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clientPr
return nil, err
}

mp, err := newScraper(settings.ID, metricsBuilder, sqlCfg.MetricsBuilderConfig, sqlCfg.ScraperControllerSettings, settings.TelemetrySettings.Logger, func() (*sql.DB, error) {
mp, err := newScraper(metricsBuilder, sqlCfg.MetricsBuilderConfig, sqlCfg.ScraperControllerSettings, settings.TelemetrySettings.Logger, func() (*sql.DB, error) {
return sqlOpenerFunc(getDataSource(*sqlCfg))
}, clientProviderFunc, instanceName)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions receiver/oracledbreceiver/scraper.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ type scraper struct {
metricsBuilderConfig metadata.MetricsBuilderConfig
}

func newScraper(id component.ID, metricsBuilder *metadata.MetricsBuilder, metricsBuilderConfig metadata.MetricsBuilderConfig, scrapeCfg scraperhelper.ScraperControllerSettings, logger *zap.Logger, providerFunc dbProviderFunc, clientProviderFunc clientProviderFunc, instanceName string) (scraperhelper.Scraper, error) {
func newScraper(metricsBuilder *metadata.MetricsBuilder, metricsBuilderConfig metadata.MetricsBuilderConfig, scrapeCfg scraperhelper.ScraperControllerSettings, logger *zap.Logger, providerFunc dbProviderFunc, clientProviderFunc clientProviderFunc, instanceName string) (scraperhelper.Scraper, error) {
s := &scraper{
mb: metricsBuilder,
metricsBuilderConfig: metricsBuilderConfig,
Expand All @@ -74,7 +74,7 @@ func newScraper(id component.ID, metricsBuilder *metadata.MetricsBuilder, metric
clientProviderFunc: clientProviderFunc,
instanceName: instanceName,
}
return scraperhelper.NewScraper(id.String(), s.scrape, scraperhelper.WithShutdown(s.shutdown), scraperhelper.WithStart(s.start))
return scraperhelper.NewScraper(metadata.Type.String(), s.scrape, scraperhelper.WithShutdown(s.shutdown), scraperhelper.WithStart(s.start))
}

func (s *scraper) start(context.Context, component.Host) error {
Expand Down

0 comments on commit b128bf7

Please sign in to comment.