Upgrade build and tracing code for Proton 0.39.0 (#99)

* Install tracing dependencies for GHA job

* Update from jaeger to otlp trace exporter

Author: jiridanek

Dockerfile

@@ -10,20 +10,34 @@ ARG IMAGE_BASE=registry.access.redhat.com/ubi${UBI_VERSION}/ubi-minimal:${UBI_RU
 #DEV FROM $IMAGE_BUILD
 FROM quay.io/centos/centos:stream9 as build
 
+ENV PROTON_VERSION=0.39.0
+
 RUN curl -OL https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
 RUN rpm -ivh epel-release-latest-9.noarch.rpm
 RUN dnf install -y 'dnf-command(config-manager)'
 RUN /usr/bin/crb enable
 
 RUN curl -L https://copr.fedorainfracloud.org/coprs/kpvdr/opentelemetry-cpp-rhel/repo/epel-9/kpvdr-opentelemetry-cpp-rhel-epel-9.repo > /etc/yum.repos.d/kpvdr-opentelemetry-cpp-rhel-epel-9.repo
 RUN curl -L https://copr.fedorainfracloud.org/coprs/kpvdr/protobuf/repo/epel-9/kpvdr-protobuf-epel-9.repo > /etc/yum.repos.d/kpvdr-protobuf-epel-9.repo
+RUN curl -L https://copr.fedorainfracloud.org/coprs/kpvdr/json/repo/epel-9/kpvdr-json-epel-9.repo > /etc/yum.repos.d/kpvdr-json-epel-9.repo
+
+#CMake Error at /usr/lib64/cmake/protobuf/protobuf-targets.cmake:106 (message):
+#  The imported target "protobuf::libprotobuf-lite" references the file
+#
+#     "/usr/lib64/libprotobuf-lite.so.3.19.6.0"
 
 RUN dnf -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install \
     ccache findutils git patchelf \
     \
     cmake ninja-build \
     gcc gcc-c++ \
     \
+    protobuf-lite-devel \
+    \
+    opentelemetry-cpp-devel \
+    opentelemetry-cpp-exporter-otlp-devel \
+    opentelemetry-cpp-zpages-devel \
+    \
     cyrus-sasl-devel \
     openssl-devel \
     python-devel
@@ -36,10 +50,8 @@ WORKDIR /src
 ENV CCACHE_COMPRESS=true
 ENV CCACHE_MAXSIZE=400MB
 
-# WORKAROUND: Use Proton 0.37.0 (without tracing) to get something compiling quickly
-RUN git clone --branch=0.37.0 --depth=1 https://github.com/apache/qpid-proton.git
+RUN git clone --branch=${PROTON_VERSION} --depth=1 https://github.com/apache/qpid-proton.git
 RUN CCACHE_DIR=/ccache/$(arch) cmake -S qpid-proton -B cmake-build-qpid-proton -GNinja \
-    -DENABLE_WARNING_ERROR=OFF \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
     -DCMAKE_INSTALL_PREFIX=cmake-install \
@@ -71,9 +83,13 @@ RUN rpm -ivh epel-release-latest-9.noarch.rpm
 RUN dnf install -y 'dnf-command(config-manager)'
 RUN /usr/bin/crb enable
 
-RUN curl -L https://copr.fedorainfracloud.org/coprs/kpvdr/opentelemetry-cpp/repo/epel-9/kpvdr-opentelemetry-cpp-epel-9.repo > /etc/yum.repos.d/kpvdr-opentelemetry-cpp-epel-9.repo
+RUN curl -L https://copr.fedorainfracloud.org/coprs/kpvdr/opentelemetry-cpp-rhel/repo/epel-9/kpvdr-opentelemetry-cpp-rhel-epel-9.repo > /etc/yum.repos.d/kpvdr-opentelemetry-cpp-rhel-epel-9.repo
+RUN curl -L https://copr.fedorainfracloud.org/coprs/kpvdr/protobuf/repo/epel-9/kpvdr-protobuf-epel-9.repo > /etc/yum.repos.d/kpvdr-protobuf-epel-9.repo
+RUN curl -L https://copr.fedorainfracloud.org/coprs/kpvdr/json/repo/epel-9/kpvdr-json-epel-9.repo > /etc/yum.repos.d/kpvdr-json-epel-9.repo
 
 RUN dnf -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install \
+    protobuf-lite \
+    opentelemetry-cpp opentelemetry-cpp-exporter-otlp opentelemetry-cpp-zpages \
     cyrus-sasl cyrus-sasl-gssapi cyrus-sasl-lib cyrus-sasl-plain \
     openssl
 

Dockerfile.ubi8_upstream

@@ -1,7 +1,11 @@
+# podman build -f Dockerfile.ubi8_upstream -t quay.io/jdanek/cli-cpp_ubi8_upstream .
+
 FROM docker.io/almalinux/8-base
 
 RUN dnf install -y 'dnf-command(copr)' \
-&& dnf copr enable -y kpvdr/opentelemetry-cpp \
+&& dnf copr enable -y kpvdr/json \
+&& dnf copr enable -y kpvdr/protobuf \
+&& dnf copr enable -y kpvdr/opentelemetry-cpp-rhel \
 && yum install -y dnf \
 && dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \
 && dnf install -y \
@@ -16,6 +20,8 @@ RUN dnf install -y 'dnf-command(copr)' \
     boost-devel \
     \
     opentelemetry-cpp-devel \
+    opentelemetry-cpp-exporter-otlp-devel \
+    opentelemetry-cpp-zpages-devel \
     \
     cyrus-sasl-devel \
     openssl-devel \

src/api/qpid-proton/CMakeLists.txt

@@ -81,14 +81,17 @@ target_link_libraries(
 
 if (OPENTELEMETRY_ENABLED)
     set(CMAKE_BUILD_TYPE "")
-    find_package(opentelemetry-cpp)
+    # This is a workaround because the otlp exporter requires protobuf but most packaged versions
+    # of protobuf don't ship cmake config yet. We use this exporter in our examples
+    find_package(Protobuf REQUIRED)
+    find_package(opentelemetry-cpp REQUIRED)
     include_directories(${OPENTELEMETRY_CPP_INCLUDE_DIRS})
 
     target_link_libraries(dtests-proton-reactor
             opentelemetry-cpp::trace
-            opentelemetry-cpp::jaeger_trace_exporter
-            opentelemetry-cpp::ostream_span_exporter)
-endif (UNIX)
+            opentelemetry-cpp::otlp_http_exporter
+    )
+endif ()
 
 set(proton-reactor-clients
     aac3_connector

src/api/qpid-proton/common/ModernClient_tracing_opentracing.cpp

@@ -6,7 +6,7 @@
 #include <opentelemetry/sdk/trace/tracer_provider.h>
 #include <opentelemetry/trace/provider.h>
 #include <opentelemetry/nostd/unique_ptr.h>
-#include <opentelemetry/exporters/jaeger/jaeger_exporter.h>
+#include <opentelemetry/exporters/otlp/otlp_http_exporter.h>
 #include <opentelemetry/exporters/ostream/span_exporter.h>
 #include <opentelemetry/sdk/resource/resource.h>
 
@@ -17,11 +17,11 @@
 void dtests::proton::common::ModernClient::enableTracing(std::string service_name) const
 {
 
-    opentelemetry::exporter::jaeger::JaegerExporterOptions opts;
+    opentelemetry::exporter::otlp::OtlpHttpExporterOptions opts;
 
     // Initialize Jaeger Exporter
     std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> exporter = std::unique_ptr<opentelemetry::sdk::trace::SpanExporter>(
-            new opentelemetry::exporter::jaeger::JaegerExporter(opts));
+            new opentelemetry::exporter::otlp::OtlpHttpExporter(opts));
 
     // Set service-name
     auto resource_attributes = opentelemetry::sdk::resource::ResourceAttributes

vcpkg.json

@@ -0,0 +1,10 @@
+{
+  "name" : "cli-cpp",
+  "version-string" : "1.0.0",
+  "builtin-baseline" : "223b8d5695bd0615e1eeba393c64770f6faf20e7",
+  "dependencies" : [ {
+    "name" : "opentelemetry-cpp",
+    "version>=" : "1.9.1",
+    "features": ["otlp-http"]
+  } ]
+}