From dbecc8bbf8d29fbf1114979a8dffb8124ee9522c Mon Sep 17 00:00:00 2001 From: emdneto <9735060+emdneto@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:23:42 -0300 Subject: [PATCH] regenerate code with grpcio-tools==1.63.2 Signed-off-by: emdneto <9735060+emdneto@users.noreply.github.com> --- gen-requirements.txt | 2 +- .../proto/collector/logs/v1/logs_service_pb2_grpc.py | 10 +++------- .../collector/metrics/v1/metrics_service_pb2_grpc.py | 10 +++------- .../proto/collector/trace/v1/trace_service_pb2_grpc.py | 10 +++------- tox.ini | 6 +++--- 5 files changed, 13 insertions(+), 25 deletions(-) diff --git a/gen-requirements.txt b/gen-requirements.txt index 283d12c524..923aa86130 100644 --- a/gen-requirements.txt +++ b/gen-requirements.txt @@ -2,5 +2,5 @@ # both protobuf 3.19.x and 4.x (see https://github.com/protocolbuffers/protobuf/issues/11123). # Bump this version with caution to preserve compatibility with protobuf 3. # https://github.com/open-telemetry/opentelemetry-python/blob/main/opentelemetry-proto/pyproject.toml#L28 -grpcio-tools==1.65.5 +grpcio-tools==1.63.2 mypy-protobuf~=3.5.0 diff --git a/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2_grpc.py b/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2_grpc.py index 329808a7ce..99c720386b 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2_grpc.py +++ b/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2_grpc.py @@ -7,10 +7,10 @@ logs_service_pb2 as opentelemetry_dot_proto_dot_collector_dot_logs_dot_v1_dot_logs__service__pb2, ) -GRPC_GENERATED_VERSION = "1.65.5" +GRPC_GENERATED_VERSION = "1.63.2" GRPC_VERSION = grpc.__version__ -EXPECTED_ERROR_RELEASE = "1.66.0" -SCHEDULED_RELEASE_DATE = "August 6, 2024" +EXPECTED_ERROR_RELEASE = "1.65.0" +SCHEDULED_RELEASE_DATE = "June 25, 2024" _version_not_supported = False try: @@ -83,10 +83,6 @@ def add_LogsServiceServicer_to_server(servicer, server): rpc_method_handlers, ) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers( - "opentelemetry.proto.collector.logs.v1.LogsService", - rpc_method_handlers, - ) # This class is part of an EXPERIMENTAL API. diff --git a/opentelemetry-proto/src/opentelemetry/proto/collector/metrics/v1/metrics_service_pb2_grpc.py b/opentelemetry-proto/src/opentelemetry/proto/collector/metrics/v1/metrics_service_pb2_grpc.py index 01ae7c7367..fcf72343f8 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/collector/metrics/v1/metrics_service_pb2_grpc.py +++ b/opentelemetry-proto/src/opentelemetry/proto/collector/metrics/v1/metrics_service_pb2_grpc.py @@ -7,10 +7,10 @@ metrics_service_pb2 as opentelemetry_dot_proto_dot_collector_dot_metrics_dot_v1_dot_metrics__service__pb2, ) -GRPC_GENERATED_VERSION = "1.65.5" +GRPC_GENERATED_VERSION = "1.63.2" GRPC_VERSION = grpc.__version__ -EXPECTED_ERROR_RELEASE = "1.66.0" -SCHEDULED_RELEASE_DATE = "August 6, 2024" +EXPECTED_ERROR_RELEASE = "1.65.0" +SCHEDULED_RELEASE_DATE = "June 25, 2024" _version_not_supported = False try: @@ -83,10 +83,6 @@ def add_MetricsServiceServicer_to_server(servicer, server): rpc_method_handlers, ) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers( - "opentelemetry.proto.collector.metrics.v1.MetricsService", - rpc_method_handlers, - ) # This class is part of an EXPERIMENTAL API. diff --git a/opentelemetry-proto/src/opentelemetry/proto/collector/trace/v1/trace_service_pb2_grpc.py b/opentelemetry-proto/src/opentelemetry/proto/collector/trace/v1/trace_service_pb2_grpc.py index 617498b364..f58f7ef640 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/collector/trace/v1/trace_service_pb2_grpc.py +++ b/opentelemetry-proto/src/opentelemetry/proto/collector/trace/v1/trace_service_pb2_grpc.py @@ -7,10 +7,10 @@ trace_service_pb2 as opentelemetry_dot_proto_dot_collector_dot_trace_dot_v1_dot_trace__service__pb2, ) -GRPC_GENERATED_VERSION = "1.65.5" +GRPC_GENERATED_VERSION = "1.63.2" GRPC_VERSION = grpc.__version__ -EXPECTED_ERROR_RELEASE = "1.66.0" -SCHEDULED_RELEASE_DATE = "August 6, 2024" +EXPECTED_ERROR_RELEASE = "1.65.0" +SCHEDULED_RELEASE_DATE = "June 25, 2024" _version_not_supported = False try: @@ -83,10 +83,6 @@ def add_TraceServiceServicer_to_server(servicer, server): rpc_method_handlers, ) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers( - "opentelemetry.proto.collector.trace.v1.TraceService", - rpc_method_handlers, - ) # This class is part of an EXPERIMENTAL API. diff --git a/tox.ini b/tox.ini index 96f2f07c82..cc68258f2c 100644 --- a/tox.ini +++ b/tox.ini @@ -243,7 +243,7 @@ commands = lint-opentelemetry-exporter-otlp-proto-common: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common lint-opentelemetry-exporter-otlp-proto-common: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common lint-opentelemetry-exporter-otlp-proto-common: flake8 --config {toxinidir}/.flake8 {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common - lint-opentelemetry-exporter-otlp-proto-common: sh -c "cd exporter && pylint --rcfile ../.pylintrc {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common" + lint-opentelemetry-exporter-otlp-proto-common: sh -c "cd exporter && pylint --prefer-stubs yes --rcfile ../.pylintrc {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common" test-opentelemetry-exporter-otlp-combined: pytest {toxinidir}/exporter/opentelemetry-exporter-otlp/tests {posargs} lint-opentelemetry-exporter-otlp-combined: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/exporter/opentelemetry-exporter-otlp @@ -255,14 +255,14 @@ commands = lint-opentelemetry-exporter-otlp-proto-grpc: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc lint-opentelemetry-exporter-otlp-proto-grpc: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc lint-opentelemetry-exporter-otlp-proto-grpc: flake8 --config {toxinidir}/.flake8 {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc - lint-opentelemetry-exporter-otlp-proto-grpc: sh -c "cd exporter && pylint --rcfile ../.pylintrc {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc" + lint-opentelemetry-exporter-otlp-proto-grpc: sh -c "cd exporter && pylint --prefer-stubs yes --rcfile ../.pylintrc {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc" benchmark-opentelemetry-exporter-otlp-proto-grpc: pytest {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/benchmarks --benchmark-json=exporter-otlp-proto-grpc-benchmark.json {posargs} 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 lint-opentelemetry-exporter-otlp-proto-http: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http lint-opentelemetry-exporter-otlp-proto-http: flake8 --config {toxinidir}/.flake8 {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http - lint-opentelemetry-exporter-otlp-proto-http: sh -c "cd exporter && pylint --rcfile ../.pylintrc {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http" + lint-opentelemetry-exporter-otlp-proto-http: sh -c "cd exporter && pylint --prefer-stubs yes --rcfile ../.pylintrc {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http" test-opentelemetry-exporter-prometheus: pytest {toxinidir}/exporter/opentelemetry-exporter-prometheus/tests {posargs} lint-opentelemetry-exporter-prometheus: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/exporter/opentelemetry-exporter-prometheus