Merge branch 'main' into FixJaegerIds

Author: lalitb

CHANGELOG.md

@@ -15,6 +15,9 @@ Increment the:
 
 ## [Unreleased]
 
+* [EXPORTER] Add OTLP/HTTP+JSON Protocol exporter ([#810](https://github.com/open-telemetry/opentelemetry-cpp/pull/810))
+* [EXPORTER] Rename `OtlpExporter` to `OtlpGrpcExporter`, rename `otlp_exporter.h` to `otlp_grpc_exporter.h` ([#810](https://github.com/open-telemetry/opentelemetry-cpp/pull/810))
+
 ## [1.0.0-rc1] 2021-06-04
 
 * [BUILD] Enable Jaeger exporter build in Windows ([#815](https://github.com/open-telemetry/opentelemetry-cpp/pull/815))

CMakeLists.txt

@@ -203,7 +203,7 @@ if(WITH_OTLP)
       find_package(Protobuf REQUIRED)
     endif()
     if(NOT gRPC_FOUND)
-      find_package(gRPC REQUIRED)
+      find_package(gRPC)
     endif()
     if(WIN32)
       # Always use x64 protoc.exe
@@ -221,6 +221,15 @@ if(WITH_OTLP)
   message("PROTOBUF_PROTOC_EXECUTABLE=${PROTOBUF_PROTOC_EXECUTABLE}")
 
   include(cmake/opentelemetry-proto.cmake)
+  include(CMakeDependentOption)
+  find_package(CURL)
+  find_package(nlohmann_json)
+  cmake_dependent_option(
+    WITH_OTLP_GRPC "Whether to include the OTLP gRPC exporter in the SDK" ON
+    "gRPC_FOUND" OFF)
+  cmake_dependent_option(
+    WITH_OTLP_HTTP "Whether to include the OTLP http exporter in the SDK" ON
+    "CURL_FOUND;nlohmann_json_FOUND" OFF)
 endif()
 
 list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}")
@@ -268,11 +277,11 @@ if(NOT WITH_API_ONLY)
   include_directories(ext/include)
 
   add_subdirectory(sdk)
+  add_subdirectory(ext)
   add_subdirectory(exporters)
   if(WITH_EXAMPLES)
     add_subdirectory(examples)
   endif()
-  add_subdirectory(ext)
 endif()
 
 # Add nlohmann/json submodule to include directories

WORKSPACE

@@ -29,9 +29,9 @@ load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
 
 grpc_extra_deps()
 
-load("@upb//bazel:repository_defs.bzl", "bazel_version_repository")
+load("@upb//bazel:workspace_deps.bzl", "upb_deps")
 
-bazel_version_repository(name = "upb_bazel_version")
+upb_deps()
 
 # Load prometheus C++ dependencies.
 load("@com_github_jupp0r_prometheus_cpp//bazel:repositories.bzl", "prometheus_cpp_repositories")

bazel/repository.bzl

@@ -29,13 +29,23 @@ def opentelemetry_cpp_deps():
     )
 
     # Load gRPC dependency
+    maybe(
+        http_archive,
+        name = "com_github_grpc_grpc_legacy",
+        sha256 = "2060769f2d4b0d3535ba594b2ab614d7f68a492f786ab94b4318788d45e3278a",
+        strip_prefix = "grpc-1.33.2",
+        urls = [
+            "https://github.com/grpc/grpc/archive/v1.33.2.tar.gz",
+        ],
+    )
+
     maybe(
         http_archive,
         name = "com_github_grpc_grpc",
-        sha256 = "d6277f77e0bb922d3f6f56c0f93292bb4cfabfc3c92b31ee5ccea0e100303612",
-        strip_prefix = "grpc-1.28.0",
+        sha256 = "2060769f2d4b0d3535ba594b2ab614d7f68a492f786ab94b4318788d45e3278a",
+        strip_prefix = "grpc-1.33.2",
         urls = [
-            "https://github.com/grpc/grpc/archive/v1.28.0.tar.gz",
+            "https://github.com/grpc/grpc/archive/v1.33.2.tar.gz",
         ],
     )
 

cmake/opentelemetry-proto.cmake

@@ -1,85 +1,4 @@
-macro(check_append_cxx_compiler_flag OUTPUT_VAR)
-  foreach(CHECK_FLAG ${ARGN})
-    check_cxx_compiler_flag(${CHECK_FLAG}
-                            "check_cxx_compiler_flag_${CHECK_FLAG}")
-    if(check_cxx_compiler_flag_${CHECK_FLAG})
-      list(APPEND ${OUTPUT_VAR} ${CHECK_FLAG})
-    endif()
-  endforeach()
-endmacro()
-
-if(NOT PATCH_PROTOBUF_SOURCES_OPTIONS_SET)
-  if(MSVC)
-    unset(PATCH_PROTOBUF_SOURCES_OPTIONS CACHE)
-    set(PATCH_PROTOBUF_SOURCES_OPTIONS /wd4244 /wd4251 /wd4267 /wd4309)
-
-    if(MSVC_VERSION GREATER_EQUAL 1922)
-      # see
-      # https://docs.microsoft.com/en-us/cpp/overview/cpp-conformance-improvements?view=vs-2019#improvements_162
-      # for detail
-      list(APPEND PATCH_PROTOBUF_SOURCES_OPTIONS /wd5054)
-    endif()
-
-    if(MSVC_VERSION GREATER_EQUAL 1925)
-      list(APPEND PATCH_PROTOBUF_SOURCES_OPTIONS /wd4996)
-    endif()
-
-    if(MSVC_VERSION LESS 1910)
-      list(APPEND PATCH_PROTOBUF_SOURCES_OPTIONS /wd4800)
-    endif()
-  else()
-    unset(PATCH_PROTOBUF_SOURCES_OPTIONS CACHE)
-    include(CheckCXXCompilerFlag)
-    check_append_cxx_compiler_flag(
-      PATCH_PROTOBUF_SOURCES_OPTIONS -Wno-type-limits
-      -Wno-deprecated-declarations -Wno-unused-parameter)
-  endif()
-  set(PATCH_PROTOBUF_SOURCES_OPTIONS_SET TRUE)
-  if(PATCH_PROTOBUF_SOURCES_OPTIONS)
-    set(PATCH_PROTOBUF_SOURCES_OPTIONS
-        ${PATCH_PROTOBUF_SOURCES_OPTIONS}
-        CACHE INTERNAL
-              "Options to disable warning of generated protobuf sources" FORCE)
-  endif()
-endif()
-
-function(patch_protobuf_sources)
-  if(PATCH_PROTOBUF_SOURCES_OPTIONS)
-    foreach(PROTO_SRC ${ARGN})
-      unset(PROTO_SRC_OPTIONS)
-      get_source_file_property(PROTO_SRC_OPTIONS ${PROTO_SRC} COMPILE_OPTIONS)
-      if(PROTO_SRC_OPTIONS)
-        list(APPEND PROTO_SRC_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS})
-      else()
-        set(PROTO_SRC_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS})
-      endif()
-
-      set_source_files_properties(
-        ${PROTO_SRC} PROPERTIES COMPILE_OPTIONS "${PROTO_SRC_OPTIONS}")
-    endforeach()
-    unset(PROTO_SRC)
-    unset(PROTO_SRC_OPTIONS)
-  endif()
-endfunction()
-
-function(patch_protobuf_targets)
-  if(PATCH_PROTOBUF_SOURCES_OPTIONS)
-    foreach(PROTO_TARGET ${ARGN})
-      unset(PROTO_TARGET_OPTIONS)
-      get_target_property(PROTO_TARGET_OPTIONS ${PROTO_TARGET} COMPILE_OPTIONS)
-      if(PROTO_TARGET_OPTIONS)
-        list(APPEND PROTO_TARGET_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS})
-      else()
-        set(PROTO_TARGET_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS})
-      endif()
-
-      set_target_properties(
-        ${PROTO_TARGET} PROPERTIES COMPILE_OPTIONS "${PROTO_TARGET_OPTIONS}")
-    endforeach()
-    unset(PROTO_TARGET)
-    unset(PROTO_TARGET_OPTIONS)
-  endif()
-endfunction()
+include(${PROJECT_SOURCE_DIR}/cmake/proto-options-patch.cmake)
 
 set(PROTO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third_party/opentelemetry-proto")
 

cmake/proto-options-patch.cmake

@@ -0,0 +1,82 @@
+macro(check_append_cxx_compiler_flag OUTPUT_VAR)
+  foreach(CHECK_FLAG ${ARGN})
+    check_cxx_compiler_flag(${CHECK_FLAG}
+                            "check_cxx_compiler_flag_${CHECK_FLAG}")
+    if(check_cxx_compiler_flag_${CHECK_FLAG})
+      list(APPEND ${OUTPUT_VAR} ${CHECK_FLAG})
+    endif()
+  endforeach()
+endmacro()
+
+if(NOT PATCH_PROTOBUF_SOURCES_OPTIONS_SET)
+  if(MSVC)
+    unset(PATCH_PROTOBUF_SOURCES_OPTIONS CACHE)
+    set(PATCH_PROTOBUF_SOURCES_OPTIONS /wd4244 /wd4251 /wd4267 /wd4309)
+
+    if(MSVC_VERSION GREATER_EQUAL 1922)
+      # see
+      # https://docs.microsoft.com/en-us/cpp/overview/cpp-conformance-improvements?view=vs-2019#improvements_162
+      # for detail
+      list(APPEND PATCH_PROTOBUF_SOURCES_OPTIONS /wd5054)
+    endif()
+
+    if(MSVC_VERSION GREATER_EQUAL 1925)
+      list(APPEND PATCH_PROTOBUF_SOURCES_OPTIONS /wd4996)
+    endif()
+
+    if(MSVC_VERSION LESS 1910)
+      list(APPEND PATCH_PROTOBUF_SOURCES_OPTIONS /wd4800)
+    endif()
+  else()
+    unset(PATCH_PROTOBUF_SOURCES_OPTIONS CACHE)
+    include(CheckCXXCompilerFlag)
+    check_append_cxx_compiler_flag(
+      PATCH_PROTOBUF_SOURCES_OPTIONS -Wno-type-limits
+      -Wno-deprecated-declarations -Wno-unused-parameter)
+  endif()
+  set(PATCH_PROTOBUF_SOURCES_OPTIONS_SET TRUE)
+  if(PATCH_PROTOBUF_SOURCES_OPTIONS)
+    set(PATCH_PROTOBUF_SOURCES_OPTIONS
+        ${PATCH_PROTOBUF_SOURCES_OPTIONS}
+        CACHE INTERNAL
+              "Options to disable warning of generated protobuf sources" FORCE)
+  endif()
+endif()
+
+function(patch_protobuf_sources)
+  if(PATCH_PROTOBUF_SOURCES_OPTIONS)
+    foreach(PROTO_SRC ${ARGN})
+      unset(PROTO_SRC_OPTIONS)
+      get_source_file_property(PROTO_SRC_OPTIONS ${PROTO_SRC} COMPILE_OPTIONS)
+      if(PROTO_SRC_OPTIONS)
+        list(APPEND PROTO_SRC_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS})
+      else()
+        set(PROTO_SRC_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS})
+      endif()
+
+      set_source_files_properties(
+        ${PROTO_SRC} PROPERTIES COMPILE_OPTIONS "${PROTO_SRC_OPTIONS}")
+    endforeach()
+    unset(PROTO_SRC)
+    unset(PROTO_SRC_OPTIONS)
+  endif()
+endfunction()
+
+function(patch_protobuf_targets)
+  if(PATCH_PROTOBUF_SOURCES_OPTIONS)
+    foreach(PROTO_TARGET ${ARGN})
+      unset(PROTO_TARGET_OPTIONS)
+      get_target_property(PROTO_TARGET_OPTIONS ${PROTO_TARGET} COMPILE_OPTIONS)
+      if(PROTO_TARGET_OPTIONS)
+        list(APPEND PROTO_TARGET_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS})
+      else()
+        set(PROTO_TARGET_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS})
+      endif()
+
+      set_target_properties(
+        ${PROTO_TARGET} PROPERTIES COMPILE_OPTIONS "${PROTO_TARGET_OPTIONS}")
+    endforeach()
+    unset(PROTO_TARGET)
+    unset(PROTO_TARGET_OPTIONS)
+  endif()
+endfunction()

examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(WITH_OTLP)
+if(WITH_OTLP_GRPC OR WITH_OTLP_HTTP)
   add_subdirectory(otlp)
   add_subdirectory(grpc)
 endif()

examples/grpc/CMakeLists.txt

@@ -16,12 +16,13 @@ add_custom_command(
     ${PROTOBUF_PROTOC_EXECUTABLE} ARGS "--grpc_out=${CMAKE_CURRENT_BINARY_DIR}"
     "--cpp_out=${CMAKE_CURRENT_BINARY_DIR}" "--proto_path=${proto_file_path}"
     --plugin=protoc-gen-grpc="${gRPC_CPP_PLUGIN_EXECUTABLE}" "${proto_file}")
-# DEPENDS "${proto_file}")
 
-# hw_grpc_proto
 add_library(example_grpc_proto ${example_grpc_srcs} ${example_grpc_hdrs}
                                ${example_proto_srcs} ${example_proto_hdrs})
 
+include(${PROJECT_SOURCE_DIR}/cmake/proto-options-patch.cmake)
+patch_protobuf_targets(example_grpc_proto)
+
 include_directories(
   ${CMAKE_SOURCE_DIR}/exporters/ostream/include ${CMAKE_SOURCE_DIR}/ext/include
   ${CMAKE_SOURCE_DIR}/api/include/ ${CMAKE_SOURCE_DIR/})
@@ -45,4 +46,5 @@ foreach(_target client server)
     gRPC::grpc++_reflection
     opentelemetry_trace
     opentelemetry_exporter_ostream_span)
+  patch_protobuf_targets(${_target})
 endforeach()

examples/otlp/BUILD

@@ -12,14 +12,27 @@ cc_library(
 )
 
 cc_binary(
-    name = "example_otlp",
+    name = "example_otlp_grpc",
     srcs = [
-        "main.cc",
+        "grpc_main.cc",
     ],
     deps = [
         ":foo_library",
         "//api",
-        "//exporters/otlp:otlp_exporter",
+        "//exporters/otlp:otlp_grpc_exporter",
+        "//sdk/src/trace",
+    ],
+)
+
+cc_binary(
+    name = "example_otlp_http",
+    srcs = [
+        "http_main.cc",
+    ],
+    deps = [
+        ":foo_library",
+        "//api",
+        "//exporters/otlp:otlp_http_exporter",
         "//sdk/src/trace",
     ],
 )

examples/otlp/CMakeLists.txt

@@ -6,12 +6,21 @@ add_library(otlp_foo_library foo_library/foo_library.cc)
 target_link_libraries(otlp_foo_library ${CMAKE_THREAD_LIBS_INIT}
                       ${CORE_RUNTIME_LIBS} opentelemetry_api)
 
-add_executable(example_otlp main.cc)
-target_link_libraries(
-  example_otlp
-  ${CMAKE_THREAD_LIBS_INIT}
-  otlp_foo_library
-  opentelemetry_trace
-  ${CORE_RUNTIME_LIBS}
-  opentelemetry_exporter_otprotocol
-  gRPC::grpc++)
+if(WITH_OTLP_GRPC)
+  add_executable(example_otlp_grpc grpc_main.cc)
+  target_link_libraries(
+    example_otlp_grpc
+    ${CMAKE_THREAD_LIBS_INIT}
+    otlp_foo_library
+    opentelemetry_trace
+    ${CORE_RUNTIME_LIBS}
+    opentelemetry_exporter_otlp_grpc
+    gRPC::grpc++)
+endif()
+
+if(WITH_OTLP_HTTP)
+  add_executable(example_otlp_http http_main.cc)
+  target_link_libraries(
+    example_otlp_http ${CMAKE_THREAD_LIBS_INIT} otlp_foo_library
+    opentelemetry_trace ${CORE_RUNTIME_LIBS} opentelemetry_exporter_otlp_http)
+endif()

examples/otlp/README.md

@@ -4,15 +4,16 @@ This is an example of how to use the [OpenTelemetry
 Protocol](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/README.md)
 (OTLP) exporter.
 
-The application in `main.cc` initializes an `OtlpExporter` instance and uses it
-to register a tracer provider from the [OpenTelemetry
+The application in `grpc_main.cc` initializes an `OtlpGrpcExporter` instance and
+the application in `http_main.cc` initializes an `OtlpHttpExporter` instance
+and they register a tracer provider from the [OpenTelemetry
 SDK](https://github.com/open-telemetry/opentelemetry-cpp). The application then
 calls a `foo_library` which has been instrumented using the [OpenTelemetry
 API](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/api).
 
 To enable TLS authentication for OTLP grpc exporter, SslCredentials can be used
 by specifying the path to client certificate pem file, or the string containing
-this certificate via OtlpExporterOptions. The path to such a .pem file can be
+this certificate via OtlpGrpcExporterOptions. The path to such a .pem file can be
 provided as a command-line argument alongwith the collector endpoint to the main
 binary invocation above.
 
@@ -31,18 +32,19 @@ OpenTelemetry Collector with an OTLP receiver by running:
 - On Unix based systems use:
 
 ```console
-docker run --rm -it -p 4317:4317 -v $(pwd)/examples/otlp:/cfg otel/opentelemetry-collector:0.19.0 --config=/cfg/opentelemetry-collector-config/config.dev.yaml
+docker run --rm -it -p 4317:4317 -p 55681:55681 -v $(pwd)/examples/otlp:/cfg otel/opentelemetry-collector:0.19.0 --config=/cfg/opentelemetry-collector-config/config.dev.yaml
 ```
 
 - On Windows use:
 
 ```console
-docker run --rm -it -p 4317:4317 -v "%cd%/examples/otlp":/cfg otel/opentelemetry-collector:0.19.0 --config=/cfg/opentelemetry-collector-config/config.dev.yaml
+docker run --rm -it -p 4317:4317 -p 55681:55681 -v "%cd%/examples/otlp":/cfg otel/opentelemetry-collector:0.19.0 --config=/cfg/opentelemetry-collector-config/config.dev.yaml
 ```
 
 Note that the OTLP exporter connects to the Collector at `localhost:4317` by
 default. This can be changed with first argument from command-line, for example:
-`./example_otlp gateway.docker.internal:4317`.
+`./example_otlp_grpc gateway.docker.internal:4317` and
+`./example_otlp_http gateway.docker.internal:55681/v1/traces`.
 
 Once you have the Collector running, see
 [CONTRIBUTING.md](../../CONTRIBUTING.md) for instructions on building and