This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.2.x by this push:
new 0b8f060ed Handle opentelemetry-cpp v1.3.0 upgrade for otel_tracer
plugin (#8834)
0b8f060ed is described below
commit 0b8f060ed20cd0c1ca1e8fece4f4c4adb7d2b347
Author: Kit Chan <[email protected]>
AuthorDate: Mon May 9 13:33:01 2022 -0700
Handle opentelemetry-cpp v1.3.0 upgrade for otel_tracer plugin (#8834)
(cherry picked from commit 2f29b32616c74f27914e3b6d2c3a65deb2c4eb49)
---
configure.ac | 2 +-
doc/admin-guide/plugins/otel_tracer.en.rst | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 850b5c547..434930c13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1783,7 +1783,7 @@ AC_CHECK_HEADERS([opentelemetry/trace/provider.h], [
AC_CHECK_LIB([curl], [curl_version], [
AC_CHECK_LIB([protobuf], [main], [
AC_CHECK_LIB([opentelemetry_exporter_otlp_http], [main], [
- AC_SUBST([OTEL_LIBS], [" -lopentelemetry_exporter_otlp_http
-lopentelemetry_exporter_otlp_http_client -lopentelemetry_otlp_recordable
-lopentelemetry_proto -lopentelemetry_trace -lopentelemetry_resources
-lopentelemetry_version -lopentelemetry_common -lhttp_client_curl -lcurl
-lprotobuf "])
+ AC_SUBST([OTEL_LIBS], [" -lopentelemetry_exporter_otlp_http
-lopentelemetry_exporter_otlp_http_client -lopentelemetry_otlp_recordable
-lopentelemetry_proto -lopentelemetry_trace -lopentelemetry_resources
-lopentelemetry_version -lopentelemetry_common -lopentelemetry_http_client_curl
-lcurl -lprotobuf "])
AC_SUBST(has_otel, 1)
], [
AC_SUBST([OTEL_LIBS], [""])
diff --git a/doc/admin-guide/plugins/otel_tracer.en.rst
b/doc/admin-guide/plugins/otel_tracer.en.rst
index 9e05901cf..6c127775b 100644
--- a/doc/admin-guide/plugins/otel_tracer.en.rst
+++ b/doc/admin-guide/plugins/otel_tracer.en.rst
@@ -82,9 +82,9 @@ opentelemetry-cpp
::
cd
- wget
https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.2.0.tar.gz
- tar zxvf v1.2.0.tar.gz
- cd opentelemetry-cpp-1.2.0
+ wget
https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.3.0.tar.gz
+ tar zxvf v1.3.0.tar.gz
+ cd opentelemetry-cpp-1.3.0
mkdir build
cd build
cmake .. -DBUILD_TESTING=OFF -DWITH_EXAMPLES=OFF -DWITH_JAEGER=OFF
-DWITH_OTLP=ON -DWITH_OTLP_GRPC=OFF -DWITH_OTLP_HTTP=ON
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_STANDARD=17
-DCMAKE_CXX_STANDARD_REQUIRED=ON
