Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, windows-2019]
os: [windows-latest]
permissions:
contents: read
steps:
- uses: actions/checkout@v6
with:
submodules: true

- name: Build on ${{ matrix.os }} with vs-2019
- name: Build on ${{ matrix.os }}
run: |
.\scripts\win_build.bat

Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/cfl
2 changes: 1 addition & 1 deletion lib/fluent-otel-proto
Submodule fluent-otel-proto updated 30 files
+33 −10 CMakeLists.txt
+30 −13 README.md
+4 −4 include/fluent-otel-proto/fluent-otel-info.h
+1 −1 include/fluent-otel-proto/fluent-otel_found.h
+1 −1 proto_c/opentelemetry/proto/collector/logs/v1/logs_service.pb-c.c
+6 −6 proto_c/opentelemetry/proto/collector/logs/v1/logs_service.pb-c.h
+1 −1 proto_c/opentelemetry/proto/collector/metrics/v1/metrics_service.pb-c.c
+6 −6 proto_c/opentelemetry/proto/collector/metrics/v1/metrics_service.pb-c.h
+317 −0 proto_c/opentelemetry/proto/collector/profiles/v1development/profiles_service.pb-c.c
+202 −0 proto_c/opentelemetry/proto/collector/profiles/v1development/profiles_service.pb-c.h
+1 −1 proto_c/opentelemetry/proto/collector/trace/v1/trace_service.pb-c.c
+6 −6 proto_c/opentelemetry/proto/collector/trace/v1/trace_service.pb-c.h
+169 −21 proto_c/opentelemetry/proto/common/v1/common.pb-c.c
+133 −15 proto_c/opentelemetry/proto/common/v1/common.pb-c.h
+23 −10 proto_c/opentelemetry/proto/logs/v1/logs.pb-c.c
+61 −21 proto_c/opentelemetry/proto/logs/v1/logs.pb-c.h
+72 −46 proto_c/opentelemetry/proto/metrics/v1/metrics.pb-c.c
+135 −47 proto_c/opentelemetry/proto/metrics/v1/metrics.pb-c.h
+1,525 −0 proto_c/opentelemetry/proto/profiles/v1development/pprofextended.pb-c.c
+799 −0 proto_c/opentelemetry/proto/profiles/v1development/pprofextended.pb-c.h
+1,704 −0 proto_c/opentelemetry/proto/profiles/v1development/profiles.pb-c.c
+939 −0 proto_c/opentelemetry/proto/profiles/v1development/profiles.pb-c.h
+16 −3 proto_c/opentelemetry/proto/resource/v1/resource.pb-c.c
+13 −5 proto_c/opentelemetry/proto/resource/v1/resource.pb-c.h
+67 −9 proto_c/opentelemetry/proto/trace/v1/trace.pb-c.c
+112 −37 proto_c/opentelemetry/proto/trace/v1/trace.pb-c.h
+4 −11 proto_c/protobuf-c/protobuf-c.c
+3 −3 proto_c/protobuf-c/protobuf-c.h
+5 −0 src/CMakeLists.txt
+6 −0 src/fluent-otel.c
5 changes: 5 additions & 0 deletions src/ctr_decode_opentelemetry.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading