From 805c1f78786ec4c2e9024af9d099bdebd9472915 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Thu, 14 Mar 2024 18:19:26 +0100 Subject: [PATCH 1/5] Bump mypy to 0.982 (#3776) --- CHANGELOG.md | 2 ++ dev-requirements.txt | 2 +- opentelemetry-api/src/opentelemetry/context/__init__.py | 2 +- opentelemetry-api/src/opentelemetry/trace/__init__.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c501b9bb3ef..0f9d6613214 100644 --- 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) diff --git a/dev-requirements.txt b/dev-requirements.txt index f440423ffcc..15462dea502 100644 --- 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/opentelemetry-api/src/opentelemetry/context/__init__.py b/opentelemetry-api/src/opentelemetry/context/__init__.py index d170089812e..91133884f68 100644 --- 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 index 9f9abe0f719..8910fd27518 100644 --- 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 From 0d429d1b5d37baf5fedc55cfd1abf44442f6a1e5 Mon Sep 17 00:00:00 2001 From: John Bley Date: Thu, 14 Mar 2024 13:30:22 -0400 Subject: [PATCH 2/5] Use set -e to catch errors in all scripts (#3777) --- scripts/generate_website_docs.sh | 2 ++ scripts/semconv/generate.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/scripts/generate_website_docs.sh b/scripts/generate_website_docs.sh index a36c00e7126..11f4c154a8e 100755 --- 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 index 3a453db025d..d4cf9a33931 100755 --- 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}/../../" From 88eda0ad369aceba8a2c00e03b0366db123612cc Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Thu, 14 Mar 2024 19:00:20 +0100 Subject: [PATCH 3/5] ci: fix benchmark reporting (#3773) Use the same tests output path to have the reporting tool find it. --- .github/workflows/benchmarks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 4fccfe73524..1191c2d0da3 100644 --- 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: From 1ce38b59968d6f5aa91c3f7fa1d67783832a38eb Mon Sep 17 00:00:00 2001 From: Mehmet Enes <94247411+enesonus@users.noreply.github.com> Date: Thu, 14 Mar 2024 21:57:18 +0300 Subject: [PATCH 4/5] docs(examples/logs): include traces to pipelines (#3772) Co-authored-by: Diego Hurtado --- docs/examples/logs/otel-collector-config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/examples/logs/otel-collector-config.yaml b/docs/examples/logs/otel-collector-config.yaml index d6538d71646..e08cbc18738 100644 --- 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] \ No newline at end of file From 190f3cc080c8a9d0572475cad08277b8d5466383 Mon Sep 17 00:00:00 2001 From: Fritz Stapfer Paz Date: Thu, 14 Mar 2024 18:17:58 -0400 Subject: [PATCH 5/5] Update pyproject.toml (#3576) Co-authored-by: Diego Hurtado --- opentelemetry-api/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-api/pyproject.toml b/opentelemetry-api/pyproject.toml index 3d66d39ece6..29d219e6193 100644 --- a/opentelemetry-api/pyproject.toml +++ b/opentelemetry-api/pyproject.toml @@ -27,7 +27,7 @@ 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",