Merge branch 'main' into prometheus_exporter

Author: fcollonval

.github/workflows/contrib_0.yml

@@ -2060,6 +2060,34 @@ jobs:
       - name: Run tests
         run: tox -e py38-test-instrumentation-aio-pika-3 -- -ra
 
+  py38-test-instrumentation-aiokafka:
+    name: instrumentation-aiokafka 
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
+        uses: actions/checkout@v4
+        with:
+          repository: open-telemetry/opentelemetry-python-contrib
+          ref: ${{ env.CONTRIB_REPO_SHA }}
+
+      - name: Checkout core repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+        with:
+          repository: open-telemetry/opentelemetry-python
+          path: opentelemetry-python-core
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.8"
+          architecture: "x64"
+
+      - name: Install tox
+        run: pip install tox
+
+      - name: Run tests
+        run: tox -e py38-test-instrumentation-aiokafka -- -ra
+
   py38-test-instrumentation-kafka-python:
     name: instrumentation-kafka-python 
     runs-on: ubuntu-latest

.github/workflows/misc_0.yml

@@ -88,6 +88,24 @@ jobs:
       - name: Run tests
         run: tox -e mypyinstalled
 
+  pyright:
+    name: pyright
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Install tox
+        run: pip install tox
+
+      - name: Run tests
+        run: tox -e pyright
+
   docs:
     name: docs
     runs-on: ubuntu-latest
@@ -147,7 +165,7 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       !contains(github.event.pull_request.labels.*.name, 'Approve Public API check')
-      && github.actor != 'opentelemetrybot'
+      && github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4

.github/workflows/prepare-release-branch.yml

@@ -41,6 +41,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install toml
+        run: pip install toml
+
       - name: Create release branch
         env:
           PRERELEASE_VERSION: ${{ github.event.inputs.prerelease_version }}
@@ -105,6 +108,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install toml
+        run: pip install toml
+
       - name: Set environment variables
         env:
           PRERELEASE_VERSION: ${{ github.event.inputs.prerelease_version }}

CHANGELOG.md

@@ -7,11 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-- sdk: Implementation of exemplars
-  ([#4094](https://github.com/open-telemetry/opentelemetry-python/pull/4094))
+- Removed superfluous py.typed markers and added them where they were missing
+  ([#4172](https://github.com/open-telemetry/opentelemetry-python/pull/4172))
+- Include metric info in encoding exceptions
+  ([#4154](https://github.com/open-telemetry/opentelemetry-python/pull/4154))
 - sdk: Add support for log formatting
   ([#4137](https://github.com/open-telemetry/opentelemetry-python/pull/4166))
-  
+- sdk: Implementation of exemplars
+  ([#4094](https://github.com/open-telemetry/opentelemetry-python/pull/4094))
+- Implement events sdk
+  ([#4176](https://github.com/open-telemetry/opentelemetry-python/pull/4176))
+- Update semantic conventions to version 1.28.0
+  ([#4218](https://github.com/open-telemetry/opentelemetry-python/pull/4218))
+
 ## Version 1.27.0/0.48b0 (2024-08-28)
 
 - Implementation of Events API

CONTRIBUTING.md

@@ -82,7 +82,7 @@ Every public symbol is something that has to be kept in order to maintain backwa
 
 To check if your PR is adding public symbols, run `tox -e public-symbols-check`. This will always fail if public symbols are being added/removed. The idea
 behind this is that every PR that adds/removes public symbols fails in CI, forcing reviewers to check the symbols to make sure they are strictly necessary.
-If after checking them, it is considered that they are indeed necessary, the PR will be labeled with `Skip Public API check` so that this check is not
+If after checking them, it is considered that they are indeed necessary, the PR will be labeled with `Approve Public API check` so that this check is not
 run.
 
 Also, we try to keep our console output as clean as possible. Most of the time this means catching expected log messages in the test cases:
@@ -224,6 +224,23 @@ updating the GitHub workflow to reference a PR in the Contrib repo
 * Trivial change (typo, cosmetic, doc, etc.) doesn't have to wait for one day.
 * Urgent fix can take exception as long as it has been actively communicated.
 
+#### Allow edits from maintainers
+
+Something _very important_ is to allow edits from maintainers when opening a PR. This will
+allow maintainers to rebase your PR against `main` which is necessary in order to merge
+your PR. You could do it yourself too, but keep in mind that every time another PR gets
+merged, your PR will require rebasing. Since only maintainers can merge your PR it is
+almost impossible for maintainers to find your PR just when it has been rebased by you so
+that it can be merged. Allowing maintainers to edit your PR also allows them to help you
+get your PR merged by making any minor fixes to solve any issue that while being unrelated
+to your PR, can still happen.
+
+#### Fork from a personal Github account
+
+Right now Github [does not allow](https://github.com/orgs/community/discussions/5634) PRs
+to be edited by maintainers if the corresponding repo fork exists in a Github organization.
+Please for this repo in a personal Github account instead.
+
 One of the maintainers will merge the PR once it is **ready to merge**.
 
 ## Design Choices

dev-requirements.txt

@@ -1,4 +1,4 @@
-pylint==3.0.2
+pylint==3.2.1
 flake8==6.1.0
 isort==5.12.0
 black==24.3.0

docs/conf.py

@@ -149,7 +149,7 @@
     (
         "py:class",
         "opentelemetry.sdk.metrics._internal.aggregation._Aggregation",
-    )
+    ),
 ]
 
 # Add any paths that contain templates here, relative to this directory.

docs/examples/error_handler/error_handler_0/pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
 error_handler_0 = "error_handler_0:ErrorHandler0"
 
 [tool.hatch.version]
-path = "src/error_handler_0/version.py"
+path = "src/error_handler_0/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

docs/examples/error_handler/error_handler_0/src/error_handler_0/version.py renamed to docs/examples/error_handler/error_handler_0/src/error_handler_0/version/__init__.py

@@ -32,7 +32,7 @@ dependencies = [
 error_handler_1 = "error_handler_1:ErrorHandler1"
 
 [tool.hatch.version]
-path = "src/error_handler_1/version.py"
+path = "src/error_handler_1/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [