1DS C++ SDK bindings for Unity C# layer

examples/cpp/SampleCppMini/main.cpp

@@ -31,7 +31,7 @@ void test_cpp_api(const char * token, int ticketType, const char *ticket)
 
     if (ticket != nullptr)
     {
-        const char *ticketNames[7] =
+        const char *ticketNames[8] =
         {
             "TicketType_MSA_Device",
             "TicketType_MSA_User",
@@ -40,7 +40,7 @@ void test_cpp_api(const char * token, int ticketType, const char *ticket)
             "TicketType_AAD",
             "TicketType_AAD_User",
             "TicketType_AAD_JWT",
-            "TicketType_AAD_Device",
+            "TicketType_AAD_Device"
         };
         printf("\nSet ticket %s=%s\n", ticketNames[ticketType], ticket);
         auto tc = LogManager::GetAuthTokensController();

lib/api/capi.cpp

@@ -242,10 +242,24 @@ evt_status_t mat_log(evt_context_t *ctx)
     EventProperties props;
     props.unpack(evt, ctx->size);
 
+    // Determine ingestion token to use for this record.
+    std::string token;
+
+    // Use LogManager configuration primary token if available.
+    if (config.HasConfig(CFG_STR_PRIMARY_TOKEN))
+    {
+        token = static_cast<const char*>(config[CFG_STR_PRIMARY_TOKEN]);
+    }
+
+    // Allow to override iKey per event via property.
+    // C API client maintains one handle for different tenants.
     auto m = props.GetProperties();
-    EventProperty &prop = m[COMMONFIELDS_IKEY];
-    std::string token = prop.as_string;
-    props.erase(COMMONFIELDS_IKEY);
+    if (m.count(COMMONFIELDS_IKEY))
+    {
+        EventProperty& prop = m[COMMONFIELDS_IKEY];
+        token = prop.as_string;
+        props.erase(COMMONFIELDS_IKEY);
+    }
 
     // Privacy feature for OTEL C API client:
     //

lib/include/public/ctmacros.hpp

@@ -127,4 +127,24 @@
 #define EVTSDK_LIBABI_CDECL MATSDK_LIBABI_CDECL
 #define EVTSDK_SPEC         MATSDK_SPEC
 
+/* Implement struct packing for stable FFI C API */
+#ifdef __clang__
+# define MATSDK_PACKED_STRUCT __attribute__((packed))
+# define MATSDK_PACK_PUSH
+# define MATSDK_PACK_POP
+#elif __GNUC__
+# define MATSDK_PACKED_STRUCT __attribute__((packed))
+# define MATSDK_PACK_PUSH
+# define MATSDK_PACK_POP
+#elif _MSC_VER
+# define MATSDK_PACKED_STRUCT
+# define MATSDK_PACK_PUSH     __pragma(pack(push, 1))
+# define MATSDK_PACK_POP      __pragma(pack(pop))
+#else
+/* No packing behavior on unknown compilers */
+# define MATSDK_PACKED_STRUCT
+# define MATSDK_PACK_PUSH
+# define MATSDK_PACK_POP
+#endif
+
 #endif

lib/include/public/mat.h

@@ -9,7 +9,7 @@
  * For version handshake check there is no mandatory requirement to update the $PATCH level.
  * Ref. https://semver.org/ for Semantic Versioning documentation.
  */
-#define TELEMETRY_EVENTS_VERSION	"3.1.0"
+#define TELEMETRY_EVENTS_VERSION "3.7.0"
 
 #include "ctmacros.hpp"
 
@@ -59,7 +59,8 @@ extern "C" {
         EVT_OP_FLUSH = 0x0000000A,
         EVT_OP_VERSION = 0x0000000B,
         EVT_OP_OPEN_WITH_PARAMS = 0x0000000C,
-        EVT_OP_MAX = EVT_OP_OPEN_WITH_PARAMS + 1
+        EVT_OP_MAX = EVT_OP_OPEN_WITH_PARAMS + 1,
+        EVT_OP_MAXINT = 0xFFFFFFFF
     } evt_call_t;
 
     typedef enum evt_prop_t
@@ -79,11 +80,13 @@ extern "C" {
         TYPE_BOOL_ARRAY,
         TYPE_GUID_ARRAY,
         /* NULL-type */
-        TYPE_NULL
+        TYPE_NULL,
+        TYPE_MAXINT = 0xFFFFFFFF
     } evt_prop_t;
 
-    typedef struct evt_guid_t
+    typedef struct MATSDK_PACKED_STRUCT evt_guid_t
     {
+MATSDK_PACK_PUSH
         /**
          * <summary>
          * Specifies the first eight hexadecimal digits of the GUID.
@@ -111,19 +114,22 @@ extern "C" {
          * </summary>
          */
         uint8_t  Data4[8];
+MATSDK_PACK_POP
     } evt_guid_t;
 
     typedef int64_t  evt_handle_t;
     typedef int32_t  evt_status_t;
     typedef struct   evt_event evt_event;
 
-    typedef struct evt_context_t
+    typedef struct MATSDK_PACKED_STRUCT evt_context_t
     {
+MATSDK_PACK_PUSH
         evt_call_t      call;       /* In       */
         evt_handle_t    handle;     /* In / Out */
         void*           data;       /* In / Out */
         evt_status_t    result;     /* Out      */
         uint32_t        size;       /* In / Out */
+MATSDK_PACK_POP
     } evt_context_t;
 
     /**
@@ -183,12 +189,14 @@ extern "C" {
         uint64_t**          as_arr_time;
     } evt_prop_v;
 
-    typedef struct evt_prop
+    typedef struct MATSDK_PACKED_STRUCT evt_prop
     {
+MATSDK_PACK_PUSH
         const char*             name;
         evt_prop_t              type;
         evt_prop_v              value;
         uint32_t                piiKind;
+MATSDK_PACK_POP
     } evt_prop;
 
     /**