Merge branch 'main' into lzchen-patch-5

open-telemetry · Jul 12, 2024 · 9e2bc90 · 9e2bc90
2 parents ef6d8ed + 9304017
commit 9e2bc90
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 4 deletions.
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/benchmark-requirements.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/benchmark-requirements.txt
@@ -0,0 +1 @@
+pytest-benchmark==4.0.0
diff --git a/...nchmarks/test_benchmark_trace_exporter.py → ...nchmarks/test_benchmark_trace_exporter.py b/...nchmarks/test_benchmark_trace_exporter.py → ...nchmarks/test_benchmark_trace_exporter.py
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
@@ -9,7 +9,6 @@ pluggy==1.5.0
 protobuf==3.20.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
@@ -9,7 +9,6 @@ pluggy==1.5.0
 protobuf==4.25.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/opentelemetry-sdk/test-requirements.txt b/opentelemetry-sdk/test-requirements.txt
@@ -7,7 +7,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/propagator/opentelemetry-propagator-b3/benchmark-requirements.txt b/propagator/opentelemetry-propagator-b3/benchmark-requirements.txt
@@ -0,0 +1 @@
+pytest-benchmark==4.0.0
diff --git a/...e/propagation/test_benchmark_b3_format.py → ...e/propagation/test_benchmark_b3_format.py b/...e/propagation/test_benchmark_b3_format.py → ...e/propagation/test_benchmark_b3_format.py
diff --git a/propagator/opentelemetry-propagator-b3/test-requirements.txt b/propagator/opentelemetry-propagator-b3/test-requirements.txt
@@ -6,7 +6,6 @@ packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0

diff --git a/tox.ini b/tox.ini
@@ -62,6 +62,7 @@ envlist =
     py3{8,9,10,11,12}-test-opentelemetry-exporter-otlp-proto-grpc-{0,1}
     ; intentionally excluded from pypy3
     lint-opentelemetry-exporter-otlp-proto-grpc
+    benchmark-opentelemetry-exporter-otlp-proto-grpc
 
     ; The numbers at the end of the environment names
     ; below mean these dependencies are being used:
@@ -91,6 +92,7 @@ envlist =
     py3{8,9,10,11,12}-test-opentelemetry-propagator-b3
     pypy3-test-opentelemetry-propagator-b3
     lint-opentelemetry-propagator-b3
+    benchmark-opentelemetry-propagator-b3
 
     py3{8,9,10,11,12}-test-opentelemetry-propagator-jaeger
     pypy3-test-opentelemetry-propagator-jaeger
@@ -160,6 +162,7 @@ commands_pre =
   opentelemetry-exporter-otlp-proto-grpc-0: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
   opentelemetry-exporter-otlp-proto-grpc-1: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
   lint-opentelemetry-exporter-otlp-proto-grpc: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
+  benchmark-exporter-otlp-proto-grpc: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/benchmark-requirements.txt
 
   opentelemetry-exporter-otlp-proto-http-0: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt
   opentelemetry-exporter-otlp-proto-http-1: pip install -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt
@@ -178,6 +181,7 @@ commands_pre =
   exporter-zipkin-json: pip install -r {toxinidir}/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
 
   propagator-b3: pip install -r {toxinidir}/propagator/opentelemetry-propagator-b3/test-requirements.txt
+  benchmark-opentelemetry-propagator-b3: pip install -r {toxinidir}/propagator/opentelemetry-propagator-b3/benchmark-requirements.txt
 
   propagator-jaeger: pip install -r {toxinidir}/propagator/opentelemetry-propagator-jaeger/test-requirements.txt
 
@@ -266,6 +270,7 @@ commands =
   lint-opentelemetry-exporter-otlp-proto-grpc: flake8 --config {toxinidir}/.flake8 {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc
   lint-opentelemetry-exporter-otlp-proto-grpc: pylint {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry
   lint-opentelemetry-exporter-otlp-proto-grpc: pylint {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/tests
+  benchmark-opentelemetry-exporter-otlp-proto-grpc: pytest {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/benchmarks {posargs} --benchmark-json=exporter-otlp-proto-grpc-benchmark.json
 
   test-opentelemetry-exporter-otlp-proto-http: pytest {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/tests {posargs}
   lint-opentelemetry-exporter-otlp-proto-http: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http
@@ -308,6 +313,7 @@ commands =
   lint-opentelemetry-propagator-b3: flake8 --config {toxinidir}/.flake8 {toxinidir}/propagator/opentelemetry-propagator-b3
   lint-opentelemetry-propagator-b3: pylint {toxinidir}/propagator/opentelemetry-propagator-b3/src/opentelemetry
   lint-opentelemetry-propagator-b3: pylint {toxinidir}/propagator/opentelemetry-propagator-b3/tests
+  benchmark-opentelemetry-propagator-b3: pytest {toxinidir}/propagator/opentelemetry-propagator-b3/benchmarks {posargs} --benchmark-json=propagator-b3-benchmark.json
 
   test-opentelemetry-propagator-jaeger: pytest {toxinidir}/propagator/opentelemetry-propagator-jaeger/tests {posargs}
   lint-opentelemetry-propagator-jaeger: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/propagator/opentelemetry-propagator-jaeger