Skip to content

Fix issue when resetting config after new value has been added #1068

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

Merged
merged 6 commits into from
Mar 16, 2021

Conversation

beniwohli
Copy link
Contributor

When a new value has been added to the config, resetting to the original config can raise a KeyError

Related issues

closes #1067

@apmmachine
Copy link
Contributor

apmmachine commented Mar 11, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #1068 updated

  • Start Time: 2021-03-16T10:41:47.639+0000

  • Duration: 21 min 2 sec

  • Commit: 3f133cd

Test stats 🧪

Test Results
Failed 0
Passed 7956
Skipped 5735
Total 13691

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 7956
Skipped 5735
Total 13691

@beniwohli beniwohli marked this pull request as ready for review March 11, 2021 15:56
@beniwohli beniwohli requested a review from basepi March 11, 2021 15:56
Copy link
Contributor

@basepi basepi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

basepi and others added 3 commits March 16, 2021 11:39
* Refactor auto_ecs_logging to log_ecs_formatting

This matches the Java implementation which is more flexible (due
to using an enum instead of a bool) and will match the upcoming
ecs log formatting spec

* `override`, not `on`

* Update the test 🤦‍♂️
@beniwohli beniwohli merged commit c73dca6 into elastic:master Mar 16, 2021
@beniwohli beniwohli deleted the fix-1067 branch March 16, 2021 11:19
beniwohli added a commit to beniwohli/apm-agent-python that referenced this pull request Mar 16, 2021
…ic#1068)

* add test that demonstrates problem from elastic#1067

* check if key existed in original config before setting up callback for it
beniwohli added a commit that referenced this pull request Mar 16, 2021
* Use `elasticapm` as Django app label

Django 3.2 now verifies that the app label is a valid Python identifier name.

* use `re_path` instead of `url` if available

this reduces the deprecation warning noise in newer Django releases

* added Django 3.2 to test matrix

* Fix issue when resetting config after new value has been added (#1068)

* add test that demonstrates problem from #1067

* check if key existed in original config before setting up callback for it

* update changelog
beniwohli added a commit to beniwohli/apm-agent-python that referenced this pull request Sep 14, 2021
…ic#1068)

* add test that demonstrates problem from elastic#1067

* check if key existed in original config before setting up callback for it
beniwohli added a commit to beniwohli/apm-agent-python that referenced this pull request Sep 14, 2021
* Use `elasticapm` as Django app label

Django 3.2 now verifies that the app label is a valid Python identifier name.

* use `re_path` instead of `url` if available

this reduces the deprecation warning noise in newer Django releases

* added Django 3.2 to test matrix

* Fix issue when resetting config after new value has been added (elastic#1068)

* add test that demonstrates problem from elastic#1067

* check if key existed in original config before setting up callback for it

* update changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Traceback from agent on max spans
3 participants