Merge branch 'master' into sid-dahiya/TestUpdatesForImprovedIpAddressFiltering

Author: sid-dahiya

lib/android_build/maesdk/src/main/java/com/microsoft/applications/events/Constants.java

@@ -15,7 +15,6 @@ private Constants() { }
 
     public static final String COMMONFIELDS_APP_EXPERIMENTIDS                       = "AppInfo.ExperimentIds";
     public static final String COMMONFIELDS_APP_EXPERIMENTETAG                      = "AppInfo.ETag";
-    public static final String COMMONFIELDS_APP_EXPERIMENT_IMPRESSION_ID            = "AppInfo.ImpressionId";
 
     public static final String COMMONFIELDS_DEVICE_ID                               = "DeviceInfo.Id";
     public static final String COMMONFIELDS_DEVICE_MAKE                             = "DeviceInfo.Make";
@@ -58,6 +57,7 @@ private Constants() { }
     public static final String SESSION_FIRST_TIME                                   = "Session.FirstLaunchTime";
     public static final String SESSION_STATE                                        = "Session.State";
     public static final String SESSION_ID                                           = "Session.Id";
+    public static final String SESSION_IMPRESSION_ID                                = "Session.ImpressionId";
     public static final String SESSION_DURATION                                     = "Session.Duration";
     public static final String SESSION_DURATION_BUCKET                              = "Session.DurationBucket";
     public static final String SESSION_ID_LEGACY                                    = "act_session_id";

lib/android_build/maesdk/src/main/java/com/microsoft/applications/events/SemanticContext.java

@@ -104,7 +104,7 @@ public void setAppExperimentETag(final String appExperimentETag) {
      */
     @Override
     public void setAppExperimentImpressionId(final String appExperimentImpressionId) {
-        setCommonField(Constants.COMMONFIELDS_APP_EXPERIMENT_IMPRESSION_ID, appExperimentImpressionId);
+        setCommonField(Constants.SESSION_IMPRESSION_ID, appExperimentImpressionId);
     }
 
     private native void nativeSetEventExperimentIds(long nativeISemanticContextPtr, String eventName, String experimentIds);

lib/api/ContextFieldsProvider.cpp

@@ -125,13 +125,13 @@ namespace ARIASDK_NS_BEGIN
 
             if (!m_commonContextFields.empty())
             {
-                if (m_commonContextFields.find(COMMONFIELDS_APP_EXPERIMENT_IMPRESSION_ID) != m_commonContextFields.end())
+                if (m_commonContextFields.find(SESSION_IMPRESSION_ID) != m_commonContextFields.end())
                 {
                     CsProtocol::Value temp;
-                    EventProperty prop = m_commonContextFields[COMMONFIELDS_APP_EXPERIMENT_IMPRESSION_ID];
+                    EventProperty prop = m_commonContextFields[SESSION_IMPRESSION_ID];
                     temp.stringValue = prop.as_string;
 
-                    ext[COMMONFIELDS_APP_EXPERIMENT_IMPRESSION_ID] = temp;
+                    ext[SESSION_IMPRESSION_ID] = temp;
                 }
 
                 if (m_commonContextFields.find(COMMONFIELDS_APP_EXPERIMENTETAG) != m_commonContextFields.end())

lib/include/public/CommonFields.h

@@ -14,7 +14,6 @@
 
 #define COMMONFIELDS_APP_EXPERIMENTIDS                       "AppInfo.ExperimentIds"
 #define COMMONFIELDS_APP_EXPERIMENTETAG                      "AppInfo.ETag"
-#define COMMONFIELDS_APP_EXPERIMENT_IMPRESSION_ID            "AppInfo.ImpressionId"
 
 #define COMMONFIELDS_DEVICE_ID                               "DeviceInfo.Id"
 #define COMMONFIELDS_DEVICE_MAKE                             "DeviceInfo.Make"
@@ -57,6 +56,7 @@
 #define SESSION_FIRST_TIME                                   "Session.FirstLaunchTime"
 #define SESSION_STATE                                        "Session.State"
 #define SESSION_ID                                           "Session.Id"
+#define SESSION_IMPRESSION_ID                                "Session.ImpressionId"
 #define SESSION_DURATION                                     "Session.Duration"
 #define SESSION_DURATION_BUCKET                              "Session.DurationBucket"
 #define SESSION_ID_LEGACY                                    "act_session_id"

lib/include/public/ISemanticContext.hpp

@@ -71,7 +71,7 @@ namespace ARIASDK_NS_BEGIN
         /// Set the application experimentation impression id information of telemetry event.
         /// </summary>
         /// <param name="appExperimentIds">List of expementation IDs which are app/platform specific</param>
-        DECLARE_COMMONFIELD(AppExperimentImpressionId, COMMONFIELDS_APP_EXPERIMENT_IMPRESSION_ID);
+        DECLARE_COMMONFIELD(AppExperimentImpressionId, SESSION_IMPRESSION_ID);
 
         /// <summary>
         /// Set the experiment IDs information of the specified telemetry event.

lib/include/public/LogManagerBase.hpp

@@ -676,6 +676,16 @@ namespace ARIASDK_NS_BEGIN
             return nullLogManager.GetDataViewerCollection();
 #endif
         }
+
+        /// <summary>
+        /// Obtain a raw pointer to the ILogManager singleton instance.
+        /// NOTE: this API should not be used concurrently with Initialize or FlushAndTeardown API calls.
+        /// </summary>
+        static ILogManager* GetInstance() noexcept
+        {
+            LM_LOCKGUARD(stateLock());
+            return instance;
+        }
     };
 
     // Implements LogManager<T> singleton template static  members

tests/functests/BasicFuncTests.cpp

@@ -1443,6 +1443,20 @@ TEST_F(BasicFuncTests, raceBetweenUploadAndShutdownMultipleLogManagers)
 }
 #endif
 
+TEST_F(BasicFuncTests, logManager_getLogManagerInstance_uninitializedReturnsNull)
+{
+    auto lm = LogManager::GetInstance();
+    EXPECT_EQ(lm,nullptr);
+}
+
+TEST_F(BasicFuncTests, logManager_getLogManagerInstance_initializedReturnsNonnull)
+{
+    LogManager::Initialize();
+    auto lm = LogManager::GetInstance();
+    EXPECT_NE(lm,nullptr);
+    LogManager::FlushAndTeardown();
+}
+
 #if 0   // XXX: [MG] - This test was never supposed to work! Because the URL is invalid, we won't get anything in receivedRequests
 
 TEST_F(BasicFuncTests, networkProblemsDoNotDropEvents)

wrappers/obj-c/ODWSemanticContext.h

@@ -25,13 +25,34 @@ NS_ASSUME_NONNULL_BEGIN
  */
 -(void)setUserAdvertisingId:(nonnull NSString *)userAdvertisingId;
 
+/*!
+ @brief Sets the experimentation IDs for determining the deployment configuration.
+ @param experimentIds A string that contains the experimentation IDs.
+ */
+-(void)setAppExperimentIds:(nonnull NSString*)experimentIds;
+
+/*!
+ @brief Sets the experimentation IDs for the specified telemetry event.
+ @param experimentIds A string that contains the experimentation IDs.
+ @param eventName A string that contains the name of the event.
+ */
+-(void)setAppExperimentIds:(nonnull NSString*)experimentIds
+                  forEvent:(nonnull NSString*)eventName;
+
 /*!
  @brief Sets the experiment tag (experiment configuration) context information for telemetry events.
  <b>Note:</b> This method removes any previously stored experiment IDs that were set using setAppExperimentETag.
  @param eTag A string that contains the ETag which is a hash of the set of experiments.
  */
 -(void)setAppExperimentETag:(nonnull NSString *)eTag;
 
+/*!
+ @brief Sets the impression ID (an identifier of the currently running flights) for an experiment.
+ @details Calling this method removes the previously stored experimentation IDs and flight IDs.
+ @param impressionId A string that contains the impression ID for the currently active configuration.
+ */
+-(void)setAppExperimentImpressionId:(nonnull NSString*)impressionId;
+
 @end
 
 NS_ASSUME_NONNULL_END

wrappers/obj-c/ODWSemanticContext.mm

@@ -37,10 +37,30 @@ -(void)setUserAdvertisingId:(nonnull NSString *)userAdvertisingId
     _wrappedSemanticContext->SetUserAdvertisingId(strUserAdvertisingId);
 }
 
+-(void)setAppExperimentIds:(nonnull NSString*)experimentIds
+{
+    std::string strAppExperimentIds = std::string([experimentIds UTF8String]);
+    _wrappedSemanticContext->SetAppExperimentIds(strAppExperimentIds);
+}
+
+-(void)setAppExperimentIds:(nonnull NSString*)experimentIds
+                  forEvent:(nonnull NSString*)eventName
+{
+    std::string strAppExperimentIds = std::string([experimentIds UTF8String]);
+    std::string stEventName = std::string([eventName UTF8String]);
+    _wrappedSemanticContext->SetEventExperimentIds(stEventName, strAppExperimentIds);
+}
+
 -(void)setAppExperimentETag:(nonnull NSString *)eTag
 {
     std::string strETag = std::string([eTag UTF8String]);
     _wrappedSemanticContext->SetAppExperimentETag(strETag);
 }
 
+-(void)setAppExperimentImpressionId:(nonnull NSString*)impressionId
+{
+    std::string strImpressionId = std::string([impressionId UTF8String]);
+    _wrappedSemanticContext->SetAppExperimentImpressionId(strImpressionId);
+}
+
 @end