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.

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

Move NGINX discovery to OTel receiver #5689

Merged
merged 15 commits into from
Dec 12, 2024

Conversation

pjanotti
Copy link
Contributor

@pjanotti pjanotti commented Dec 9, 2024

Description:
The discovery for NGINX should use the OTel receiver instead of the SmartAgent monitor.

Link:
https://splunk.atlassian.net/browse/OTL-2998

Testing:
N/A

Documentation:

@pjanotti pjanotti changed the title [draft] Initial changes to move NGINX discovery to OTel receiver Move NGINX discovery to OTel receiver Dec 12, 2024
@pjanotti pjanotti marked this pull request as ready for review December 12, 2024 14:29
@pjanotti pjanotti requested review from a team as code owners December 12, 2024 14:29
@pjanotti
Copy link
Contributor Author

Integration test failure:

2024-12-12T15:06:20.518Z	INFO	testutils/collector_container.go:267	go.opentelemetry.io/collector/receiver@v0.114.0/scraperhelper/scrapercontroller.go:183
    golden.go:125: 
        	Error Trace:	/home/runner/work/splunk-otel-collector/splunk-otel-collector/tests/testutils/golden.go:127
        	            				/opt/hostedtoolcache/go/1.22.7/x64/src/runtime/asm_amd64.s:1695
        	Error:      	No metrics collected
    golden.go:125: 
        	Error Trace:	/home/runner/work/splunk-otel-collector/splunk-otel-collector/tests/testutils/golden.go:125
        	            				/home/runner/work/splunk-otel-collector/splunk-otel-collector/tests/receivers/apachespark/apachespark_test.go:30
        	Error:      	Condition never satisfied
        	Test:       	TestApacheSparkIntegration
2024/12/12 15:06:34 🐳 Stopping container: c55a7b46c83e
2024-12-12T15:06:34.251Z	INFO	testutils/collector_container.go:267	2024-12-12T15:06:34.250Z	info	otelcol@v0.114.0/collector.go:328	Received signal from OS	{"signal": "terminated"}
2024-12-12T15:06:34.251Z	INFO	testutils/collector_container.go:267	2024-12-12T15:06:34.250Z	info	service@v0.114.0/service.go:303	Starting shutdown...
2024-12-12T15:06:34.251Z	INFO	testutils/collector_container.go:267	2024-12-12T15:06:34.250Z	info	extensions/extensions.go:66	Stopping extensions...
2024-12-12T15:06:34.251Z	INFO	testutils/collector_container.go:267	2024-12-12T15:06:34.250Z	info	service@v0.114.0/service.go:317	Shutdown complete.
2024/12/12 15:06:34 ✅ Container stopped: c55a7b46c83e
2024/12/12 15:06:34 🐳 Stopping container: c55a7b46c83e
2024/12/12 15:06:34 ✅ Container stopped: c55a7b46c83e
2024/12/12 15:06:34 🐳 Terminating container: c55a7b46c83e
2024/12/12 15:06:34 🚫 Container terminated: c55a7b46c83e
--- FAIL: TestApacheSparkIntegration (35.64s)
FAIL
FAIL	github.com/signalfx/splunk-otel-collector/tests/receivers/apachespark	35.663s

Re-running...

Copy link
Contributor

@swahba swahba left a comment

Choose a reason for hiding this comment

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

I see smartagent with collectd/nginx monitor type (Linux) in the README file (https://github.com/signalfx/splunk-otel-collector/tree/main/internal/confmapprovider/discovery#readme). Should that also be updated?

@hughesjj
Copy link
Contributor

I see smartagent with collectd/nginx monitor type (Linux) in the README file (https://github.com/signalfx/splunk-otel-collector/tree/main/internal/confmapprovider/discovery#readme). Should that also be updated?

Oof, that's a bit out of date, we should update it regardless. It's missing the ones I did too (kafkametrics and jmx/cassandra) at least.

@pjanotti
Copy link
Contributor Author

Eagle eye @swahba! @hughesjj I will remove the obvious ones, but, it still may require some careful reading.

@pjanotti
Copy link
Contributor Author

@hughesjj it will be a bit messy: there are files to be deleted, links to be checked, etc. I will fix the one related to NGINX and will do a separate PR to fix the others.

@pjanotti pjanotti merged commit e172128 into signalfx:main Dec 12, 2024
252 checks passed
@pjanotti pjanotti deleted the switch-nginx-discovery-to-otel-rcvr branch December 12, 2024 22:48
@github-actions github-actions bot locked and limited conversation to collaborators Dec 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants