Skip to content

Commit fc005fe

Browse files
committed
add opentel
1 parent d79e3a3 commit fc005fe

File tree

3 files changed

+28
-1
lines changed

3 files changed

+28
-1
lines changed

src/viam/api/CMakeLists.txt

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ if (VIAMCPPSDK_USE_DYNAMIC_PROTOS)
1616

1717
string(REGEX MATCH "api[ \t\r\n]*commit: ([A-Za-z0-9_]*)" _ ${lockfile})
1818
set(BUF_VIAM_API_SOURCE buf.build/viamrobotics/api:${CMAKE_MATCH_1})
19+
20+
string(REGEX MATCH "opentelemetry[ \t\r\n]*commit: ([A-Za-z0-9_]*)" _ ${lockfile})
21+
set(BUF_OPENTEL_SOURCE buf.build/opentelemetry/opentelemetry:${CMAKE_MATCH_1})
1922
endif()
2023

2124
set(BUF_PROTO_COMPONENTS
@@ -216,6 +219,18 @@ if (VIAMCPPSDK_USE_DYNAMIC_PROTOS)
216219
${PROTO_GEN_DIR}/google/api/http.pb.h
217220
${PROTO_GEN_DIR}/google/rpc/status.pb.cc
218221
${PROTO_GEN_DIR}/google/rpc/status.pb.h
222+
${PROTO_GEN_DIR}/opentelemetry/proto/common/v1/common.grpc.pb.cc
223+
${PROTO_GEN_DIR}/opentelemetry/proto/common/v1/common.grpc.pb.h
224+
${PROTO_GEN_DIR}/opentelemetry/proto/common/v1/common.pb.cc
225+
${PROTO_GEN_DIR}/opentelemetry/proto/common/v1/common.pb.h
226+
${PROTO_GEN_DIR}/opentelemetry/proto/resource/v1/resource.grpc.pb.cc
227+
${PROTO_GEN_DIR}/opentelemetry/proto/resource/v1/resource.pb.cc
228+
${PROTO_GEN_DIR}/opentelemetry/proto/resource/v1/resource.grpc.pb.h
229+
${PROTO_GEN_DIR}/opentelemetry/proto/resource/v1/resource.pb.h
230+
${PROTO_GEN_DIR}/opentelemetry/proto/trace/v1/trace.grpc.pb.cc
231+
${PROTO_GEN_DIR}/opentelemetry/proto/trace/v1/trace.grpc.pb.h
232+
${PROTO_GEN_DIR}/opentelemetry/proto/trace/v1/trace.pb.cc
233+
${PROTO_GEN_DIR}/opentelemetry/proto/trace/v1/trace.pb.h
219234
${PROTO_GEN_DIR}/module/v1/module.grpc.pb.cc
220235
${PROTO_GEN_DIR}/module/v1/module.grpc.pb.h
221236
${PROTO_GEN_DIR}/module/v1/module.pb.cc
@@ -252,6 +267,7 @@ if (VIAMCPPSDK_USE_DYNAMIC_PROTOS)
252267
COMMAND ${BUF_COMMAND} generate ${BUF_GOOGLE_API_SOURCE} --template buf.gen.yaml --path google/rpc --path google/api
253268
COMMAND ${BUF_COMMAND} generate ${BUF_VIAM_GOUTILS_SOURCE} --template buf.gen.yaml
254269
COMMAND ${BUF_COMMAND} generate ${BUF_VIAM_API_SOURCE} --template buf.gen.yaml --path ${BUF_PROTO_COMPONENTS_JOINED}
270+
COMMAND ${BUF_COMMAND} generate ${BUF_OPENTEL_SOURCE} --template buf.gen.yaml
255271

256272
# After generating the protos, include a step to invoke a search-and-replace for switch -> switch_ in the Switch component files
257273
COMMAND ${CMAKE_COMMAND} "-DSWITCH_REPLACE_PATHS=\"${VIAMCPPSDK_SWITCH_REPLACE_PATHS}\"" -P ${CMAKE_CURRENT_SOURCE_DIR}/viamcppsdk_replace_switch.cmake
@@ -283,7 +299,7 @@ endif(VIAMCPPSDK_USE_DYNAMIC_PROTOS)
283299

284300
add_custom_target(
285301
update-buf
286-
COMMAND buf mod update ${CMAKE_CURRENT_SOURCE_DIR}
302+
COMMAND buf dep update ${CMAKE_CURRENT_SOURCE_DIR}
287303
)
288304

289305
# Declare the viamcpp library, and attach sources,
@@ -353,6 +369,12 @@ target_sources(viamapi
353369
${PROTO_GEN_DIR}/google/api/http.pb.cc
354370
${PROTO_GEN_DIR}/google/api/httpbody.pb.cc
355371
${PROTO_GEN_DIR}/google/rpc/status.pb.cc
372+
${PROTO_GEN_DIR}/opentelemetry/proto/common/v1/common.grpc.pb.cc
373+
${PROTO_GEN_DIR}/opentelemetry/proto/common/v1/common.pb.cc
374+
${PROTO_GEN_DIR}/opentelemetry/proto/resource/v1/resource.grpc.pb.cc
375+
${PROTO_GEN_DIR}/opentelemetry/proto/resource/v1/resource.pb.cc
376+
${PROTO_GEN_DIR}/opentelemetry/proto/trace/v1/trace.grpc.pb.cc
377+
${PROTO_GEN_DIR}/opentelemetry/proto/trace/v1/trace.pb.cc
356378
${PROTO_GEN_DIR}/module/v1/module.grpc.pb.cc
357379
${PROTO_GEN_DIR}/module/v1/module.pb.cc
358380
${PROTO_GEN_DIR}/robot/v1/robot.grpc.pb.cc

src/viam/api/buf.lock

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ deps:
1313
owner: viamrobotics
1414
repository: goutils
1515
commit: 5fff320e3fab4611aea8180e09bcb5e5
16+
- remote: buf.build
17+
owner: opentelemetry
18+
repository: opentelemetry
19+
commit: 648a3e2f02e14fe187656ea4ac3befa1

src/viam/api/buf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ deps:
99
- buf.build/googleapis/googleapis
1010
- buf.build/viamrobotics/api
1111
- buf.build/viamrobotics/goutils
12+
- buf.build/opentelemetry/opentelemetry

0 commit comments

Comments
 (0)