Skip to content
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
d700d32
Add files via upload
merdzikdominik Sep 7, 2025
9b32801
Update factory_windows.go
merdzikdominik Sep 7, 2025
2caf6a8
Update factory.go
merdzikdominik Sep 7, 2025
e92563e
Update scraper.go
merdzikdominik Sep 7, 2025
e8d7715
Update winapi.go
merdzikdominik Sep 7, 2025
4193646
Update winservice.go
merdzikdominik Sep 7, 2025
8ec62cc
Update README.md
merdzikdominik Sep 7, 2025
e4ce831
Update README.md
merdzikdominik Sep 7, 2025
e074798
Update builder-config.yaml
merdzikdominik Sep 7, 2025
314ac81
Update winservice.go
merdzikdominik Sep 21, 2025
72fb072
Update scraper.go
merdzikdominik Sep 21, 2025
203dc1c
Update factory_windows.go
merdzikdominik Sep 21, 2025
00e60bc
Update factory_others.go
merdzikdominik Sep 21, 2025
b5341a6
Update factory.go
merdzikdominik Sep 21, 2025
3af4ef6
Update README.md
merdzikdominik Sep 21, 2025
8f5bce0
Update README.md
merdzikdominik Sep 21, 2025
4708906
Update go.mod
merdzikdominik Sep 21, 2025
b689b9c
Update go.sum
merdzikdominik Sep 21, 2025
c7bb867
Update factory.go
merdzikdominik Sep 22, 2025
927b023
Update factory_others.go
merdzikdominik Sep 22, 2025
448d532
Update scraper.go
merdzikdominik Sep 22, 2025
f516436
Update winapi.go
merdzikdominik Sep 22, 2025
35f02a7
Update winservice.go
merdzikdominik Sep 22, 2025
1ddaabe
removed goroutine from scraper.go
merdzikdominik Oct 9, 2025
57d15ee
adjusted builder-config.yaml
merdzikdominik Oct 10, 2025
bdb4484
Merge pull request #1 from merdzikdominik/merdzikdominik-windowsservi…
merdzikdominik Oct 10, 2025
f655c70
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
pjanotti Oct 13, 2025
91fc456
Undo changes to builder-config.yaml
pjanotti Oct 13, 2025
1231141
codereview2
merdzikdominik Oct 29, 2025
27f9ba9
builder-config.yaml fr
merdzikdominik Oct 29, 2025
0876798
Merge branch 'merdzikdominik-windowsservicereceiver' into merdzikdomi…
merdzikdominik Oct 29, 2025
9d28ac4
Merge pull request #2 from merdzikdominik/merdzikdominik-windowsservi…
merdzikdominik Oct 29, 2025
654c1ef
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
pjanotti Nov 3, 2025
4de59c3
make tidy
pjanotti Nov 3, 2025
5c857a0
Remove changes to build-config.yaml
pjanotti Nov 3, 2025
2c77f18
make generate
pjanotti Nov 3, 2025
4399e54
Merge branch 'main' into merdzikdominik-windowsservicereceiver
pjanotti Nov 4, 2025
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
502 changes: 252 additions & 250 deletions cmd/otelcontribcol/builder-config.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion receiver/windowsservicereceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
| Distributions | [contrib] |
| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Fwindowsservice%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Areceiver%2Fwindowsservice) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Fwindowsservice%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Areceiver%2Fwindowsservice) |
| Code coverage | [![codecov](https://codecov.io/github/open-telemetry/opentelemetry-collector-contrib/graph/main/badge.svg?component=receiver_windowsservice)](https://app.codecov.io/gh/open-telemetry/opentelemetry-collector-contrib/tree/main/?components%5B0%5D=receiver_windowsservice&displayType=list) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@pjanotti](https://www.github.com/pjanotti), [@shalper2](https://www.github.com/shalper2) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@pjanotti](https://www.github.com/pjanotti), [@shalper2](https://www.github.com/shalper2), [@merdzikdominik](https://github.com/merdzikdominik)|

[development]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#development
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
Expand Down
42 changes: 12 additions & 30 deletions receiver/windowsservicereceiver/factory.go
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

//revive:disable:unused-parameter
//go:build windows

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since there is a file named factory_windows.go this file, factory.go, is expected to have code that is common to all platforms and this file should not need this compile directive.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This directive shouldn't be necessary anymore... I see that it is still needed because there is still a NewFactory implementation in factory_others.go...


package windowsservicereceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsservicereceiver"

import (
"context"
"time"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsservicereceiver/internal/metadata"
)

func createDefaultConfig() component.Config {
return &Config{}
}

func NewFactory() receiver.Factory {
return receiver.NewFactory(
metadata.Type,
Expand All @@ -27,27 +23,13 @@ func NewFactory() receiver.Factory {
)
}

func createMetricsReceiver(
_ context.Context,
_ receiver.Settings,
rConf component.Config,
consumer consumer.Metrics,
) (receiver.Metrics, error) {
cfg := rConf.(*Config)
rcvr := newMetricsReceiver(cfg, consumer)
return rcvr, nil
}

func newMetricsReceiver(*Config, consumer.Metrics) *windowsServiceReceiver {
return &windowsServiceReceiver{}
}

type windowsServiceReceiver struct{}

func (*windowsServiceReceiver) Start(context.Context, component.Host) error {
return nil
}

func (*windowsServiceReceiver) Shutdown(context.Context) error {
return nil
func createDefaultConfig() component.Config {
return &Config{
ControllerConfig: scraperhelper.ControllerConfig{
CollectionInterval: 1 * time.Minute,
},
MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(),
IncludeServices: nil,
ExcludeServices: nil,
}
}
48 changes: 48 additions & 0 deletions receiver/windowsservicereceiver/factory_others.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
//go:build !windows
Comment thread
pjanotti marked this conversation as resolved.

package windowsservicereceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsservicereceiver"

import (
"context"
"errors"
"time"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsservicereceiver/internal/metadata"
)

var errUnsupportedOS = errors.New("windowsservicereceiver: supported only on Windows")

func NewFactory() receiver.Factory {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At first I think this will be better if you have the same NewFactory at factory.go but then changing line 26 to receiver.WithMetrics(createMetricsReceiver, metadata.MetricsStability) and then implement the platform dependent createMetricsReceiver in factory_windows.go and factory_others.go. See receiver/windowsperfcountersreceiver for an example.

return receiver.NewFactory(
metadata.Type,
createDefaultConfig,
receiver.WithMetrics(createUnsupported, metadata.MetricsStability),
)
}

func createDefaultConfig() component.Config {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This same function is also defined in factory.go so there is no need to have it here, as long as the compile directive //go:build windows is removed from factory.go.

Side note: the suffix of the file names in go, e.g.: factory_windows.go, is in general enough for the compiler, but I personally like to have the compile directives there too.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still an issue.

return &Config{
ControllerConfig: scraperhelper.ControllerConfig{
CollectionInterval: 1 * time.Minute,
},
MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(),
IncludeServices: nil,
ExcludeServices: nil,
}
}

func createUnsupported(
Comment thread
pjanotti marked this conversation as resolved.
Outdated
_ context.Context,
_ receiver.Settings,
_ component.Config,
_ consumer.Metrics,
) (receiver.Metrics, error) {
return nil, errUnsupportedOS
}
40 changes: 40 additions & 0 deletions receiver/windowsservicereceiver/factory_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,43 @@
//go:build windows

package windowsservicereceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsservicereceiver"

import (
"context"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/scraper"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsservicereceiver/internal/metadata"
)

func createMetricsReceiver(
_ context.Context,
settings receiver.Settings,
cfg component.Config,
next consumer.Metrics,
) (receiver.Metrics, error) {
rcfg := cfg.(*Config)

mb := metadata.NewMetricsBuilder(rcfg.MetricsBuilderConfig, settings)
s := newWindowsServiceScraper(settings, rcfg, mb)

ms, err := scraper.NewMetrics(
s.scrape,
scraper.WithStart(s.start),
scraper.WithShutdown(s.shutdown),
)
if err != nil {
return nil, err
}

return scraperhelper.NewMetricsController(
&rcfg.ControllerConfig,
settings,
next,
scraperhelper.AddScraper(metadata.Type, ms),
)
}
5 changes: 3 additions & 2 deletions receiver/windowsservicereceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@ require (
go.opentelemetry.io/collector/pdata v1.40.0
go.opentelemetry.io/collector/receiver v1.40.0
go.opentelemetry.io/collector/receiver/receivertest v0.134.0
go.opentelemetry.io/collector/scraper v0.134.0
go.opentelemetry.io/collector/scraper/scraperhelper v0.134.0
go.uber.org/goleak v1.3.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
golang.org/x/sync v0.15.0
golang.org/x/sys v0.35.0
)

Expand Down Expand Up @@ -46,15 +49,13 @@ require (
go.opentelemetry.io/collector/pipeline v1.40.0 // indirect
go.opentelemetry.io/collector/receiver/receiverhelper v0.134.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.134.0 // indirect
go.opentelemetry.io/collector/scraper v0.134.0 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
go.opentelemetry.io/otel v1.37.0 // indirect
go.opentelemetry.io/otel/log v0.13.0 // indirect
go.opentelemetry.io/otel/metric v1.37.0 // indirect
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
go.opentelemetry.io/otel/trace v1.37.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/net v0.41.0 // indirect
golang.org/x/text v0.26.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions receiver/windowsservicereceiver/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

128 changes: 107 additions & 21 deletions receiver/windowsservicereceiver/scraper.go
Original file line number Diff line number Diff line change
@@ -1,48 +1,134 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

//revive:disable:unused-parameter
//go:build windows

package windowsservicereceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsservicereceiver"

import (
"context"
"time"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/receiver"
"go.uber.org/multierr"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsservicereceiver/internal/metadata"
)

//nolint:unused
type windowsServiceScraper struct {
scm serviceManager
settings receiver.Settings
conf *Config
mb *metadata.MetricsBuilder
logger *zap.Logger
cfg *Config
mb *metadata.MetricsBuilder
mgr serviceManager
includeSet map[string]struct{}
excludeSet map[string]struct{}
}

func newWindowsServiceScraper(settings receiver.Settings, cfg *Config, mb *metadata.MetricsBuilder) *windowsServiceScraper {
ws := &windowsServiceScraper{
logger: settings.Logger,
cfg: cfg,
mb: mb,
mgr: serviceManager{},
}
if len(cfg.IncludeServices) > 0 {
ws.includeSet = make(map[string]struct{}, len(cfg.IncludeServices))
for _, n := range cfg.IncludeServices {
ws.includeSet[n] = struct{}{}
}
}
if len(cfg.ExcludeServices) > 0 {
ws.excludeSet = make(map[string]struct{}, len(cfg.ExcludeServices))
for _, n := range cfg.ExcludeServices {
ws.excludeSet[n] = struct{}{}
}
}
return ws
}

//nolint:unused
func newWindowsServiceScraper(settings receiver.Settings, _ *Config) windowsServiceScraper {
return windowsServiceScraper{
settings: settings,
mb: metadata.NewMetricsBuilder(metadata.DefaultMetricsBuilderConfig(), settings),
func mapStartTypeToAttr(st StartType) metadata.AttributeStartupMode {
switch st {
case StartBoot:
return metadata.AttributeStartupModeBootStart
case StartSystem:
return metadata.AttributeStartupModeSystemStart
case StartAutomatic:
return metadata.AttributeStartupModeAutoStart
case StartManual:
return metadata.AttributeStartupModeDemandStart
case StartDisabled:
return metadata.AttributeStartupModeDisabled
default:
return metadata.AttributeStartupModeDemandStart
}
}

//nolint:unused
func (*windowsServiceScraper) start(context.Context, component.Host) (err error) {
return nil
func (ws *windowsServiceScraper) start(_ context.Context, _ component.Host) error {
return ws.mgr.connect()
}

//nolint:unused
func (*windowsServiceScraper) shutdown(context.Context) (err error) {
return nil
func (ws *windowsServiceScraper) shutdown(_ context.Context) error {
return ws.mgr.disconnect()
}

//nolint:unused
func (ws *windowsServiceScraper) scrape(context.Context) (pmetric.Metrics, error) {
return ws.mb.Emit(), nil
func (ws *windowsServiceScraper) allowed(name string) bool {
if len(ws.includeSet) > 0 {
if _, ok := ws.includeSet[name]; !ok {
return false
}
}
if _, banned := ws.excludeSet[name]; banned {
return false
}
return true
}

func (ws *windowsServiceScraper) scrape(_ context.Context) (pmetric.Metrics, error) {
ts := pcommon.NewTimestampFromTime(time.Now())

names, err := ws.mgr.listServices()
if err != nil {
return ws.mb.Emit(), err
}

var scrapeErr error

for _, name := range names {
Comment thread
atoulme marked this conversation as resolved.
if !ws.allowed(name) {
continue
}

svc, err := updateService(&ws.mgr, name)
if err != nil {
scrapeErr = multierr.Append(scrapeErr, err)
continue
}

func() {
Comment thread
pjanotti marked this conversation as resolved.
Outdated
defer func() { _ = svc.close() }()

if err := svc.updateStatus(); err != nil {
scrapeErr = multierr.Append(scrapeErr, err)
return
}
if err := svc.updateConfig(); err != nil {
scrapeErr = multierr.Append(scrapeErr, err)
return
}

val := int64(svc.status.State)

if val < 1 || val > 7 {
val = 0
}

startAttr := mapStartTypeToAttr(svc.config.StartType)
ws.mb.RecordWindowsServiceStatusDataPoint(ts, val, name, startAttr)
}()
}

return ws.mb.Emit(), scrapeErr
}
Loading