Skip to content

Commit 553ad0c

Browse files
authored
Merge branch 'main' into antonpirker/run-tests-in-python-313
2 parents 3f9e051 + dbfa681 commit 553ad0c

File tree

5 files changed

+15
-3
lines changed

5 files changed

+15
-3
lines changed

.github/workflows/instrumentations_1.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
- "resource-detector-container"
4141
- "util-http"
4242
- "fastapi-slim"
43+
- "processor-baggage"
4344
os: [ubuntu-20.04]
4445
exclude:
4546
- python-version: pypy3

CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ The continuous integration overrides that environment variable with as per the c
250250
Below is a checklist of things to be mindful of when implementing a new instrumentation or working on a specific instrumentation. It is one of our goals as a community to keep the implementation specific details of instrumentations as similar across the board as possible for ease of testing and feature parity. It is also good to abstract as much common functionality as possible.
251251

252252
- Follow semantic conventions
253-
- The instrumentation should follow the semantic conventions defined [here](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/semantic-conventions.md)
253+
- The instrumentation should follow the semantic conventions defined [here](https://github.com/open-telemetry/semantic-conventions/tree/main/docs)
254+
- Contains a name that is not already claimed in [Pypi](https://pypi.org/). Contact a maintainer, bring the issue up in the weekly Python SIG or create a ticket in Pypi if a desired name has already been taken.
254255
- Extends from [BaseInstrumentor](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/2518a4ac07cb62ad6587dd8f6cbb5f8663a7e179/opentelemetry-instrumentation/src/opentelemetry/instrumentation/instrumentor.py#L35)
255256
- Supports auto-instrumentation
256257
- Add an entry point (ex. <https://github.com/open-telemetry/opentelemetry-python-contrib/blob/2518a4ac07cb62ad6587dd8f6cbb5f8663a7e179/instrumentation/opentelemetry-instrumentation-requests/pyproject.toml#L44>)

RELEASING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@
9090
<https://readthedocs.org/projects/opentelemetry-python/builds/>.
9191
If the build has not run automatically, it can be manually trigger via the readthedocs interface.
9292

93+
## Releasing dev version of new packages to claim namespace
94+
95+
When a contribution introduces a new package, in order to mitigate name-squatting incidents, release the current development version of the new package under the `opentelemetry` user to simply claim the namespace. This should be done shortly after the PR that introduced this package has been merged into `main`.
96+
9397
## Troubleshooting
9498

9599
### Publish failed

processor/opentelemetry-processor-baggage/pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.5",
29+
"opentelemetry-sdk ~= 1.5",
2930
"wrapt >= 1.0.0, < 2.0.0",
3031
]
3132

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
2-
-e processor/opentelemetry-processor-baggage
1+
importlib_metadata==8.0.0
2+
typing_extensions==4.12.2
3+
wrapt==1.16.0
4+
zipp==3.19.2
5+
pytest==7.4.4
6+
Deprecated==1.2.14
7+
-e processor/opentelemetry-processor-baggage

0 commit comments

Comments
 (0)