Merge branch 'main' into fix-jinja2-template

open-telemetry · Jul 30, 2024 · 43eeddd · 43eeddd
2 parents 86e8542 + dbfa681
commit 43eeddd
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/instrumentations_1.yml b/.github/workflows/instrumentations_1.yml
@@ -39,6 +39,7 @@ jobs:
           - "resource-detector-container"
           - "util-http"
           - "fastapi-slim"
+          - "processor-baggage"
         os: [ubuntu-20.04]
         exclude:
           - python-version: pypy3

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -250,7 +250,8 @@ The continuous integration overrides that environment variable with as per the c
 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.
 
 - Follow semantic conventions
-  - The instrumentation should follow the semantic conventions defined [here](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/semantic-conventions.md)
+  - The instrumentation should follow the semantic conventions defined [here](https://github.com/open-telemetry/semantic-conventions/tree/main/docs)
+- 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.
 - Extends from [BaseInstrumentor](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/2518a4ac07cb62ad6587dd8f6cbb5f8663a7e179/opentelemetry-instrumentation/src/opentelemetry/instrumentation/instrumentor.py#L35)
 - Supports auto-instrumentation
   - Add an entry point (ex. <https://github.com/open-telemetry/opentelemetry-python-contrib/blob/2518a4ac07cb62ad6587dd8f6cbb5f8663a7e179/instrumentation/opentelemetry-instrumentation-requests/pyproject.toml#L44>)

diff --git a/RELEASING.md b/RELEASING.md
@@ -90,6 +90,10 @@
     <https://readthedocs.org/projects/opentelemetry-python/builds/>.
     If the build has not run automatically, it can be manually trigger via the readthedocs interface.
 
+## Releasing dev version of new packages to claim namespace
+
+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`.
+
 ## Troubleshooting
 
 ### Publish failed

diff --git a/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml
@@ -28,7 +28,6 @@ dependencies = [
   "opentelemetry-api ~= 1.14",
   "opentelemetry-instrumentation == 0.48b0.dev",
   "opentelemetry-semantic-conventions == 0.48b0.dev",
-  "opentelemetry-test-utils == 0.48b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/tests/test_fastapi_instrumentation.py b/instrumentation/opentelemetry-instrumentation-fastapi/tests/test_fastapi_instrumentation.py
@@ -768,7 +768,6 @@ def test_basic_metric_nonstandard_http_method_success_both_semconv(self):
             for point in list(metric.data.data_points):
                 if isinstance(point, HistogramDataPoint):
                     self.assertEqual(point.count, 1)
-                    self.assertAlmostEqual(duration, point.sum, delta=40)
                     if metric.name == "http.server.request.duration":
                         self.assertAlmostEqual(duration_s, point.sum, places=1)
                         self.assertDictEqual(

diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt
@@ -1,15 +1,12 @@
 asgiref==3.7.2
 cffi==1.15.1
 Deprecated==1.2.14
-greenlet==0.4.13
-hpy==0.0.4.dev179+g9b5d200
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-readline==6.2.4.1
 SQLAlchemy==1.1.18
 tomli==2.0.1
 typing_extensions==4.10.0

diff --git a/processor/opentelemetry-processor-baggage/pyproject.toml b/processor/opentelemetry-processor-baggage/pyproject.toml
@@ -26,6 +26,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.5",
+  "opentelemetry-sdk ~= 1.5",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/processor/opentelemetry-processor-baggage/test-requirements.txt b/processor/opentelemetry-processor-baggage/test-requirements.txt
@@ -1,2 +1,7 @@
-
--e processor/opentelemetry-processor-baggage
+importlib_metadata==8.0.0
+typing_extensions==4.12.2
+wrapt==1.16.0
+zipp==3.19.2
+pytest==7.4.4
+Deprecated==1.2.14
+-e processor/opentelemetry-processor-baggage