Revert changes to test and add instructions for example

CMakeLists.txt

@@ -1211,7 +1211,6 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx orca_service_end2end_test)
   add_dependencies(buildtests_cxx orphanable_test)
   add_dependencies(buildtests_cxx osa_distance_test)
-  add_dependencies(buildtests_cxx otel_plugin_test)
   add_dependencies(buildtests_cxx out_of_bounds_bad_client_test)
   add_dependencies(buildtests_cxx outlier_detection_lb_config_parser_test)
   add_dependencies(buildtests_cxx outlier_detection_test)
@@ -20605,72 +20604,6 @@ target_link_libraries(osa_distance_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(otel_plugin_test
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h
-  src/cpp/ext/otel/otel_client_filter.cc
-  src/cpp/ext/otel/otel_plugin.cc
-  src/cpp/ext/otel/otel_server_call_tracer.cc
-  test/cpp/end2end/test_service_impl.cc
-  test/cpp/ext/otel/otel_plugin_test.cc
-  test/cpp/ext/otel/otel_test_library.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(otel_plugin_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-      "GRPCXX_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(otel_plugin_test PUBLIC cxx_std_14)
-target_include_directories(otel_plugin_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(otel_plugin_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  opentelemetry-cpp::api
-  opentelemetry-cpp::metrics
-  grpc++_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 

build_autogenerated.yaml

@@ -13189,34 +13189,6 @@ targets:
   - test/core/util/osa_distance_test.cc
   deps:
   - gtest
-- name: otel_plugin_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/cpp/ext/otel/key_value_iterable.h
-  - src/cpp/ext/otel/otel_call_tracer.h
-  - src/cpp/ext/otel/otel_client_filter.h
-  - src/cpp/ext/otel/otel_plugin.h
-  - src/cpp/ext/otel/otel_server_call_tracer.h
-  - test/cpp/end2end/test_service_impl.h
-  - test/cpp/ext/otel/otel_test_library.h
-  src:
-  - src/proto/grpc/testing/echo.proto
-  - src/proto/grpc/testing/echo_messages.proto
-  - src/proto/grpc/testing/simple_messages.proto
-  - src/proto/grpc/testing/xds/v3/orca_load_report.proto
-  - src/cpp/ext/otel/otel_client_filter.cc
-  - src/cpp/ext/otel/otel_plugin.cc
-  - src/cpp/ext/otel/otel_server_call_tracer.cc
-  - test/cpp/end2end/test_service_impl.cc
-  - test/cpp/ext/otel/otel_plugin_test.cc
-  - test/cpp/ext/otel/otel_test_library.cc
-  deps:
-  - gtest
-  - opentelemetry-cpp::api
-  - opentelemetry-cpp::metrics
-  - grpc++_test_util
 - name: out_of_bounds_bad_client_test
   gtest: true
   build: test

examples/cpp/otel/CMakeLists.txt

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 # cmake build file for C++ gRPC OpenTelemetry example.
-# Assumes absl, protobuf, prometheus-cpp, opentelemetry-cpp and gRPC have been installed using cmake.
+# Assumes absl, protobuf, prometheus-cpp, opentelemetry-cpp and gRPC (with -DgRPC_BUILD_OPENTELEMETRY_PLUGIN=ON) have been installed using cmake.
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 

examples/cpp/otel/README.md

@@ -39,6 +39,15 @@ $ curl localhost:9465/metrics
 > ***NOTE:*** If the prometheus endpoint configured is overridden, please update
 > the target in the above curl command.
 
+## CMake Instructions
+
+The following libraries need to be installed before building the example with CMake -
+* absl
+* protobuf
+* prometheus-cpp
+* opentelemetry-cpp (with the options `-DWITH_ABSEIL=ON` `-DWITH_PROMETHEUS=ON`)
+* grpc (with the option `-DgRPC_BUILD_OPENTELEMETRY_PLUGIN=ON`)
+
 You can find a complete set of instructions for building gRPC and running the
 Hello World app in the [C++ Quick Start][].
 

tools/run_tests/generated/tests.json

@@ -6455,30 +6455,6 @@
     ],
     "uses_polling": true
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "otel_plugin_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": true
-  },
   {
     "args": [],
     "benchmark": false,