Skip to content

Commit 9392bc1

Browse files
committed
lib: ctraces: upgrade to v0.5.4
Signed-off-by: Eduardo Silva <[email protected]>
1 parent c147d45 commit 9392bc1

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

lib/ctraces/.github/workflows/build.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ jobs:
3939
steps:
4040
- name: Set up base image dependencies
4141
run: |
42+
sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\/mirrorlist.centos.org/g" /etc/yum.repos.d/CentOS-Base.repo
43+
sed -i -e "s/^#baseurl=http:\/\/mirror.centos.org/baseurl=http:\/\/vault.centos.org/g" /etc/yum.repos.d/CentOS-Base.repo
4244
yum -y update && \
4345
yum install -y ca-certificates cmake curl-devel gcc gcc-c++ git make wget && \
44-
wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
45-
rpm -ivh epel-release-latest-7.noarch.rpm && \
46+
yum install -y epel-release
4647
yum install -y cmake3
4748
shell: bash
4849

lib/ctraces/.github/workflows/lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ jobs:
2929
steps:
3030
- uses: actions/checkout@v3
3131
- name: Run markdownlint
32-
uses: actionshub/markdownlint@2.0.2
32+
uses: actionshub/markdownlint@v3.1.4

lib/ctraces/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ endif()
2727
# CTraces Version
2828
set(CTR_VERSION_MAJOR 0)
2929
set(CTR_VERSION_MINOR 5)
30-
set(CTR_VERSION_PATCH 2)
30+
set(CTR_VERSION_PATCH 3)
3131
set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}")
3232

3333
# Define __FILENAME__ consistently across Operating Systems

lib/ctraces/examples/otlp-encoder/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,3 @@ service:
2323
```
2424
2525
Now you can run the example and see the trace data logged by the collector instance.
26-

lib/ctraces/src/ctr_encode_msgpack.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,12 @@ static void pack_scope_spans(mpack_writer_t *writer, struct cfl_list *scope_span
424424

425425
/* scope */
426426
mpack_write_cstr(writer, "scope");
427-
pack_instrumentation_scope(writer, scope_span->instrumentation_scope);
427+
if (scope_span->instrumentation_scope != NULL) {
428+
pack_instrumentation_scope(writer, scope_span->instrumentation_scope);
429+
}
430+
else {
431+
mpack_write_nil(writer);
432+
}
428433

429434
/* spans */
430435
mpack_write_cstr(writer, "spans");

0 commit comments

Comments
 (0)