Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade lightstep to 0.16 #117

Merged
merged 3 commits into from
Oct 4, 2016
Merged

Upgrade lightstep to 0.16 #117

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a14471
Upgrade lightstep to 0.16.
RomanDzhabarov Oct 4, 2016
2c7e070
change version to 16.
RomanDzhabarov Oct 4, 2016
fa86228
Removing unused lightstep settings.
RomanDzhabarov Oct 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ci/build_container/build_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ tar xf tclap-1.2.1.tar.gz
rm tclap-1.2.1.tar.gz

# lightstep
wget https://github.com/lightstep/lightstep-tracer-cpp/releases/download/v0_14/lightstep-tracer-cpp-0.14.tar.gz
tar xf lightstep-tracer-cpp-0.14.tar.gz
cd lightstep-tracer-cpp-0.14
wget https://github.com/lightstep/lightstep-tracer-cpp/releases/download/v0_16/lightstep-tracer-cpp-0.16.tar.gz
tar xf lightstep-tracer-cpp-0.16.tar.gz
cd lightstep-tracer-cpp-0.16
./configure --disable-grpc --prefix=$THIRDPARTY_BUILD --enable-shared=no \
protobuf_CFLAGS="-I$THIRDPARTY_BUILD/include" protobuf_LIBS="-L$THIRDPARTY_BUILD/lib -lprotobuf"
make install
rm -rf lightstep-tracer-cpp-0.14
rm -rf lightstep-tracer-cpp-0.16
cd ..

# googletest
Expand Down
2 changes: 1 addition & 1 deletion thirdparty.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ set(ENVOY_PROTOBUF_INCLUDE_DIR "" CACHE FILEPATH "location of protobuf includes"
set(ENVOY_PROTOBUF_PROTOC "" CACHE FILEPATH "location of protoc")

# http://lightstep.com/
# Last tested with lightstep-tracer-cpp-0.14
# Last tested with lightstep-tracer-cpp-0.16
set(ENVOY_LIGHTSTEP_TRACER_INCLUDE_DIR "" CACHE FILEPATH "location of lighstep tracer includes")

# Extra linker flags required to properly link envoy with all of the above libraries.
Expand Down