Merge branch 'main' into main

open-telemetry · Feb 25, 2024 · 9fbe232 · 9fbe232
2 parents e453f05 + 8daa8ad
commit 9fbe232
Show file tree

Hide file tree

Showing 126 changed files with 1,210 additions and 316 deletions.
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -70,3 +70,6 @@ components:
 
  instrumentation/opentelemetry-instrumentation-asyncio:
  - bourbonkk
+
+ instrumentation/opentelemetry-instrumentation-psycopg:
+ - federicobond
diff --git a/.github/workflows/instrumentations_0.yml b/.github/workflows/instrumentations_0.yml
@@ -6,7 +6,7 @@ on:
  - 'release/*'
  pull_request:
 env:
- CORE_REPO_SHA: e98af82ff0ebe7e687fda265093aa576cd9ba80f
+ CORE_REPO_SHA: a1253585f66d63e7c05a19f070f3bfe0ab6460c1
 
 jobs:
  instrumentations-0:

diff --git a/.github/workflows/instrumentations_1.yml b/.github/workflows/instrumentations_1.yml
@@ -6,7 +6,7 @@ on:
  - 'release/*'
  pull_request:
 env:
- CORE_REPO_SHA: e98af82ff0ebe7e687fda265093aa576cd9ba80f
+ CORE_REPO_SHA: a1253585f66d63e7c05a19f070f3bfe0ab6460c1
 
 jobs:
  instrumentations-1:
@@ -29,6 +29,7 @@ jobs:
  - "wsgi"
  - "distro"
  - "richconsole"
+ - "psycopg"
  - "prometheus-remote-write"
  - "sdkextension-aws"
  - "propagator-aws-xray"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,12 +45,6 @@ jobs:
 
  echo "PRIOR_VERSION_WHEN_PATCH=$prior_version_when_patch" >> $GITHUB_ENV
 
- # check out main branch to verify there won't be problems with merging the change log
- # at the end of this workflow
- - uses: actions/checkout@v3
- with:
- ref: main
-
  - run: |
  if [[ -z $PRIOR_VERSION_WHEN_PATCH ]]; then
  # not making a patch release
@@ -60,6 +54,12 @@ jobs:
  fi
  fi
 
+ # check out main branch to verify there won't be problems with merging the change log
+ # at the end of this workflow
+ - uses: actions/checkout@v3
+ with:
+ ref: main
+
  # back to the release branch
  - uses: actions/checkout@v3
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
  - 'release/*'
  pull_request:
 env:
- CORE_REPO_SHA: e98af82ff0ebe7e687fda265093aa576cd9ba80f
+ CORE_REPO_SHA: a1253585f66d63e7c05a19f070f3bfe0ab6460c1
 
 jobs:
  misc:

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.23.0/0.44b0 (2024-02-23)
+
 - Drop support for 3.7
  ([#2151](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2151))
 - `opentelemetry-resource-detector-azure` Added 10s timeout to VM Resource Detector
@@ -21,6 +23,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  ([#2178](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2178))
 - AwsLambdaInstrumentor handles and re-raises function exception ([#2245](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2245))
 
+### Added
+
+- `opentelemetry-instrumentation-psycopg` Initial release for psycopg 3.x
+
 ## Version 1.22.0/0.43b0 (2023-12-14)
 
 ### Added
@@ -1445,3 +1451,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `opentelemetry-ext-wsgi` Initial release
 - `opentelemetry-ext-http-requests` Initial release
+
+- Drop support for 3.7
+ ([#2151](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2151))
+- `opentelemetry-resource-detector-azure` Added 10s timeout to VM Resource Detector
+ ([#2119](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2119))
+- `opentelemetry-instrumentation-asyncpg` Allow AsyncPGInstrumentor to be instantiated multiple times
+([#1791](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1791))
+- `opentelemetry-instrumentation-confluent-kafka` Add support for higher versions until 2.3.0 of confluent_kafka
+ ([#2132](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2132))
+- `opentelemetry-resource-detector-azure` Changed timeout to 4 seconds due to [timeout bug](https://github.com/open-telemetry/opentelemetry-python/issues/3644)
+ ([#2136](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2136))
+- `opentelemetry-resource-detector-azure` Suppress instrumentation for `urllib` call
+ ([#2178](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2178))
+- AwsLambdaInstrumentor handles and re-raises function exception ([#2245](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2245))
+
diff --git a/RELEASING.md b/RELEASING.md
@@ -7,8 +7,10 @@
  * If making a pre-release of stable components (e.g. release candidate),
  enter the pre-release version number, e.g. `1.9.0rc2`.
  (otherwise the workflow will pick up the version from `main` and just remove the `.dev` suffix).
- * Review and merge the two pull requests that it creates
+ * Review the two pull requests that it creates.
  (one is targeted to the release branch and one is targeted to `main`).
+ * Merge the one targeted towards the release branch.
+ * The builds will fail for the `main` pr because of validation rules. Follow the [release workflow](https://github.com/open-telemetry/opentelemetry-python/blob/main/RELEASING.md) for the core repo up until this same point. Change the SHAs of each PR to point at each other to get the `main` builds to pass.
 
 ## Preparing a new patch release
 

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.44b0.dev"
+__version__ = "0.45b0.dev"
diff --git a/docs-requirements.txt b/docs-requirements.txt
@@ -36,6 +36,7 @@ kafka-python>=2.0,<3.0
 mysql-connector-python~=8.0
 mysqlclient~=2.1.1
 psutil>=5
+psycopg~=3.1.17
 pika>=0.12.0
 pymongo~=3.1
 PyMySQL~=0.9.3

diff --git a/docs/instrumentation/psycopg/psycopg.rst b/docs/instrumentation/psycopg/psycopg.rst
@@ -0,0 +1,7 @@
+OpenTelemetry Psycopg Instrumentation
+=====================================
+
+.. automodule:: opentelemetry.instrumentation.psycopg
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/docs/instrumentation/psycopg2/psycopg2.rst b/docs/instrumentation/psycopg2/psycopg2.rst
@@ -1,5 +1,5 @@
-OpenTelemetry Psycopg Instrumentation
-=====================================
+OpenTelemetry Psycopg2 Instrumentation
+======================================
 
 .. automodule:: opentelemetry.instrumentation.psycopg2
  :members:

diff --git a/eachdist.ini b/eachdist.ini
@@ -16,7 +16,7 @@ sortfirst=
  ext/*
 
 [stable]
-version=1.23.0.dev
+version=1.24.0.dev
 
 packages=
  opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
  opentelemetry-api
 
 [prerelease]
-version=0.44b0.dev
+version=0.45b0.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.44b0.dev"
+__version__ = "0.45b0.dev"
diff --git a/exporter/opentelemetry-exporter-richconsole/pyproject.toml b/exporter/opentelemetry-exporter-richconsole/pyproject.toml
@@ -26,7 +26,7 @@ classifiers = [
 dependencies = [
  "opentelemetry-api ~= 1.12",
  "opentelemetry-sdk ~= 1.12",
- "opentelemetry-semantic-conventions == 0.44b0.dev",
+ "opentelemetry-semantic-conventions == 0.45b0.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.44b0.dev"
+__version__ = "0.45b0.dev"
diff --git a/instrumentation/README.md b/instrumentation/README.md
@@ -29,6 +29,7 @@
 | [opentelemetry-instrumentation-mysql](./opentelemetry-instrumentation-mysql) | mysql-connector-python ~= 8.0 | No
 | [opentelemetry-instrumentation-mysqlclient](./opentelemetry-instrumentation-mysqlclient) | mysqlclient < 3 | No
 | [opentelemetry-instrumentation-pika](./opentelemetry-instrumentation-pika) | pika >= 0.12.0 | No
+| [opentelemetry-instrumentation-psycopg](./opentelemetry-instrumentation-psycopg) | psycopg >= 3.1.0 | No
 | [opentelemetry-instrumentation-psycopg2](./opentelemetry-instrumentation-psycopg2) | psycopg2 >= 2.7.3.1 | No
 | [opentelemetry-instrumentation-pymemcache](./opentelemetry-instrumentation-pymemcache) | pymemcache >= 1.3.5, < 5 | No
 | [opentelemetry-instrumentation-pymongo](./opentelemetry-instrumentation-pymongo) | pymongo >= 3.1, < 5.0 | No

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
@@ -25,7 +25,7 @@ classifiers = [
 ]
 dependencies = [
  "opentelemetry-api ~= 1.5",
- "opentelemetry-instrumentation == 0.44b0.dev",
+ "opentelemetry-instrumentation == 0.45b0.dev",
  "wrapt >= 1.0.0, < 2.0.0",
 ]
 
@@ -35,7 +35,7 @@ instruments = [
 ]
 test = [
  "opentelemetry-instrumentation-aio-pika[instruments]",
- "opentelemetry-test-utils == 0.44b0.dev",
+ "opentelemetry-test-utils == 0.45b0.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.44b0.dev"
+__version__ = "0.45b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
  "opentelemetry-api ~= 1.12",
- "opentelemetry-instrumentation == 0.44b0.dev",
- "opentelemetry-semantic-conventions == 0.44b0.dev",
- "opentelemetry-util-http == 0.44b0.dev",
+ "opentelemetry-instrumentation == 0.45b0.dev",
+ "opentelemetry-semantic-conventions == 0.45b0.dev",
+ "opentelemetry-util-http == 0.45b0.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.44b0.dev"
+__version__ = "0.45b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
  "opentelemetry-api ~= 1.12",
- "opentelemetry-instrumentation == 0.44b0.dev",
- "opentelemetry-semantic-conventions == 0.44b0.dev",
- "opentelemetry-util-http == 0.44b0.dev",
+ "opentelemetry-instrumentation == 0.45b0.dev",
+ "opentelemetry-semantic-conventions == 0.45b0.dev",
+ "opentelemetry-util-http == 0.45b0.dev",
  "wrapt >= 1.0.0, < 2.0.0",
 ]
 

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.44b0.dev"
+__version__ = "0.45b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
  "opentelemetry-api ~= 1.12",
- "opentelemetry-instrumentation == 0.44b0.dev",
- "opentelemetry-instrumentation-dbapi == 0.44b0.dev",
+ "opentelemetry-instrumentation == 0.45b0.dev",
+ "opentelemetry-instrumentation-dbapi == 0.45b0.dev",
  "wrapt >= 1.0.0, < 2.0.0",
 ]
 
@@ -36,8 +36,8 @@ instruments = [
 ]
 test = [
  "opentelemetry-instrumentation-aiopg[instruments]",
- "opentelemetry-semantic-conventions == 0.44b0.dev",
- "opentelemetry-test-utils == 0.44b0.dev",
+ "opentelemetry-semantic-conventions == 0.45b0.dev",
+ "opentelemetry-test-utils == 0.45b0.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.44b0.dev"
+__version__ = "0.45b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml
@@ -26,9 +26,9 @@ classifiers = [
 dependencies = [
  "asgiref ~= 3.0",
  "opentelemetry-api ~= 1.12",
- "opentelemetry-instrumentation == 0.44b0.dev",
- "opentelemetry-semantic-conventions == 0.44b0.dev",
- "opentelemetry-util-http == 0.44b0.dev",
+ "opentelemetry-instrumentation == 0.45b0.dev",
+ "opentelemetry-semantic-conventions == 0.45b0.dev",
+ "opentelemetry-util-http == 0.45b0.dev",
 ]
 
 [project.optional-dependencies]
@@ -37,7 +37,7 @@ instruments = [
 ]
 test = [
  "opentelemetry-instrumentation-asgi[instruments]",
- "opentelemetry-test-utils == 0.44b0.dev",
+ "opentelemetry-test-utils == 0.45b0.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.44b0.dev"
+__version__ = "0.45b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
  "opentelemetry-api ~= 1.14",
- "opentelemetry-instrumentation == 0.44b0.dev",
- "opentelemetry-semantic-conventions == 0.44b0.dev",
- "opentelemetry-test-utils == 0.44b0.dev",
+ "opentelemetry-instrumentation == 0.45b0.dev",
+ "opentelemetry-semantic-conventions == 0.45b0.dev",
+ "opentelemetry-test-utils == 0.45b0.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.44b0.dev"
+__version__ = "0.45b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
  "opentelemetry-api ~= 1.12",
- "opentelemetry-instrumentation == 0.44b0.dev",
- "opentelemetry-semantic-conventions == 0.44b0.dev",
+ "opentelemetry-instrumentation == 0.45b0.dev",
+ "opentelemetry-semantic-conventions == 0.45b0.dev",
 ]
 
 [project.optional-dependencies]
@@ -35,7 +35,7 @@ instruments = [
 ]
 test = [
  "opentelemetry-instrumentation-asyncpg[instruments]",
- "opentelemetry-test-utils == 0.44b0.dev",
+ "opentelemetry-test-utils == 0.45b0.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.44b0.dev"
+__version__ = "0.45b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml
@@ -21,15 +21,15 @@ classifiers = [
  "Programming Language :: Python :: 3.8",
 ]
 dependencies = [
- "opentelemetry-instrumentation == 0.44b0.dev",
+ "opentelemetry-instrumentation == 0.45b0.dev",
  "opentelemetry-propagator-aws-xray == 1.0.1",
- "opentelemetry-semantic-conventions == 0.44b0.dev",
+ "opentelemetry-semantic-conventions == 0.45b0.dev",
 ]
 
 [project.optional-dependencies]
 instruments = []
 test = [
- "opentelemetry-test-utils == 0.44b0.dev",
+ "opentelemetry-test-utils == 0.45b0.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.44b0.dev"
+__version__ = "0.45b0.dev"