Skip to content

Commit

Permalink
ci(telemetry): fix failing instrumentation telemetry test (#6779)
Browse files Browse the repository at this point in the history
Test failure was introduced in
619c4bf

This fix was cherry-picked from the following commit:
e738aa9

## Checklist

- [x] Change(s) are motivated and described in the PR description.
- [x] Testing strategy is described if automated tests are not included
in the PR.
- [x] Risk is outlined (performance impact, potential for breakage,
maintainability, etc).
- [x] Change is maintainable (easy to change, telemetry, documentation).
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed. If no release note is required, add label
`changelog/no-changelog`.
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/)).
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist

- [ ] Title is accurate.
- [ ] No unnecessary changes are introduced.
- [ ] Description motivates each change.
- [ ] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes unless absolutely necessary.
- [ ] Testing strategy adequately addresses listed risk(s).
- [ ] Change is maintainable (easy to change, telemetry, documentation).
- [ ] Release note makes sense to a user of the library.
- [ ] Reviewer has explicitly acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment.
- [ ] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
- [ ] If this PR touches code that signs or publishes builds or
packages, or handles credentials of any kind, I've requested a review
from `@DataDog/security-design-and-guidance`.
- [ ] This PR doesn't touch any of that.
  • Loading branch information
mabdinur authored Aug 28, 2023
1 parent 530b3dc commit 9a39c3a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions tests/telemetry/test_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,14 @@ def test_app_started_event_configuration_override(test_agent_session, run_python
assert status == 0, stderr

events = test_agent_session.get_events()
events[0]["payload"]["configuration"].sort(key=lambda c: c["name"])

assert len(events) == 1
events[0]["payload"]["configuration"].sort(key=lambda c: c["name"])
assert events[0]["payload"]["configuration"] == [
{"name": "DD_APPSEC_ENABLED", "origin": "unknown", "value": False},
{"name": "DD_CALL_BASIC_CONFIG", "origin": "unknown", "value": True},
{"name": "DD_DATA_STREAMS_ENABLED", "origin": "unknown", "value": False},
{"name": "DD_DYNAMIC_INSTRUMENTATION_ENABLED", "origin": "unknown", "value": False},
{"name": "DD_DYNAMIC_INSTRUMENTATION_ENABLED", "origin": "unknown", "value": True},
{"name": "DD_EXCEPTION_DEBUGGING_ENABLED", "origin": "unknown", "value": True},
{"name": "DD_INSTRUMENTATION_TELEMETRY_ENABLED", "origin": "unknown", "value": True},
{"name": "DD_LOGS_INJECTION", "origin": "unknown", "value": True},
Expand Down

0 comments on commit 9a39c3a

Please sign in to comment.