Merge branch 'main' into feature/pkgresource-deprecation

open-telemetry · Aug 30, 2024 · aa295d6 · aa295d6
2 parents 67b4c6d + 98958b6
commit aa295d6
Show file tree

Hide file tree

Showing 120 changed files with 285 additions and 281 deletions.
diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2
@@ -23,7 +23,7 @@ jobs:
     {%- if job_data == "generate-workflows" %}
     if: |
       !contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
-      && github.actor != 'opentelemetrybot'
+      && github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
     {%- endif %}
     {%- if job_data == "public-symbols-check" %}
     if: |

diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml
@@ -96,7 +96,7 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       !contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
-      && github.actor != 'opentelemetrybot'
+      && github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## Version 1.27.0/0.48b0 ()
+
 ### Added
 
 - `opentelemetry-instrumentation-kafka-python` Instrument temporary fork, kafka-python-ng
@@ -46,6 +48,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2563](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2563))
 - `opentelemetry-instrumentation` fix `http.host` new http semantic convention mapping to depend on `kind` of span
   ([#2814](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2814))
+- `opentelemetry-instrumentation` Fix the description of `http.server.duration` and `http.server.request.duration`
+  ([#2753](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2753))
 
 ## Version 1.26.0/0.47b0 (2024-07-23)
 

diff --git a/_template/version.py b/_template/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/eachdist.ini b/eachdist.ini
@@ -16,7 +16,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.27.0.dev
+version=1.28.0.dev
 
 packages=
     opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.48b0.dev
+version=0.49b0.dev
 
 packages=
     all

diff --git a/...ter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py b/...ter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/exporter/opentelemetry-exporter-richconsole/pyproject.toml b/exporter/opentelemetry-exporter-richconsole/pyproject.toml
@@ -27,7 +27,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-sdk ~= 1.12",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
   "rich>=10.0.0",
 ]
 

diff --git a/...rter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py b/...rter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
@@ -26,7 +26,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.5",
-  "opentelemetry-instrumentation == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/...ntelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py b/...ntelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml
@@ -26,9 +26,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
-  "opentelemetry-util-http == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
+  "opentelemetry-util-http == 0.49b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/...nstrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py b/...nstrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml
@@ -26,9 +26,9 @@ classifiers = [
 ]
 dependencies = [
     "opentelemetry-api ~= 1.12",
-    "opentelemetry-instrumentation == 0.48b0.dev",
-    "opentelemetry-semantic-conventions == 0.48b0.dev",
-    "opentelemetry-util-http == 0.48b0.dev",
+    "opentelemetry-instrumentation == 0.49b0.dev",
+    "opentelemetry-semantic-conventions == 0.49b0.dev",
+    "opentelemetry-util-http == 0.49b0.dev",
     "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/...strumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/__init__.py b/...strumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/__init__.py
@@ -207,7 +207,7 @@ async def middleware(request, handler):
     duration_histogram = meter.create_histogram(
         name=MetricInstruments.HTTP_SERVER_DURATION,
         unit="ms",
-        description="Duration of HTTP server requests.",
+        description="Measures the duration of inbound HTTP requests.",
     )
 
     active_requests_counter = meter.create_up_down_counter(

diff --git a/...nstrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.py b/...nstrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-instrumentation-dbapi == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
+  "opentelemetry-instrumentation-dbapi == 0.49b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/...on/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py b/...on/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml
@@ -27,9 +27,9 @@ classifiers = [
 dependencies = [
   "asgiref ~= 3.0",
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
-  "opentelemetry-util-http == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
+  "opentelemetry-util-http == 0.49b0.dev",
 ]
 
 [project.optional-dependencies]

diff --git a/...ion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py b/...ion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py
@@ -579,7 +579,7 @@ def __init__(
             self.duration_histogram_old = self.meter.create_histogram(
                 name=MetricInstruments.HTTP_SERVER_DURATION,
                 unit="ms",
-                description="Duration of HTTP server requests.",
+                description="Measures the duration of inbound HTTP requests.",
             )
         self.duration_histogram_new = None
         if _report_new(sem_conv_opt_in_mode):

diff --git a/...tion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py b/...tion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.14",
-  "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/...pentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/version.py b/...pentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
 ]
 
 [project.optional-dependencies]

diff --git a/...pentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py b/...pentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "opentelemetry-instrumentation == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
   "opentelemetry-propagator-aws-xray ~= 1.0.1",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
 ]
 
 [project.optional-dependencies]

diff --git a/...emetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py b/...emetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml b/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
 ]
 
 [project.optional-dependencies]

diff --git a/...tion/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py b/...tion/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml b/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/...ntelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/version.py b/...ntelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml b/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
   "opentelemetry-propagator-aws-xray ~= 1.0.1",
 ]
 

diff --git a/...ntelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py b/...ntelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml b/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/...elemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/version.py b/...elemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-celery/pyproject.toml b/instrumentation/opentelemetry-instrumentation-celery/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
 ]
 
 [project.optional-dependencies]

diff --git a/.../opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py b/.../opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml b/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml
@@ -25,7 +25,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "opentelemetry-instrumentation == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
   "opentelemetry-api ~= 1.12",
   "wrapt >= 1.0.0, < 2.0.0",
 ]

diff --git a/...trumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/version.py b/...trumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

diff --git a/...on/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py b/...on/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"
 
 _instruments = tuple()
diff --git a/instrumentation/opentelemetry-instrumentation-django/pyproject.toml b/instrumentation/opentelemetry-instrumentation-django/pyproject.toml
@@ -26,15 +26,15 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-instrumentation-wsgi == 0.48b0.dev",
-  "opentelemetry-semantic-conventions == 0.48b0.dev",
-  "opentelemetry-util-http == 0.48b0.dev",
+  "opentelemetry-instrumentation == 0.49b0.dev",
+  "opentelemetry-instrumentation-wsgi == 0.49b0.dev",
+  "opentelemetry-semantic-conventions == 0.49b0.dev",
+  "opentelemetry-util-http == 0.49b0.dev",
 ]
 
 [project.optional-dependencies]
 asgi = [
-  "opentelemetry-instrumentation-asgi == 0.48b0.dev",
+  "opentelemetry-instrumentation-asgi == 0.49b0.dev",
 ]
 instruments = [
   "django >= 1.10",

diff --git a/...opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/__init__.py b/...opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/__init__.py
@@ -344,7 +344,7 @@ def _instrument(self, **kwargs):
             _DjangoMiddleware._duration_histogram_old = meter.create_histogram(
                 name=MetricInstruments.HTTP_SERVER_DURATION,
                 unit="ms",
-                description="Duration of HTTP server requests.",
+                description="Measures the duration of inbound HTTP requests.",
             )
         _DjangoMiddleware._duration_histogram_new = None
         if _report_new(sem_conv_opt_in_mode):

diff --git a/.../opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py b/.../opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.48b0.dev"
+__version__ = "0.49b0.dev"