-
Notifications
You must be signed in to change notification settings - Fork 621
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
Adding try catch to fix ImproperlyConfigured exception while allowing #1369
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
jeremydvoss
commented
Oct 4, 2022
exception, | ||
) | ||
settings.configure() | ||
settings_middleware = getattr(settings, _middleware_setting, []) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Though the fix is the same, since these are distinct scenarios, I decided to keep them as separate except
clauses
lzchen
approved these changes
Oct 4, 2022
saartochner-lumigo
pushed a commit
to lumigo-io/opentelemetry-python-contrib
that referenced
this pull request
Nov 13, 2022
saartochner-lumigo
pushed a commit
to lumigo-io/opentelemetry-python-contrib
that referenced
this pull request
Nov 13, 2022
6 tasks
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.
custom django settings
Description
See issue: #677
If Django is installed but the DJANGO_SETTINGS_MODULE is not set, auto-instrumentation breaks -- even when auto-instrumenting non-django apps.
Since this would cause issues for non-django apps, and it is unreasonable to ask that users always uninstall django on their machines when running non-django apps or to have a
DJANGO_SETTINGS_MODULE
env var configured when running non-django apps, I see 2 possible fixes:settings.configure()
. This leaves the settings empty, but configured. Which means we can still add['opentelemetry.instrumentation.django.middleware.otel_middleware._DjangoMiddleware']
to it. The reason why we would actually set the settings to nothing instead of just the settings_middleware variable is that the remaining code usesgetattr
again. At first, I expected to make the following change:However, it turns out that when
DJANGO_SETTINGS_MODULE
set,settings.configured
still returnsfalse
. It's only whengetattr
is called for the first time that django searches for the settings thatDJANGO_SETTINGS_MODULE
points to. Then, it either sets the settings toconfigured
or throws theImproperlyConfigured
exception. For this reason, this PR checks whether django is configured by callinggetattr
itself.Fixes # (#677)
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
DJANGO_SETTINGS_MODULE
. Ensured thatDJANGO_SETTINGS_MODULE
settings are used and not overwritten.DJANGO_SETTINGS_MODULE
. Ensured that instrumentation succeeds and spans are produced.Does This PR Require a Core Repo Change?
Checklist:
See contributing.md for styleguide, changelog guidelines, and more.