Skip to content

Commit

Permalink
Handle opentelemetry-cpp v1.3.0 upgrade for otel_tracer plugin (#8834)
Browse files Browse the repository at this point in the history
(cherry picked from commit 2f29b32)
  • Loading branch information
shukitchan authored and zwoop committed May 16, 2022
1 parent 041e55f commit 0b8f060
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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], [""])
Expand Down
6 changes: 3 additions & 3 deletions doc/admin-guide/plugins/otel_tracer.en.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0b8f060

Please sign in to comment.