Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore][receiver/sqlserver] Rename and move Windows-specific logic #32471

Merged
merged 2 commits into from
Apr 17, 2024
Merged

[chore][receiver/sqlserver] Rename and move Windows-specific logic #32471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e4e0b7
[chore][receiver/sqlserver] Add Windows-specific updates for direct c…
crobert-1 Apr 16, 2024
ea2bb88
Merge branch 'main' into sqlserver_windows_direct_connect
crobert-1 Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion receiver/sqlserverreceiver/factory_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func createMetricsReceiver(
if !ok {
return nil, errConfigNotSQLServer
}
sqlServerScraper := newSQLServerScraper(params, cfg)
sqlServerScraper := newSQLServerPCScraper(params, cfg)

scraper, err := scraperhelper.NewScraper(metadata.Type.String(), sqlServerScraper.scrape,
scraperhelper.WithStart(sqlServerScraper.start),
Expand Down
17 changes: 9 additions & 8 deletions receiver/sqlserverreceiver/scraper.go → ...iver/sqlserverreceiver/scraper_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata"
)

type sqlServerScraper struct {
// SQL Server Perf Counter (PC) Scraper. This is used to scrape metrics from Windows Perf Counters.
type sqlServerPCScraper struct {
logger *zap.Logger
config *Config
watcherRecorders []watcherRecorder
Expand All @@ -37,17 +38,17 @@ type watcherRecorder struct {
// it needs metadata.MetricsBuilder and timestamp as arguments.
type curriedRecorder func(*metadata.MetricsBuilder, pcommon.Timestamp)

// newSQLServerScraper returns a new sqlServerScraper.
func newSQLServerScraper(params receiver.CreateSettings, cfg *Config) *sqlServerScraper {
return &sqlServerScraper{
// newSQLServerPCScraper returns a new sqlServerPCScraper.
func newSQLServerPCScraper(params receiver.CreateSettings, cfg *Config) *sqlServerPCScraper {
return &sqlServerPCScraper{
logger: params.Logger,
config: cfg,
mb: metadata.NewMetricsBuilder(cfg.MetricsBuilderConfig, params),
}
}

// start creates and sets the watchers for the scraper.
func (s *sqlServerScraper) start(_ context.Context, _ component.Host) error {
func (s *sqlServerPCScraper) start(_ context.Context, _ component.Host) error {
s.watcherRecorders = []watcherRecorder{}

for _, pcr := range perfCounterRecorders {
Expand All @@ -71,7 +72,7 @@ func (s *sqlServerScraper) start(_ context.Context, _ component.Host) error {
}

// scrape collects windows performance counter data from all watchers and then records/emits it using the metricBuilder
func (s *sqlServerScraper) scrape(_ context.Context) (pmetric.Metrics, error) {
func (s *sqlServerPCScraper) scrape(_ context.Context) (pmetric.Metrics, error) {
recordersByDatabase, errs := recordersPerDatabase(s.watcherRecorders)

for dbName, recorders := range recordersByDatabase {
Expand Down Expand Up @@ -113,7 +114,7 @@ func recordersPerDatabase(watcherRecorders []watcherRecorder) (map[string][]curr
return dbToRecorders, errs
}

func (s *sqlServerScraper) emitMetricGroup(recorders []curriedRecorder, databaseName string) {
func (s *sqlServerPCScraper) emitMetricGroup(recorders []curriedRecorder, databaseName string) {
now := pcommon.NewTimestampFromTime(time.Now())

for _, recorder := range recorders {
Expand All @@ -132,7 +133,7 @@ func (s *sqlServerScraper) emitMetricGroup(recorders []curriedRecorder, database
}

// shutdown stops all of the watchers for the scraper.
func (s sqlServerScraper) shutdown(_ context.Context) error {
func (s sqlServerPCScraper) shutdown(_ context.Context) error {
var errs error
for _, wr := range s.watcherRecorders {
err := wr.watcher.Close()
Expand Down
6 changes: 3 additions & 3 deletions receiver/sqlserverreceiver/scraper_test.go → ...sqlserverreceiver/scraper_windows_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func TestSqlServerScraper(t *testing.T) {
logger, obsLogs := observer.New(zap.WarnLevel)
settings := receivertest.NewNopCreateSettings()
settings.Logger = zap.New(logger)
s := newSQLServerScraper(settings, cfg)
s := newSQLServerPCScraper(settings, cfg)

assert.NoError(t, s.start(context.Background(), nil))
assert.Equal(t, 0, len(s.watcherRecorders))
Expand Down Expand Up @@ -114,7 +114,7 @@ func TestScrape(t *testing.T) {
factory := NewFactory()
cfg := factory.CreateDefaultConfig().(*Config)
settings := receivertest.NewNopCreateSettings()
scraper := newSQLServerScraper(settings, cfg)
scraper := newSQLServerPCScraper(settings, cfg)

for i, rec := range perfCounterRecorders {
perfCounterWatcher := &mockPerfCounterWatcher{}
Expand Down Expand Up @@ -158,7 +158,7 @@ func TestScrape(t *testing.T) {
cfg.InstanceName = "CustomInstance"

settings := receivertest.NewNopCreateSettings()
scraper := newSQLServerScraper(settings, cfg)
scraper := newSQLServerPCScraper(settings, cfg)

for i, rec := range perfCounterRecorders {
perfCounterWatcher := &mockPerfCounterWatcher{}
Expand Down
Loading