Skip to content
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

Add support for generic OTEL_PYTHON_EXCLUDED_URLS variable #790

Merged
merged 5 commits into from
Nov 10, 2021

Conversation

adamantike
Copy link
Contributor

@adamantike adamantike commented Nov 2, 2021

Description

Use OTEL_PYTHON_EXCLUDED_URLS environment variable as a fallback of OTEL_PYTHON_{instrumentation}_EXCLUDED_URLS.

Fixes #789

Type of change

  • New feature (non-breaking change which adds functionality)
  • This change requires a documentation update

How Has This Been Tested?

  • tox -e test-util-http

Does This PR Require a Core Repo Change?

  • No.

Checklist:

  • Followed the style guidelines of this project
  • Changelogs have been updated
  • Unit tests have been added
  • Documentation has been updated

@adamantike adamantike requested a review from a team November 2, 2021 23:44
@adamantike adamantike force-pushed the add-OTEL_PYTHON_EXCLUDED_URLS branch from 2698849 to f0a3bce Compare November 2, 2021 23:46
@@ -32,7 +32,8 @@

Exclude lists
*************
To exclude certain URLs from being tracked, set the environment variable ``OTEL_PYTHON_DJANGO_EXCLUDED_URLS`` with comma delimited regexes representing which URLs to exclude.
To exclude certain URLs from being tracked, set the environment variable ``OTEL_PYTHON_EXCLUDED_URLS`` or ``OTEL_PYTHON_DJANGO_EXCLUDED_URLS``
with comma delimited regexes representing which URLs to exclude.
Copy link
Member

Choose a reason for hiding this comment

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

Maybe mention the precedence when both are set?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Would this wording make that clear, or should we go with a different one?

To exclude certain URLs from being tracked, set the environment variable OTEL_PYTHON_{instrumentation}_EXCLUDED_URLS (or OTEL_PYTHON_EXCLUDED_URLS as fallback) with comma delimited regexes representing which URLs to exclude.

Copy link
Contributor

Choose a reason for hiding this comment

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

@lonewolf3739 please resolve if you are satisfied with the change. thanks

@owais owais enabled auto-merge (squash) November 8, 2021 23:29
@ocelotl
Copy link
Contributor

ocelotl commented Nov 9, 2021

@adamantike please resolve conflicts so that we can merge ✌️

Use `OTEL_PYTHON_EXCLUDED_URLS` environment variable as a fallback of
`OTEL_PYTHON_{instrumentation}_EXCLUDED_URLS`.
auto-merge was automatically disabled November 9, 2021 15:25

Head branch was pushed to by a user without write access

@adamantike adamantike force-pushed the add-OTEL_PYTHON_EXCLUDED_URLS branch from de7ce9d to 74c366d Compare November 9, 2021 15:25
@adamantike
Copy link
Contributor Author

Rebased, and changed docs wording. Let me know if that's clear enough!

@owais owais enabled auto-merge (squash) November 10, 2021 22:34
@owais owais merged commit d4ad8f5 into open-telemetry:main Nov 10, 2021
@adamantike adamantike deleted the add-OTEL_PYTHON_EXCLUDED_URLS branch November 11, 2021 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for generic OTEL_PYTHON_EXCLUDED_URLS variable
5 participants