Skip to content

Commit 73f3515

Browse files
owentowent
authored
Merge main into async changes (open-telemetry#1321)
1 parent ad3bdfe commit 73f3515

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1190
-404
lines changed

‎.github/.codecov.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ coverage:
1212
informational: true
1313
target: auto
1414
threshold: 10%
15-
patch:
16-
default:
17-
informational: true
18-
target: auto
19-
threshold: 10%
15+
patch: false
2016

2117
parsers:
2218
gcov:

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ main ]
66
pull_request:
7-
branches: [ main ]
7+
branches: [ main, async-changes ]
88

99
jobs:
1010
cmake_test:
@@ -375,7 +375,7 @@ jobs:
375375
- name: run tests and generate report
376376
run: ./ci/do_ci.sh code.coverage
377377
- name: upload report
378-
uses: codecov/codecov-action@v2.1.0
378+
uses: codecov/codecov-action@v3
379379
with:
380380
file: /home/runner/build/coverage.info
381381

‎.github/workflows/stale.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ jobs:
1313
close-issue-message: 'Closed as inactive. Feel free to reopen if this is still an issue.'
1414
days-before-issue-stale: 60
1515
days-before-issue-close: 7
16-
exempt-pr-labels: 'do-not-stale'
16+
exempt-issue-labels: 'do-not-stale'

‎examples/http/CMakeLists.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ else()
1010
add_executable(http_server server.cc)
1111

1212
target_link_libraries(
13-
http_client ${CMAKE_THREAD_LIBS_INIT} opentelemetry_trace http_client_curl
14-
opentelemetry_exporter_ostream_span ${CURL_LIBRARIES})
13+
http_client ${CMAKE_THREAD_LIBS_INIT} opentelemetry_trace
14+
opentelemetry_http_client_curl opentelemetry_exporter_ostream_span
15+
${CURL_LIBRARIES})
1516

1617
target_link_libraries(
17-
http_server ${CMAKE_THREAD_LIBS_INIT} opentelemetry_trace http_client_curl
18-
opentelemetry_exporter_ostream_span)
18+
http_server ${CMAKE_THREAD_LIBS_INIT} opentelemetry_trace
19+
opentelemetry_http_client_curl opentelemetry_exporter_ostream_span)
1920
endif()

‎exporters/elasticsearch/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ target_include_directories(
1010

1111
target_link_libraries(
1212
opentelemetry_exporter_elasticsearch_logs
13-
PUBLIC opentelemetry_trace opentelemetry_logs http_client_curl)
13+
PUBLIC opentelemetry_trace opentelemetry_logs opentelemetry_http_client_curl)
1414

1515
install(
1616
TARGETS opentelemetry_exporter_elasticsearch_logs

‎exporters/jaeger/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ target_include_directories(
3131

3232
target_link_libraries(
3333
opentelemetry_exporter_jaeger_trace
34-
PUBLIC opentelemetry_resources http_client_curl
34+
PUBLIC opentelemetry_resources opentelemetry_http_client_curl
3535
PRIVATE thrift::thrift)
3636

3737
if(MSVC)

‎exporters/ostream/BUILD‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -43,36 +43,37 @@ cc_library(
4343
],
4444
)
4545

46-
cc_library(
47-
name = "ostream_metric_exporter",
48-
srcs = [
49-
"src/metric_exporter.cc",
50-
],
51-
hdrs = [
52-
"include/opentelemetry/exporters/ostream/metric_exporter.h",
53-
],
54-
strip_include_prefix = "include",
55-
tags = [
56-
"metrics",
57-
"ostream",
58-
],
59-
deps = [
60-
"//sdk/src/metrics",
61-
],
62-
)
46+
# TODO - Uncomment once MetricData interface is finalised
47+
#cc_library(
48+
# name = "ostream_metric_exporter",
49+
# srcs = [
50+
# "src/metric_exporter.cc",
51+
# ],
52+
# hdrs = [
53+
# "include/opentelemetry/exporters/ostream/metric_exporter.h",
54+
# ],
55+
# strip_include_prefix = "include",
56+
# tags = [
57+
# "metrics",
58+
# "ostream",
59+
# ],
60+
# deps = [
61+
# "//sdk/src/metrics",
62+
# ],
63+
#)
6364

64-
cc_test(
65-
name = "ostream_metric_test",
66-
srcs = ["test/ostream_metric_test.cc"],
67-
tags = [
68-
"ostream",
69-
"test",
70-
],
71-
deps = [
72-
":ostream_metric_exporter",
73-
"@com_google_googletest//:gtest_main",
74-
],
75-
)
65+
#cc_test(
66+
# name = "ostream_metric_test",
67+
# srcs = ["test/ostream_metric_test.cc"],
68+
# tags = [
69+
# "ostream",
70+
# "test",
71+
# ],
72+
# deps = [
73+
# ":ostream_metric_exporter",
74+
# "@com_google_googletest//:gtest_main",
75+
# ],
76+
#)
7677

7778
cc_test(
7879
name = "ostream_metrics_test_deprecated",

‎exporters/otlp/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if(WITH_OTLP_HTTP)
4646
PROPERTIES EXPORT_NAME otlp_http_client)
4747
target_link_libraries(
4848
opentelemetry_exporter_otlp_http_client
49-
PUBLIC opentelemetry_sdk opentelemetry_proto http_client_curl
49+
PUBLIC opentelemetry_sdk opentelemetry_proto opentelemetry_http_client_curl
5050
nlohmann_json::nlohmann_json)
5151
if(nlohmann_json_clone)
5252
add_dependencies(opentelemetry_exporter_otlp_http_client

‎exporters/zipkin/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ add_library(opentelemetry_exporter_zipkin_trace src/zipkin_exporter.cc
2020

2121
target_link_libraries(
2222
opentelemetry_exporter_zipkin_trace
23-
PUBLIC opentelemetry_trace http_client_curl nlohmann_json::nlohmann_json)
23+
PUBLIC opentelemetry_trace opentelemetry_http_client_curl
24+
nlohmann_json::nlohmann_json)
2425

2526
install(
2627
TARGETS opentelemetry_exporter_zipkin_trace

‎ext/src/http/client/curl/CMakeLists.txt‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
find_package(CURL)
22
if(CURL_FOUND)
3-
add_library(http_client_curl http_client_factory_curl.cc http_client_curl.cc)
3+
add_library(opentelemetry_http_client_curl http_client_factory_curl.cc
4+
http_client_curl.cc)
45

5-
set_target_properties(http_client_curl PROPERTIES EXPORT_NAME
6-
http_client_curl)
6+
set_target_properties(opentelemetry_http_client_curl
7+
PROPERTIES EXPORT_NAME http_client_curl)
78

89
if(TARGET CURL::libcurl)
9-
target_link_libraries(http_client_curl PUBLIC opentelemetry_ext
10-
CURL::libcurl)
10+
target_link_libraries(opentelemetry_http_client_curl
11+
PUBLIC opentelemetry_ext CURL::libcurl)
1112
else()
12-
target_include_directories(http_client_curl
13+
target_include_directories(opentelemetry_http_client_curl
1314
INTERFACE "${CURL_INCLUDE_DIRS}")
14-
target_link_libraries(http_client_curl PUBLIC opentelemetry_ext
15-
${CURL_LIBRARIES})
15+
target_link_libraries(opentelemetry_http_client_curl
16+
PUBLIC opentelemetry_ext ${CURL_LIBRARIES})
1617
endif()
1718

1819
install(
19-
TARGETS http_client_curl
20+
TARGETS opentelemetry_http_client_curl
2021
EXPORT "${PROJECT_NAME}-target"
2122
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
2223
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

0 commit comments

Comments
 (0)