Skip to content

feat: implement remaining config C bindings #90

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

Merged
merged 19 commits into from
May 18, 2023
Merged

feat: implement remaining config C bindings #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3a9562a
add bindings for endpoints builder
cwaldren-ld May 16, 2023
a3baa1d
add appinfo builder
cwaldren-ld May 16, 2023
7f1e5de
add event config
cwaldren-ld May 16, 2023
01ae47d
update unit tests
cwaldren-ld May 16, 2023
4d5966f
add datasource config
cwaldren-ld May 16, 2023
ffb575e
add http props builder
cwaldren-ld May 16, 2023
33c9576
add basic logging builder
cwaldren-ld May 16, 2023
926c751
add test for custom logger
cwaldren-ld May 17, 2023
483e916
polish
cwaldren-ld May 17, 2023
bd8e030
fix some test memory leaks
cwaldren-ld May 17, 2023
b77dcbb
fix some broken tests and hello-cpp
cwaldren-ld May 17, 2023
2851d49
add LAUNCHDARKLY_USE_ASSERT to CI builds
cwaldren-ld May 17, 2023
fe358e9
update docs
cwaldren-ld May 17, 2023
66b39f0
Merge branch 'main' into cw/sc-201468/config-bindings
cwaldren-ld May 17, 2023
7bd47e8
add missing HttpPropertiesBuilder::WriteTimeout function
cwaldren-ld May 17, 2023
32c2ae3
fix some compiler warnings
cwaldren-ld May 17, 2023
10165d9
remove null checks from free functions
cwaldren-ld May 17, 2023
28192cb
Update libs/common/include/launchdarkly/error.hpp
kinyoklion May 18, 2023
253b94a
add WriteTimeout to config_builder_test.cpp
cwaldren-ld May 18, 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 @@ -26,6 +26,7 @@ option(BUILD_TESTING "Enable C++ unit tests." ON)
option(TESTING_SANITIZERS "Enable sanitizers for unit tests." ON)

if (BUILD_TESTING)
add_compile_definitions(LAUNCHDARKLY_USE_ASSERT)
if (TESTING_SANITIZERS)
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize=undefined -fsanitize=leak")
Expand Down Expand Up @@ -62,7 +63,7 @@ else ()
else ()
set(Boost_USE_STATIC_LIBS ON)
endif ()
endif()
endif ()

set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME OFF)
Expand Down
42 changes: 23 additions & 19 deletions apps/hello-cpp/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,29 @@ int main() {
return 1;
}

Client client(
ConfigBuilder(key)
.ServiceEndpoints(
launchdarkly::client_side::EndpointsBuilder()
// Set to http to demonstrate redirect to https.
.PollingBaseUrl("http://sdk.launchdarkly.com")
.StreamingBaseUrl("https://stream.launchdarkly.com")
.EventsBaseUrl("https://events.launchdarkly.com"))
.DataSource(DataSourceBuilder()
.Method(DataSourceBuilder::Polling().PollInterval(
std::chrono::seconds{30}))
.WithReasons(true)
.UseReport(true))
.Logging(LoggingBuilder::BasicLogging().Level(LogLevel::kDebug))
.Events(launchdarkly::client_side::EventsBuilder().FlushInterval(
std::chrono::seconds(5)))
.Build()
.value(),
ContextBuilder().kind("user", "ryan").build());
auto config_builder = ConfigBuilder(key);

config_builder.ServiceEndpoints()
.PollingBaseUrl("http://sdk.launchdarkly.com")
.StreamingBaseUrl("https://stream.launchdarkly.com")
.EventsBaseUrl("https://events.launchdarkly.com");
config_builder.DataSource()
.Method(
DataSourceBuilder::Polling().PollInterval(std::chrono::seconds{30}))
.WithReasons(true)
.UseReport(true);
config_builder.Logging().Logging(
LoggingBuilder::BasicLogging().Level(LogLevel::kDebug));
Copy link
Contributor Author

@cwaldren-ld cwaldren-ld May 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could probably slightly improve this by adding Basic()/Custom() members to the logging builder, so it's not Logging().Logging. Hmm

config_builder.Events().FlushInterval(std::chrono::seconds(5));

auto config = config_builder.Build();
if (!config) {
std::cout << config.error();
return 1;
}

Client client(std::move(*config),
ContextBuilder().kind("user", "ryan").build());

std::cout << "Initial Status: " << client.DataSourceStatus().Status()
<< std::endl;
Expand Down
16 changes: 5 additions & 11 deletions apps/sdk-contract-tests/src/entity_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@ std::optional<std::string> EntityManager::create(ConfigParams const& in) {
auto default_endpoints =
launchdarkly::client_side::Defaults::ServiceEndpoints();

auto endpoints =
EndpointsBuilder()
auto& endpoints =
config_builder.ServiceEndpoints()
.EventsBaseUrl(default_endpoints.EventsBaseUrl())
.PollingBaseUrl(default_endpoints.PollingBaseUrl())
.StreamingBaseUrl(default_endpoints.StreamingBaseUrl());

auto datasource = DataSourceBuilder();

if (in.serviceEndpoints) {
if (in.serviceEndpoints->streaming) {
endpoints.StreamingBaseUrl(*in.serviceEndpoints->streaming);
Expand All @@ -57,6 +55,8 @@ std::optional<std::string> EntityManager::create(ConfigParams const& in) {
}
}

auto& datasource = config_builder.DataSource();

if (in.polling) {
if (in.polling->baseUri) {
endpoints.PollingBaseUrl(*in.polling->baseUri);
Expand All @@ -73,7 +73,7 @@ std::optional<std::string> EntityManager::create(ConfigParams const& in) {
}
}

auto event_config = EventsBuilder();
auto& event_config = config_builder.Events();

if (in.events) {
ConfigEventParams const& events = *in.events;
Expand Down Expand Up @@ -106,10 +106,6 @@ std::optional<std::string> EntityManager::create(ConfigParams const& in) {
event_config.Disable();
}

config_builder.Events(std::move(event_config));

config_builder.ServiceEndpoints(std::move(endpoints));

if (in.clientSide->evaluationReasons) {
datasource.WithReasons(*in.clientSide->evaluationReasons);
}
Expand All @@ -118,8 +114,6 @@ std::optional<std::string> EntityManager::create(ConfigParams const& in) {
datasource.UseReport(*in.clientSide->useReport);
}

config_builder.DataSource(std::move(datasource));

auto config = config_builder.Build();
if (!config) {
LD_LOG(logger_, LogLevel::kWarn)
Expand Down
Loading