-
Notifications
You must be signed in to change notification settings - Fork 452
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
doc: customized auto-instrumentation #762
Merged
Merged
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7d35ffa
doc: customized auto-instrumentation
cuichenli 90a4420
doc: update based on comments
cuichenli cf57276
doc: wording
cuichenli aca5035
doc: update based on comments
cuichenli 9e2875d
doc: update based on comments
cuichenli a34dc41
Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…
cuichenli File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -215,6 +215,28 @@ The possible values for the annotation can be | |
* `"my-instrumentation"` - name of `Instrumentation` CR instance. | ||
* `"false"` - do not inject | ||
|
||
#### Use customized or vendor instrumentation | ||
|
||
By default, the operator uses upstream auto-instrumentation libraries. Custom auto-instrumentation can be configured by | ||
overriding the image fields in a CR. | ||
|
||
```yaml | ||
apiVersion: opentelemetry.io/v1alpha1 | ||
kind: Instrumentation | ||
metadata: | ||
name: my-instrumentation | ||
spec: | ||
java: | ||
image: your-customized-auto-instrumentation-image:java | ||
nodejs: | ||
image: your-customized-auto-instrumentation-image:nodejs | ||
python: | ||
image: your-customized-auto-instrumentation-image:python | ||
``` | ||
|
||
To build your customized image, you can start by reusing the default dockerfiles. They are stored in the `autoinstrumentation` | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. updated |
||
directory. In general, you should comply with the guidelines described in the dockerfiles under the `autoinstrumentation` directory. | ||
|
||
## Compatibility matrix | ||
|
||
### OpenTelemetry Operator vs. OpenTelemetry Collector | ||
|
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could you please change the CR and keep only the image configuration?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated