diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5b40bbe..81b7e79 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest, windows-2019] + os: [windows-latest] permissions: contents: read steps: @@ -22,7 +22,7 @@ jobs: with: submodules: true - - name: Build on ${{ matrix.os }} with vs-2019 + - name: Build on ${{ matrix.os }} run: | .\scripts\win_build.bat @@ -79,9 +79,9 @@ jobs: working-directory: ctraces build-debian: - name: Debian Buster build to confirm no issues once used downstream + name: Debian Bullseye build to confirm no issues once used downstream runs-on: ubuntu-latest - container: debian:buster + container: debian:bullseye steps: - name: Set up base image dependencies run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 7372343..226e70d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,8 @@ endif() # CTraces Version set(CTR_VERSION_MAJOR 0) -set(CTR_VERSION_MINOR 6) -set(CTR_VERSION_PATCH 6) +set(CTR_VERSION_MINOR 7) +set(CTR_VERSION_PATCH 0) set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}") # Define __FILENAME__ consistently across Operating Systems diff --git a/lib/cfl b/lib/cfl index e6b1efb..d4f891d 160000 --- a/lib/cfl +++ b/lib/cfl @@ -1 +1 @@ -Subproject commit e6b1efbfb33ed8dbda7cf7205ead5fd0d4bc9617 +Subproject commit d4f891d48f68dd6df30bfa96dc53c1ab5e310d6c diff --git a/lib/fluent-otel-proto b/lib/fluent-otel-proto index 99373d4..95a3475 160000 --- a/lib/fluent-otel-proto +++ b/lib/fluent-otel-proto @@ -1 +1 @@ -Subproject commit 99373d42f9b028604ae774a51697596d18398977 +Subproject commit 95a3475b94f8d58a565f018b9ee6895820ceba51 diff --git a/src/ctr_decode_opentelemetry.c b/src/ctr_decode_opentelemetry.c index 8c50780..d62f78a 100644 --- a/src/ctr_decode_opentelemetry.c +++ b/src/ctr_decode_opentelemetry.c @@ -308,6 +308,11 @@ static int convert_any_value(struct opentelemetry_decode_value *ctr_val, result = convert_string_value(ctr_val, value_type, key, val->string_value); break; + case OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_STRING_VALUE_STRINDEX: + /* Profiling-only string dictionary reference: ignore in traces. */ + result = 0; + break; + case OPENTELEMETRY__PROTO__COMMON__V1__ANY_VALUE__VALUE_BOOL_VALUE: result = convert_bool_value(ctr_val, value_type, key, val->bool_value); break;