Revert "interop: fix black formatting and cross-platform OTel tracing flags"

This reverts commit 3991f87.

Author: AgraVator

src/python/grpcio_tests/tests/interop/client.py

@@ -84,7 +84,9 @@ def parse_interop_client_args(argv):
         type=str,
         help="the server host to which to claim to connect",
     )
-    parser.add_argument("--oauth_scope", type=str, help="scope for OAuth tokens")
+    parser.add_argument(
+        "--oauth_scope", type=str, help="scope for OAuth tokens"
+    )
     parser.add_argument(
         "--default_service_account",
         type=str,
@@ -170,10 +172,14 @@ def get_secure_channel_parameters(args):
                     request=google_auth.transport.requests.Request(),
                 )
             )
-            channel_credentials = grpc.compute_engine_channel_credentials(call_creds)
+            channel_credentials = grpc.compute_engine_channel_credentials(
+                call_creds
+            )
         else:
             raise ValueError(
-                "Unknown credentials type '{}'".format(args.custom_credentials_type)
+                "Unknown credentials type '{}'".format(
+                    args.custom_credentials_type
+                )
             )
     elif args.use_tls:
         if args.use_test_ca:
@@ -215,7 +221,9 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
         sent_span_name = f"Sent.{full_method}"
         attempt_span_name = f"Attempt.{full_method}"
 
-        sent_span = self._tracer.start_span(sent_span_name, kind=trace.SpanKind.CLIENT)
+        sent_span = self._tracer.start_span(
+            sent_span_name, kind=trace.SpanKind.CLIENT
+        )
         sent_ctx = trace.set_span_in_context(sent_span)
         attempt_span = self._tracer.start_span(
             attempt_span_name, kind=trace.SpanKind.CLIENT, context=sent_ctx
@@ -254,7 +262,11 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
 def _create_channel(args):
     target = "{}:{}".format(args.server_host, args.server_port)
 
-    if args.use_tls or args.use_alts or args.custom_credentials_type is not None:
+    if (
+        args.use_tls
+        or args.use_alts
+        or args.custom_credentials_type is not None
+    ):
         channel_credentials, options = get_secure_channel_parameters(args)
         channel = grpc.secure_channel(target, channel_credentials, options)
     else:
@@ -264,7 +276,9 @@ def _create_channel(args):
         from tests.interop import otel_interop_helper
 
         _, tracer = otel_interop_helper.init_tracer_provider()
-        channel = grpc.intercept_channel(channel, _OTelClientInterceptor(tracer))
+        channel = grpc.intercept_channel(
+            channel, _OTelClientInterceptor(tracer)
+        )
 
     return channel
 
@@ -305,3 +319,4 @@ def test_interoperability(args):
 
 if __name__ == "__main__":
     app.run(test_interoperability, flags_parser=parse_interop_client_args)
+

src/python/grpcio_tests/tests/interop/otel_interop_helper.py

@@ -11,7 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""OpenTelemetry Tracing Interop Helper for Python gRPC Interop Client/Server"""
+"""OpenTelemetry Tracing Interop Helper for Python gRPC Interop Client/Server
+"""
 
 import os
 from typing import Optional, Tuple
@@ -192,12 +193,16 @@ def intercept_service(self, continuation, handler_call_details):
         traceparent_header = None
         for k, v in handler_call_details.invocation_metadata:
             k_str = (
-                k.decode("ascii", errors="ignore") if isinstance(k, bytes) else str(k)
+                k.decode("ascii", errors="ignore")
+                if isinstance(k, bytes)
+                else str(k)
             )
             if k_str.lower() == "grpc-trace-bin":
                 trace_bin_header = v
             elif k_str.lower() == "traceparent":
-                traceparent_header = v if isinstance(v, str) else v.decode("latin1")
+                traceparent_header = (
+                    v if isinstance(v, str) else v.decode("latin1")
+                )
 
         parent_ctx = None
         trace_id, parent_span_id, is_sampled = None, None, False
@@ -235,7 +240,9 @@ def intercept_service(self, continuation, handler_call_details):
                 span_name, kind=trace.SpanKind.SERVER, context=ctx
             )
         else:
-            server_span = self._tracer.start_span(span_name, kind=trace.SpanKind.SERVER)
+            server_span = self._tracer.start_span(
+                span_name, kind=trace.SpanKind.SERVER
+            )
 
         server_span.add_event("Inbound message")
 
@@ -247,7 +254,6 @@ def intercept_service(self, continuation, handler_call_details):
 
         if handler.unary_unary:
             orig_func = handler.unary_unary
-
             def wrapper(request, context):
                 try:
                     res = orig_func(request, context)
@@ -256,7 +262,6 @@ def wrapper(request, context):
                 finally:
                     server_span.end()
                     flush_tracer_provider()
-
             return grpc.unary_unary_rpc_method_handler(
                 wrapper,
                 request_deserializer=handler.request_deserializer,

src/python/grpcio_tests/tests/interop/server.py

@@ -114,7 +114,9 @@ def serve(args):
     else:
         server = test_common.test_server()
 
-    test_pb2_grpc.add_TestServiceServicer_to_server(service.TestService(), server)
+    test_pb2_grpc.add_TestServiceServicer_to_server(
+        service.TestService(), server
+    )
     if args.use_tls or args.use_alts:
         credentials = get_server_credentials(args.use_tls)
         server.add_secure_port("[::]:{}".format(args.port), credentials)

test/cpp/interop/client.cc

@@ -222,15 +222,13 @@ int main(int argc, char** argv) {
             grpc::experimental::ClientInterceptorFactoryInterface>>
             factories;
         if (!additional_metadata->empty()) {
-          factories.emplace_back(
-              std::make_unique<
-                  grpc::testing::AdditionalMetadataInterceptorFactory>(
+          factories.emplace_back(std::make_unique<
+              grpc::testing::AdditionalMetadataInterceptorFactory>(
                   *additional_metadata));
         }
         if (absl::GetFlag(FLAGS_log_metadata_and_status)) {
-          factories.emplace_back(
-              std::make_unique<
-                  grpc::testing::MetadataAndStatusLoggerInterceptorFactory>());
+          factories.emplace_back(std::make_unique<
+              grpc::testing::MetadataAndStatusLoggerInterceptorFactory>());
         }
         std::string service_config_json =
             absl::GetFlag(FLAGS_service_config_json);

test/cpp/interop/interop_server.cc

@@ -41,6 +41,7 @@
 #include "test/cpp/interop/otel_helper.h"
 #include "test/cpp/interop/server_helper.h"
 #include "test/cpp/util/test_config.h"
+
 #include "absl/flags/flag.h"
 #include "absl/log/log.h"
 

test/cpp/interop/otel_helper.cc

@@ -27,7 +27,6 @@
 #include <mutex>
 #include <string>
 
-#include "src/core/util/env.h"
 #include "absl/flags/flag.h"
 #include "absl/log/log.h"
 
@@ -58,13 +57,14 @@ static std::once_flag g_otel_init_once;
 #endif
 
 void MaybeRegisterOpenTelemetry() {
-  if (!absl::GetFlag(FLAGS_enable_opentelemetry)) {
-    return;
-  }
 #ifdef GRPC_HAS_OTEL_TRACING
   std::call_once(g_otel_init_once, []() {
-    auto otel_traces_exporter = grpc_core::GetEnv("OTEL_TRACES_EXPORTER");
-    if (otel_traces_exporter.has_value() && *otel_traces_exporter == "none") {
+    if (!absl::GetFlag(FLAGS_enable_opentelemetry)) {
+      return;
+    }
+    const char* otel_traces_exporter = std::getenv("OTEL_TRACES_EXPORTER");
+    if (otel_traces_exporter != nullptr &&
+        std::string(otel_traces_exporter) == "none") {
       LOG(INFO) << "OTEL_TRACES_EXPORTER is set to none. Tracing is disabled.";
       return;
     }
@@ -76,8 +76,9 @@ void MaybeRegisterOpenTelemetry() {
     auto processor =
         opentelemetry::sdk::trace::SimpleSpanProcessorFactory::Create(
             std::move(exporter));
-    auto provider = std::make_shared<opentelemetry::sdk::trace::TracerProvider>(
-        std::move(processor));
+    auto provider =
+        std::make_shared<opentelemetry::sdk::trace::TracerProvider>(
+            std::move(processor));
     std::atomic_store(&g_tracer_provider, provider);
 
     auto status =

test/cpp/interop/otlp_collector.cc

@@ -16,9 +16,6 @@
 //
 //
 
-#include <google/protobuf/json/json.h>
-#include <grpcpp/grpcpp.h>
-
 #include <atomic>
 #include <chrono>
 #include <csignal>
@@ -29,11 +26,14 @@
 #include <thread>
 #include <vector>
 
-#include "opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.h"
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/log/log.h"
 
+#include <google/protobuf/json/json.h>
+#include <grpcpp/grpcpp.h>
+#include "opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.h"
+
 ABSL_FLAG(int, port, 0, "Port to listen on");
 ABSL_FLAG(std::string, file, "", "File to write JSON spans to");
 
@@ -66,8 +66,7 @@ class TraceServiceServiceImpl final
     std::lock_guard<std::mutex> lock(mu_);
     requests_json_.push_back(json_string);
 
-    // Write to a temporary file first and rename to avoid read-during-write
-    // data race
+    // Write to a temporary file first and rename to avoid read-during-write data race
     std::string tmp_file = file_path_ + ".tmp";
     std::ofstream out(tmp_file, std::ios::trunc);
     if (!out) {