Merge zero-config-dev branch #3791
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jeffreyc-splunk
force-pushed
the
zero-config-dev
branch
2 times, most recently
from
b401fd9
to
1b5556b
Compare
atoulme
approved these changes
Oct 17, 2023
aunshc
reviewed
Oct 18, 2023
| OpenTelemetry Collector | ||
| 2. [Install](../docs/getting-started/linux-manual.md#auto-instrumentation-debianrpm-packages) the | ||
| `splunk-otel-auto-instrumentation` deb/rpm package | ||
| 3. If Auto Instrumentation for Node.js is required, [install]( |
There was a problem hiding this comment.
Couple of questions:
Correct me if I am wrong, for our installers both steps 2 and 3 will be abstracted for customers right?
Is the reason for not including the node.js binary as part of the splunk-otel-auto-instrumentation that contains the java agent because it requires a separate install with npm?
There was a problem hiding this comment.
- The
splunk-otel-auto-instrumentationdeb/rpm will include the latestsplunk-otel-jstgz package from https://github.com/signalfx/splunk-otel-js/releases. - After installing the
splunk-otel-auto-instrumentationdeb/rpm, thesplunk-otel-jstgz package is then required to be separately installed withnpm. The plan is to update the installers to try to automate these steps to enable Node.js.
aunshc
reviewed
Oct 18, 2023
aunshc
reviewed
Oct 18, 2023
| ``` | ||
| Configuration of the respective agents is supported by the adding/updating the following environment variables in | ||
| each of these files (***any environment variable not in this list will be ignored***): | ||
| - `OTEL_EXPORTER_OTLP_ENDPOINT` |
There was a problem hiding this comment.
Would the instrumentation fail completely if another variable is set that is not part of this list? Or would it ignore the issue and use the other valid entries? Is there a specific error message to look out?
There was a problem hiding this comment.
I'll defer to @atoulme since he wrote that code, but looks like libsplunk.so will just silently skip (without failing) everything not in the allowed list: https://github.com/signalfx/splunk-otel-collector/blob/zero-config-dev/instrumentation/src/main.c#L89-L91.
There was a problem hiding this comment.
silently skip. We want this resilient and we don't know how to log errors.
… Node.js (#3514) * Remove sending a metric as part of auto-instrumentation (#3482) * refactor the code to inject allowed env vars * latest after pair programming * latest after review and pairing * only inject env vars for java and nodejs programs. Apply env vars from different files for java and nodejs * remove docker interactive and tty flags * wip * use arch var to set the name of the file to copy * make tests pass on arm64 * try to support arm * build for the proper platform * fix package build * review with Jason, test for env vars overrides * Make ALLOWED_ENV_VARS a single string defined through the preprocessor * Update instrumentation/tests/java/Dockerfile Co-authored-by: Jeff Cheng <[email protected]> * load preload file same way as java test * move file locations to macros * use n functions to handle strings when possible --------- Co-authored-by: Jeff Cheng <[email protected]>
* Add systemd sample file to splunk-otel-auto-instrumention * Update manual instructions * Include default /etc/splunk/zeroconfig_java.conf in deb/rpm packages * Update tests for new libsplunk.so * Run auto instrumentation workflow for the zero-config-dev branch
* Add systemd sample file to splunk-otel-auto-instrumention * Update tests for new libsplunk.so * Include splunk-otel-js in auto instrumentation deb/rpm * Include default /etc/splunk/zeroconfig_node.conf in deb/rpm packages
* Update docs * Update splunk-otel-js to v2.4.2 * Combine sample systemd config files * Install splunk-otel-js globally for tests * Update deps installation for node tests * Update splunk-otel-js to v2.4.4 * Update linux-manual.md * Update test for centos/oraclelinux 7 arm64 --------- Co-authored-by: Anna U <[email protected]>
* Update otlp endpoint for linux installer script * remove 0.0.0.0
jeffreyc-splunk
force-pushed
the
zero-config-dev
branch
from
34ad248
to
b87ea02
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See commits and doc changes for details.
TODO: Update all installers to support node.js and the new configs.