Python: fix module mappings for opentelemetry libs. #20705
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
kaos
commented
Mar 22, 2024
Comment on lines
-162
to
-164
| "opentelemetry-exporter-otlp": ("opentelemetry.exporter",), | ||
| "opentelemetry-exporter-otlp-proto-grpc": ("opentelemetry.exporter.otlp.proto.grpc",), | ||
| "opentelemetry-exporter-otlp-proto-http": ("opentelemetry.exporter.otlp.proto.http",), |
There was a problem hiding this comment.
removed these 3, as they map 1:1 with a simple s/-/./g (the first one was incorrect.. missing the final .otlp part)
There was a problem hiding this comment.
Btw - the default replacement is s/-/_/g, so these break now. We should add these back.
pants.backend.python.dependency_inference.rules.UnownedDependencyError: Pants cannot infer owners for the following imports in the target <redacted>:
* opentelemetry.exporter.otlp.proto.http.trace_exporter.OTLPSpanExporter (line: 6)
* opentelemetry.sdk.resources.Resource (line: 11)
* opentelemetry.sdk.resources.SERVICE_NAME (line: 11)
* opentelemetry.sdk.trace.TracerProvider (line: 12)
* opentelemetry.sdk.trace.export.BatchSpanProcessor (line: 14)
* opentelemetry.sdk.trace.export.ConsoleSpanExporter (line: 15)
* opentelemetry.sdk.trace.export.SpanExporter (line: 16)
There was a problem hiding this comment.
Oh, good catch. Hopefully fixes in #20749
| @@ -158,22 +158,18 @@ def two_groups_hyphens_two_replacements_with_suffix( | |||
| "opencv-python-headless": ("cv2",), | |||
| "opensearch-py": ("opensearchpy",), | |||
| # opentelemetry | |||
| "opentelemetry-api": ("opentelemetry",), | |||
There was a problem hiding this comment.
This one is bogus. opentelemetry is a namespace. The list of modules attributed to opentelemetry-sdk actually belongs to opentelemetry-api, according to the docs linked to from #20551 (so was a mistake to begin with.)
| "opentelemetry-exporter-otlp-proto-grpc": ("opentelemetry.exporter.otlp.proto.grpc",), | ||
| "opentelemetry-exporter-otlp-proto-http": ("opentelemetry.exporter.otlp.proto.http",), | ||
| "opentelemetry-instrumentation-kafka-python": ("opentelemetry.instrumentation.kafka",), | ||
| "opentelemetry-sdk": ( |
There was a problem hiding this comment.
Also 1:1, so no need for a module mapping for it..
|
Given that these where introduced in 2.20.0a0, I think we'd like to pick them so the correct mappings can be included in the stable release.. |
benjyw
approved these changes
Mar 23, 2024
|
I tried to automatically cherry-pick this change back to each relevant milestone, so that it is available in those older releases of Pants. ✔️ 2.20.xSuccessfully opened #20713. Thanks again for your contributions! |
huonw
pushed a commit
that referenced
this pull request
Mar 25, 2024
…20705) (#20713) Co-authored-by: Andreas Stenius <[email protected]>
huonw
added a commit
that referenced
this pull request
Apr 4, 2024
Several of mappings for opentelemetry packages were added/adjusted in #20551 and then adjusted more in #20705, but the second adjustment was based on the default fallback mapping replacing `-` with `.`, but it actually replaces them with `_`. This restores explicit mappings for the following (where I've downloaded the wheels and verified their contents): - `opentelemetry-exporter-otlp` - `opentelemetry-exporter-otlp-proto-grpc` - `opentelemetry-exporter-otlp-proto-http` - `opentelemetry-sdk` These were originally added in #16337, released in 2.14.0, so this would be a notable regression if we released 2.20.0 without them. Noticed in #20705 (comment)
WorkerPants
pushed a commit
that referenced
this pull request
Apr 4, 2024
Several of mappings for opentelemetry packages were added/adjusted in #20551 and then adjusted more in #20705, but the second adjustment was based on the default fallback mapping replacing `-` with `.`, but it actually replaces them with `_`. This restores explicit mappings for the following (where I've downloaded the wheels and verified their contents): - `opentelemetry-exporter-otlp` - `opentelemetry-exporter-otlp-proto-grpc` - `opentelemetry-exporter-otlp-proto-http` - `opentelemetry-sdk` These were originally added in #16337, released in 2.14.0, so this would be a notable regression if we released 2.20.0 without them. Noticed in #20705 (comment)
huonw
added a commit
that referenced
this pull request
Apr 4, 2024
…20753) Several of mappings for opentelemetry packages were added/adjusted in #20551 and then adjusted more in #20705, but the second adjustment was based on the default fallback mapping replacing `-` with `.`, but it actually replaces them with `_`. This restores explicit mappings for the following (where I've downloaded the wheels and verified their contents): - `opentelemetry-exporter-otlp` - `opentelemetry-exporter-otlp-proto-grpc` - `opentelemetry-exporter-otlp-proto-http` - `opentelemetry-sdk` These were originally added in #16337, released in 2.14.0, so this would be a notable regression if we released 2.20.0 without them. Noticed in #20705 (comment) Co-authored-by: Huon Wilson <[email protected]>
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.
No description provided.