Skip to content

Commit 1341118

Browse files
mediumTajmediumTaj
authored
Merge pull request #509 from watson-developer-cloud/6058-analytics-headers
Analytics headers
2 parents 9800c7c + 3a8ed10 commit 1341118

File tree

22 files changed

+203
-1502
lines changed

22 files changed

+203
-1502
lines changed

‎Assistant.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Assistant/v2.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Core.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Core/Editor.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Core/Editor/Help.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Core/Editor/Help/Working.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Scripts/Connection/RESTConnector.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,18 @@ private void AddHeaders(Dictionary<string, string> headers)
375375
}
376376
}
377377

378-
headers.Add("User-Agent", Constants.String.Version);
378+
string osInfo = SystemInfo.operatingSystem;
379+
int osIndex = osInfo.IndexOf(" ");
380+
string os = osInfo.Substring(0, osIndex).Replace(" ", "");
381+
string osVersion = osInfo.Substring(osIndex).Replace(" ", "");
382+
headers.Add("User-Agent",
383+
string.Format(
384+
"{0} {1} {2} {3}",
385+
Constants.String.Version,
386+
os,
387+
osVersion,
388+
Application.unityVersion
389+
));
379390
}
380391

381392
private IEnumerator ProcessRequestQueue()

‎Scripts/Services/Assistant/v1/Assistant.cs

Lines changed: 45 additions & 0 deletions
Large diffs are not rendered by default.

‎Scripts/Services/Assistant/v2/Assistant.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ public bool CreateSession(SuccessCallback<SessionResponse> successCallback, Fail
165165
req.Headers["Content-Type"] = "application/json";
166166
req.Parameters["version"] = VersionDate;
167167
req.OnResponse = OnCreateSessionResponse;
168+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=conversation;service_version=v2;operation_id=CreateSession";
168169

169170
RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v2/assistants/{0}/sessions", assistantId));
170171
if (connector == null)
@@ -281,6 +282,7 @@ public bool DeleteSession(SuccessCallback<object> successCallback, FailCallback
281282
}
282283
req.Parameters["version"] = VersionDate;
283284
req.OnResponse = OnDeleteSessionResponse;
285+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=conversation;service_version=v2;operation_id=DeleteSession";
284286

285287
RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v2/assistants/{0}/sessions/{1}", assistantId, sessionId));
286288
if (connector == null)
@@ -410,6 +412,7 @@ public bool Message(SuccessCallback<MessageResponse> successCallback, FailCallba
410412
req.Headers["Content-Type"] = "application/json";
411413
req.Parameters["version"] = VersionDate;
412414
req.OnResponse = OnMessageResponse;
415+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=conversation;service_version=v2;operation_id=Message";
413416

414417
RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v2/assistants/{0}/sessions/{1}/message", assistantId, sessionId));
415418
if (connector == null)

‎Scripts/Services/CompareComply/v1/CompareComply.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ public bool ConvertToHtml(SuccessCallback<HTMLReturn> successCallback, FailCallb
161161
if (!string.IsNullOrEmpty(modelId))
162162
req.Parameters["model_id"] = modelId;
163163
req.OnResponse = OnConvertToHtmlResponse;
164+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=compare-comply;service_version=v1;operation_id=ConvertToHtml";
164165

165166
RESTConnector connector = RESTConnector.GetConnector(Credentials, "/v1/html_conversion");
166167
if (connector == null)
@@ -269,6 +270,7 @@ public bool ClassifyElements(SuccessCallback<ClassifyReturn> successCallback, Fa
269270
if (!string.IsNullOrEmpty(modelId))
270271
req.Parameters["model_id"] = modelId;
271272
req.OnResponse = OnClassifyElementsResponse;
273+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=compare-comply;service_version=v1;operation_id=ClassifyElements";
272274

273275
RESTConnector connector = RESTConnector.GetConnector(Credentials, "/v1/element_classification");
274276
if (connector == null)
@@ -376,6 +378,7 @@ public bool ExtractTables(SuccessCallback<TableReturn> successCallback, FailCall
376378
if (!string.IsNullOrEmpty(modelId))
377379
req.Parameters["model_id"] = modelId;
378380
req.OnResponse = OnExtractTablesResponse;
381+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=compare-comply;service_version=v1;operation_id=ExtractTables";
379382

380383
RESTConnector connector = RESTConnector.GetConnector(Credentials, "/v1/tables");
381384
if (connector == null)
@@ -498,6 +501,7 @@ public bool CompareDocuments(SuccessCallback<CompareReturn> successCallback, Fai
498501
if (!string.IsNullOrEmpty(modelId))
499502
req.Parameters["model_id"] = modelId;
500503
req.OnResponse = OnCompareDocumentsResponse;
504+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=compare-comply;service_version=v1;operation_id=CompareDocuments";
501505

502506
RESTConnector connector = RESTConnector.GetConnector(Credentials, "/v1/comparison");
503507
if (connector == null)
@@ -607,6 +611,7 @@ public bool AddFeedback(SuccessCallback<FeedbackReturn> successCallback, FailCal
607611
req.Headers["Content-Type"] = "application/json";
608612
req.Parameters["version"] = VersionDate;
609613
req.OnResponse = OnAddFeedbackResponse;
614+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=compare-comply;service_version=v1;operation_id=AddFeedback";
610615

611616
RESTConnector connector = RESTConnector.GetConnector(Credentials, "/v1/feedback");
612617
if (connector == null)
@@ -710,6 +715,7 @@ public bool DeleteFeedback(SuccessCallback<FeedbackDeleted> successCallback, Fai
710715
if (!string.IsNullOrEmpty(modelId))
711716
req.Parameters["model_id"] = modelId;
712717
req.OnResponse = OnDeleteFeedbackResponse;
718+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=compare-comply;service_version=v1;operation_id=DeleteFeedback";
713719

714720
RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/feedback/{0}", feedbackId));
715721
if (connector == null)
@@ -814,6 +820,7 @@ public bool GetFeedback(SuccessCallback<GetFeedback> successCallback, FailCallba
814820
if (!string.IsNullOrEmpty(modelId))
815821
req.Parameters["model_id"] = modelId;
816822
req.OnResponse = OnGetFeedbackResponse;
823+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=compare-comply;service_version=v1;operation_id=GetFeedback";
817824

818825
RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/feedback/{0}", feedbackId));
819826
if (connector == null)
@@ -981,6 +988,7 @@ public bool ListFeedback(SuccessCallback<FeedbackList> successCallback, FailCall
981988
if (includeTotal != null)
982989
req.Parameters["include_total"] = includeTotal;
983990
req.OnResponse = OnListFeedbackResponse;
991+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=compare-comply;service_version=v1;operation_id=ListFeedback";
984992

985993
RESTConnector connector = RESTConnector.GetConnector(Credentials, "/v1/feedback");
986994
if (connector == null)
@@ -1126,6 +1134,7 @@ public bool CreateBatch(SuccessCallback<BatchStatus> successCallback, FailCallba
11261134
if (!string.IsNullOrEmpty(modelId))
11271135
req.Parameters["model_id"] = modelId;
11281136
req.OnResponse = OnCreateBatchResponse;
1137+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=compare-comply;service_version=v1;operation_id=CreateBatch";
11291138

11301139
RESTConnector connector = RESTConnector.GetConnector(Credentials, "/v1/batches");
11311140
if (connector == null)
@@ -1226,6 +1235,7 @@ public bool GetBatch(SuccessCallback<BatchStatus> successCallback, FailCallback
12261235
}
12271236
req.Parameters["version"] = VersionDate;
12281237
req.OnResponse = OnGetBatchResponse;
1238+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=compare-comply;service_version=v1;operation_id=GetBatch";
12291239

12301240
RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/batches/{0}", batchId));
12311241
if (connector == null)
@@ -1323,6 +1333,7 @@ public bool ListBatches(SuccessCallback<Batches> successCallback, FailCallback f
13231333
}
13241334
req.Parameters["version"] = VersionDate;
13251335
req.OnResponse = OnGetBatchesResponse;
1336+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=compare-comply;service_version=v1;operation_id=ListBatches";
13261337

13271338
RESTConnector connector = RESTConnector.GetConnector(Credentials, "/v1/batches");
13281339
if (connector == null)
@@ -1436,6 +1447,7 @@ public bool UpdateBatch(SuccessCallback<BatchStatus> successCallback, FailCallba
14361447
if (!string.IsNullOrEmpty(modelId))
14371448
req.Parameters["model_id"] = modelId;
14381449
req.OnResponse = OnUpdateBatchResponse;
1450+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=compare-comply;service_version=v1;operation_id=UpdateBatch";
14391451

14401452
RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/batches/{0}", batchId));
14411453
if (connector == null)

‎Scripts/Services/Conversation/v1/Conversation.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ public bool Message(SuccessCallback<object> successCallback, FailCallback failCa
172172
req.Function = "/" + workspaceID + "/message";
173173
req.Send = Encoding.UTF8.GetBytes(reqString);
174174
req.OnResponse = MessageResp;
175+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=conversation;service_version=v1;operation_id=Message";
175176
req.DisableSslVerification = DisableSslVerification;
176177
req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
177178
if (req.CustomData.ContainsKey(Constants.String.CUSTOM_REQUEST_HEADERS))
@@ -242,6 +243,7 @@ public bool Message(SuccessCallback<object> successCallback, FailCallback failCa
242243
req.Function = "/" + workspaceID + "/message";
243244
req.Send = Encoding.UTF8.GetBytes(stringToSend);
244245
req.OnResponse = MessageResp;
246+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=conversation;service_version=v1;operation_id=Message";
245247
req.DisableSslVerification = DisableSslVerification;
246248
req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
247249
if (req.CustomData.ContainsKey(Constants.String.CUSTOM_REQUEST_HEADERS))
@@ -355,6 +357,7 @@ public bool DeleteUserData(SuccessCallback<object> successCallback, FailCallback
355357
req.Parameters["version"] = VersionDate;
356358

357359
req.OnResponse = OnDeleteUserDataResponse;
360+
req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=conversation;service_version=v1;operation_id=DeleteUserData";
358361

359362
RESTConnector connector = RESTConnector.GetConnector(Credentials, "/v1/user_data");
360363
if (connector == null)

0 commit comments

Comments
 (0)