Skip to content

Commit f6df898

Browse files
ThomsonTanThomsonTan
authored
[Geneva] Update opentelemetry-cpp to 1.21.0 (open-telemetry#552)
1 parent bfbaf5e commit f6df898

File tree

8 files changed

+119
-26
lines changed

8 files changed

+119
-26
lines changed

‎.github/workflows/fluentd.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@v3
3030
with:
3131
repository: "open-telemetry/opentelemetry-cpp"
32-
ref: "v1.19.0"
32+
ref: "v1.21.0"
3333
path: "opentelemetry-cpp"
3434
submodules: "recursive"
3535
- name: setup dependencies

‎.github/workflows/geneva_metrics.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v3
2525
with:
2626
repository: "open-telemetry/opentelemetry-cpp"
27-
ref: "v1.20.0"
27+
ref: "v1.21.0"
2828
path: "otel_cpp"
2929
submodules: "recursive"
3030
- name: setup

‎.github/workflows/user_events.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/checkout@v3
2828
with:
2929
repository: "open-telemetry/opentelemetry-cpp"
30-
ref: "v1.20.0"
30+
ref: "v1.21.0"
3131
path: "opentelemetry-cpp"
3232
submodules: "recursive"
3333
- name: setup dependencies

‎exporters/fluentd/CMakeLists.txt‎

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,42 @@ if (WITH_EXAMPLES)
117117
endif()
118118

119119
if(OPENTELEMETRY_INSTALL)
120-
install(
121-
TARGETS opentelemetry_exporter_geneva_logs
122-
opentelemetry_exporter_geneva_trace
123-
EXPORT "${PROJECT_NAME}-target"
124-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
125-
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
126-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
127-
128-
install(
129-
DIRECTORY include/opentelemetry/exporters/
130-
DESTINATION include/opentelemetry/exporters/
131-
FILES_MATCHING
132-
PATTERN "*.h")
120+
if(MAIN_PROJECT)
121+
install(
122+
TARGETS opentelemetry_exporter_geneva_logs
123+
opentelemetry_exporter_geneva_trace
124+
EXPORT "${PROJECT_NAME}-target"
125+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
126+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
127+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
128+
129+
install(
130+
DIRECTORY include/opentelemetry/exporters/
131+
DESTINATION include/opentelemetry/exporters/
132+
FILES_MATCHING
133+
PATTERN "*.h")
134+
else()
135+
set_target_properties(
136+
opentelemetry_exporter_geneva_trace
137+
PROPERTIES
138+
EXPORT_NAME opentelemetry_exporter_geneva_trace)
139+
set_target_properties(
140+
opentelemetry_exporter_geneva_logs
141+
PROPERTIES
142+
EXPORT_NAME opentelemetry_exporter_geneva_logs)
143+
otel_add_component(
144+
COMPONENT
145+
exporters_geneva_fluentd
146+
TARGETS
147+
opentelemetry_exporter_geneva_logs
148+
opentelemetry_exporter_geneva_trace
149+
FILES_DIRECTORY
150+
"include/opentelemetry/exporters/"
151+
FILES_DESTINATION
152+
"include/opentelemetry/exporters"
153+
FILES_MATCHING
154+
PATTERN "*.h")
155+
endif()
133156
endif()
134157

135158
if(BUILD_TESTING)

‎exporters/geneva-trace/CMakeLists.txt‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,39 @@ if(WITH_EXAMPLES)
3030
endif()
3131

3232
if(OPENTELEMETRY_INSTALL)
33-
install(DIRECTORY include/ DESTINATION include)
33+
if(MAIN_PROJECT)
34+
install(DIRECTORY include/ DESTINATION include)
3435

35-
install(
36-
TARGETS opentelemetry_exporter_geneva_trace opentelemetry_exporter_geneva_logs
37-
EXPORT "${PROJECT_NAME}-target")
38-
39-
if(NOT MAIN_PROJECT)
4036
install(
41-
EXPORT "${PROJECT_NAME}-target"
42-
NAMESPACE "${PROJECT_NAME}::"
43-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
37+
TARGETS opentelemetry_exporter_geneva_trace opentelemetry_exporter_geneva_logs
38+
EXPORT "${PROJECT_NAME}-target")
39+
40+
if(NOT MAIN_PROJECT)
41+
install(
42+
EXPORT "${PROJECT_NAME}-target"
43+
NAMESPACE "${PROJECT_NAME}::"
44+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
45+
endif()
46+
else()
47+
set_target_properties(
48+
opentelemetry_exporter_geneva_trace
49+
PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_trace)
50+
set_target_properties(
51+
opentelemetry_exporter_geneva_logs
52+
PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_logs)
53+
54+
otel_add_component(
55+
COMPONENT
56+
exporters_geneva_trace_logs
57+
TARGETS
58+
opentelemetry_exporter_geneva_trace
59+
opentelemetry_exporter_geneva_logs
60+
FILES_DIRECTORY
61+
"include/opentelemetry/exporters/geneva"
62+
FILES_DESTINATION
63+
"include/opentelemetry/exporters/geneva"
64+
FILES_MATCHING
65+
PATTERN
66+
"*.h")
4467
endif()
4568
endif()

‎exporters/geneva-trace/third_party/opentelemetry-cpp‎

Submodule opentelemetry-cpp updated 316 files

‎exporters/geneva/CMakeLists.txt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ if(BUILD_TESTING)
9191
endif()
9292

9393
if(OPENTELEMETRY_INSTALL)
94+
95+
if(MAIN_PROJECT)
96+
9497
install(
9598
TARGETS opentelemetry_exporter_geneva_metrics
9699
EXPORT "${PROJECT_NAME}-target"
@@ -103,6 +106,25 @@ if(OPENTELEMETRY_INSTALL)
103106
DESTINATION include/opentelemetry/exporters
104107
FILES_MATCHING
105108
PATTERN "*.h")
109+
110+
else()
111+
112+
set_target_properties(opentelemetry_exporter_geneva_metrics PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_metrics)
113+
114+
otel_add_component(
115+
COMPONENT
116+
exporters_geneva_metrics
117+
TARGETS
118+
opentelemetry_exporter_geneva_metrics
119+
FILES_DIRECTORY
120+
"include/opentelemetry/exporters/geneva"
121+
FILES_DESTINATION
122+
"include/opentelemetry/exporters"
123+
FILES_MATCHING
124+
PATTERN
125+
"*.h")
126+
127+
endif()
106128
endif()
107129

108130
if(WITH_EXAMPLES)

‎exporters/user_events/CMakeLists.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ if(WITH_BENCHMARK)
136136
opentelemetry_exporter_user_events_logs)
137137
endif()
138138

139+
if(MAIN_PROJECT)
140+
139141
install(
140142
TARGETS opentelemetry_exporter_user_events_logs
141143
EXPORT "${PROJECT_NAME}-target"
@@ -148,3 +150,26 @@ install(
148150
DESTINATION include/opentelemetry/exporters
149151
FILES_MATCHING
150152
PATTERN "*.h")
153+
else()
154+
set_target_properties(
155+
opentelemetry_exporter_user_events_logs
156+
PROPERTIES
157+
EXPORT_NAME opentelemetry_exporter_user_events_logs)
158+
set_target_properties(
159+
opentelemetry_exporter_user_events_metrics
160+
PROPERTIES
161+
EXPORT_NAME opentelemetry_exporter_user_events_metrics)
162+
otel_add_component(
163+
COMPONENT
164+
exporters_user_events
165+
TARGETS
166+
opentelemetry_exporter_user_events_logs
167+
opentelemetry_exporter_user_events_metrics
168+
FILES_DIRECTORY
169+
"include/opentelemetry/exporters/user_events"
170+
FILES_DESTINATION
171+
"include/opentelemetry/exporters"
172+
FILES_MATCHING
173+
PATTERN
174+
"*.h")
175+
endif()

0 commit comments

Comments
 (0)