diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc index ecab4b4361da3..c656dc3b141fa 100644 --- a/src/core/tsi/fake_transport_security.cc +++ b/src/core/tsi/fake_transport_security.cc @@ -18,19 +18,21 @@ #include "src/core/tsi/fake_transport_security.h" -#include -#include #include #include +#include "absl/log/check.h" +#include "absl/log/log.h" + +#include +#include + #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/dump_args.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/transport_security_grpc.h" #include "src/core/tsi/transport_security_interface.h" -#include "absl/log/check.h" -#include "absl/log/log.h" // --- Constants. --- #define TSI_FAKE_FRAME_HEADER_SIZE 4 diff --git a/src/python/grpcio_csm_observability/grpc_csm_observability/_csm_observability_plugin.py b/src/python/grpcio_csm_observability/grpc_csm_observability/_csm_observability_plugin.py index 2da71b7d06888..e733811e93868 100644 --- a/src/python/grpcio_csm_observability/grpc_csm_observability/_csm_observability_plugin.py +++ b/src/python/grpcio_csm_observability/grpc_csm_observability/_csm_observability_plugin.py @@ -264,7 +264,10 @@ def __init__( generic_method_attribute_filter: Optional[Callable[[str], bool]] = None, ): new_options = list(plugin_options) + [CsmOpenTelemetryPluginOption()] - import sys; sys.stderr.write(f"[xuanwn_testing] init_CsmOpenTelemetryPlugin\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] init_CsmOpenTelemetryPlugin\n") + sys.stderr.flush() super().__init__( plugin_options=new_options, meter_provider=meter_provider, diff --git a/src/python/grpcio_observability/grpc_observability/_open_telemetry_observability.py b/src/python/grpcio_observability/grpc_observability/_open_telemetry_observability.py index 1e5a5c1c409bf..53dc864627e5b 100644 --- a/src/python/grpcio_observability/grpc_observability/_open_telemetry_observability.py +++ b/src/python/grpcio_observability/grpc_observability/_open_telemetry_observability.py @@ -79,7 +79,10 @@ class _OpenTelemetryPlugin: identifier: str def __init__(self, plugin: OpenTelemetryPlugin): - import sys; sys.stderr.write(f"[xuanwn_testing] init__OpenTelemetryPlugin\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] init__OpenTelemetryPlugin\n") + sys.stderr.flush() self._plugin = plugin self._metric_to_recorder = dict() self.identifier = str(id(self)) @@ -93,7 +96,10 @@ def __init__(self, plugin: OpenTelemetryPlugin): self._metric_to_recorder = self._register_metrics( meter, enabled_metrics ) - import sys; sys.stderr.write(f"[xuanwn_testing] after_init__OpenTelemetryPlugin\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] after_init__OpenTelemetryPlugin\n") + sys.stderr.flush() def _should_record(self, stats_data: StatsData) -> bool: # Decide if this plugin should record the stats_data. @@ -377,22 +383,34 @@ def __init__( self._server_option_activated = False def observability_init(self): - import sys; sys.stderr.write(f"[xuanwn_testing] observability_init\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] observability_init\n") + sys.stderr.flush() try: _cyobservability.activate_stats() self.set_stats(True) except Exception as e: # pylint: disable=broad-except raise ValueError(f"Activate observability metrics failed with: {e}") - import sys; sys.stderr.write(f"[xuanwn_testing] after_activate_stats\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] after_activate_stats\n") + sys.stderr.flush() try: _cyobservability.cyobservability_init(self._exporter) # TODO(xuanwn): Use specific exceptons except Exception as e: # pylint: disable=broad-except _LOGGER.exception("Initiate observability failed with: %s", e) - import sys; sys.stderr.write(f"[xuanwn_testing] after_cyobservability_init\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] after_cyobservability_init\n") + sys.stderr.flush() grpc._observability.observability_init(self) - import sys; sys.stderr.write(f"[xuanwn_testing] after_observability_init\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] after_observability_init\n") + sys.stderr.flush() def observability_deinit(self) -> None: # Sleep so we don't loss any data. If we shutdown export thread @@ -512,7 +530,10 @@ def get_enabled_optional_labels(self) -> List[OptionalLabelType]: def _start_open_telemetry_observability( otel_o11y: OpenTelemetryObservability, ) -> None: - import sys; sys.stderr.write(f"[xuanwn_testing] _start_open_telemetry_observability\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] _start_open_telemetry_observability\n") + sys.stderr.flush() global _OPEN_TELEMETRY_OBSERVABILITY # pylint: disable=global-statement with _observability_lock: if _OPEN_TELEMETRY_OBSERVABILITY is None: @@ -522,7 +543,13 @@ def _start_open_telemetry_observability( raise RuntimeError( "gPRC Python observability was already initialized!" ) - import sys; sys.stderr.write(f"[xuanwn_testing] after_start_open_telemetry_observability\n"); sys.stderr.flush() + import sys + + sys.stderr.write( + f"[xuanwn_testing] after_start_open_telemetry_observability\n" + ) + sys.stderr.flush() + def _end_open_telemetry_observability() -> None: global _OPEN_TELEMETRY_OBSERVABILITY # pylint: disable=global-statement diff --git a/src/python/grpcio_observability/grpc_observability/_open_telemetry_plugin.py b/src/python/grpcio_observability/grpc_observability/_open_telemetry_plugin.py index 5f72b676833ca..1a543f23ad978 100644 --- a/src/python/grpcio_observability/grpc_observability/_open_telemetry_plugin.py +++ b/src/python/grpcio_observability/grpc_observability/_open_telemetry_plugin.py @@ -127,7 +127,10 @@ def __init__( Return True means the original method name will be used, False means method name will be replaced with "other". """ - import sys; sys.stderr.write(f"[xuanwn_testing] init_OpenTelemetryPlugin\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] init_OpenTelemetryPlugin\n") + sys.stderr.flush() self.plugin_options = plugin_options self.meter_provider = meter_provider self.target_attribute_filter = target_attribute_filter or ( @@ -147,7 +150,12 @@ def register_global(self) -> None: Raises: RuntimeError: If a global plugin was already registered. """ - import sys; sys.stderr.write(f"[xuanwn_testing] OpenTelemetryPlugin.register_global\n"); sys.stderr.flush() + import sys + + sys.stderr.write( + f"[xuanwn_testing] OpenTelemetryPlugin.register_global\n" + ) + sys.stderr.flush() _open_telemetry_observability.start_open_telemetry_observability( plugins=self._plugins ) diff --git a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc index e9d2c1bf87aa2..0e442d5feb271 100644 --- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc +++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc @@ -110,7 +110,8 @@ void PythonOpenCensusServerCallTracer::RecordSendInitialMetadata( void PythonOpenCensusServerCallTracer::RecordReceivedInitialMetadata( grpc_metadata_batch* recv_initial_metadata) { - LOG(INFO) << "[xuanwn_testing] [Server] calling RecordReceivedInitialMetadata"; + LOG(INFO) + << "[xuanwn_testing] [Server] calling RecordReceivedInitialMetadata"; ServerO11yMetadata som; GetO11yMetadata(recv_initial_metadata, &som); path_ = std::move(som.path); @@ -182,7 +183,8 @@ void PythonOpenCensusServerCallTracer::RecordReceivedMessage( void PythonOpenCensusServerCallTracer::RecordReceivedDecompressedMessage( const grpc_core::SliceBuffer& recv_decompressed_message) { - LOG(INFO) << "[xuanwn_testing] [Server] calling RecordReceivedDecompressedMessage"; + LOG(INFO) + << "[xuanwn_testing] [Server] calling RecordReceivedDecompressedMessage"; RecordAnnotation(absl::StrFormat("Received decompressed message: %ld bytes", recv_decompressed_message.Length())); LOG(INFO) << "[xuanwn_testing] [Server] calling end"; diff --git a/src/python/grpcio_tests/tests_py3_only/interop/xds_interop_client.py b/src/python/grpcio_tests/tests_py3_only/interop/xds_interop_client.py index 9aa18121acccd..0c58b20becae9 100644 --- a/src/python/grpcio_tests/tests_py3_only/interop/xds_interop_client.py +++ b/src/python/grpcio_tests/tests_py3_only/interop/xds_interop_client.py @@ -533,11 +533,22 @@ def _run( logger.info("Starting python xDS Interop Client.") csm_plugin = None if args.enable_csm_observability: - import sys; sys.stderr.write(f"[xuanwn_testing] calling__prepare_csm_observability_plugin\n"); sys.stderr.flush() + import sys + + sys.stderr.write( + f"[xuanwn_testing] calling__prepare_csm_observability_plugin\n" + ) + sys.stderr.flush() csm_plugin = _prepare_csm_observability_plugin() - import sys; sys.stderr.write(f"[xuanwn_testing] register_global\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] register_global\n") + sys.stderr.flush() csm_plugin.register_global() - import sys; sys.stderr.write(f"[xuanwn_testing] register_global\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] register_global\n") + sys.stderr.flush() global _global_server # pylint: disable=global-statement method_handles = [] channel_configs = {} @@ -559,7 +570,10 @@ def _run( ) channel_configs[method] = channel_config method_handles.append(_MethodHandle(args.num_channels, channel_config)) - import sys; sys.stderr.write(f"[xuanwn_testing] create_global_server\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] create_global_server\n") + sys.stderr.flush() _global_server = grpc.server(concurrent.futures.ThreadPoolExecutor()) _global_server.add_insecure_port(f"0.0.0.0:{args.stats_port}") test_pb2_grpc.add_LoadBalancerStatsServiceServicer_to_server( @@ -570,7 +584,10 @@ def _run( _global_server, ) grpc_admin.add_admin_servicers(_global_server) - import sys; sys.stderr.write(f"[xuanwn_testing] start_global_server\n"); sys.stderr.flush() + import sys + + sys.stderr.write(f"[xuanwn_testing] start_global_server\n") + sys.stderr.flush() _global_server.start() _global_server.wait_for_termination() for method_handle in method_handles: