Re: [PATCH] CI: enable OpenTracing feature

[Miroslav Zagorac]

On 05/18/2021 06:49 PM, Илья Шипицин wrote:

Miroslav,


can you please keep an eye on patch from OpenTracing build failures using
clang · Issue #1242 · haproxy/haproxy (github.com)
  ?



Hello Илья,

I thought that patch was already applied..  Ok, I'll send it to the 
mailing list today.  Thank you for the notice.


Best regards,

--
Zaga

What can change the nature of a man?

Re: [PATCH] CI: enable OpenTracing feature

[Илья Шипицин]

Miroslav,


can you please keep an eye on patch from OpenTracing build failures using
clang · Issue #1242 · haproxy/haproxy (github.com)
 ?

вт, 18 мая 2021 г. в 21:38, Willy Tarreau :

> On Tue, May 18, 2021 at 01:32:56PM +0200, Tim Düsterhus wrote:
> > Willy,
> >
> > On 5/18/21 12:42 PM,  ??? wrote:
> > > this enables OpenTracing for CI builds.
> >
> > This one looks good to me.
>
> Applied, thanks guys.
>
> Willy
>

Re: [PATCH] CI: enable OpenTracing feature

[Willy Tarreau]

On Tue, May 18, 2021 at 01:32:56PM +0200, Tim Düsterhus wrote:
> Willy,
> 
> On 5/18/21 12:42 PM,  ??? wrote:
> > this enables OpenTracing for CI builds.
> 
> This one looks good to me.

Applied, thanks guys.

Willy

Re: [PATCH] CI: enable OpenTracing feature

[Tim Düsterhus]

Willy,

On 5/18/21 12:42 PM, Илья Шипицин wrote:

this enables OpenTracing for CI builds.


This one looks good to me.

Best regards
Tim Düsterhus

[PATCH] CI: enable OpenTracing feature

[Илья Шипицин]

Hello,

this enables OpenTracing for CI builds.


thanks.
Ilya
From 9ca15c0d95b1c4fa5dc040116f9ec006712095f1 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin 
Date: Tue, 18 May 2021 09:46:43 +
Subject: [PATCH] CI: github actions: add OpenTracing builds

let us add OpenTracing module to "all features" builds
---
 .github/matrix.py   |  8 
 .github/workflows/vtest.yml |  3 +++
 scripts/build-ot.sh | 34 ++
 3 files changed, 45 insertions(+)
 create mode 100755 scripts/build-ot.sh

diff --git a/.github/matrix.py b/.github/matrix.py
index 067ce93..9e9b395 100644
--- a/.github/matrix.py
+++ b/.github/matrix.py
@@ -71,6 +71,10 @@ for CC in ["gcc", "clang"]:
 "CC": CC,
 "FLAGS": [
 "USE_ZLIB=1",
+"USE_OT=1",
+"OT_INC=${HOME}/opt/include",
+"OT_LIB=${HOME}/opt/lib",
+"OT_RUNPATH=1",
 "USE_PCRE=1",
 "USE_PCRE_JIT=1",
 "USE_LUA=1",
@@ -139,6 +143,10 @@ matrix.append(
 "FLAGS": get_asan_flags(CC)
 + [
 "USE_ZLIB=1",
+"USE_OT=1",
+"OT_INC=${HOME}/opt/include",
+"OT_LIB=${HOME}/opt/lib",
+"OT_RUNPATH=1",
 "USE_PCRE=1",
 "USE_PCRE_JIT=1",
 "USE_LUA=1",
diff --git a/.github/workflows/vtest.yml b/.github/workflows/vtest.yml
index f7f34d7..7867133 100644
--- a/.github/workflows/vtest.yml
+++ b/.github/workflows/vtest.yml
@@ -64,6 +64,9 @@ jobs:
 - name: Install SSL ${{ matrix.ssl }}
   if: ${{ matrix.ssl && matrix.ssl != 'stock' }}
   run: env ${{ matrix.ssl }} scripts/build-ssl.sh
+- name: Install OpenTracing libs
+  if: ${{ contains(matrix.FLAGS, 'USE_OT=1') }}
+  run: scripts/build-ot.sh
 - name: Build WURFL
   if: ${{ contains(matrix.FLAGS, 'USE_WURFL=1') }}
   run: make -C addons/wurfl/dummy
diff --git a/scripts/build-ot.sh b/scripts/build-ot.sh
new file mode 100755
index 000..59d6af5
--- /dev/null
+++ b/scripts/build-ot.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+#
+# OT helper. script built from documentation: 
https://github.com/haproxytech/opentracing-c-wrapper
+#
+
+set -e
+
+export OT_CPP_VERSION=1.5.0
+
+if [ ! -f "download-cache/v${OT_CPP_VERSION}.tar.gz" ]; then
+wget -P download-cache/ \
+
"https://github.com/opentracing/opentracing-cpp/archive/v${OT_CPP_VERSION}.tar.gz;
+fi
+
+if [ "$(cat ${HOME}/opt/.ot-cpp-version)" != "${OT_CPP_VERSION}" ]; then
+tar xf download-cache/v${OT_CPP_VERSION}.tar.gz
+cd opentracing-cpp-${OT_CPP_VERSION}
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=${HOME}/opt -DBUILD_STATIC_LIBS=OFF 
-DBUILD_MOCKTRACER=OFF -DBUILD_TESTING=OFF ..
+make
+make install
+echo "${OT_CPP_VERSION}" > "${HOME}/opt/.ot-cpp-version"
+fi
+
+git clone https://github.com/haproxytech/opentracing-c-wrapper.git
+cd opentracing-c-wrapper
+ ./scripts/bootstrap
+ ./configure --prefix=${HOME}/opt --with-opentracing=${HOME}/opt
+ make
+ make install
+
+
-- 
1.8.3.1