Merge branch 'main' into asyncpg-span

Author: krnr

.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: b3b0ba3a47dbdd844b524c46db22a60549364071
+  CORE_REPO_SHA: 35c38d3b6ccabcbc408ee93331533a11ee19b026
 
 jobs:
   build:

CHANGELOG.md

@@ -5,26 +5,39 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.13.0-0.34b0...HEAD)
+
+### Added
+
+- `opentelemetry-instrumentation-system-metrics` add supports to collect system thread count. ([#1339](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1339))
+
+## [1.13.0-0.34b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.13.0-0.34b0) - 2022-09-26
+
+
 
 ### Added
 
 - `opentelemetry-instrumentation-grpc` add supports to filter requests to instrument. ([#1241](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1241))
 - Flask sqlalchemy psycopg2 integration
   ([#1224](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1224))
+- Add metric instrumentation in Falcon
+  ([#1230](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1230))
 - Add metric instrumentation in fastapi
   ([#1199](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1199))
 - Add metric instrumentation in Pyramid
   ([#1242](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1242))
 - `opentelemetry-util-http` Add support for sanitizing HTTP header values.
   ([#1253](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1253))
+- Add metric instrumentation in starlette
+  ([#1327](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1327))
+
 
 ### Fixed
 
 - `opentelemetry-instrumentation-boto3sqs` Make propagation compatible with other SQS instrumentations, add 'messaging.url' span attribute, and fix missing package dependencies.
-  ([#1234](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1234)) 
+  ([#1234](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1234))
 - `opentelemetry-instrumentation-pymongo` Change span names to not contain queries but only database name and command name
-  ([#1247](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1247)) 
+  ([#1247](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1247))
 - restoring metrics in django framework
   ([#1208](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1208))
 - `opentelemetry-instrumentation-aiohttp-client` Fix producing additional spans with each newly created ClientSession
@@ -48,8 +61,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1206](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1206))
 - Add psycopg2 native tags to sqlcommenter
   ([#1203](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1203))
-- Deprecation of direction attribute for metrics. Addition of direction based metric names
-  ([#1214](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1214))
 
 ### Added
 - `opentelemetry-instrumentation-redis` add support to instrument RedisCluster clients

_template/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.33b0"
+__version__ = "0.34b0"

eachdist.ini

@@ -16,7 +16,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.12.0
+version=1.13.0
 
 packages=
     opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.33b0
+version=0.34b0
 
 packages=
     all

exporter/opentelemetry-exporter-richconsole/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-sdk ~= 1.12",
-  "opentelemetry-semantic-conventions == 0.33b0",
+  "opentelemetry-semantic-conventions == 0.34b0",
   "rich>=10.0.0",
 ]
 

exporter/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.33b0"
+__version__ = "0.34b0"

instrumentation/README.md

@@ -36,7 +36,7 @@
 | [opentelemetry-instrumentation-sklearn](./opentelemetry-instrumentation-sklearn) | scikit-learn ~= 0.24.0 | No
 | [opentelemetry-instrumentation-sqlalchemy](./opentelemetry-instrumentation-sqlalchemy) | sqlalchemy | No
 | [opentelemetry-instrumentation-sqlite3](./opentelemetry-instrumentation-sqlite3) | sqlite3 | No
-| [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette ~= 0.13.0 | No
+| [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette ~= 0.13.0 | Yes
 | [opentelemetry-instrumentation-system-metrics](./opentelemetry-instrumentation-system-metrics) | psutil >= 5 | No
 | [opentelemetry-instrumentation-tornado](./opentelemetry-instrumentation-tornado) | tornado >= 5.1.1 | No
 | [opentelemetry-instrumentation-urllib](./opentelemetry-instrumentation-urllib) | urllib | No

instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

@@ -34,7 +34,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-aio-pika[instruments]",
-  "opentelemetry-test-utils == 0.33b0",
+  "opentelemetry-test-utils == 0.34b0",
   "pytest",
   "wrapt >= 1.0.0, < 2.0.0",
 ]

instrumentation/opentelemetry-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.33b0"
+__version__ = "0.34b0"

instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml

@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.33b0",
-  "opentelemetry-semantic-conventions == 0.33b0",
-  "opentelemetry-util-http == 0.33b0",
+  "opentelemetry-instrumentation == 0.34b0",
+  "opentelemetry-semantic-conventions == 0.34b0",
+  "opentelemetry-util-http == 0.34b0",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

instrumentation/opentelemetry-instrumentation-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.33b0"
+__version__ = "0.34b0"

instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.33b0",
-  "opentelemetry-instrumentation-dbapi == 0.33b0",
+  "opentelemetry-instrumentation == 0.34b0",
+  "opentelemetry-instrumentation-dbapi == 0.34b0",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
@@ -36,8 +36,8 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-aiopg[instruments]",
-  "opentelemetry-semantic-conventions == 0.33b0",
-  "opentelemetry-test-utils == 0.33b0",
+  "opentelemetry-semantic-conventions == 0.34b0",
+  "opentelemetry-test-utils == 0.34b0",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

instrumentation/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.33b0"
+__version__ = "0.34b0"

instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml

@@ -26,9 +26,9 @@ classifiers = [
 dependencies = [
   "asgiref ~= 3.0",
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.33b0",
-  "opentelemetry-semantic-conventions == 0.33b0",
-  "opentelemetry-util-http == 0.33b0",
+  "opentelemetry-instrumentation == 0.34b0",
+  "opentelemetry-semantic-conventions == 0.34b0",
+  "opentelemetry-util-http == 0.34b0",
 ]
 
 [project.optional-dependencies]
@@ -37,7 +37,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-asgi[instruments]",
-  "opentelemetry-test-utils == 0.33b0",
+  "opentelemetry-test-utils == 0.34b0",
 ]
 
 [project.urls]

instrumentation/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.33b0"
+__version__ = "0.34b0"

instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.33b0",
-  "opentelemetry-semantic-conventions == 0.33b0",
+  "opentelemetry-instrumentation == 0.34b0",
+  "opentelemetry-semantic-conventions == 0.34b0",
 ]
 
 [project.optional-dependencies]
@@ -35,7 +35,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-asyncpg[instruments]",
-  "opentelemetry-test-utils == 0.33b0",
+  "opentelemetry-test-utils == 0.34b0",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

instrumentation/opentelemetry-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.33b0"
+__version__ = "0.34b0"

instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml

@@ -22,15 +22,15 @@ classifiers = [
   "Programming Language :: Python :: 3.8",
 ]
 dependencies = [
-  "opentelemetry-instrumentation == 0.33b0",
+  "opentelemetry-instrumentation == 0.34b0",
   "opentelemetry-propagator-aws-xray == 1.0.1",
-  "opentelemetry-semantic-conventions == 0.33b0",
+  "opentelemetry-semantic-conventions == 0.34b0",
 ]
 
 [project.optional-dependencies]
 instruments = []
 test = [
-  "opentelemetry-test-utils == 0.33b0",
+  "opentelemetry-test-utils == 0.34b0",
 ]
 
 [project.urls]

instrumentation/opentelemetry-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.33b0"
+__version__ = "0.34b0"

instrumentation/opentelemetry-instrumentation-boto/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.33b0",
-  "opentelemetry-semantic-conventions == 0.33b0",
+  "opentelemetry-instrumentation == 0.34b0",
+  "opentelemetry-semantic-conventions == 0.34b0",
 ]
 
 [project.optional-dependencies]
@@ -37,7 +37,7 @@ test = [
   "opentelemetry-instrumentation-boto[instruments]",
   "markupsafe==2.0.1",
   "moto~=2.0",
-  "opentelemetry-test-utils == 0.33b0",
+  "opentelemetry-test-utils == 0.34b0",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

instrumentation/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.33b0"
+__version__ = "0.34b0"

instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.33b0",
-  "opentelemetry-semantic-conventions == 0.33b0",
+  "opentelemetry-instrumentation == 0.34b0",
+  "opentelemetry-semantic-conventions == 0.34b0",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
@@ -36,7 +36,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-boto3sqs[instruments]",
-  "opentelemetry-test-utils == 0.33b0",
+  "opentelemetry-test-utils == 0.34b0",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

instrumentation/opentelemetry-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.33b0"
+__version__ = "0.34b0"

instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.33b0",
-  "opentelemetry-semantic-conventions == 0.33b0",
+  "opentelemetry-instrumentation == 0.34b0",
+  "opentelemetry-semantic-conventions == 0.34b0",
 ]
 
 [project.optional-dependencies]
@@ -37,7 +37,7 @@ test = [
   "opentelemetry-instrumentation-botocore[instruments]",
   "markupsafe==2.0.1",
   "moto[all] ~= 2.2.6",
-  "opentelemetry-test-utils == 0.33b0",
+  "opentelemetry-test-utils == 0.34b0",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

instrumentation/opentelemetry-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.33b0"
+__version__ = "0.34b0"

instrumentation/opentelemetry-instrumentation-celery/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.33b0",
-  "opentelemetry-semantic-conventions == 0.33b0",
+  "opentelemetry-instrumentation == 0.34b0",
+  "opentelemetry-semantic-conventions == 0.34b0",
 ]
 
 [project.optional-dependencies]
@@ -35,7 +35,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-celery[instruments]",
-  "opentelemetry-test-utils == 0.33b0",
+  "opentelemetry-test-utils == 0.34b0",
   "pytest",
 ]
 

instrumentation/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.33b0"
+__version__ = "0.34b0"

instrumentation/opentelemetry-instrumentation-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.33b0"
+__version__ = "0.34b0"

instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml

@@ -25,15 +25,15 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.33b0",
-  "opentelemetry-semantic-conventions == 0.33b0",
+  "opentelemetry-instrumentation == 0.34b0",
+  "opentelemetry-semantic-conventions == 0.34b0",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
 [project.optional-dependencies]
 instruments = []
 test = [
-  "opentelemetry-test-utils == 0.33b0",
+  "opentelemetry-test-utils == 0.34b0",
 ]
 
 [project.urls]

instrumentation/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.33b0"
+__version__ = "0.34b0"
 
 _instruments = tuple()