Otel tracing interop test changes.

Author: kannanjgithub

buildscripts/kokoro/psm-interop-build-java.sh

@@ -31,7 +31,7 @@ readonly BUILD_APP_PATH="interop-testing/build/install/grpc-interop-testing"
 #   Writes the output of xds-test-client and xds-test-server --help to stderr
 #######################################
 _build_java_test_app() {
-  psm::tools::log "Building Java test app"
+  echo "Building Java test app"
   cd "${SRC_DIR}"
 
   set -x
@@ -40,9 +40,9 @@ _build_java_test_app() {
     -PskipCodegen=true -PskipAndroid=true --console=plain
   set +x
 
-  psm::tools::log "Test-run grpc-java PSM interop binaries"
-  psm::tools::run_ignore_exit_code "${SRC_DIR}/${BUILD_APP_PATH}/bin/xds-test-client" --help
-  psm::tools::run_ignore_exit_code "${SRC_DIR}/${BUILD_APP_PATH}/bin/xds-test-server" --help
+  #echo "Test-run grpc-java PSM interop binaries"
+  #psm::tools::run_ignore_exit_code "${SRC_DIR}/${BUILD_APP_PATH}/bin/xds-test-client" --help
+  #psm::tools::run_ignore_exit_code "${SRC_DIR}/${BUILD_APP_PATH}/bin/xds-test-server" --help
 }
 
 #######################################
@@ -62,7 +62,7 @@ psm::lang::build_docker_images() {
   local java_build_log="${BUILD_LOGS_ROOT}/build-lang-java.log"
   _build_java_test_app |& tee "${java_build_log}"
 
-  psm::tools::log "Building Java xDS interop test app Docker images"
+  echo "Building Java xDS interop test app Docker images"
   local docker_dir="${SRC_DIR}/buildscripts/xds-k8s"
   local build_dir
   build_dir="$(mktemp -d)"

gcp-csm-observability/src/main/java/io/grpc/gcp/csm/observability/CsmObservability.java

@@ -133,6 +133,11 @@ public Builder enableMetrics(Collection<String> enableMetrics) {
       return this;
     }
 
+    public Builder enableTracing() {
+      delegate.enableTracing(true);
+      return this;
+    }
+
     /**
      * Disables the specified metrics from being collected and exported.
      */

interop-testing/build.gradle

@@ -9,6 +9,9 @@ plugins {
 
 description = "gRPC: Integration Testing"
 
+def openTelemetryVersion = '1.56.0'
+def openTelemetryContribVersion = '1.52.0'
+
 dependencies {
     implementation project(path: ':grpc-alts', configuration: 'shadow'),
             project(':grpc-auth'),
@@ -45,6 +48,9 @@ dependencies {
             project(':grpc-googleapis'),
             project(':grpc-grpclb'),
             project(':grpc-rls')
+    runtimeOnly group: 'io.opentelemetry', name: 'opentelemetry-exporter-otlp', version: "${openTelemetryVersion}"
+    runtimeOnly group: 'io.opentelemetry.contrib', name: 'opentelemetry-gcp-resources', version: "${openTelemetryContribVersion}-alpha"
+    runtimeOnly group: 'io.opentelemetry.contrib', name: 'opentelemetry-gcp-auth-extension', version: "${openTelemetryContribVersion}-alpha"
     testImplementation testFixtures(project(':grpc-api')),
             testFixtures(project(':grpc-core')),
             project(':grpc-inprocess'),

interop-testing/src/main/java/io/grpc/testing/integration/XdsTestClient.java

@@ -266,11 +266,14 @@ private static RpcType parseRpc(String rpc) {
   private void run() {
     if (enableCsmObservability) {
       csmObservability = CsmObservability.newBuilder()
+          .enableTracing()
           .sdk(AutoConfiguredOpenTelemetrySdk.builder()
               .addPropertiesSupplier(() -> ImmutableMap.of(
                   "otel.logs.exporter", "none",
                   "otel.metrics.exporter", "prometheus",
-                  "otel.traces.exporter", "none"))
+                  "otel.traces.exporter", "otlp",
+                  "otel.exporter.otlp.endpoint", "https://telemetry.googleapis.com",
+                  "otel.exporter.otlp.protocol", "http/protobuf"))
               .build()
               .getOpenTelemetrySdk())
           .build();

interop-testing/src/main/java/io/grpc/testing/integration/XdsTestServer.java

@@ -198,11 +198,14 @@ void parseArgs(String[] args) {
   void start() throws Exception {
     if (enableCsmObservability) {
       csmObservability = CsmObservability.newBuilder()
+          .enableTracing()
           .sdk(AutoConfiguredOpenTelemetrySdk.builder()
               .addPropertiesSupplier(() -> ImmutableMap.of(
                   "otel.logs.exporter", "none",
                   "otel.metrics.exporter", "prometheus",
-                  "otel.traces.exporter", "none"))
+                  "otel.traces.exporter", "otlp",
+                  "otel.exporter.otlp.endpoint", "https://telemetry.googleapis.com",
+                  "otel.exporter.otlp.protocol", "http/protobuf"))
               .build()
               .getOpenTelemetrySdk())
           .build();

opentelemetry/src/main/java/io/grpc/opentelemetry/GrpcOpenTelemetry.java

@@ -416,7 +416,7 @@ public Builder disableAllMetrics() {
       return this;
     }
 
-    Builder enableTracing(boolean enable) {
+    public Builder enableTracing(boolean enable) {
       ENABLE_OTEL_TRACING = enable;
       return this;
     }