Skip to content

up log quality add target_key and target_bucket #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 21, 2020
Merged

up log quality add target_key and target_bucket #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f34adff
up log quality add target_key and target_bucket
Sep 18, 2020
515349f
Merge branch 'master' of YangSen-qn:qiniu/android-sdk into develop
Sep 18, 2020
c4db246
up log quality add target_key and target_bucket
Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/library.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
Expand Down
2 changes: 2 additions & 0 deletions library/src/main/java/com/qiniu/android/collect/ReportItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ public String toJson(){
public static final String QualityKeyLogType = "log_type";
public static final String QualityKeyUpTime = "up_time";
public static final String QualityKeyResult = "result";
public static final String QualityKeyTargetBucket = "target_bucket";
public static final String QualityKeyTargetKey = "target_key";
public static final String QualityKeyTotalElapsedTime = "total_elapsed_time";
public static final String QualityKeyRequestsCount = "requests_count";
public static final String QualityKeyRegionsCount = "regions_count";
Expand Down
8 changes: 6 additions & 2 deletions library/src/main/java/com/qiniu/android/storage/UploadManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ private void completeAction(final String token,
final UploadTaskMetrics taskMetrics,
final UpCompletionHandler completionHandler){

reportQuality(responseInfo, taskMetrics, token);
reportQuality(key, responseInfo, taskMetrics, token);
if (completionHandler != null){
final Wait wait = new Wait();
AsyncRun.runInMain(new Runnable() {
Expand All @@ -345,16 +345,20 @@ public void run() {
}
}

private void reportQuality(ResponseInfo responseInfo,
private void reportQuality(String key,
ResponseInfo responseInfo,
UploadTaskMetrics taskMetrics,
String token){

UpToken upToken = UpToken.parse(token);
UploadTaskMetrics taskMetricsP = taskMetrics != null ? taskMetrics : new UploadTaskMetrics(null);

ReportItem item = new ReportItem();
item.setReport(ReportItem.LogTypeQuality, ReportItem.QualityKeyLogType);
item.setReport((Utils.currentTimestamp()/1000), ReportItem.QualityKeyUpTime);
item.setReport(ReportItem.qualityResult(responseInfo), ReportItem.QualityKeyResult);
item.setReport(key, ReportItem.QualityKeyTargetKey);
item.setReport(upToken != null ? upToken.bucket : null, ReportItem.QualityKeyTargetBucket);
item.setReport(taskMetricsP.totalElapsedTime(), ReportItem.QualityKeyTotalElapsedTime);
item.setReport(taskMetricsP.requestCount(), ReportItem.QualityKeyRequestsCount);
item.setReport(taskMetricsP.regionCount(), ReportItem.QualityKeyRegionsCount);
Expand Down