launchdarkly
diff --git a/‎CMakeLists.txt‎
Lines changed: 1 addition & 1 deletion b/‎CMakeLists.txt‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Makefile‎
Lines changed: 1 addition & 1 deletion b/‎Makefile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎c-sdk-common/src/utility.c‎
Lines changed: 3 additions & 2 deletions b/‎c-sdk-common/src/utility.c‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎c-sdk-common/src/utility.h‎
Lines changed: 4 additions & 0 deletions b/‎c-sdk-common/src/utility.h‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎contract-tests/lib/internal/include/definitions/definitions.hpp‎
Lines changed: 9 additions & 1 deletion b/‎contract-tests/lib/internal/include/definitions/definitions.hpp‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎contract-tests/lib/internal/src/client_entity.cpp‎
Lines changed: 28 additions & 8 deletions b/‎contract-tests/lib/internal/src/client_entity.cpp‎
Lines changed: 28 additions & 8 deletions
diff --git a/‎contract-tests/lib/internal/src/service.cpp‎
Lines changed: 2 additions & 1 deletion b/‎contract-tests/lib/internal/src/service.cpp‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎include/launchdarkly/client.h‎
Lines changed: 5 additions & 5 deletions b/‎include/launchdarkly/client.h‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎include/launchdarkly/config.h‎
Lines changed: 11 additions & 0 deletions b/‎include/launchdarkly/config.h‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎include/launchdarkly/data_source.h‎
Lines changed: 11 additions & 0 deletions b/‎include/launchdarkly/data_source.h‎
Lines changed: 11 additions & 0 deletions
@@ -59,7 +59,7 @@ if (REDIS_STORE)
     add_subdirectory(stores/redis)
 endif (REDIS_STORE)
 
-file(GLOB SOURCES "src/*" "third-party/src/*" "c-sdk-common/src/*")
+file(GLOB SOURCES "src/*" "src/integrations/*" "third-party/src/*" "c-sdk-common/src/*")
 
 if(NOT DEFINED MSVC)
     list(REMOVE_ITEM SOURCES
 
@@ -11,7 +11,7 @@ start-contract-test-service-bg:
 	@make start-contract-test-service >$(TEMP_TEST_OUTPUT) 2>&1 &
 
 run-contract-tests:
-	@curl -s https://raw.githubusercontent.com/launchdarkly/sdk-test-harness/master/downloader/run.sh \
+	@curl -s https://raw.githubusercontent.com/launchdarkly/sdk-test-harness/main/downloader/run.sh \
       | VERSION=v1 PARAMS="-url http://localhost:8000 -debug -stop-service-at-end $(TEST_HARNESS_PARAMS)" sh
 
 contract-tests: build-contract-tests start-contract-test-service-bg run-contract-tests
 
@@ -5,6 +5,7 @@
 #define _CRT_RAND_S
 #endif
 #include <stdlib.h>
+#include <math.h>
 
 #include <launchdarkly/json.h>
 #include <launchdarkly/memory.h>
@@ -107,7 +108,7 @@ LDi_sleepMilliseconds(const unsigned long milliseconds)
 static double
 LDi_timeSpecToMilliseconds(const struct timespec ts)
 {
-    return ((double)ts.tv_sec * 1000.0) + ((double)ts.tv_nsec / 1000000.0);
+    return floor(((double)ts.tv_sec * 1000.0) + ((double)ts.tv_nsec / 1000000.0));
 }
 
 LDBoolean
@@ -168,7 +169,7 @@ LDBoolean
 LDi_getUnixMilliseconds(double *const resultMilliseconds)
 {
 #ifdef _WIN32
-    *resultMilliseconds = (double)time(NULL) * 1000.0;
+    *resultMilliseconds = floor((double)time(NULL) * 1000.0);
 
     return LDBooleanTrue;
 #else
 
@@ -22,12 +22,16 @@
 
 LDBoolean
 LDi_sleepMilliseconds(const unsigned long milliseconds);
+
 LDBoolean
 LDi_getMonotonicMilliseconds(double *const resultMilliseconds);
+
 LDBoolean
 LDi_getUnixMilliseconds(double *const resultMilliseconds);
+
 LDBoolean
 LDi_randomHex(char *const buffer, const size_t bufferSize);
+
 #define LD_UUID_SIZE 36
 LDBoolean
 LDi_UUIDv4(char *const buffer);
 
@@ -55,16 +55,24 @@ struct SDKConfigEventParams {
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(SDKConfigEventParams, baseUri, capacity, enableDiagnostics,
                                                 allAttributesPrivate, globalPrivateAttributes, flushIntervalMs,
                                                 inlineUsers);
+struct SDKConfigServiceEndpointsParams {
+    std::optional<std::string> streaming;
+    std::optional<std::string> polling;
+    std::optional<std::string> events;
+};
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(SDKConfigServiceEndpointsParams, streaming, polling, events);
+
 
 struct SDKConfigParams {
     std::string credential;
     std::optional<uint32_t> startWaitTimeMs;
     std::optional<bool> initCanFail;
     std::optional<SDKConfigStreamingParams> streaming;
     std::optional<SDKConfigEventParams> events;
+    std::optional<SDKConfigServiceEndpointsParams> serviceEndpoints;
 };
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(SDKConfigParams, credential, startWaitTimeMs, initCanFail,
-                                                streaming, events);
+                                                streaming, events, serviceEndpoints);
 
 struct CreateInstanceParams {
     SDKConfigParams configuration;
 
@@ -206,29 +206,37 @@ bool ClientEntity::customEvent(const CustomEventParams &params) {
         return false;
     }
 
-    struct LDJSON* json = params.data ?
+    struct LDJSON* data = params.data ?
           LDJSONDeserialize(params.data->dump().c_str()) :
           LDNewNull();
 
-    if (params.metricValue) {
-        return static_cast<bool>(LDClientTrackMetric(
+
+    if (params.omitNullData.value_or(false) && !params.metricValue && !params.data) {
+        return static_cast<bool>(LDClientTrack(
                 m_client,
                 params.eventKey.c_str(),
                 user.get(),
-                json,
-                *params.metricValue
+                data
         ));
     }
-    if (params.data) {
+
+    if (!params.metricValue) {
         return static_cast<bool>(LDClientTrack(
                 m_client,
                 params.eventKey.c_str(),
                 user.get(),
-                json
+                data
         ));
     }
 
-    return false;
+
+    return static_cast<bool>(LDClientTrackMetric(
+            m_client,
+            params.eventKey.c_str(),
+            user.get(),
+            data,
+            *params.metricValue
+    ));
 }
 
 bool ClientEntity::aliasEvent(const AliasEventParams &params) {
@@ -317,6 +325,18 @@ struct LDConfig * make_config(const SDKConfigParams &in) {
         return nullptr;
     }
 
+    if (in.serviceEndpoints) {
+        if (in.serviceEndpoints->streaming) {
+            LDConfigSetStreamURI(out, in.serviceEndpoints->streaming->c_str());
+        }
+        if (in.serviceEndpoints->polling) {
+            LDConfigSetBaseURI(out, in.serviceEndpoints->polling->c_str());
+        }
+        if (in.serviceEndpoints->events) {
+            LDConfigSetEventsURI(out, in.serviceEndpoints->events->c_str());
+        }
+    }
+
     if (in.streaming && in.streaming->baseUri) {
         LDConfigSetStreamURI(out, in.streaming->baseUri->c_str());
     }
 
@@ -27,7 +27,8 @@ void TestService::get_status(const httplib::Request &req, httplib::Response &res
             "strongly-typed",
             "all-flags-with-reasons",
             "all-flags-client-side-only",
-            "all-flags-details-only-for-tracked-flags"
+            "all-flags-details-only-for-tracked-flags",
+            "service-endpoints"
     };
     res.set_content(rsp.dump(), "application/json");
 }
 
@@ -57,8 +57,8 @@ LD_EXPORT(LDBoolean) LDClientIsInitialized(struct LDClient *const client);
  * @param[in] user The user to generate the event for. Ownership is not
  * transferred. May not be `NULL`.
  * @param[in] data The JSON to attach to the event. Ownership of `data` is
- * transferred. May be `NULL`.
- * @return True if the event was queued, False on error.
+ * transferred only if True is returned. May be `NULL`.
+ * @return True if the event was queued successfully, or if analytics events are disabled. False on error.
  */
 LD_EXPORT(LDBoolean)
 LDClientTrack(
@@ -77,7 +77,7 @@ LDClientTrack(
  * @param[in] data The JSON to attach to the event. Ownership of `data` is
  * transferred. May be `NULL`.
  * @param[in] metric A metric to be associated with the event.
- * @return True if the event was queued, False on error.
+ * @return True if the event was queued successfully, or if analytics events are disabled. False on error.
  */
 LD_EXPORT(LDBoolean)
 LDClientTrackMetric(
@@ -94,7 +94,7 @@ LDClientTrackMetric(
  * transferred. May not be `NULL`.
  * @param[in] previousUser The previous version of a user. Ownership is not
  * transferred. May not be `NULL`.
- * @return True if the event was queued, False on error.
+ * @return True if the event was queued successfully, or if analytics events are disabled. False on error.
  */
 LD_EXPORT(LDBoolean)
 LDClientAlias(
@@ -107,7 +107,7 @@ LDClientAlias(
  * @param[in] client The client to use. May not be `NULL`.
  * @param[in] user The user to generate the event for. Ownership is not
  * transferred. May not be `NULL`.
- * @return True if the event was queued, False on error.
+ * @return True if the event was queued successfully, or if analytics events are disabled. False on error.
  */
 LD_EXPORT(LDBoolean)
 LDClientIdentify(
 
@@ -8,6 +8,7 @@
 #include <launchdarkly/boolean.h>
 #include <launchdarkly/export.h>
 #include <launchdarkly/store.h>
+#include <launchdarkly/data_source.h>
 
 /**
  * @struct LDConfig
@@ -223,6 +224,16 @@ LD_EXPORT(void)
 LDConfigSetFeatureStoreBackend(
     struct LDConfig *const config, struct LDStoreInterface *const backend);
 
+/**
+ * @brief Sets the implementation of the data source
+ * @param[in] config The configuration to modify. May not be `NULL`.
+ * @param[in] dataSource May be `NULL`. Ownership of `dataSource` is transferred.
+ * @return Void.
+ */
+LD_EXPORT(void)
+LDConfigSetDataSource(
+    struct LDConfig *const config, struct LDDataSource *const dataSource);
+
 /**
  * @brief When a feature store backend is provided, configure how long items
  * will be cached in memory. Set the value to zero to always hit the external
 
@@ -0,0 +1,11 @@
+/*!
+ * @file data_source.h
+ * @brief Public API for data source implementation
+ */
+#pragma once
+
+/**
+ * @struct LDDataSource
+ * @brief An opaque data source object.
+ */
+struct LDDataSource;