Skip to content

Fix to start the NGINX plus scraper #1072

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

Merged
dhurley merged 2 commits into from
May 1, 2025
Merged

Fix to start the NGINX plus scraper #1072

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
2e018fb
Fix to start the NGINX plus scraper
dhurley Apr 30, 2025
facca73
Fix agent config
dhurley May 1, 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
18 changes: 17 additions & 1 deletion internal/collector/nginxplusreceiver/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import (
"errors"
"time"

"go.opentelemetry.io/collector/scraper"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/receiver"
Expand Down Expand Up @@ -43,6 +46,19 @@ func createMetricsReceiver(
}

nps := newNginxPlusScraper(params, cfg)
npsMetrics, npsMetricsError := scraper.NewMetrics(
nps.Scrape,
scraper.WithStart(nps.Start),
scraper.WithShutdown(nps.Shutdown),
)
if npsMetricsError != nil {
return nil, npsMetricsError
}

return nps, nil
return scraperhelper.NewMetricsController(
&cfg.ControllerConfig,
params,
metricsConsumer,
scraperhelper.AddScraper(metadata.Type, npsMetrics),
)
}
2 changes: 1 addition & 1 deletion internal/config/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ type (
}

ContainerMetricsReceiver struct {
CollectionInterval time.Duration `yaml:"-" mapstructure:"collection_interval"`
CollectionInterval time.Duration `yaml:"collection_interval" mapstructure:"collection_interval"`
}

HostMetrics struct {
Expand Down
8 changes: 4 additions & 4 deletions test/mock/collector/nginx-agent.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@ allowed_directories:
- /var/run/nginx

client:
timeout: 10s
http:
timeout: 10s

collector:
log:
level: DEBUG
receivers:
container_metrics:
collection_interval: 10s
collection_interval: 1m0s
host_metrics:
collection_interval: 1m0s
initial_delay: 1s
Expand All @@ -49,9 +50,8 @@ collector:
- server:
host: "127.0.0.1"
port: 4317
type: 0
auth:
Token: secret-receiver-token
token: secret-receiver-token
tls:
server_name: test-local-server
ca: /tmp/ca.pem
Expand Down