Merge branch 'main' into issue_3728

open-telemetry · Mar 14, 2024 · f1e2cbf · f1e2cbf
2 parents 9a203a7 + 6c1940a
commit f1e2cbf
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 10 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -36,7 +36,7 @@ jobs:
         key: v3-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini',
           'dev-requirements.txt') }}-core
     - name: Run tox
-      run: tox -f ${{ matrix.python-version }}-sdk -- -k opentelemetry-sdk/tests/performance/benchmarks --benchmark-json=output.json
+      run: tox -f ${{ matrix.python-version }}-sdk -- -k opentelemetry-sdk/tests/performance/benchmarks --benchmark-json=opentelemetry-sdk/tests/output.json
     - name: Report on SDK benchmark results
       uses: benchmark-action/github-action-benchmark@v1
       with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fix python 3.12 deprecation warning
   ([#3751](https://github.com/open-telemetry/opentelemetry-python/pull/3751))
+- bump mypy to 0.982
+  ([#3776](https://github.com/open-telemetry/opentelemetry-python/pull/3776))
 
 ## Version 1.23.0/0.44b0 (2024-02-23)
 
@@ -33,7 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix explicit bucket histogram aggregation
   ([#3429](https://github.com/open-telemetry/opentelemetry-python/pull/3429))
 - Add `code.lineno`, `code.function` and `code.filepath` to all logs 
-  ([#3645](https://github.com/open-telemetry/opentelemetry-python/pull/3645))
+  ([#3675](https://github.com/open-telemetry/opentelemetry-python/pull/3675))
 - Add Synchronous Gauge instrument
   ([#3462](https://github.com/open-telemetry/opentelemetry-python/pull/3462))
 - Drop support for 3.7

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -3,7 +3,7 @@ flake8==6.1.0
 isort==5.12.0
 black==22.3.0
 httpretty==1.1.4
-mypy==0.931
+mypy==0.982
 sphinx==7.1.2
 sphinx-rtd-theme==2.0.0rc4
 sphinx-autodoc-typehints==1.25.2

diff --git a/docs/examples/logs/otel-collector-config.yaml b/docs/examples/logs/otel-collector-config.yaml
@@ -13,6 +13,10 @@ processors:
 service:
     pipelines:
         logs:
+            receivers: [otlp]
+            processors: [batch]
+            exporters: [logging]
+        traces: 
             receivers: [otlp]
             processors: [batch]
             exporters: [logging]
diff --git a/opentelemetry-api/pyproject.toml b/opentelemetry-api/pyproject.toml
@@ -27,15 +27,12 @@ dependencies = [
     "Deprecated >= 1.2.6",
     # FIXME This should be able to be removed after 3.12 is released if there is a reliable API
     # in importlib.metadata.
-    "importlib-metadata >= 6.0, < 7.0",
+    "importlib-metadata >= 6.0, <= 7.0",
 ]
 dynamic = [
     "version",
 ]
 
-[project.optional-dependencies]
-test = []
-
 [project.entry-points.opentelemetry_context]
 contextvars_context = "opentelemetry.context.contextvars_context:ContextVarsRuntimeContext"
 

diff --git a/opentelemetry-api/src/opentelemetry/context/__init__.py b/opentelemetry-api/src/opentelemetry/context/__init__.py
@@ -39,7 +39,7 @@ def _load_runtime_context(func: _F) -> _F:
     """
 
     @wraps(func)  # type: ignore[misc]
-    def wrapper(  # type: ignore[misc]
+    def wrapper(
         *args: typing.Tuple[typing.Any, typing.Any],
         **kwargs: typing.Dict[typing.Any, typing.Any],
     ) -> typing.Optional[typing.Any]:

diff --git a/opentelemetry-api/src/opentelemetry/trace/__init__.py b/opentelemetry-api/src/opentelemetry/trace/__init__.py
@@ -432,7 +432,7 @@ def start_span(self, *args, **kwargs) -> Span:  # type: ignore
         return self._tracer.start_span(*args, **kwargs)  # type: ignore
 
     @contextmanager  # type: ignore
-    def start_as_current_span(self, *args, **kwargs) -> Iterator[Span]:  # type: ignore
+    def start_as_current_span(self, *args, **kwargs) -> Iterator[Span]:
         with self._tracer.start_as_current_span(*args, **kwargs) as span:  # type: ignore
             yield span
 

diff --git a/opentelemetry-api/test-requirements.txt b/opentelemetry-api/test-requirements.txt
@@ -0,0 +1,17 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+flaky==3.7.0
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-api
diff --git a/scripts/generate_website_docs.sh b/scripts/generate_website_docs.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -e
+
 # this script generates the documentation required for
 # opentelemetry.io
 

diff --git a/scripts/semconv/generate.sh b/scripts/semconv/generate.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ROOT_DIR="${SCRIPT_DIR}/../../"

diff --git a/tox.ini b/tox.ini
@@ -100,6 +100,7 @@ commands_pre =
 ; Install without -e to test the actual installation
   py3{8,9,10,11}: python -m pip install -U pip setuptools wheel
 
+  api: pip install -r {toxinidir}/opentelemetry-api/test-requirements.txt
   sdk: pip install -r {toxinidir}/opentelemetry-sdk/test-requirements.txt
 
 ; Install common packages for all the tests. These are not needed in all the
@@ -209,7 +210,7 @@ deps =
   -r dev-requirements.txt
 
 commands_pre =
-  python -m pip install -e {toxinidir}/opentelemetry-api[test]
+  pip install -r {toxinidir}/opentelemetry-api/test-requirements.txt
   python -m pip install -e {toxinidir}/opentelemetry-semantic-conventions[test]
   pip install -r {toxinidir}/opentelemetry-sdk/test-requirements.txt
   python -m pip install -e {toxinidir}/opentelemetry-proto[test]