NH-100646 Default OTLP auth header always in lambda #494
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
| @@ -52,6 +52,9 @@ def before_and_after_each(self): | |||
| if old_otel_ev_lh: | |||
| del os.environ["OTEL_EXPORTER_OTLP_LOGS_HEADERS"] | |||
| old_key = os.environ.get("SW_APM_SERVICE_KEY", None) | |||
| old_otel_ev_proto = os.environ.get("OTEL_EXPORTER_OTLP_PROTOCOL", None) | |||
There was a problem hiding this comment.
This os.environ stash and reset was missing and causing inconsistencies, noticed only after updating tests in this PR.
| @@ -347,6 +352,18 @@ def test__configure_traces_export_env_defaults_valid_protocol_grpc(self, mocker) | |||
| assert os.environ.get(OTEL_EXPORTER_OTLP_TRACES_ENDPOINT) == "https://otel.collector.na-01.cloud.solarwinds.com:443/v1/traces" | |||
| assert os.environ.get(OTEL_EXPORTER_OTLP_TRACES_HEADERS) == "authorization=Bearer%20foo-token" | |||
|
|
|||
| def test_configure_set_otlp_header_defaults_not_lambda_no_header_token(self, mocker): | |||
There was a problem hiding this comment.
This test coverage was missing before
tammy-baylis-swi
changed the title
cheempz
approved these changes
Jan 29, 2025
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.
Simplifies APM Python custom distro by removing one unnecessary
is_lambdacheck.Change is that now, in lambda environment, default values for
OTEL_EXPORTER_OTLP_(TRACES|METRICS|LOGS)_HEADERSalways get set tof"authorization=Bearer%20{header_token}"even ifheader_tokenis empty, which should normally be the case. This does not affect export to otel-collector layer on localhost -- see ticket comment for more test info. This is again for default values, so user can always override with their ownHEADERSset in environment.Works the same as before outside of lambda.
Also adds more unit tests and clarifies existing ones.