Skip to content

Commit

Permalink
Merge pull request #56 from 3scale/use_dynamic_opentracing_load
Browse files Browse the repository at this point in the history
Enable opentracing dynamic tracer load.
  • Loading branch information
jmprusi authored Apr 23, 2018
2 parents 5eff92e + 1149cdd commit 79ffe21
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions scripts/build-opentracing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

yum install -y centos-release-scl epel-release

yum install -y thrift GeoIP libxml2 libxslt gd
yum install -y thrift GeoIP libxml2 libxslt gd yaml-cpp

yum install -y \
openresty-openssl-devel \
openresty-pcre-devel \
git devtoolset-7 cmake3 thrift-devel GeoIP-devel \
systemtap-sdt-devel libxml2-devel libxslt-devel\
gd-devel
gd-devel yaml-cpp-devel

# Source the devtoolset-7, building tools (gcc...)
# Sourced before the fail modes due to an unbound variable in the script
Expand Down Expand Up @@ -45,7 +45,7 @@ make install
cd "${TEMP}/jaeger-cpp"
mkdir .build
cd .build
cmake3 -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DJAEGERTRACING_WITH_YAML_CPP=OFF -DBUILD_TESTING=OFF ..
cmake3 -DCMAKE_BUILD_TYPE=Release ..
make -j"$(nproc)"
make install

Expand Down Expand Up @@ -85,8 +85,7 @@ cd "${TEMP}/openresty-${OPENRESTY_RPM_VERSION}"
--with-stream \
--with-stream_ssl_module \
--with-threads \
--add-dynamic-module="${TEMP}/nginx-opentracing/opentracing" \
--add-dynamic-module="${TEMP}/nginx-opentracing/jaeger"
--add-dynamic-module="${TEMP}/nginx-opentracing/opentracing"

make -j"$(nproc)"

Expand All @@ -95,7 +94,6 @@ cd "${TEMP}/openresty-${OPENRESTY_RPM_VERSION}/build/nginx-1.13.6/" && make modu
# Move modules to another dir.
mkdir ~/nginx-modules/
cp objs/ngx_http_opentracing_module.so ~/nginx-modules/
cp objs/ngx_http_jaeger_module.so ~/nginx-modules/

# Move libraries
mkdir ${LIBDIR}
Expand Down

0 comments on commit 79ffe21

Please sign in to comment.