Skip to content

Commit a0a5fe1

Browse files
aef123aef123
authored
Fixing URLs for Collector (#1097)
1 parent e8eb28f commit a0a5fe1

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

‎Solutions/win32-cs/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static void Main(string[] args)
5454
AutoLogAppSuspend = false,
5555
AutoLogUnhandledException = false,
5656
OfflineStorage = "offline.storage",
57-
// CollectorURL = "https://pipe.int.trafficmanager.net/Collector/3.0/", // INT collector example
57+
// CollectorURL = "https://mobile.events-sandbox.data.microsoft.com/Collector/3.0/", // INT collector example
5858
MinTraceLevel = ACTTraceLevel.ACTTraceLevel_Trace,
5959
TraceLevelMask = 0xFFFFFFFF, // API calls + Global mask for general messages
6060
MaxTeardownUploadTimeInSec = 5

‎examples/cpp/EventSender/EventSender.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const char* defaultConfig = static_cast<const char *> JSON_CONFIG
3535
"dotType": true
3636
},
3737
"enableLifecycleSession" : false,
38-
"eventCollectorUri" : "https://self.events.data.microsoft.com/OneCollector/1.0/",
38+
"eventCollectorUri" : "https://mobile.events.data.microsoft.com/OneCollector/1.0/",
3939
"forcedTenantToken" : null,
4040
"hostMode" : true,
4141
"http" : {

‎examples/cpp/EventSender/direct.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dotType": true
99
},
1010
"enableLifecycleSession": false,
11-
"eventCollectorUri": "https://self.events.data.microsoft.com/OneCollector/1.0/",
11+
"eventCollectorUri": "https://mobile.events.data.microsoft.com/OneCollector/1.0/",
1212
"forcedTenantToken": null,
1313
"hostMode": true,
1414
"http": {

‎lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/LogManagerDDVUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ public void onDebugEvent(DebugEvent evt) {
538538
@Test
539539
public void getDefaultConfig() {
540540
ILogConfiguration defaultConfig = ILogConfiguration.getDefaultConfiguration();
541-
final String COLLECTOR_URL_PROD = "https://self.events.data.microsoft.com/OneCollector/1.0/";
541+
final String COLLECTOR_URL_PROD = "https://mobile.events.data.microsoft.com/OneCollector/1.0/";
542542

543543
assertThat(defaultConfig.getBoolean(LogConfigurationKey.CFG_BOOL_ENABLE_ANALYTICS), is(false));
544544
assertThat(defaultConfig.getLong(LogConfigurationKey.CFG_INT_CACHE_FILE_SIZE), is(3145728L));

‎lib/include/public/ILogConfiguration.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,32 @@ namespace MAT_NS_BEGIN
2222
class IHttpClient;
2323

2424
/// Default collector url to send events to
25-
static constexpr const char* COLLECTOR_URL_PROD = "https://self.events.data.microsoft.com/OneCollector/1.0/";
25+
static constexpr const char* COLLECTOR_URL_PROD = "https://mobile.events.data.microsoft.com/OneCollector/1.0/";
2626

2727
/// <summary>
2828
/// The URI of the United States collector.
2929
/// </summary>
30-
static constexpr const char* COLLECTOR_URL_UNITED_STATES = "https://noam.events.data.microsoft.com/OneCollector/1.0/";
30+
static constexpr const char* COLLECTOR_URL_UNITED_STATES = "https://us-mobile.events.data.microsoft.com/OneCollector/1.0/";
3131

3232
/// <summary>
3333
/// The URI of the German collector.
3434
/// </summary>
35-
static constexpr const char* COLLECTOR_URL_GERMANY = "https://emea.events.data.microsoft.com/OneCollector/1.0/";
35+
static constexpr const char* COLLECTOR_URL_GERMANY = "https://eu-mobile.events.data.microsoft.com/OneCollector/1.0/";
3636

3737
/// <summary>
3838
/// The URI of the Australian collector.
3939
/// </summary>
40-
static constexpr const char* COLLECTOR_URL_AUSTRALIA = "https://apac.events.data.microsoft.com/OneCollector/1.0/";
40+
static constexpr const char* COLLECTOR_URL_AUSTRALIA = "https://au-mobile.events.data.microsoft.com/OneCollector/1.0/";
4141

4242
/// <summary>
4343
/// The URI of the Japanese collector.
4444
/// </summary>
45-
static constexpr const char* COLLECTOR_URL_JAPAN = "https://apac.events.data.microsoft.com/OneCollector/1.0/";
45+
static constexpr const char* COLLECTOR_URL_JAPAN = "https://jp-mobile.events.data.microsoft.com/OneCollector/1.0/";
4646

4747
/// <summary>
4848
/// The URI of the European collector.
4949
/// </summary>
50-
static constexpr const char* COLLECTOR_URL_EUROPE = "https://emea.events.data.microsoft.com/OneCollector/1.0/";
50+
static constexpr const char* COLLECTOR_URL_EUROPE = "https://eu-mobile.events.data.microsoft.com/OneCollector/1.0/";
5151

5252
/// <summary>
5353
/// The real-time transmit profile.

‎lib/shared/LogConfigurationCX.hpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ namespace Microsoft {
4343
{
4444
public:
4545
#ifndef _WINRT_DLL /* C# .NET implementation */
46-
static String^ CollectorUrlDefault = L"https://self.events.data.microsoft.com/OneCollector/1.0/";
47-
static String^ CollectorUrlUnitedStates = L"https://noam.events.data.microsoft.com/OneCollector/1.0/";
48-
static String^ CollectorUrlGermany = L"https://emea.events.data.microsoft.com/OneCollector/1.0/";
49-
static String^ CollectorUrlAustralia = L"https://apac.events.data.microsoft.com/OneCollector/1.0/";
50-
static String^ CollectorUrlJapan = L"https://apac.events.data.microsoft.com/OneCollector/1.0/";
51-
static String^ CollectorUrlEurope = L"https://emea.events.data.microsoft.com/OneCollector/1.0/";
46+
static String^ CollectorUrlDefault = L"https://mobile.events.data.microsoft.com/OneCollector/1.0/";
47+
static String^ CollectorUrlUnitedStates = L"https://us-mobile.events.data.microsoft.com/OneCollector/1.0/";
48+
static String^ CollectorUrlGermany = L"https://eu-mobile.events.data.microsoft.com/OneCollector/1.0/";
49+
static String^ CollectorUrlAustralia = L"https://au-mobile.events.data.microsoft.com/OneCollector/1.0/";
50+
static String^ CollectorUrlJapan = L"https://jp-mobile.events.data.microsoft.com/OneCollector/1.0/";
51+
static String^ CollectorUrlEurope = L"https://eu-mobile.events.data.microsoft.com/OneCollector/1.0/";
5252
#else /* WinRT .winmd linkage implementation*/
53-
static property String^ CollectorUrlDefault { String ^get() { return L"https://self.events.data.microsoft.com/OneCollector/1.0/"; } }
54-
static property String^ CollectorUrlUnitedStates { String ^get() { return L"https://noam.events.data.microsoft.com/OneCollector/1.0/"; } }
55-
static property String^ CollectorUrlGermany { String ^get() { return L"https://emea.events.data.microsoft.com/OneCollector/1.0/"; } }
56-
static property String^ CollectorUrlAustralia { String ^get() { return L"https://apac.events.data.microsoft.com/OneCollector/1.0/"; } }
57-
static property String^ CollectorUrlJapan { String ^get() { return L"https://apac.events.data.microsoft.com/OneCollector/1.0/"; } }
58-
static property String^ CollectorUrlEurope { String ^get() { return L"https://emea.events.data.microsoft.com/OneCollector/1.0/"; } }
53+
static property String^ CollectorUrlDefault { String ^get() { return L"https://mobile.events.data.microsoft.com/OneCollector/1.0/"; } }
54+
static property String^ CollectorUrlUnitedStates { String ^get() { return L"https://us-mobile.events.data.microsoft.com/OneCollector/1.0/"; } }
55+
static property String^ CollectorUrlGermany { String ^get() { return L"https://eu-mobile.events.data.microsoft.com/OneCollector/1.0/"; } }
56+
static property String^ CollectorUrlAustralia { String ^get() { return L"https://au-mobile.events.data.microsoft.com/OneCollector/1.0/"; } }
57+
static property String^ CollectorUrlJapan { String ^get() { return L"https://jp-mobile.events.data.microsoft.com/OneCollector/1.0/"; } }
58+
static property String^ CollectorUrlEurope { String ^get() { return L"https://eu-mobile.events.data.microsoft.com/OneCollector/1.0/"; } }
5959
#endif
6060
LogConfiguration()
6161
{

‎tests/functests/APITest.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1144,8 +1144,8 @@ TEST(APITest, LogConfiguration_MsRoot_Check)
11441144
{
11451145
{"https://v10.events.data.microsoft.com/OneCollector/1.0/", false, 1}, // MS-Rooted, no MS-Root check: post succeeds
11461146
{"https://v10.events.data.microsoft.com/OneCollector/1.0/", true, 1}, // MS-Rooted, MS-Root check: post succeeds
1147-
{"https://self.events.data.microsoft.com/OneCollector/1.0/", false, 1}, // Non-MS rooted, no MS-Root check: post succeeds
1148-
{"https://self.events.data.microsoft.com/OneCollector/1.0/", true, 0} // Non-MS rooted, MS-Root check: post fails
1147+
{"https://mobile.events.data.microsoft.com/OneCollector/1.0/", false, 1}, // Non-MS rooted, no MS-Root check: post succeeds
1148+
{"https://mobile.events.data.microsoft.com/OneCollector/1.0/", true, 0} // Non-MS rooted, MS-Root check: post fails
11491149
};
11501150

11511151
// 4 test runs
@@ -1193,7 +1193,7 @@ TEST(APITest, LogManager_BadNetwork_Test)
11931193
"https://0.0.0.0/",
11941194
"https://127.0.0.1/",
11951195
#endif
1196-
"https://1ds.pipe.int.trafficmanager.net/OneCollector/1.0/",
1196+
"https://mobile.events-sandbox.data.microsoft.com/OneCollector/1.0/",
11971197
"https://invalid.host.name.microsoft.com/"
11981198
})
11991199
{

‎tests/unittests/HttpRequestEncoderTests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ TEST_F(HttpRequestEncoderTests, SetsAllParameters)
6565

6666
EXPECT_THAT(req->m_id, Eq("HttpRequestEncoderTests"));
6767
EXPECT_THAT(req->m_method, Eq("POST"));
68-
EXPECT_THAT(req->m_url, Eq("https://self.events.data.microsoft.com/OneCollector/1.0/"));
68+
EXPECT_THAT(req->m_url, Eq("https://mobile.events.data.microsoft.com/OneCollector/1.0/"));
6969
EXPECT_THAT(req->m_headers, Contains(Pair("Expect", "100-continue")));
7070
EXPECT_THAT(req->m_headers, Contains(Pair("SDK-Version", PAL::getSdkVersion())));
7171
EXPECT_THAT(req->m_headers, Contains(Pair("Client-Id", "NO_AUTH")));

0 commit comments

Comments
 (0)