Merge branch 'main' into botocore-xray

open-telemetry · May 18, 2023 · 47dd9b8 · 47dd9b8
2 parents 1253d64 + afd8428
commit 47dd9b8
Show file tree

Hide file tree

Showing 99 changed files with 278 additions and 276 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 2387b4465d930b020df79692a8097e1d54b66ec1
+  CORE_REPO_SHA: e9530c5c548d08a6aaa56268d103f9beb00cd002
 
 jobs:
   build:

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.18.0/0.39b0 (2023-05-10)
+
 - `opentelemetry-instrumentation-system-metrics` Add `process.` prefix to `runtime.memory`, `runtime.cpu.time`, and `runtime.gc_count`. Change `runtime.memory` from count to UpDownCounter. ([#1735](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1735))
 - Add request and response hooks for GRPC instrumentation (client only)
   ([#1706](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1706))

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.39b0.dev"
+__version__ = "0.40b0.dev"
diff --git a/eachdist.ini b/eachdist.ini
@@ -16,7 +16,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.18.0.dev
+version=1.19.0.dev
 
 packages=
     opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.39b0.dev
+version=0.40b0.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.39b0.dev"
+__version__ = "0.40b0.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.39b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.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.39b0.dev"
+__version__ = "0.40b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
@@ -35,7 +35,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-aio-pika[instruments]",
-  "opentelemetry-test-utils == 0.39b0.dev",
+  "opentelemetry-test-utils == 0.40b0.dev",
   "pytest",
   "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.39b0.dev"
+__version__ = "0.40b0.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.39b0.dev",
-  "opentelemetry-semantic-conventions == 0.39b0.dev",
-  "opentelemetry-util-http == 0.39b0.dev",
+  "opentelemetry-instrumentation == 0.40b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.dev",
+  "opentelemetry-util-http == 0.40b0.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.39b0.dev"
+__version__ = "0.40b0.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.39b0.dev",
-  "opentelemetry-instrumentation-dbapi == 0.39b0.dev",
+  "opentelemetry-instrumentation == 0.40b0.dev",
+  "opentelemetry-instrumentation-dbapi == 0.40b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
@@ -37,8 +37,8 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-aiopg[instruments]",
-  "opentelemetry-semantic-conventions == 0.39b0.dev",
-  "opentelemetry-test-utils == 0.39b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.dev",
+  "opentelemetry-test-utils == 0.40b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

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.39b0.dev"
+__version__ = "0.40b0.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.39b0.dev",
-  "opentelemetry-semantic-conventions == 0.39b0.dev",
-  "opentelemetry-util-http == 0.39b0.dev",
+  "opentelemetry-instrumentation == 0.40b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.dev",
+  "opentelemetry-util-http == 0.40b0.dev",
 ]
 
 [project.optional-dependencies]
@@ -38,7 +38,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-asgi[instruments]",
-  "opentelemetry-test-utils == 0.39b0.dev",
+  "opentelemetry-test-utils == 0.40b0.dev",
 ]
 
 [project.urls]

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.39b0.dev"
+__version__ = "0.40b0.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.39b0.dev",
-  "opentelemetry-semantic-conventions == 0.39b0.dev",
+  "opentelemetry-instrumentation == 0.40b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.dev",
 ]
 
 [project.optional-dependencies]
@@ -36,7 +36,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-asyncpg[instruments]",
-  "opentelemetry-test-utils == 0.39b0.dev",
+  "opentelemetry-test-utils == 0.40b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

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.39b0.dev"
+__version__ = "0.40b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml
@@ -22,15 +22,15 @@ classifiers = [
   "Programming Language :: Python :: 3.8",
 ]
 dependencies = [
-  "opentelemetry-instrumentation == 0.39b0.dev",
+  "opentelemetry-instrumentation == 0.40b0.dev",
   "opentelemetry-propagator-aws-xray == 1.0.1",
-  "opentelemetry-semantic-conventions == 0.39b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.dev",
 ]
 
 [project.optional-dependencies]
 instruments = []
 test = [
-  "opentelemetry-test-utils == 0.39b0.dev",
+  "opentelemetry-test-utils == 0.40b0.dev",
 ]
 
 [project.urls]

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.39b0.dev"
+__version__ = "0.40b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml b/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.39b0.dev",
-  "opentelemetry-semantic-conventions == 0.39b0.dev",
+  "opentelemetry-instrumentation == 0.40b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.dev",
 ]
 
 [project.optional-dependencies]
@@ -38,7 +38,7 @@ test = [
   "opentelemetry-instrumentation-boto[instruments]",
   "markupsafe==2.0.1",
   "moto~=2.0",
-  "opentelemetry-test-utils == 0.39b0.dev",
+  "opentelemetry-test-utils == 0.40b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

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.39b0.dev"
+__version__ = "0.40b0.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.39b0.dev",
-  "opentelemetry-semantic-conventions == 0.39b0.dev",
+  "opentelemetry-instrumentation == 0.40b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
@@ -37,7 +37,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-boto3sqs[instruments]",
-  "opentelemetry-test-utils == 0.39b0.dev",
+  "opentelemetry-test-utils == 0.40b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

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.39b0.dev"
+__version__ = "0.40b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml b/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml
@@ -26,10 +26,10 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.39b0.dev",
-  "opentelemetry-semantic-conventions == 0.39b0.dev",
+  "opentelemetry-instrumentation == 0.40b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.dev",
   "opentelemetry-propagator-aws-xray == 1.0.1",
-]
+
 
 [project.optional-dependencies]
 instruments = [
@@ -39,7 +39,7 @@ test = [
   "opentelemetry-instrumentation-botocore[instruments]",
   "markupsafe==2.0.1",
   "moto[all] ~= 2.2.6",
-  "opentelemetry-test-utils == 0.39b0.dev",
+  "opentelemetry-test-utils == 0.40b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

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.39b0.dev"
+__version__ = "0.40b0.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.39b0.dev",
-  "opentelemetry-semantic-conventions == 0.39b0.dev",
+  "opentelemetry-instrumentation == 0.40b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.dev",
 ]
 
 [project.optional-dependencies]
@@ -36,7 +36,7 @@ instruments = [
 ]
 test = [
   "opentelemetry-instrumentation-celery[instruments]",
-  "opentelemetry-test-utils == 0.39b0.dev",
+  "opentelemetry-test-utils == 0.40b0.dev",
   "pytest",
 ]
 

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.39b0.dev"
+__version__ = "0.40b0.dev"
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.39b0.dev"
+__version__ = "0.40b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml
@@ -26,15 +26,15 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.39b0.dev",
-  "opentelemetry-semantic-conventions == 0.39b0.dev",
+  "opentelemetry-instrumentation == 0.40b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
 [project.optional-dependencies]
 instruments = []
 test = [
-  "opentelemetry-test-utils == 0.39b0.dev",
+  "opentelemetry-test-utils == 0.40b0.dev",
 ]
 
 [project.urls]

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.39b0.dev"
+__version__ = "0.40b0.dev"
 
 _instruments = tuple()
diff --git a/instrumentation/opentelemetry-instrumentation-django/pyproject.toml b/instrumentation/opentelemetry-instrumentation-django/pyproject.toml
@@ -26,22 +26,22 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.39b0.dev",
-  "opentelemetry-instrumentation-wsgi == 0.39b0.dev",
-  "opentelemetry-semantic-conventions == 0.39b0.dev",
-  "opentelemetry-util-http == 0.39b0.dev",
+  "opentelemetry-instrumentation == 0.40b0.dev",
+  "opentelemetry-instrumentation-wsgi == 0.40b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.dev",
+  "opentelemetry-util-http == 0.40b0.dev",
 ]
 
 [project.optional-dependencies]
 asgi = [
-  "opentelemetry-instrumentation-asgi == 0.39b0.dev",
+  "opentelemetry-instrumentation-asgi == 0.40b0.dev",
 ]
 instruments = [
   "django >= 1.10",
 ]
 test = [
   "opentelemetry-instrumentation-django[instruments]",
-  "opentelemetry-test-utils == 0.39b0.dev",
+  "opentelemetry-test-utils == 0.40b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

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.39b0.dev"
+__version__ = "0.40b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml b/instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.39b0.dev",
-  "opentelemetry-semantic-conventions == 0.39b0.dev",
+  "opentelemetry-instrumentation == 0.40b0.dev",
+  "opentelemetry-semantic-conventions == 0.40b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
@@ -38,7 +38,7 @@ instruments = [
 test = [
   "opentelemetry-instrumentation-elasticsearch[instruments]",
   "elasticsearch-dsl >= 2.0",
-  "opentelemetry-test-utils == 0.39b0.dev",
+  "opentelemetry-test-utils == 0.40b0.dev",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]