Skip to content

Commit 0829bba

Browse files
kpratyuskpratyus
authored
Opentelemetry version update for otel-webserver-module (#115)
* Changing the header files call * Dockerfile update * Update README.md * Create CHANGELOG.md * Update CHANGELOG.md
1 parent b48d169 commit 0829bba

File tree

9 files changed

+36
-28
lines changed

9 files changed

+36
-28
lines changed

‎instrumentation/otel-webserver-module/CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## [1.0.0] 2022-03-10
2+
3+
[Dependencies] Update Opentelemetry C++ SDK version to 1.2.0 from previous version 1.0.0-rc1 ([#115](https://github.com/open-telemetry/opentelemetry-cpp-contrib/pull/115/))

‎instrumentation/otel-webserver-module/Dockerfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -172,23 +172,23 @@ RUN mkdir -p dependencies/apache-log4cxx/0.11.0 \
172172
&& cd .. && rm -rf apache-log4cxx-0.11.0.tar.gz && rm -rf apache-log4cxx-0.11.0
173173

174174
# install opentelemetry
175-
RUN mkdir -p dependencies/opentelemetry/1.0.0-rc1/lib \
176-
&& mkdir -p dependencies/opentelemetry/1.0.0-rc1/include \
175+
RUN mkdir -p dependencies/opentelemetry/1.2.0/lib \
176+
&& mkdir -p dependencies/opentelemetry/1.2.0/include \
177177
&& git clone https://github.com/open-telemetry/opentelemetry-cpp \
178178
&& cd opentelemetry-cpp/ \
179-
&& git checkout tags/v1.0.0-rc1 -b v1.0.0-rc1 \
179+
&& git checkout tags/v1.2.0 -b v1.2.0 \
180180
&& git submodule update --init --recursive \
181181
&& mkdir build \
182182
&& cd build \
183-
&& cmake .. -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON -DWITH_OTLP=ON -DCMAKE_INSTALL_PREFIX=/dependencies/opentelemetry/1.0.0-rc1 \
183+
&& cmake .. -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON -DWITH_OTLP=ON -DCMAKE_INSTALL_PREFIX=/dependencies/opentelemetry/1.2.0 \
184184
&& cmake --build . --target all \
185185
&& cd .. \
186-
&& find . -name "*.so" -type f -exec cp {} /dependencies/opentelemetry/1.0.0-rc1/lib/ \; \
187-
&& cp build/libopentelemetry_proto.a /dependencies/opentelemetry/1.0.0-rc1/lib \
188-
&& cp -r api/include/ /dependencies/opentelemetry/1.0.0-rc1/ \
189-
&& for dir in exporters/*; do if [ -d "$dir" ]; then cp -rf "$dir/include" /dependencies/opentelemetry/1.0.0-rc1/; fi; done \
190-
&& cp -r sdk/include/ /dependencies/opentelemetry/1.0.0-rc1/ \
191-
&& cp -r build/generated/third_party/opentelemetry-proto/opentelemetry/proto/ /dependencies/opentelemetry/1.0.0-rc1/include/opentelemetry/ \
186+
&& find . -name "*.so" -type f -exec cp {} /dependencies/opentelemetry/1.2.0/lib/ \; \
187+
&& cp build/libopentelemetry_proto.a /dependencies/opentelemetry/1.2.0/lib \
188+
&& cp -r api/include/ /dependencies/opentelemetry/1.2.0/ \
189+
&& for dir in exporters/*; do if [ -d "$dir" ]; then cp -rf "$dir/include" /dependencies/opentelemetry/1.2.0/; fi; done \
190+
&& cp -r sdk/include/ /dependencies/opentelemetry/1.2.0/ \
191+
&& cp -r build/generated/third_party/opentelemetry-proto/opentelemetry/proto/ /dependencies/opentelemetry/1.2.0/include/opentelemetry/ \
192192
&& cd .. && rm -rf opentelemetry-cpp
193193

194194
# install googletest

‎instrumentation/otel-webserver-module/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Monitoring individual modules is crucial to the instrumentation of Apache web se
2828
| Apr-util | 1.6.1 |
2929
| Expat | 2.3.0 |
3030
| Boost | 1.75.0 |
31-
| Opentelemetry - C++ SDK | 1.0.0-rc1 |
31+
| Opentelemetry - C++ SDK | 1.2.0 |
3232
| Googletest | 1.10.0 |
3333

3434
*There are some libraries which are just used to generate Apache Header files

‎instrumentation/otel-webserver-module/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,12 @@ task stageLibrary(type: Copy) {
169169

170170
from("src/sdk_lib/src/api/include/appdynamics.h") { it.into "sdk_lib" }
171171
from(buildLibrary) { it.into "sdk_lib/lib" }
172-
from("${modDepDir}/opentelemetry/1.0.0-rc1/lib/libopentelemetry_common.so") { it.into "sdk_lib/lib" }
173-
from("${modDepDir}/opentelemetry/1.0.0-rc1/lib/libopentelemetry_resources.so") { it.into "sdk_lib/lib" }
174-
from("${modDepDir}/opentelemetry/1.0.0-rc1/lib/libopentelemetry_trace.so") { it.into "sdk_lib/lib" }
175-
from("${modDepDir}/opentelemetry/1.0.0-rc1/lib/libopentelemetry_exporter_ostream_span.so") { it.into "sdk_lib/lib" }
176-
from("${modDepDir}/opentelemetry/1.0.0-rc1/lib/libopentelemetry_exporter_otprotocol.so") { it.into "sdk_lib/lib" }
172+
from("${modDepDir}/opentelemetry/1.2.0/lib/libopentelemetry_common.so") { it.into "sdk_lib/lib" }
173+
from("${modDepDir}/opentelemetry/1.2.0/lib/libopentelemetry_resources.so") { it.into "sdk_lib/lib" }
174+
from("${modDepDir}/opentelemetry/1.2.0/lib/libopentelemetry_trace.so") { it.into "sdk_lib/lib" }
175+
from("${modDepDir}/opentelemetry/1.2.0/lib/libopentelemetry_otlp_recordable.so") { it.into "sdk_lib/lib" }
176+
from("${modDepDir}/opentelemetry/1.2.0/lib/libopentelemetry_exporter_ostream_span.so") { it.into "sdk_lib/lib" }
177+
from("${modDepDir}/opentelemetry/1.2.0/lib/libopentelemetry_exporter_otlp_grpc.so") { it.into "sdk_lib/lib" }
177178
from("dist/appdynamics_sdk_log4cxx.xml.template") { it.into "conf" }
178179
from("dist/install.${scriptExt}") { it.fileMode 0700 }
179180

‎instrumentation/otel-webserver-module/opentelemetry_module.conf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
LoadFile /opt/opentelemetry-webserver-sdk/sdk_lib/lib/libopentelemetry_common.so
22
LoadFile /opt/opentelemetry-webserver-sdk/sdk_lib/lib/libopentelemetry_resources.so
33
LoadFile /opt/opentelemetry-webserver-sdk/sdk_lib/lib/libopentelemetry_trace.so
4+
LoadFile /opt/opentelemetry-webserver-sdk/sdk_lib/lib/libopentelemetry_otlp_recordable.so
45
LoadFile /opt/opentelemetry-webserver-sdk/sdk_lib/lib/libopentelemetry_exporter_ostream_span.so
5-
LoadFile /opt/opentelemetry-webserver-sdk/sdk_lib/lib/libopentelemetry_exporter_otprotocol.so
6+
LoadFile /opt/opentelemetry-webserver-sdk/sdk_lib/lib/libopentelemetry_exporter_otlp_grpc.so
67

78
#Load the ApacheModule SDK
89
LoadFile /opt/opentelemetry-webserver-sdk/sdk_lib/lib/libopentelemetry_webserver_sdk.so

‎instrumentation/otel-webserver-module/src/build.gyp‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,12 @@
5151
'$(ANSDK_DIR)/apache-log4cxx/0.11.0/lib/liblog4cxx.a',
5252
'$(ANSDK_DIR)/boost/1.75.0/lib/libboost_filesystem.a',
5353
'$(ANSDK_DIR)/boost/1.75.0/lib/libboost_system.a',
54-
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/lib/libopentelemetry_common.so',
55-
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/lib/libopentelemetry_resources.so',
56-
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/lib/libopentelemetry_trace.so',
57-
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/lib/libopentelemetry_exporter_ostream_span.so',
58-
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/lib/libopentelemetry_exporter_otprotocol.so'
54+
'$(ANSDK_DIR)/opentelemetry/1.2.0/lib/libopentelemetry_common.so',
55+
'$(ANSDK_DIR)/opentelemetry/1.2.0/lib/libopentelemetry_resources.so',
56+
'$(ANSDK_DIR)/opentelemetry/1.2.0/lib/libopentelemetry_trace.so',
57+
'$(ANSDK_DIR)/opentelemetry/1.2.0/lib/libopentelemetry_otlp_recordable.so',
58+
'$(ANSDK_DIR)/opentelemetry/1.2.0/lib/libopentelemetry_exporter_ostream_span.so',
59+
'$(ANSDK_DIR)/opentelemetry/1.2.0/lib/libopentelemetry_exporter_otlp_grpc.so'
5960
],
6061

6162
'include_dirs': [
@@ -64,7 +65,7 @@
6465
'$(ANSDK_DIR)/boost/1.75.0/include',
6566
'../include/util',
6667
'../include/core',
67-
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/include/',
68+
'$(ANSDK_DIR)/opentelemetry/1.2.0/include/',
6869
],
6970

7071
'ldflags': [

‎instrumentation/otel-webserver-module/src/core/sdkwrapper/SdkHelperFactory.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "opentelemetry/sdk/trace/samplers/parent.h"
2626
#include "opentelemetry/sdk/trace/samplers/trace_id_ratio.h"
2727
#include "opentelemetry/sdk/resource/resource.h"
28-
#include "opentelemetry/exporters/otlp/otlp_exporter.h"
28+
#include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
2929
#include "opentelemetry/baggage/propagation/baggage_propagator.h"
3030
#include <module_version.h>
3131
#include <fstream>
@@ -124,15 +124,15 @@ OtelSpanExporter SdkHelperFactory::GetExporter(
124124
LOG4CXX_WARN(mLogger, "Received unknown exporter type: " << type << ". Will create default(otlp) exporter");
125125
type = OTLP_EXPORTER_TYPE;
126126
}
127-
opentelemetry::exporter::otlp::OtlpExporterOptions opts;
127+
opentelemetry::exporter::otlp::OtlpGrpcExporterOptions opts;
128128
opts.endpoint = config->getOtelExporterEndpoint();
129129
if (config->getOtelSslEnabled()) {
130130
opts.use_ssl_credentials = config->getOtelSslEnabled();
131131
opts.ssl_credentials_cacert_path = config->getOtelSslCertPath();
132132
LOG4CXX_TRACE(mLogger, "Ssl Credentials are enabled for exporter, path: "
133133
<< opts.ssl_credentials_cacert_path);
134134
}
135-
exporter.reset(new opentelemetry::exporter::otlp::OtlpExporter(opts));
135+
exporter.reset(new opentelemetry::exporter::otlp::OtlpGrpcExporter(opts));
136136
}
137137

138138
LOG4CXX_INFO(mLogger, "Exporter created with ExporterType: "

‎instrumentation/otel-webserver-module/test/ApacheTesting.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ echo '
1616
LoadFile /opt/appdynamics-sdk-native/sdk_lib/lib/libopentelemetry_common.so
1717
LoadFile /opt/appdynamics-sdk-native/sdk_lib/lib/libopentelemetry_resources.so
1818
LoadFile /opt/appdynamics-sdk-native/sdk_lib/lib/libopentelemetry_trace.so
19+
LoadFile /opt/appdynamics-sdk-native/sdk_lib/lib/libopentelemetry_otlp_recordable.so
1920
LoadFile /opt/appdynamics-sdk-native/sdk_lib/lib/libopentelemetry_exporter_ostream_span.so
20-
LoadFile /opt/appdynamics-sdk-native/sdk_lib/lib/libopentelemetry_exporter_otprotocol.so
21+
LoadFile /opt/appdynamics-sdk-native/sdk_lib/lib/libopentelemetry_exporter_otlp_grpc.so
2122
2223
#Load the AppDynamics SDK
2324
LoadFile /opt/appdynamics-sdk-native/sdk_lib/lib/libappdynamics_native_sdk.so

‎instrumentation/otel-webserver-module/test/unit/unit_test.gyp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@
5151
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/lib/libopentelemetry_common.so',
5252
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/lib/libopentelemetry_resources.so',
5353
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/lib/libopentelemetry_trace.so',
54+
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/lib/libopentelemetry_otlp_recordable.so',
5455
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/lib/libopentelemetry_exporter_ostream_span.so',
55-
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/lib/libopentelemetry_exporter_otprotocol.so',
56+
'$(ANSDK_DIR)/opentelemetry/1.0.0-rc1/lib/libopentelemetry_exporter_otlp_grpc.so',
5657
],
5758

5859
'ldflags': [

0 commit comments

Comments
 (0)