-
Notifications
You must be signed in to change notification settings - Fork 754
Remove usage of pkg_resources #3047
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
Changes from all commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
bceff8c
Remove usage of pkg_resources
ocelotl 9c4b65f
WIP
ocelotl bd3baaa
WIP
ocelotl fff4430
Add test case for _load_providers
ocelotl 2eb9b58
Fix test case for 3.9
ocelotl 79d056c
Fix lint
ocelotl a3be85a
Fix 3.7 sdk tests
ocelotl c050c1c
Fix lint
ocelotl cf2b427
Fix lint
ocelotl 5d5a74f
Fix mypy again
ocelotl 8b627fe
WIP
ocelotl 09111e4
WIP
ocelotl 25af79a
WIP
ocelotl 78ee090
WIP
ocelotl 34e4e5c
Move to module
ocelotl a63a8cf
Fix SDK
ocelotl 0e0c46a
Fix mypy
ocelotl ff4e9d9
Refactor load call
ocelotl ace3324
Fix mypy
ocelotl 1df7556
Fix lint
ocelotl df3041e
Fix opencensus exporter
ocelotl 622e81c
Refactor implementation
ocelotl 036927d
Add missing dependency
ocelotl 15f3050
Undo changes in shim
ocelotl 3ea9a8d
Fix dependency
ocelotl 66cde8c
Revert "Undo changes in shim"
ocelotl eb583bb
Update dependencies
ocelotl af6d00f
Update dependency for opencensus exporter
ocelotl 5efa728
Add descriptive error
ocelotl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
38 changes: 38 additions & 0 deletions
38
opentelemetry-api/src/opentelemetry/util/_importlib_metadata.py
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| # Copyright The OpenTelemetry Authors | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| from sys import version_info | ||
|
|
||
| # FIXME remove this when support for 3.7 is dropped. | ||
| if version_info.minor == 7: | ||
| # pylint: disable=import-error | ||
| from importlib_metadata import entry_points, version # type: ignore | ||
|
|
||
| # FIXME remove this file when support for 3.9 is dropped. | ||
| elif version_info.minor in (8, 9): | ||
| # pylint: disable=import-error | ||
| from importlib.metadata import ( | ||
| entry_points as importlib_metadata_entry_points, | ||
| ) | ||
| from importlib.metadata import version | ||
|
|
||
| def entry_points(group: str, name: str): # type: ignore | ||
| for entry_point in importlib_metadata_entry_points()[group]: | ||
| if entry_point.name == name: | ||
| yield entry_point | ||
|
|
||
| else: | ||
| from importlib.metadata import entry_points, version | ||
|
|
||
| __all__ = ["entry_points", "version"] |
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.