Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EXPORTER] Add OTLP HTTP SSL support #1793

Merged
merged 90 commits into from
Apr 5, 2023
Merged

[EXPORTER] Add OTLP HTTP SSL support #1793

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
e3f1b17
[WIP] Implement OTLP HTTP SSL
marcalff Nov 23, 2022
236832d
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Nov 23, 2022
9f5c8aa
Format cleanup
marcalff Nov 23, 2022
82341ef
Cleanup
marcalff Nov 23, 2022
000e36d
Fixed windows build
marcalff Nov 24, 2022
29f2851
PROTOTYPE, investigating CURLOPT for SSL.
marcalff Nov 24, 2022
98cf4bb
Build cleanup
marcalff Nov 25, 2022
0a7d8a6
Merge branch 'open-telemetry:main' into fix_otlp_http_ssl_1402
marcalff Nov 25, 2022
8362479
Build cleanup
marcalff Nov 25, 2022
20d0e16
Implement CURLOPT for SSL.
marcalff Nov 25, 2022
e4afdb6
Merge branch 'open-telemetry:main' into fix_otlp_http_ssl_1402
marcalff Nov 28, 2022
41dfeb9
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Dec 1, 2022
461eec5
Work in progress
marcalff Dec 1, 2022
8c7e68e
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Dec 2, 2022
d25fae8
Work in progress
marcalff Dec 6, 2022
d5164e3
Work in progress, continued.
marcalff Dec 6, 2022
d686852
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Dec 7, 2022
cf6cb43
Used CAINFO
marcalff Dec 7, 2022
51eaad7
Merge branch 'open-telemetry:main' into fix_otlp_http_ssl_1402
marcalff Dec 7, 2022
eba3156
Merge branch 'open-telemetry:main' into fix_otlp_http_ssl_1402
marcalff Dec 11, 2022
21acc47
Merge branch 'open-telemetry:main' into fix_otlp_http_ssl_1402
marcalff Dec 13, 2022
956774a
Added doc, testing with SSL/TLS.
marcalff Dec 13, 2022
299d774
Implemented flag ssl_insecure_skip_verify.
marcalff Dec 13, 2022
d5a54fd
Format cleanup
marcalff Dec 13, 2022
e17c891
Merge branch 'open-telemetry:main' into fix_otlp_http_ssl_1402
marcalff Dec 13, 2022
1e96070
Code cleanup.
marcalff Dec 14, 2022
512e793
Merge branch 'open-telemetry:main' into fix_otlp_http_ssl_1402
marcalff Jan 2, 2023
becf5df
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Jan 4, 2023
9fc560d
Add TLS support - work in progress
marcalff Jan 4, 2023
09204ba
WIP
marcalff Jan 10, 2023
dfcd670
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Jan 16, 2023
e49eef5
SSL TLS
marcalff Jan 16, 2023
4c78897
TLS SSL, continued.
marcalff Jan 17, 2023
46c0662
WIP
marcalff Jan 17, 2023
7294163
Revert TLS 1.2 and 1.3 mix, fixed build breaks.
marcalff Jan 17, 2023
88e88e1
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Jan 17, 2023
7c3f50c
Format
marcalff Jan 17, 2023
4f301cb
Merge branch 'open-telemetry:main' into fix_otlp_http_ssl_1402
marcalff Jan 17, 2023
cb9e025
Resolved TLS 1.2 vs TLS 1.3 CIPHER.
marcalff Jan 18, 2023
cd8a172
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Jan 24, 2023
71e83c1
Implemented code review comments.
marcalff Jan 24, 2023
e0f91a0
Fixed GCC 12 warnings
marcalff Jan 24, 2023
e0bc8bb
Code cleanup for TLS version.
marcalff Jan 24, 2023
3b0663f
Code cleanup
marcalff Jan 25, 2023
3b31f96
Implemented test client (draft)
marcalff Jan 29, 2023
ab3bba8
format cleanup, maintainer build
marcalff Jan 29, 2023
1e2a610
add grpc in maintainer ci
marcalff Jan 29, 2023
2266202
CI
marcalff Jan 29, 2023
ea15e31
PROTOBUF_VERSION: 3.21.12
marcalff Jan 29, 2023
835fab4
Back to probuf 3.20.3,
marcalff Jan 29, 2023
72edc68
Do not check in cert, generate them (todo)
marcalff Jan 29, 2023
7b7009c
CI protobuf
marcalff Jan 29, 2023
05e4419
Merge branch 'open-telemetry:main' into fix_otlp_http_ssl_1402
marcalff Jan 29, 2023
beb6aa8
Protobuf tar name
marcalff Jan 29, 2023
9cc76a9
Run func test
marcalff Jan 29, 2023
f6fff95
Func test, continued.
marcalff Jan 29, 2023
65b72e3
Fix cfssl
marcalff Jan 29, 2023
25bc4f7
functional test client, continued.
marcalff Jan 30, 2023
e493ed1
Fixed build warnings.
marcalff Feb 1, 2023
8ed1403
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Feb 1, 2023
1a26090
Integration of functional tests to CI
marcalff Feb 2, 2023
e228383
Run both sync and async functional tests, added report in CI.
marcalff Feb 2, 2023
4458dac
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Feb 3, 2023
4074614
ASYNC tests failed,
marcalff Feb 4, 2023
62ce2e8
Implemented warnings on duration env var, when parsing failed.
marcalff Feb 8, 2023
750155e
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Feb 8, 2023
73eca29
Fixed copyright.
marcalff Feb 8, 2023
4074120
Fixed code review comments.
marcalff Feb 9, 2023
3bc586b
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Feb 13, 2023
34eff9e
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Feb 13, 2023
0f17600
Code cleanup
marcalff Feb 14, 2023
4437433
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Feb 17, 2023
cb9b6eb
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Mar 3, 2023
af04e5d
WIP
marcalff Mar 3, 2023
2613c7d
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Mar 11, 2023
eb9bc19
Cleanup env var names.
marcalff Mar 11, 2023
f6d6c04
Resolved duplication of SSL options.
marcalff Mar 11, 2023
f088bbc
Code cleanup
marcalff Mar 12, 2023
dce246e
CHANGELOG
marcalff Mar 12, 2023
ba6d403
Removed notes.txt, duplicated with ssl doc.
marcalff Mar 12, 2023
659ff69
Build cleanup
marcalff Mar 12, 2023
a5e6cdf
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Mar 23, 2023
df6335e
Fixed code review comments, added _PREVIEW to feature flags.
marcalff Mar 24, 2023
663f009
Fixed warnings in maintainer mode.
marcalff Mar 24, 2023
5b529bd
Merge branch 'main' into fix_otlp_http_ssl_1402
marcalff Mar 29, 2023
eb6c362
Implemented code review comments.
marcalff Mar 30, 2023
0593b4c
Fixed http examples
marcalff Mar 30, 2023
340ac8d
Build cleanup for windows / gmock
marcalff Mar 30, 2023
c247437
Build cleanup, windows + gmock macros
marcalff Mar 30, 2023
8a47cf8
Merge branch 'main' into fix_otlp_http_ssl_1402
esigo Apr 1, 2023
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
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ option(
option(WITH_EXAMPLES "Whether to build examples" ON)

option(WITH_LOGS_PREVIEW "Whether to build logs preview" OFF)
option(WITH_ASYNC_EXPORT_PREVIEW "Whether enable async export" OFF)
option(WITH_ASYNC_EXPORT_PREVIEW "Whether to enable async export" OFF)
option(WITH_OTLP_HTTP_SSL_PREVIEW "Whether to enable otlp http ssl export" OFF)
# Exemplar specs status is experimental, so behind feature flag by default
option(WITH_METRICS_EXEMPLAR_PREVIEW
"Whethere to enable exemplar within metrics" OFF)
Expand Down
5 changes: 5 additions & 0 deletions api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ if(WITH_ASYNC_EXPORT_PREVIEW)
target_compile_definitions(opentelemetry_api INTERFACE ENABLE_ASYNC_EXPORT)
endif()

# A better place should be in exporter/otlp, not api
if(WITH_OTLP_HTTP_SSL_PREVIEW)
target_compile_definitions(opentelemetry_api INTERFACE ENABLE_OTLP_HTTP_SSL)
marcalff marked this conversation as resolved.
Show resolved Hide resolved
endif()

if(WITH_METRICS_EXEMPLAR_PREVIEW)
target_compile_definitions(opentelemetry_api
INTERFACE ENABLE_METRICS_EXEMPLAR_PREVIEW)
Expand Down
2 changes: 2 additions & 0 deletions exporters/otlp/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
cc_library(
name = "otlp_recordable",
srcs = [
"src/otlp_environment.cc",
"src/otlp_log_recordable.cc",
"src/otlp_metric_utils.cc",
"src/otlp_populate_attribute_utils.cc",
"src/otlp_recordable.cc",
"src/otlp_recordable_utils.cc",
],
hdrs = [
"include/opentelemetry/exporters/otlp/otlp_environment.h",
"include/opentelemetry/exporters/otlp/otlp_log_recordable.h",
"include/opentelemetry/exporters/otlp/otlp_metric_utils.h",
"include/opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h",
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_library(
opentelemetry_otlp_recordable
src/otlp_log_recordable.cc src/otlp_recordable.cc
src/otlp_environment.cc src/otlp_log_recordable.cc src/otlp_recordable.cc
src/otlp_populate_attribute_utils.cc src/otlp_recordable_utils.cc
src/otlp_metric_utils.cc)
set_target_properties(opentelemetry_otlp_recordable PROPERTIES EXPORT_NAME
Expand Down
Loading