Merge branch 'main' into devin/1774991616-immutable-releases

keelerm84 · keelerm84 · commit 1c06409a7448 · 2026-04-06T17:37:16.000Z
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,7 @@ build-dynamic
 build-static-debug
 build-dynamic-debug
 cmake-build-*
+.cache
 
 # For Macs..
 .DS_Store
diff --git a/libs/client-sdk/package.json b/libs/client-sdk/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "launchdarkly-cpp-client",
+  "name": "@launchdarkly/cpp-client",
   "description": "This package.json exists for modeling dependencies for the release process.",
   "version": "3.11.1",
   "private": true,
   "dependencies": {
-    "launchdarkly-cpp-internal": "0.13.0",
-    "launchdarkly-cpp-common": "1.11.0",
-    "launchdarkly-cpp-sse-client": "0.6.1"
+    "@launchdarkly/cpp-internal": "0.13.0",
+    "@launchdarkly/cpp-common": "1.11.0",
+    "@launchdarkly/cpp-sse-client": "0.6.1"
   }
 }
diff --git a/libs/common/package.json b/libs/common/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "launchdarkly-cpp-common",
+  "name": "@launchdarkly/cpp-common",
   "description": "This package.json exists for modeling dependencies for the release process.",
   "version": "1.11.0",
   "private": true
diff --git a/libs/internal/package.json b/libs/internal/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "launchdarkly-cpp-internal",
+  "name": "@launchdarkly/cpp-internal",
   "description": "This package.json exists for modeling dependencies for the release process.",
   "version": "0.13.0",
   "private": true,
   "dependencies": {
-    "launchdarkly-cpp-common": "1.11.0",
-    "launchdarkly-cpp-networking": "0.2.0"
+    "@launchdarkly/cpp-common": "1.11.0",
+    "@launchdarkly/cpp-networking": "0.2.0"
   }
 }
diff --git a/libs/networking/package.json b/libs/networking/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "launchdarkly-cpp-networking",
+  "name": "@launchdarkly/cpp-networking",
   "description": "This package.json exists for modeling dependencies for the release process.",
   "version": "0.2.0",
   "private": true
diff --git a/libs/server-sdk-otel/package.json b/libs/server-sdk-otel/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "launchdarkly-cpp-server-otel",
+  "name": "@launchdarkly/cpp-server-otel",
   "description": "This package.json exists for modeling dependencies for the release process.",
   "version": "0.1.1",
   "private": true,
   "dependencies": {
-    "launchdarkly-cpp-server": "3.10.1"
+    "@launchdarkly/cpp-server": "3.10.1"
   }
 }
diff --git a/libs/server-sdk-redis-source/package.json b/libs/server-sdk-redis-source/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "launchdarkly-cpp-server-redis-source",
+  "name": "@launchdarkly/cpp-server-redis-source",
   "description": "This package.json exists for modeling dependencies for the release process.",
   "version": "2.2.2",
   "private": true,
   "dependencies": {
-    "launchdarkly-cpp-server": "3.10.1"
+    "@launchdarkly/cpp-server": "3.10.1"
   }
 }
diff --git a/libs/server-sdk/package.json b/libs/server-sdk/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "launchdarkly-cpp-server",
+  "name": "@launchdarkly/cpp-server",
   "description": "This package.json exists for modeling dependencies for the release process.",
   "version": "3.10.1",
   "private": true,
   "dependencies": {
-    "launchdarkly-cpp-internal": "0.13.0",
-    "launchdarkly-cpp-common": "1.11.0",
-    "launchdarkly-cpp-sse-client": "0.6.1"
+    "@launchdarkly/cpp-internal": "0.13.0",
+    "@launchdarkly/cpp-common": "1.11.0",
+    "@launchdarkly/cpp-sse-client": "0.6.1"
   }
 }
diff --git a/libs/server-sdk/src/data_components/memory_store/memory_store.cpp b/libs/server-sdk/src/data_components/memory_store/memory_store.cpp
@@ -1,5 +1,7 @@
 #include "memory_store.hpp"
 
+#include <launchdarkly/detail/unreachable.hpp>
+
 namespace launchdarkly::server_side::data_components {
 
 std::shared_ptr<data_model::FlagDescriptor> MemoryStore::GetFlag(
@@ -82,4 +84,34 @@ bool MemoryStore::RemoveSegment(std::string const& key) {
     return segments_.erase(key) == 1;
 }
 
+void MemoryStore::Apply(data_model::FDv2ChangeSet changeSet) {
+    std::lock_guard lock{data_mutex_};
+
+    switch (changeSet.type) {
+        case data_model::FDv2ChangeSet::Type::kNone:
+            return;
+        case data_model::FDv2ChangeSet::Type::kPartial:
+            break;
+        case data_model::FDv2ChangeSet::Type::kFull:
+            initialized_ = true;
+            flags_.clear();
+            segments_.clear();
+            break;
+        default:
+            detail::unreachable();
+    }
+
+    for (auto& change : changeSet.changes) {
+        if (std::holds_alternative<data_model::FlagDescriptor>(change.object)) {
+            flags_[change.key] = std::make_shared<data_model::FlagDescriptor>(
+                std::move(std::get<data_model::FlagDescriptor>(change.object)));
+        } else if (std::holds_alternative<data_model::SegmentDescriptor>(
+                       change.object)) {
+            segments_[change.key] =
+                std::make_shared<data_model::SegmentDescriptor>(std::move(
+                    std::get<data_model::SegmentDescriptor>(change.object)));
+        }
+    }
+}
+
 }  // namespace launchdarkly::server_side::data_components
diff --git a/libs/server-sdk/src/data_components/memory_store/memory_store.hpp b/libs/server-sdk/src/data_components/memory_store/memory_store.hpp
@@ -3,6 +3,8 @@
 #include "../../data_interfaces/destination/idestination.hpp"
 #include "../../data_interfaces/store/istore.hpp"
 
+#include <launchdarkly/data_model/fdv2_change.hpp>
+
 #include <memory>
 #include <mutex>
 #include <string>
@@ -44,6 +46,8 @@ class MemoryStore final : public data_interfaces::IStore,
 
     bool RemoveSegment(std::string const& key);
 
+    void Apply(data_model::FDv2ChangeSet changeSet);
+
     MemoryStore() = default;
     ~MemoryStore() override = default;
 
diff --git a/libs/server-sdk/src/data_interfaces/source/fdv2_source_result.hpp b/libs/server-sdk/src/data_interfaces/source/fdv2_source_result.hpp
@@ -0,0 +1,70 @@
+#pragma once
+
+#include <launchdarkly/data_model/fdv2_change.hpp>
+#include <launchdarkly/data_sources/data_source_status_error_info.hpp>
+
+#include <optional>
+#include <string>
+#include <variant>
+
+namespace launchdarkly::server_side::data_interfaces {
+
+/**
+ * Result returned by IFDv2Initializer::Run and IFDv2Synchronizer::Next.
+ *
+ * Mirrors Java's FDv2SourceResult.
+ */
+struct FDv2SourceResult {
+    using ErrorInfo = common::data_sources::DataSourceStatusErrorInfo;
+
+    /**
+     * A changeset was successfully received and is ready to apply.
+     */
+    struct ChangeSet {
+        data_model::FDv2ChangeSet change_set;
+        /** If true, the server signaled that the client should fall back to
+         * FDv1. */
+        bool fdv1_fallback;
+    };
+
+    /**
+     * A transient error occurred; the source may recover.
+     */
+    struct Interrupted {
+        ErrorInfo error;
+        bool fdv1_fallback;
+    };
+
+    /**
+     * A non-recoverable error occurred; the source should not be retried.
+     */
+    struct TerminalError {
+        ErrorInfo error;
+        bool fdv1_fallback;
+    };
+
+    /**
+     * The source was closed cleanly (via Close()).
+     */
+    struct Shutdown {};
+
+    /**
+     * The server sent a goodbye; the orchestrator should rotate sources.
+     */
+    struct Goodbye {
+        std::optional<std::string> reason;
+        bool fdv1_fallback;
+    };
+
+    /**
+     * Next() returned because the timeout expired before a result arrived.
+     */
+    struct Timeout {};
+
+    using Value = std::variant<ChangeSet, Interrupted, TerminalError, Shutdown,
+                               Goodbye, Timeout>;
+
+    Value value;
+};
+
+}  // namespace launchdarkly::server_side::data_interfaces
diff --git a/libs/server-sdk/src/data_interfaces/source/ifdv2_initializer.hpp b/libs/server-sdk/src/data_interfaces/source/ifdv2_initializer.hpp
@@ -0,0 +1,46 @@
+#pragma once
+
+#include "fdv2_source_result.hpp"
+
+#include <string>
+
+namespace launchdarkly::server_side::data_interfaces {
+
+/**
+ * Defines a one-shot data source that runs to completion and returns a single
+ * result. Used during the initialization phase of FDv2, before handing off to
+ * an IFDv2Synchronizer.
+ */
+class IFDv2Initializer {
+   public:
+    /**
+     * Run the initializer to completion. Blocks until a result is available.
+     * Called at most once per instance.
+     *
+     * Close() may be called from another thread to unblock Run(), in which
+     * case Run() returns FDv2SourceResult::Shutdown.
+     */
+    virtual FDv2SourceResult Run() = 0;
+
+    /**
+     * Unblocks any in-progress Run() call, causing it to return
+     * FDv2SourceResult::Shutdown.
+     */
+    virtual void Close() = 0;
+
+    /**
+     * @return A display-suitable name of the initializer.
+     */
+    [[nodiscard]] virtual std::string const& Identity() const = 0;
+
+    virtual ~IFDv2Initializer() = default;
+    IFDv2Initializer(IFDv2Initializer const&) = delete;
+    IFDv2Initializer(IFDv2Initializer&&) = delete;
+    IFDv2Initializer& operator=(IFDv2Initializer const&) = delete;
+    IFDv2Initializer& operator=(IFDv2Initializer&&) = delete;
+
+   protected:
+    IFDv2Initializer() = default;
+};
+
+}  // namespace launchdarkly::server_side::data_interfaces
diff --git a/libs/server-sdk/src/data_interfaces/source/ifdv2_synchronizer.hpp b/libs/server-sdk/src/data_interfaces/source/ifdv2_synchronizer.hpp
@@ -0,0 +1,62 @@
+#pragma once
+
+#include "fdv2_source_result.hpp"
+
+#include <launchdarkly/data_model/selector.hpp>
+
+#include <chrono>
+#include <string>
+
+namespace launchdarkly::server_side::data_interfaces {
+
+/**
+ * Defines a continuous data source that produces a stream of results. Used
+ * during the synchronization phase of FDv2, after initialization is complete.
+ *
+ * The stream is started lazily on the first call to Next(). The synchronizer
+ * runs until Close() is called.
+ */
+class IFDv2Synchronizer {
+   public:
+    /**
+     * Block until the next result is available or the timeout expires.
+     *
+     * On the first call, the synchronizer starts its underlying connection.
+     * Subsequent calls continue reading from the same connection.
+     *
+     * If the timeout expires before a result arrives, returns
+     * FDv2SourceResult::Timeout. The orchestrator uses this to evaluate
+     * fallback conditions.
+     *
+     * Close() may be called from another thread to unblock Next(), in which
+     * case Next() returns FDv2SourceResult::Shutdown.
+     *
+     * @param timeout  Maximum time to wait for the next result.
+     * @param selector The selector to send with the request, reflecting any
+     *                 changesets applied since the previous call.
+     */
+    virtual FDv2SourceResult Next(std::chrono::milliseconds timeout,
+                                  data_model::Selector selector) = 0;
+
+    /**
+     * Unblocks any in-progress Next() call, causing it to return
+     * FDv2SourceResult::Shutdown, and releases underlying resources.
+     */
+    virtual void Close() = 0;
+
+    /**
+     * @return A display-suitable name of the synchronizer.
+     */
+    [[nodiscard]] virtual std::string const& Identity() const = 0;
+
+    virtual ~IFDv2Synchronizer() = default;
+    IFDv2Synchronizer(IFDv2Synchronizer const&) = delete;
+    IFDv2Synchronizer(IFDv2Synchronizer&&) = delete;
+    IFDv2Synchronizer& operator=(IFDv2Synchronizer const&) = delete;
+    IFDv2Synchronizer& operator=(IFDv2Synchronizer&&) = delete;
+
+   protected:
+    IFDv2Synchronizer() = default;
+};
+
+}  // namespace launchdarkly::server_side::data_interfaces
diff --git a/libs/server-sdk/tests/memory_store_apply_test.cpp b/libs/server-sdk/tests/memory_store_apply_test.cpp
diff --git a/libs/server-sent-events/package.json b/libs/server-sent-events/package.json
diff --git a/release-please-config.json b/release-please-config.json

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`{`
`2`		`- "name": "launchdarkly-cpp-client",`
	`2`	`+ "name": "@launchdarkly/cpp-client",`
`3`	`3`	`"description": "This package.json exists for modeling dependencies for the release process.",`
`4`	`4`	`"version": "3.11.1",`
`5`	`5`	`"private": true,`
`6`	`6`	`"dependencies": {`
`7`		`- "launchdarkly-cpp-internal": "0.13.0",`
`8`		`- "launchdarkly-cpp-common": "1.11.0",`
`9`		`- "launchdarkly-cpp-sse-client": "0.6.1"`
	`7`	`+ "@launchdarkly/cpp-internal": "0.13.0",`
	`8`	`+ "@launchdarkly/cpp-common": "1.11.0",`
	`9`	`+ "@launchdarkly/cpp-sse-client": "0.6.1"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "launchdarkly-cpp-common",`
	`2`	`+ "name": "@launchdarkly/cpp-common",`
`3`	`3`	`"description": "This package.json exists for modeling dependencies for the release process.",`
`4`	`4`	`"version": "1.11.0",`
`5`	`5`	`"private": true`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`		`- "name": "launchdarkly-cpp-internal",`
	`2`	`+ "name": "@launchdarkly/cpp-internal",`
`3`	`3`	`"description": "This package.json exists for modeling dependencies for the release process.",`
`4`	`4`	`"version": "0.13.0",`
`5`	`5`	`"private": true,`
`6`	`6`	`"dependencies": {`
`7`		`- "launchdarkly-cpp-common": "1.11.0",`
`8`		`- "launchdarkly-cpp-networking": "0.2.0"`
	`7`	`+ "@launchdarkly/cpp-common": "1.11.0",`
	`8`	`+ "@launchdarkly/cpp-networking": "0.2.0"`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "launchdarkly-cpp-networking",`
	`2`	`+ "name": "@launchdarkly/cpp-networking",`
`3`	`3`	`"description": "This package.json exists for modeling dependencies for the release process.",`
`4`	`4`	`"version": "0.2.0",`
`5`	`5`	`"private": true`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`		`- "name": "launchdarkly-cpp-server-otel",`
	`2`	`+ "name": "@launchdarkly/cpp-server-otel",`
`3`	`3`	`"description": "This package.json exists for modeling dependencies for the release process.",`
`4`	`4`	`"version": "0.1.1",`
`5`	`5`	`"private": true,`
`6`	`6`	`"dependencies": {`
`7`		`- "launchdarkly-cpp-server": "3.10.1"`
	`7`	`+ "@launchdarkly/cpp-server": "3.10.1"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`		`- "name": "launchdarkly-cpp-server-redis-source",`
	`2`	`+ "name": "@launchdarkly/cpp-server-redis-source",`
`3`	`3`	`"description": "This package.json exists for modeling dependencies for the release process.",`
`4`	`4`	`"version": "2.2.2",`
`5`	`5`	`"private": true,`
`6`	`6`	`"dependencies": {`
`7`		`- "launchdarkly-cpp-server": "3.10.1"`
	`7`	`+ "@launchdarkly/cpp-server": "3.10.1"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`{`
`2`		`- "name": "launchdarkly-cpp-server",`
	`2`	`+ "name": "@launchdarkly/cpp-server",`
`3`	`3`	`"description": "This package.json exists for modeling dependencies for the release process.",`
`4`	`4`	`"version": "3.10.1",`
`5`	`5`	`"private": true,`
`6`	`6`	`"dependencies": {`
`7`		`- "launchdarkly-cpp-internal": "0.13.0",`
`8`		`- "launchdarkly-cpp-common": "1.11.0",`
`9`		`- "launchdarkly-cpp-sse-client": "0.6.1"`
	`7`	`+ "@launchdarkly/cpp-internal": "0.13.0",`
	`8`	`+ "@launchdarkly/cpp-common": "1.11.0",`
	`9`	`+ "@launchdarkly/cpp-sse-client": "0.6.1"`
`10`	`10`	`}`
`11`	`11`	`}`