From 5ae76a81dfde51137023f3129a0787b17e8962cc Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 6 Jul 2021 08:36:55 -0700 Subject: [PATCH 1/5] require dependency for api/sdk to match major version --- docs/examples/error_handler/error_handler_0/setup.cfg | 2 +- docs/examples/error_handler/error_handler_1/setup.cfg | 2 +- exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg | 4 ++-- exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg | 4 ++-- exporter/opentelemetry-exporter-opencensus/setup.cfg | 4 ++-- exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg | 4 ++-- exporter/opentelemetry-exporter-zipkin-json/setup.cfg | 4 ++-- exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg | 4 ++-- opentelemetry-distro/setup.cfg | 4 ++-- propagator/opentelemetry-propagator-b3/setup.cfg | 2 +- propagator/opentelemetry-propagator-jaeger/setup.cfg | 2 +- shim/opentelemetry-opentracing-shim/setup.cfg | 2 +- tests/util/setup.cfg | 4 ++-- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/examples/error_handler/error_handler_0/setup.cfg b/docs/examples/error_handler/error_handler_0/setup.cfg index adcc0614b8..8fadec3820 100644 --- a/docs/examples/error_handler/error_handler_0/setup.cfg +++ b/docs/examples/error_handler/error_handler_0/setup.cfg @@ -36,7 +36,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-sdk ~= 1.0 [options.packages.find] where = src diff --git a/docs/examples/error_handler/error_handler_1/setup.cfg b/docs/examples/error_handler/error_handler_1/setup.cfg index b32809866c..0ca07fbd57 100644 --- a/docs/examples/error_handler/error_handler_1/setup.cfg +++ b/docs/examples/error_handler/error_handler_1/setup.cfg @@ -36,7 +36,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-sdk ~= 1.0 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg b/exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg index 8fbb0cdc8e..295e1311a1 100644 --- a/exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg +++ b/exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg @@ -42,8 +42,8 @@ packages=find_namespace: install_requires = grpcio >= 1.0.0, < 2.0.0 googleapis-common-protos ~= 1.52 - opentelemetry-api == 1.4.0.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-api ~= 1.0 + opentelemetry-sdk ~= 1.0 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg b/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg index f1780aac64..56bdfdb32e 100644 --- a/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg +++ b/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg @@ -41,8 +41,8 @@ package_dir= packages=find_namespace: install_requires = thrift >= 0.10.0 - opentelemetry-api == 1.4.0.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-api ~= 1.0 + opentelemetry-sdk ~= 1.0 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-opencensus/setup.cfg b/exporter/opentelemetry-exporter-opencensus/setup.cfg index 7eb081d23c..71d96de7a5 100644 --- a/exporter/opentelemetry-exporter-opencensus/setup.cfg +++ b/exporter/opentelemetry-exporter-opencensus/setup.cfg @@ -42,8 +42,8 @@ packages=find_namespace: install_requires = grpcio >= 1.0.0, < 2.0.0 opencensus-proto >= 0.1.0, < 1.0.0 - opentelemetry-api == 1.4.0.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-api ~= 1.0 + opentelemetry-sdk ~= 1.0 protobuf >= 3.13.0 [options.packages.find] diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg b/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg index c58cc708bd..8b336d6568 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg +++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg @@ -41,8 +41,8 @@ packages=find_namespace: install_requires = grpcio >= 1.0.0, < 2.0.0 googleapis-common-protos ~= 1.52 - opentelemetry-api == 1.4.0.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-api ~= 1.0 + opentelemetry-sdk ~= 1.0 opentelemetry-proto == 1.4.0.dev0 backoff ~= 1.10.0 diff --git a/exporter/opentelemetry-exporter-zipkin-json/setup.cfg b/exporter/opentelemetry-exporter-zipkin-json/setup.cfg index 1a0aa03c38..d0584f0405 100644 --- a/exporter/opentelemetry-exporter-zipkin-json/setup.cfg +++ b/exporter/opentelemetry-exporter-zipkin-json/setup.cfg @@ -42,8 +42,8 @@ package_dir= packages=find_namespace: install_requires = requests ~= 2.7 - opentelemetry-api == 1.4.0.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-api ~= 1.0 + opentelemetry-sdk ~= 1.0 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg b/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg index baabea2973..84d60ae19a 100644 --- a/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg +++ b/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg @@ -43,8 +43,8 @@ packages=find_namespace: install_requires = protobuf >= 3.12 requests ~= 2.7 - opentelemetry-api == 1.4.0.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-api ~= 1.0 + opentelemetry-sdk ~= 1.0 opentelemetry-exporter-zipkin-json == 1.4.0.dev0 [options.packages.find] diff --git a/opentelemetry-distro/setup.cfg b/opentelemetry-distro/setup.cfg index 65abe4b947..e6f8a9561d 100644 --- a/opentelemetry-distro/setup.cfg +++ b/opentelemetry-distro/setup.cfg @@ -41,9 +41,9 @@ packages=find_namespace: zip_safe = False include_package_data = True install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 opentelemetry-instrumentation == 0.23.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-sdk ~= 1.0 [options.packages.find] where = src diff --git a/propagator/opentelemetry-propagator-b3/setup.cfg b/propagator/opentelemetry-propagator-b3/setup.cfg index 83b7cc8158..33d185e4f3 100644 --- a/propagator/opentelemetry-propagator-b3/setup.cfg +++ b/propagator/opentelemetry-propagator-b3/setup.cfg @@ -40,7 +40,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 deprecated >= 1.2.6 [options.extras_require] diff --git a/propagator/opentelemetry-propagator-jaeger/setup.cfg b/propagator/opentelemetry-propagator-jaeger/setup.cfg index 1c28fc7940..10da79ca0c 100644 --- a/propagator/opentelemetry-propagator-jaeger/setup.cfg +++ b/propagator/opentelemetry-propagator-jaeger/setup.cfg @@ -40,7 +40,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 [options.extras_require] test = diff --git a/shim/opentelemetry-opentracing-shim/setup.cfg b/shim/opentelemetry-opentracing-shim/setup.cfg index fc87a77a23..ea4d4e66f2 100644 --- a/shim/opentelemetry-opentracing-shim/setup.cfg +++ b/shim/opentelemetry-opentracing-shim/setup.cfg @@ -42,7 +42,7 @@ packages=find_namespace: install_requires = Deprecated >= 1.2.6 opentracing ~= 2.0 - opentelemetry-api == 1.4.0.dev0 + opentelemetry-api ~= 1.0 [options.extras_require] test = diff --git a/tests/util/setup.cfg b/tests/util/setup.cfg index 3b4b47ba34..8f230bdf1d 100644 --- a/tests/util/setup.cfg +++ b/tests/util/setup.cfg @@ -37,8 +37,8 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.4.0.dev0 - opentelemetry-sdk == 1.4.0.dev0 + opentelemetry-api ~= 1.0 + opentelemetry-sdk ~= 1.0 [options.extras_require] test = flask~=1.0 From 3007a2ffa0284b11bb14a5deed44361f2ab1723d Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 6 Jul 2021 08:45:15 -0700 Subject: [PATCH 2/5] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f71ff6b41..cc2be79237 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `BoundedAttributes` to the API to make it available for `Link` which is defined in the API. Marked `BoundedDict` in the SDK as deprecated as a result. ([#1915](https://github.com/open-telemetry/opentelemetry-python/pull/1915)) +- Updating dependency for opentelemetry api/sdk packages to support major version instead of + pinning to specific versions. + ([#1933](https://github.com/open-telemetry/opentelemetry-python/pull/1933)) ## [1.3.0-0.22b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.3.0-0.22b0) - 2021-06-01 From 100fbd4649ae1b8f1ef24e50d545d3114851edf1 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 6 Jul 2021 09:05:50 -0700 Subject: [PATCH 3/5] keep dependency pinned for sdk in distro --- opentelemetry-distro/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-distro/setup.cfg b/opentelemetry-distro/setup.cfg index e6f8a9561d..c203217c99 100644 --- a/opentelemetry-distro/setup.cfg +++ b/opentelemetry-distro/setup.cfg @@ -43,7 +43,7 @@ include_package_data = True install_requires = opentelemetry-api ~= 1.0 opentelemetry-instrumentation == 0.23.dev0 - opentelemetry-sdk ~= 1.0 + opentelemetry-sdk == 1.4.0.dev0 [options.packages.find] where = src From fd5bba4302b0da7a44621ee31c0e0a23cd306af0 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 8 Jul 2021 09:29:40 -0700 Subject: [PATCH 4/5] update version to ~= 1.3 --- .../error_handler/error_handler_0/setup.cfg | 2 +- .../error_handler/error_handler_1/setup.cfg | 2 +- .../setup.cfg | 4 +- .../setup.cfg | 4 +- .../setup.cfg | 4 +- .../setup.cfg | 4 +- .../setup.cfg | 4 +- .../setup.cfg | 4 +- opentelemetry-distro/setup.cfg | 2 +- .../opentelemetry-propagator-b3/setup.cfg | 2 +- .../opentelemetry-propagator-jaeger/setup.cfg | 2 +- scripts/proto_codegen_jaeger.sh | 50 +++++++++++++++++++ shim/opentelemetry-opentracing-shim/setup.cfg | 2 +- tests/util/setup.cfg | 4 +- 14 files changed, 70 insertions(+), 20 deletions(-) create mode 100755 scripts/proto_codegen_jaeger.sh diff --git a/docs/examples/error_handler/error_handler_0/setup.cfg b/docs/examples/error_handler/error_handler_0/setup.cfg index 8fadec3820..919ece78d6 100644 --- a/docs/examples/error_handler/error_handler_0/setup.cfg +++ b/docs/examples/error_handler/error_handler_0/setup.cfg @@ -36,7 +36,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-sdk ~= 1.0 + opentelemetry-sdk ~= 1.3 [options.packages.find] where = src diff --git a/docs/examples/error_handler/error_handler_1/setup.cfg b/docs/examples/error_handler/error_handler_1/setup.cfg index 0ca07fbd57..2012fd81b1 100644 --- a/docs/examples/error_handler/error_handler_1/setup.cfg +++ b/docs/examples/error_handler/error_handler_1/setup.cfg @@ -36,7 +36,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-sdk ~= 1.0 + opentelemetry-sdk ~= 1.3 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg b/exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg index 295e1311a1..bd79242989 100644 --- a/exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg +++ b/exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg @@ -42,8 +42,8 @@ packages=find_namespace: install_requires = grpcio >= 1.0.0, < 2.0.0 googleapis-common-protos ~= 1.52 - opentelemetry-api ~= 1.0 - opentelemetry-sdk ~= 1.0 + opentelemetry-api ~= 1.3 + opentelemetry-sdk ~= 1.3 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg b/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg index 56bdfdb32e..945150d687 100644 --- a/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg +++ b/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg @@ -41,8 +41,8 @@ package_dir= packages=find_namespace: install_requires = thrift >= 0.10.0 - opentelemetry-api ~= 1.0 - opentelemetry-sdk ~= 1.0 + opentelemetry-api ~= 1.3 + opentelemetry-sdk ~= 1.3 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-opencensus/setup.cfg b/exporter/opentelemetry-exporter-opencensus/setup.cfg index 71d96de7a5..03e82b70f3 100644 --- a/exporter/opentelemetry-exporter-opencensus/setup.cfg +++ b/exporter/opentelemetry-exporter-opencensus/setup.cfg @@ -42,8 +42,8 @@ packages=find_namespace: install_requires = grpcio >= 1.0.0, < 2.0.0 opencensus-proto >= 0.1.0, < 1.0.0 - opentelemetry-api ~= 1.0 - opentelemetry-sdk ~= 1.0 + opentelemetry-api ~= 1.3 + opentelemetry-sdk ~= 1.3 protobuf >= 3.13.0 [options.packages.find] diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg b/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg index 8b336d6568..a9b5c5b558 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg +++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg @@ -41,8 +41,8 @@ packages=find_namespace: install_requires = grpcio >= 1.0.0, < 2.0.0 googleapis-common-protos ~= 1.52 - opentelemetry-api ~= 1.0 - opentelemetry-sdk ~= 1.0 + opentelemetry-api ~= 1.3 + opentelemetry-sdk ~= 1.3 opentelemetry-proto == 1.4.0.dev0 backoff ~= 1.10.0 diff --git a/exporter/opentelemetry-exporter-zipkin-json/setup.cfg b/exporter/opentelemetry-exporter-zipkin-json/setup.cfg index d0584f0405..81fcbfa261 100644 --- a/exporter/opentelemetry-exporter-zipkin-json/setup.cfg +++ b/exporter/opentelemetry-exporter-zipkin-json/setup.cfg @@ -42,8 +42,8 @@ package_dir= packages=find_namespace: install_requires = requests ~= 2.7 - opentelemetry-api ~= 1.0 - opentelemetry-sdk ~= 1.0 + opentelemetry-api ~= 1.3 + opentelemetry-sdk ~= 1.3 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg b/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg index 84d60ae19a..bee166fd53 100644 --- a/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg +++ b/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg @@ -43,8 +43,8 @@ packages=find_namespace: install_requires = protobuf >= 3.12 requests ~= 2.7 - opentelemetry-api ~= 1.0 - opentelemetry-sdk ~= 1.0 + opentelemetry-api ~= 1.3 + opentelemetry-sdk ~= 1.3 opentelemetry-exporter-zipkin-json == 1.4.0.dev0 [options.packages.find] diff --git a/opentelemetry-distro/setup.cfg b/opentelemetry-distro/setup.cfg index c203217c99..74b3436f1d 100644 --- a/opentelemetry-distro/setup.cfg +++ b/opentelemetry-distro/setup.cfg @@ -41,7 +41,7 @@ packages=find_namespace: zip_safe = False include_package_data = True install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 opentelemetry-instrumentation == 0.23.dev0 opentelemetry-sdk == 1.4.0.dev0 diff --git a/propagator/opentelemetry-propagator-b3/setup.cfg b/propagator/opentelemetry-propagator-b3/setup.cfg index 33d185e4f3..1c879987fd 100644 --- a/propagator/opentelemetry-propagator-b3/setup.cfg +++ b/propagator/opentelemetry-propagator-b3/setup.cfg @@ -40,7 +40,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 deprecated >= 1.2.6 [options.extras_require] diff --git a/propagator/opentelemetry-propagator-jaeger/setup.cfg b/propagator/opentelemetry-propagator-jaeger/setup.cfg index 10da79ca0c..639a07d3d9 100644 --- a/propagator/opentelemetry-propagator-jaeger/setup.cfg +++ b/propagator/opentelemetry-propagator-jaeger/setup.cfg @@ -40,7 +40,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 [options.extras_require] test = diff --git a/scripts/proto_codegen_jaeger.sh b/scripts/proto_codegen_jaeger.sh new file mode 100755 index 0000000000..ccbedc18cb --- /dev/null +++ b/scripts/proto_codegen_jaeger.sh @@ -0,0 +1,50 @@ +#!/bin/bash +# +# Regenerate python code from Jaeger protos in +# https://github.com/jaegertracing/jaeger-idl +# + +set +e + +PROTO_REPO_DIR=${PROTO_REPO_DIR:-"/tmp/proto_codegen_jaeger"} +# root of opentelemetry-python repo +repo_root="$(git rev-parse --show-toplevel)" +venv_dir="/tmp/proto_codegen_jaeger_venv" + +# run on exit even if crash +cleanup() { + echo "Deleting $venv_dir" + rm -rf $venv_dir +} +trap cleanup EXIT + +echo "Creating temporary virtualenv at $venv_dir using $(python3 --version)" +python3 -m venv $venv_dir +source $venv_dir/bin/activate +python -m pip install \ + -c $repo_root/dev-requirements.txt \ + grpcio-tools mypy-protobuf + +# Clone the proto repo if it doesn't exist +if [ ! -d "$PROTO_REPO_DIR" ]; then + git clone https://github.com/jaegertracing/jaeger-idl.git ${PROTO_REPO_DIR}/jaeger-idl + git clone https://github.com/grpc-ecosystem/grpc-gateway ${PROTO_REPO_DIR}/grpc-gateway + git clone https://github.com/gogo/googleapis ${PROTO_REPO_DIR}/googleapis + git clone https://github.com/gogo/protobuf ${PROTO_REPO_DIR}/protobuf +fi + +DEST="exporter/opentelemetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/gen" + +mkdir -p ${DEST} + +# protoc ${PROTO_INCLUDES} --grpc_python_out=./python_out --python_out=./python_out ${DIR}/model.proto +python -m grpc_tools.protoc \ + -I ${PROTO_REPO_DIR}/jaeger-idl/proto/api_v2 \ + -I ${PROTO_REPO_DIR}/grpc-gateway \ + -I ${PROTO_REPO_DIR}/googleapis \ + -I ${PROTO_REPO_DIR}/protobuf/protobuf \ + -I ${PROTO_REPO_DIR}/protobuf \ + --grpc_python_out=./${DEST} \ + --mypy_out=./${DEST} \ + --python_out=./${DEST} \ + ${PROTO_REPO_DIR}/jaeger-idl/proto/api_v2/model.proto ${PROTO_REPO_DIR}/jaeger-idl/proto/api_v2/collector.proto \ No newline at end of file diff --git a/shim/opentelemetry-opentracing-shim/setup.cfg b/shim/opentelemetry-opentracing-shim/setup.cfg index ea4d4e66f2..2b7db534bf 100644 --- a/shim/opentelemetry-opentracing-shim/setup.cfg +++ b/shim/opentelemetry-opentracing-shim/setup.cfg @@ -42,7 +42,7 @@ packages=find_namespace: install_requires = Deprecated >= 1.2.6 opentracing ~= 2.0 - opentelemetry-api ~= 1.0 + opentelemetry-api ~= 1.3 [options.extras_require] test = diff --git a/tests/util/setup.cfg b/tests/util/setup.cfg index 8f230bdf1d..5bc0f69948 100644 --- a/tests/util/setup.cfg +++ b/tests/util/setup.cfg @@ -37,8 +37,8 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api ~= 1.0 - opentelemetry-sdk ~= 1.0 + opentelemetry-api ~= 1.3 + opentelemetry-sdk ~= 1.3 [options.extras_require] test = flask~=1.0 From 84d603ec22e8471f53772d495981b1f94c11d2ce Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 8 Jul 2021 11:20:46 -0700 Subject: [PATCH 5/5] remove unnecessary file --- scripts/proto_codegen_jaeger.sh | 50 --------------------------------- 1 file changed, 50 deletions(-) delete mode 100755 scripts/proto_codegen_jaeger.sh diff --git a/scripts/proto_codegen_jaeger.sh b/scripts/proto_codegen_jaeger.sh deleted file mode 100755 index ccbedc18cb..0000000000 --- a/scripts/proto_codegen_jaeger.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# -# Regenerate python code from Jaeger protos in -# https://github.com/jaegertracing/jaeger-idl -# - -set +e - -PROTO_REPO_DIR=${PROTO_REPO_DIR:-"/tmp/proto_codegen_jaeger"} -# root of opentelemetry-python repo -repo_root="$(git rev-parse --show-toplevel)" -venv_dir="/tmp/proto_codegen_jaeger_venv" - -# run on exit even if crash -cleanup() { - echo "Deleting $venv_dir" - rm -rf $venv_dir -} -trap cleanup EXIT - -echo "Creating temporary virtualenv at $venv_dir using $(python3 --version)" -python3 -m venv $venv_dir -source $venv_dir/bin/activate -python -m pip install \ - -c $repo_root/dev-requirements.txt \ - grpcio-tools mypy-protobuf - -# Clone the proto repo if it doesn't exist -if [ ! -d "$PROTO_REPO_DIR" ]; then - git clone https://github.com/jaegertracing/jaeger-idl.git ${PROTO_REPO_DIR}/jaeger-idl - git clone https://github.com/grpc-ecosystem/grpc-gateway ${PROTO_REPO_DIR}/grpc-gateway - git clone https://github.com/gogo/googleapis ${PROTO_REPO_DIR}/googleapis - git clone https://github.com/gogo/protobuf ${PROTO_REPO_DIR}/protobuf -fi - -DEST="exporter/opentelemetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/gen" - -mkdir -p ${DEST} - -# protoc ${PROTO_INCLUDES} --grpc_python_out=./python_out --python_out=./python_out ${DIR}/model.proto -python -m grpc_tools.protoc \ - -I ${PROTO_REPO_DIR}/jaeger-idl/proto/api_v2 \ - -I ${PROTO_REPO_DIR}/grpc-gateway \ - -I ${PROTO_REPO_DIR}/googleapis \ - -I ${PROTO_REPO_DIR}/protobuf/protobuf \ - -I ${PROTO_REPO_DIR}/protobuf \ - --grpc_python_out=./${DEST} \ - --mypy_out=./${DEST} \ - --python_out=./${DEST} \ - ${PROTO_REPO_DIR}/jaeger-idl/proto/api_v2/model.proto ${PROTO_REPO_DIR}/jaeger-idl/proto/api_v2/collector.proto \ No newline at end of file