Add opentelemetry-sdk dependency for example and test

XuanWang-Amos · Feb 6, 2024 · 66e0d21 · 66e0d21
1 parent 889a03d
commit 66e0d21
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/examples/python/observability/requirements.txt b/examples/python/observability/requirements.txt
@@ -1,2 +1,3 @@
 grpcio>=1.62.0
 grpcio-observability>=1.62.0
+opentelemetry-sdk==1.21.0
diff --git a/requirements.bazel.txt b/requirements.bazel.txt
@@ -28,6 +28,7 @@ pyasn1==0.5.0
 rsa==4.9
 greenlet==1.1.3.post0
 zope.interface==6.1
+opentelemetry-sdk==1.21.0
 opentelemetry-api==1.21.0
 importlib-metadata==7.0.1
 Deprecated==1.2.14

diff --git a/src/python/grpcio_observability/grpc_observability/_open_telemetry_plugin.py b/src/python/grpcio_observability/grpc_observability/_open_telemetry_plugin.py
@@ -20,10 +20,10 @@
 from grpc_observability import _open_telemetry_measures
 from grpc_observability._cyobservability import MetricsName
 from grpc_observability._observability import StatsData
-from opentelemetry.sdk.metrics import Counter
-from opentelemetry.sdk.metrics import Histogram
-from opentelemetry.sdk.metrics import Meter
-from opentelemetry.sdk.metrics import MeterProvider
+from opentelemetry.metrics import Counter
+from opentelemetry.metrics import Histogram
+from opentelemetry.metrics import Meter
+from opentelemetry.metrics import MeterProvider
 
 GRPC_METHOD_LABEL = "grpc.method"
 GRPC_TARGET_LABEL = "grpc.target"

diff --git a/src/python/grpcio_tests/tests/observability/_open_telemetry_observability_test.py b/src/python/grpcio_tests/tests/observability/_open_telemetry_observability_test.py
@@ -27,7 +27,7 @@
 from grpc_observability._open_telemetry_plugin import GRPC_METHOD_LABEL
 from grpc_observability._open_telemetry_plugin import GRPC_OTHER_LABEL_VALUE
 from grpc_observability._open_telemetry_plugin import GRPC_TARGET_LABEL
-from opentelemetry.sdk.metrics import MeterProvider
+from opentelemetry.metrics import MeterProvider
 from opentelemetry.sdk.metrics.export import AggregationTemporality
 from opentelemetry.sdk.metrics.export import MetricExportResult
 from opentelemetry.sdk.metrics.export import MetricExporter

diff --git a/tools/run_tests/helper_scripts/build_python.sh b/tools/run_tests/helper_scripts/build_python.sh
@@ -217,7 +217,8 @@ pip_install_dir "$ROOT/src/python/grpcio_testing"
 # Build/install tests
 pip_install coverage==7.2.0 oauth2client==4.1.0 \
             google-auth>=1.35.0 requests==2.31.0 \
-            googleapis-common-protos>=1.5.5 rsa==4.0 absl-py==1.4.0
+            googleapis-common-protos>=1.5.5 rsa==4.0 absl-py==1.4.0 \
+            opentelemetry-sdk==1.21.0
 $VENV_PYTHON "$ROOT/src/python/grpcio_tests/setup.py" preprocess
 $VENV_PYTHON "$ROOT/src/python/grpcio_tests/setup.py" build_package_protos
 pip_install_dir "$ROOT/src/python/grpcio_tests"