CP-45235: Support for xe-cli to transmit traceparent
#5633
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
GabrielBuica
commented
May 15, 2024
psafont
reviewed
May 15, 2024
| @@ -286,6 +292,10 @@ let parse_args = | |||
| List.rev !l | |||
| in | |||
| let extras_rest = process_args extras in | |||
| (*if traceparent is set as env var update it after we process the extras.*) | |||
| Option.iter | |||
| (fun tp -> traceparent := Some tp) | |||
There was a problem hiding this comment.
The cli argument must take precedence over the environment variable, which usually takes preference over the contents of the configuration file
There was a problem hiding this comment.
This is what it does: it sets the values from configuration files, then overwrites them with the values from environment variables and then again with values from the cli argument. process_args calls set_keyword to achieve this.
This line is separate because it reads and process TRACEPARENT env var after it processes XE_EXTRA_ARGS.
psafont
reviewed
May 15, 2024
GabrielBuica
force-pushed
the
private/dbuica/CP-45235
branch
from
d3d880c
to
ffb24e9
Compare
mg12
reviewed
May 15, 2024
mg12
approved these changes
May 17, 2024
GabrielBuica
force-pushed
the
private/dbuica/CP-45235
branch
from
24681d7
to
5aa4494
Compare
Adds the possibility of `xe` commands to pass a `traceparent`. This can be done through the following ways: - a command arg: `xe <cmd> --traceparent <traceparent>`; - a environment variable: `TRACEPARENT=<traceparent>`: - specifying `traceparent=<traceparent>` in `.xe`. Priority is given in the same order as above. This should enable creating a single trace from the `xe-cli` caller through `xapi`. Signed-off-by: Gabriel Buica <danutgabriel.buica@cloud.com>
GabrielBuica
force-pushed
the
private/dbuica/CP-45235
branch
from
5aa4494
to
dab475d
Compare
|
Rebased it on master. Passes BVT+BST 199170 |
psafont
approved these changes
Jun 6, 2024
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.
Adds the possibility of
xecommands to pass atraceparent.This can be done through the following ways:
xe <cmd> --traceparent <traceparent>(orxe <cmd> traceparent=<traceparent>);TRACEPARENT=<traceparent>:traceparent=<traceparent>in.xe.Priority is given in the same order as above.
This should enable creating a single trace from the
xe-clicaller throughxapi.