Merge branch 'main' into align-proc-args-to-spec-definition

open-telemetry · Jul 11, 2024 · 1e4507a · 1e4507a
2 parents 4ccdae3 + 732ea8a
commit 1e4507a
Show file tree

Hide file tree

Showing 85 changed files with 50 additions and 162 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -7,42 +7,25 @@ on:
 jobs:
   sdk-benchmarks:
     env:
-      py312: "3.12"
-      RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-sdk-${{ matrix.os }}
     runs-on: self-hosted
-    strategy:
-      # Ensures the entire test matrix is run, even if one permutation fails
-      fail-fast: false
-      matrix:
-        python-version: [py312]
-        os: [ubuntu-20.04, windows-2019]
     steps:
     - name: Checkout Core Repo @ SHA - ${{ github.sha }}
       uses: actions/checkout@v4
-    - name: Set up Python ${{ env[matrix.python-version] }}
+    - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: ${{ env[matrix.python-version] }}
+        python-version: "3.12"
         architecture: 'x64'
     - name: Install tox
       run: pip install tox
-    - name: Cache tox environment
-      # Preserves .tox directory between runs for faster installs
-      uses: actions/cache@v4
-      with:
-        path: |
-          .tox
-          ~/.cache/pip
-        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=opentelemetry-sdk/tests/output.json
+      run: tox -e benchmark-opentelemetry-sdk -- -k opentelemetry-sdk/benchmarks --benchmark-json=opentelemetry-sdk/output.json
     - name: Report on SDK benchmark results
       uses: benchmark-action/github-action-benchmark@v1
       with:
-        name: OpenTelemetry Python SDK Benchmarks - Python ${{ env[matrix.python-version ]}} - SDK
+        name: OpenTelemetry Python SDK Benchmarks
         tool: pytest
-        output-file-path: opentelemetry-sdk/tests/output.json
+        output-file-path: opentelemetry-sdk/output.json
         gh-pages-branch: gh-pages
         github-token: ${{ secrets.GITHUB_TOKEN }}
         # Make a commit on `gh-pages` with benchmarks from previous step

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -92,11 +92,7 @@ jobs:
     - name: Windows does not let git check out files with long names
       if: ${{ matrix.os == 'windows-2019'}}
       run: git config --system core.longpaths true
-    - name: run pytest with --benchmark-skip
-      if: ${{ matrix.package == 'sdk' || matrix.package == 'exporter-otlp-proto-grpc' }}
-      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip
-    - name: run pytest without --benchmark-skip
-      if: ${{ !(matrix.package == 'sdk' || matrix.package == 'exporter-otlp-proto-grpc') }}
+    - name: run tox
       run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra
   misc:
     strategy:
@@ -217,4 +213,4 @@ jobs:
         key: v3-tox-cache-${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os
           }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
     - name: run tox
-      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip
+      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra
diff --git a/.gitignore b/.gitignore
@@ -66,3 +66,6 @@ docs/examples/django/db.sqlite3
 
 # Semantic conventions
 scripts/semconv/semantic-conventions
+
+# Benchmark result files
+*-benchmark.json
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -126,7 +126,7 @@ The continuation integration overrides that environment variable with as per the
 
 ### Benchmarks
 
-Running the `tox` tests also runs the performance tests if any are available. Benchmarking tests are done with `pytest-benchmark` and they output a table with results to the console.
+Some packages have benchmark tests. To run them, run `tox -f benchmark`. Benchmark tests use `pytest-benchmark` and they output a table with results to the console.
 
 To write benchmarks, simply use the [pytest benchmark fixture](https://pytest-benchmark.readthedocs.io/en/latest/usage.html#usage) like the following:
 
@@ -142,10 +142,10 @@ def test_simple_start_span(benchmark):
     benchmark(benchmark_start_as_current_span, "benchmarkedSpan", 42)
 ```
 
-Make sure the test file is under the `tests/performance/benchmarks/` folder of
+Make sure the test file is under the `benchmarks/` folder of
 the package it is benchmarking and further has a path that corresponds to the
 file in the package it is testing. Make sure that the file name begins with
-`test_benchmark_`. (e.g. `opentelemetry-sdk/tests/performance/benchmarks/trace/propagation/test_benchmark_b3_format.py`)
+`test_benchmark_`. (e.g. `opentelemetry-sdk/benchmarks/trace/propagation/test_benchmark_b3_format.py`)
 
 ## Pull Requests
 

diff --git a/docs/getting_started/tests/requirements.txt b/docs/getting_started/tests/requirements.txt
@@ -1,6 +1,6 @@
 asgiref==3.7.2
 attrs==23.1.0
-certifi==2023.7.22
+certifi==2024.7.4
 charset-normalizer==2.0.12
 click==8.1.7
 Deprecated==1.2.14
@@ -21,7 +21,7 @@ typing_extensions==4.8.0
 urllib3==1.26.19
 Werkzeug==3.0.3
 wrapt==1.15.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-semantic-conventions
 -e opentelemetry-api
 -e opentelemetry-sdk
diff --git a/opentelemetry-api/src/opentelemetry/py.typed → ...metry-exporter-jaeger-proto-grpc/py.typed b/opentelemetry-api/src/opentelemetry/py.typed → ...metry-exporter-jaeger-proto-grpc/py.typed
diff --git a/exporter/opentelemetry-exporter-jaeger-thrift/py.typed b/exporter/opentelemetry-exporter-jaeger-thrift/py.typed
diff --git a/exporter/opentelemetry-exporter-jaeger/py.typed b/exporter/opentelemetry-exporter-jaeger/py.typed
diff --git a/exporter/opentelemetry-exporter-opencensus/py.typed b/exporter/opentelemetry-exporter-opencensus/py.typed
diff --git a/exporter/opentelemetry-exporter-opencensus/test-requirements.txt b/exporter/opentelemetry-exporter-opencensus/test-requirements.txt
@@ -12,7 +12,7 @@ pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e opentelemetry-sdk
 -e tests/opentelemetry-test-utils

diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/py.typed b/exporter/opentelemetry-exporter-otlp-proto-common/py.typed
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt
@@ -10,7 +10,7 @@ pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e opentelemetry-sdk
 -e opentelemetry-semantic-conventions

diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt
@@ -10,7 +10,7 @@ pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e opentelemetry-sdk
 -e opentelemetry-semantic-conventions

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/py.typed b/exporter/opentelemetry-exporter-otlp-proto-grpc/py.typed
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
@@ -13,7 +13,7 @@ pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e tests/opentelemetry-test-utils
 -e exporter/opentelemetry-exporter-otlp-proto-common

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
@@ -13,7 +13,7 @@ pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e tests/opentelemetry-test-utils
 -e exporter/opentelemetry-exporter-otlp-proto-common

diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/py.typed b/exporter/opentelemetry-exporter-otlp-proto-http/py.typed
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt
@@ -1,5 +1,5 @@
 asgiref==3.7.2
-certifi==2024.2.2
+certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
 googleapis-common-protos==1.62.0
@@ -18,7 +18,7 @@ tomli==2.0.1
 typing_extensions==4.10.0
 urllib3==2.2.2
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e tests/opentelemetry-test-utils
 -e exporter/opentelemetry-exporter-otlp-proto-common

diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt
@@ -1,5 +1,5 @@
 asgiref==3.7.2
-certifi==2024.2.2
+certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
 googleapis-common-protos==1.62.0
@@ -18,7 +18,7 @@ tomli==2.0.1
 typing_extensions==4.10.0
 urllib3==2.2.2
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e tests/opentelemetry-test-utils
 -e exporter/opentelemetry-exporter-otlp-proto-common

diff --git a/exporter/opentelemetry-exporter-otlp/py.typed b/exporter/opentelemetry-exporter-otlp/py.typed
diff --git a/exporter/opentelemetry-exporter-otlp/test-requirements.txt b/exporter/opentelemetry-exporter-otlp/test-requirements.txt
@@ -9,7 +9,7 @@ pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e tests/opentelemetry-test-utils
 -e exporter/opentelemetry-exporter-otlp-proto-common

diff --git a/exporter/opentelemetry-exporter-prometheus/py.typed b/exporter/opentelemetry-exporter-prometheus/py.typed
diff --git a/exporter/opentelemetry-exporter-prometheus/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus/test-requirements.txt
@@ -10,7 +10,7 @@ pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e opentelemetry-sdk
 -e tests/opentelemetry-test-utils

diff --git a/exporter/opentelemetry-exporter-zipkin-json/py.typed b/exporter/opentelemetry-exporter-zipkin-json/py.typed
diff --git a/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
@@ -1,5 +1,5 @@
 asgiref==3.7.2
-certifi==2024.2.2
+certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
 idna==3.7
@@ -14,7 +14,7 @@ tomli==2.0.1
 typing_extensions==4.10.0
 urllib3==2.2.2
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e opentelemetry-sdk
 -e opentelemetry-semantic-conventions

diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/py.typed b/exporter/opentelemetry-exporter-zipkin-proto-http/py.typed
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt
@@ -1,5 +1,5 @@
 asgiref==3.7.2
-certifi==2024.2.2
+certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
 idna==3.7
@@ -15,7 +15,7 @@ tomli==2.0.1
 typing_extensions==4.10.0
 urllib3==2.2.2
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e exporter/opentelemetry-exporter-zipkin-json
 -e opentelemetry-sdk

diff --git a/exporter/opentelemetry-exporter-zipkin/py.typed b/exporter/opentelemetry-exporter-zipkin/py.typed
diff --git a/exporter/opentelemetry-exporter-zipkin/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin/test-requirements.txt
@@ -9,7 +9,7 @@ pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e exporter/opentelemetry-exporter-zipkin-json
 -e exporter/opentelemetry-exporter-zipkin-proto-http

diff --git a/opentelemetry-api/py.typed b/opentelemetry-api/py.typed
diff --git a/opentelemetry-api/pyproject.toml b/opentelemetry-api/pyproject.toml
@@ -55,7 +55,7 @@ default_tracer_provider = "opentelemetry.trace:NoOpTracerProvider"
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api"
 
 [tool.hatch.version]
-path = "src/opentelemetry/version.py"
+path = "src/opentelemetry/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/opentelemetry-api/src/opentelemetry/_logs/py.typed b/opentelemetry-api/src/opentelemetry/_logs/py.typed
diff --git a/opentelemetry-api/src/opentelemetry/attributes/py.typed b/opentelemetry-api/src/opentelemetry/attributes/py.typed
diff --git a/opentelemetry-api/src/opentelemetry/baggage/py.typed b/opentelemetry-api/src/opentelemetry/baggage/py.typed
diff --git a/opentelemetry-api/src/opentelemetry/context/py.typed b/opentelemetry-api/src/opentelemetry/context/py.typed
diff --git a/...rc/opentelemetry/environment_variables.py → ...lemetry/environment_variables/__init__.py b/...rc/opentelemetry/environment_variables.py → ...lemetry/environment_variables/__init__.py
diff --git a/opentelemetry-api/src/opentelemetry/environment_variables/py.typed b/opentelemetry-api/src/opentelemetry/environment_variables/py.typed
diff --git a/opentelemetry-api/src/opentelemetry/metrics/py.typed b/opentelemetry-api/src/opentelemetry/metrics/py.typed
diff --git a/opentelemetry-api/src/opentelemetry/propagate/py.typed b/opentelemetry-api/src/opentelemetry/propagate/py.typed
diff --git a/opentelemetry-api/src/opentelemetry/propagators/py.typed b/opentelemetry-api/src/opentelemetry/propagators/py.typed
diff --git a/opentelemetry-api/src/opentelemetry/trace/py.typed b/opentelemetry-api/src/opentelemetry/trace/py.typed
diff --git a/opentelemetry-api/src/opentelemetry/util/py.typed b/opentelemetry-api/src/opentelemetry/util/py.typed
diff --git a/...elemetry-api/src/opentelemetry/version.py → ...api/src/opentelemetry/version/__init__.py b/...elemetry-api/src/opentelemetry/version.py → ...api/src/opentelemetry/version/__init__.py
diff --git a/opentelemetry-api/src/opentelemetry/version/py.typed b/opentelemetry-api/src/opentelemetry/version/py.typed
diff --git a/opentelemetry-api/test-requirements.txt b/opentelemetry-api/test-requirements.txt
@@ -9,7 +9,7 @@ pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-sdk
 -e opentelemetry-semantic-conventions
 -e tests/opentelemetry-test-utils

diff --git a/opentelemetry-proto/py.typed b/opentelemetry-proto/py.typed
diff --git a/opentelemetry-proto/pyproject.toml b/opentelemetry-proto/pyproject.toml
@@ -33,7 +33,7 @@ dependencies = [
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-proto"
 
 [tool.hatch.version]
-path = "src/opentelemetry/proto/version.py"
+path = "src/opentelemetry/proto/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...-proto/src/opentelemetry/proto/version.py → ...c/opentelemetry/proto/version/__init__.py b/...-proto/src/opentelemetry/proto/version.py → ...c/opentelemetry/proto/version/__init__.py
diff --git a/opentelemetry-proto/test-requirements-0.txt b/opentelemetry-proto/test-requirements-0.txt
@@ -10,5 +10,5 @@ pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-proto
diff --git a/opentelemetry-proto/test-requirements-1.txt b/opentelemetry-proto/test-requirements-1.txt
@@ -10,5 +10,5 @@ pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-proto
diff --git a/opentelemetry-sdk/benchmark-requirements.txt b/opentelemetry-sdk/benchmark-requirements.txt
@@ -0,0 +1 @@
+pytest-benchmark==4.0.0
diff --git a/...chmarks/metrics/test_benchmark_metrics.py → ...chmarks/metrics/test_benchmark_metrics.py b/...chmarks/metrics/test_benchmark_metrics.py → ...chmarks/metrics/test_benchmark_metrics.py
diff --git a/...rics/test_benchmark_metrics_histogram,.py → ...rics/test_benchmark_metrics_histogram,.py b/...rics/test_benchmark_metrics_histogram,.py → ...rics/test_benchmark_metrics_histogram,.py
diff --git a/.../benchmarks/trace/test_benchmark_trace.py → .../benchmarks/trace/test_benchmark_trace.py b/.../benchmarks/trace/test_benchmark_trace.py → .../benchmarks/trace/test_benchmark_trace.py
diff --git a/opentelemetry-sdk/py.typed b/opentelemetry-sdk/py.typed
diff --git a/opentelemetry-sdk/pyproject.toml b/opentelemetry-sdk/pyproject.toml
@@ -72,7 +72,7 @@ process = "opentelemetry.sdk.resources:ProcessResourceDetector"
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-sdk"
 
 [tool.hatch.version]
-path = "src/opentelemetry/sdk/version.py"
+path = "src/opentelemetry/sdk/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_configuration/py.typed b/opentelemetry-sdk/src/opentelemetry/sdk/_configuration/py.typed
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/py.typed b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/py.typed
diff --git a/...pentelemetry/sdk/environment_variables.py → ...try/sdk/environment_variables/__init__.py b/...pentelemetry/sdk/environment_variables.py → ...try/sdk/environment_variables/__init__.py
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/environment_variables/py.typed b/opentelemetry-sdk/src/opentelemetry/sdk/environment_variables/py.typed
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/error_handler/py.typed b/opentelemetry-sdk/src/opentelemetry/sdk/error_handler/py.typed
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/py.typed b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/py.typed
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/resources/py.typed b/opentelemetry-sdk/src/opentelemetry/sdk/resources/py.typed
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/py.typed b/opentelemetry-sdk/src/opentelemetry/sdk/trace/py.typed
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/util/py.typed b/opentelemetry-sdk/src/opentelemetry/sdk/util/py.typed
diff --git a/...etry-sdk/src/opentelemetry/sdk/version.py → ...src/opentelemetry/sdk/version/__init__.py b/...etry-sdk/src/opentelemetry/sdk/version.py → ...src/opentelemetry/sdk/version/__init__.py
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/version/py.typed b/opentelemetry-sdk/src/opentelemetry/sdk/version/py.typed
diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt
@@ -11,7 +11,7 @@ pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e tests/opentelemetry-test-utils
 -e opentelemetry-api
 -e opentelemetry-semantic-conventions

diff --git a/...lemetry-sdk/tests/performance/resource-usage/trace/profile_resource_usage_batch_export.py b/...lemetry-sdk/tests/performance/resource-usage/trace/profile_resource_usage_batch_export.py