-
Notifications
You must be signed in to change notification settings - Fork 115
OTLP GRPC support #1711
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
Open
suyadav1
wants to merge
3
commits into
ci_prod
Choose a base branch
from
suyadav/otlp-grpc
base: ci_prod
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+27
−9
Open
OTLP GRPC support #1711
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 |
|---|---|---|
|
|
@@ -84,22 +84,40 @@ startAMACoreAgent() { | |
| echo "export AMACALogFilePath=$AMACALogFilePath" | ||
| } >> ~/.bashrc | ||
|
|
||
| if isOpenTelemetryLogsEnabled; then | ||
| export PA_AMCS_PROTOCOL="HttpProtobuf" | ||
| export PA_AMCS_HOST="0.0.0.0" | ||
| export PA_AMCS_PORT=4319 | ||
| if isOpenTelemetryLogsEnabled; then | ||
| export OTLP_HTTP_PROTOBUF_LOGS_TRACES_HOST="0.0.0.0" | ||
| export OTLP_GRPC_LOGS_TRACES_HOST="0.0.0.0" | ||
| export OTLP_HTTP_PROTOBUF_LOGS_TRACES_PORT=4319 | ||
| export OTLP_GRPC_LOGS_TRACES_PORT=4320 | ||
| if [ -n "${AZMON_OPENTELEMETRYLOGS_CONTAINER_PORT}" ]; then | ||
|
Contributor
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. some comments about data validation and error handling.
do 1 will eliminate if clause in 2. |
||
| # Convert AZMON_OPENTELEMETRYLOGS_CONTAINER_PORT from string to int | ||
| port_int=$((AZMON_OPENTELEMETRYLOGS_CONTAINER_PORT + 0)) | ||
| if [ "$port_int" -gt 0 ] 2>/dev/null; then | ||
| export PA_AMCS_PORT=$port_int | ||
| export OTLP_HTTP_PROTOBUF_LOGS_TRACES_PORT=$port_int | ||
| fi | ||
| fi | ||
|
|
||
| if [ -n "${AZMON_OPENTELEMETRYLOGS_CONTAINER_PORT_GRPC}" ]; then | ||
| # Convert AZMON_OPENTELEMETRYLOGS_CONTAINER_PORT_GRPC from string to int | ||
| port_grpc_int=$((AZMON_OPENTELEMETRYLOGS_CONTAINER_PORT_GRPC + 0)) | ||
| if [ "$port_grpc_int" -gt 0 ] 2>/dev/null; then | ||
| export OTLP_GRPC_LOGS_TRACES_PORT=$port_grpc_int | ||
| fi | ||
| fi | ||
|
|
||
| { | ||
| echo "export OTLP_HTTP_PROTOBUF_LOGS_TRACES_HOST=$OTLP_HTTP_PROTOBUF_LOGS_TRACES_HOST" | ||
| echo "export OTLP_GRPC_LOGS_TRACES_HOST=$OTLP_GRPC_LOGS_TRACES_HOST" | ||
| echo "export OTLP_HTTP_PROTOBUF_LOGS_TRACES_PORT=$OTLP_HTTP_PROTOBUF_LOGS_TRACES_PORT" | ||
| echo "export OTLP_GRPC_LOGS_TRACES_PORT=$OTLP_GRPC_LOGS_TRACES_PORT" | ||
| } >> ~/.bashrc | ||
| else | ||
| echo "OpenTelemetry logs not enabled, disabling OTLP ports for AMACoreAgent" | ||
| export OTLP_HTTP_PROTOBUF_LOGS_TRACES_PORT=-1 | ||
| export OTLP_GRPC_LOGS_TRACES_PORT=-1 | ||
| { | ||
| echo "export PA_AMCS_PROTOCOL=$PA_AMCS_PROTOCOL" | ||
| echo "export PA_AMCS_PORT=$PA_AMCS_PORT" | ||
| echo "export PA_AMCS_HOST=$PA_AMCS_HOST" | ||
| echo "export OTLP_HTTP_PROTOBUF_LOGS_TRACES_PORT=$OTLP_HTTP_PROTOBUF_LOGS_TRACES_PORT" | ||
| echo "export OTLP_GRPC_LOGS_TRACES_PORT=$OTLP_GRPC_LOGS_TRACES_PORT" | ||
| } >> ~/.bashrc | ||
| fi | ||
|
|
||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.