Skip to content

Commit deef5b3

Browse files
authored
Merge pull request 0xPolygonID#497 from 0xPolygonID/feature/loggin_update
Updated stacktrace manager to handle logging and etc.
2 parents a4ee834 + 4458826 commit deef5b3

File tree

64 files changed

+165
-430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+165
-430
lines changed

example/pubspec.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ packages:
5353
dependency: transitive
5454
description:
5555
name: async
56-
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
56+
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
5757
url: "https://pub.dev"
5858
source: hosted
59-
version: "2.12.0"
59+
version: "2.13.0"
6060
background_downloader:
6161
dependency: transitive
6262
description:
@@ -373,10 +373,10 @@ packages:
373373
dependency: transitive
374374
description:
375375
name: fake_async
376-
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
376+
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
377377
url: "https://pub.dev"
378378
source: hosted
379-
version: "1.3.2"
379+
version: "1.3.3"
380380
ffi:
381381
dependency: transitive
382382
description:
@@ -811,10 +811,10 @@ packages:
811811
dependency: transitive
812812
description:
813813
name: leak_tracker
814-
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
814+
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
815815
url: "https://pub.dev"
816816
source: hosted
817-
version: "10.0.8"
817+
version: "10.0.9"
818818
leak_tracker_flutter_testing:
819819
dependency: transitive
820820
description:
@@ -1295,10 +1295,10 @@ packages:
12951295
dependency: transitive
12961296
description:
12971297
name: vm_service
1298-
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
1298+
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
12991299
url: "https://pub.dev"
13001300
source: hosted
1301-
version: "14.3.1"
1301+
version: "15.0.0"
13021302
wallet:
13031303
dependency: transitive
13041304
description:
@@ -1351,10 +1351,10 @@ packages:
13511351
dependency: transitive
13521352
description:
13531353
name: webdriver
1354-
sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
1354+
sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade"
13551355
url: "https://pub.dev"
13561356
source: hosted
1357-
version: "3.0.4"
1357+
version: "3.1.0"
13581358
win32:
13591359
dependency: transitive
13601360
description:

lib/common/domain/use_cases/get_env_use_case.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ class GetEnvUseCase extends FutureUseCase<void, EnvEntity> {
2020

2121
return env;
2222
}).catchError((error) {
23-
logger().e("[GetEnvUseCase] Error: $error");
24-
_stacktraceManager.addTrace("[GetEnvUseCase] Error: $error");
25-
_stacktraceManager.addError(error.toString());
23+
_stacktraceManager.logError("[GetEnvUseCase] Error: $error");
2624
throw error;
2725
});
2826
}

lib/common/infrastructure/stacktrace_stream_manager.dart

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ const _stacktraceBoxName = 'stacktrace';
1010
class StacktraceManager {
1111
bool isEnabled = false;
1212

13+
bool logAll = false;
14+
1315
String _errorTrace = '';
1416
String _stacktrace = '';
1517

@@ -33,7 +35,7 @@ class StacktraceManager {
3335

3436
/// Add new trace to the stacktrace
3537
void addTrace(String stepDescription, {bool log = false}) {
36-
if (log) {
38+
if (log || logAll) {
3739
logger().i(stepDescription);
3840
}
3941

@@ -47,11 +49,19 @@ class StacktraceManager {
4749
_stacktraceStreamController.add(stepDescription);
4850
}
4951

50-
void addError(String error) {
52+
void logTrace(String stepDescription) => addTrace(stepDescription, log: true);
53+
54+
void addError(String error, {bool log = false}) {
55+
if (log || logAll) {
56+
logger().e(error);
57+
}
58+
addTrace(error, log: false);
5159
_errorTrace += '\n***' + error + '\n***';
5260
_errorStreamController.add(error);
5361
}
5462

63+
void logError(String error) => addError(error, log: true);
64+
5565
/// we reset the stream
5666
/// so we can use it again
5767
void reset() {

lib/credential/domain/use_cases/cache_credentials_use_case.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'package:polygonid_flutter_sdk/common/domain/domain_logger.dart';
21
import 'package:polygonid_flutter_sdk/common/domain/entities/env_config_entity.dart';
32
import 'package:polygonid_flutter_sdk/common/domain/use_cases/get_env_use_case.dart';
43
import 'package:polygonid_flutter_sdk/common/infrastructure/stacktrace_stream_manager.dart';
@@ -35,9 +34,7 @@ class CacheCredentialsUseCase {
3534
),
3635
);
3736
} catch (e) {
38-
logger().e(
39-
"[FetchAndSaveClaimsUseCase] Error while caching credential: $e");
40-
_stacktraceManager.addTrace(
37+
_stacktraceManager.logError(
4138
"[FetchAndSaveClaimsUseCase] Error while caching credential: $e");
4239
}
4340
}

lib/credential/domain/use_cases/generate_non_rev_proof_use_case.dart

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'package:polygonid_flutter_sdk/common/domain/domain_logger.dart';
21
import 'package:polygonid_flutter_sdk/common/domain/use_case.dart';
32
import 'package:polygonid_flutter_sdk/common/infrastructure/stacktrace_stream_manager.dart';
43
import 'package:polygonid_flutter_sdk/credential/domain/entities/claim_entity.dart';
@@ -62,15 +61,11 @@ class GenerateNonRevProofUseCase
6261
baseUrl: baseUrl,
6362
cachedNonRevProof: param.nonRevProof,
6463
);
65-
66-
_stacktraceManager.addTrace("[GenerateNonRevProofUseCase] Non rev proof");
67-
logger().i("[GenerateNonRevProofUseCase] Non rev proof: $nonRevProof");
64+
_stacktraceManager.logTrace("[GenerateNonRevProofUseCase] Non rev proof");
6865

6966
return nonRevProof;
7067
} catch (error) {
71-
_stacktraceManager.addTrace("[GenerateNonRevProofUseCase] Error: $error");
72-
logger().e("[GenerateNonRevProofUseCase] Error: $error");
73-
_stacktraceManager.addError("[GenerateNonRevProofUseCase] Error: $error");
68+
_stacktraceManager.logError("[GenerateNonRevProofUseCase] Error: $error");
7469
rethrow;
7570
}
7671
}

lib/credential/domain/use_cases/get_claim_revocation_status_use_case.dart

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:polygonid_flutter_sdk/common/infrastructure/stacktrace_stream_manager.dart';
22
import 'package:polygonid_flutter_sdk/credential/domain/use_cases/generate_non_rev_proof_use_case.dart';
33

4-
import '../../../common/domain/domain_logger.dart';
54
import '../../../common/domain/use_case.dart';
65
import '../entities/claim_entity.dart';
76
import '../repositories/credential_repository.dart';
@@ -37,10 +36,7 @@ class GetClaimRevocationStatusUseCase
3736
useRHS = await _credentialRepository.isUsingRHS(claim: param.claim);
3837
} catch (error) {
3938
_stacktraceManager
40-
.addTrace("[GetClaimRevocationStatusUseCase] Error: $error");
41-
_stacktraceManager
42-
.addError("[GetClaimRevocationStatusUseCase] Error: $error");
43-
logger().e("[GetClaimRevocationStatusUseCase] Error: $error");
39+
.logError("[GetClaimRevocationStatusUseCase] Error: $error");
4440
rethrow;
4541
}
4642

@@ -59,17 +55,12 @@ class GetClaimRevocationStatusUseCase
5955
try {
6056
final nonRevProof = await _credentialRepository.getRevocationStatus(
6157
claim: param.claim);
62-
_stacktraceManager.addTrace(
63-
"[GetClaimRevocationStatusUseCase] Revocation status: $nonRevProof");
64-
logger().i(
58+
_stacktraceManager.logTrace(
6559
"[GetClaimRevocationStatusUseCase] Revocation status: $nonRevProof");
6660
return nonRevProof;
6761
} catch (error) {
6862
_stacktraceManager
69-
.addTrace("[GetClaimRevocationStatusUseCase] Error: $error");
70-
_stacktraceManager
71-
.addError("[GetClaimRevocationStatusUseCase] Error: $error");
72-
logger().e("[GetClaimRevocationStatusUseCase] Error: $error");
63+
.logError("[GetClaimRevocationStatusUseCase] Error: $error");
7364
rethrow;
7465
}
7566
}
@@ -80,17 +71,13 @@ class GetClaimRevocationStatusUseCase
8071
try {
8172
final nonRevProof =
8273
await _credentialRepository.getRevocationStatus(claim: param.claim);
83-
_stacktraceManager.addTrace(
84-
"[GetClaimRevocationStatusUseCase] Revocation status: $nonRevProof");
85-
logger().i(
74+
_stacktraceManager.logTrace(
8675
"[GetClaimRevocationStatusUseCase] Revocation status: $nonRevProof");
76+
8777
return nonRevProof;
8878
} catch (error) {
8979
_stacktraceManager
90-
.addTrace("[GetClaimRevocationStatusUseCase] Error: $error");
91-
_stacktraceManager
92-
.addError("[GetClaimRevocationStatusUseCase] Error: $error");
93-
logger().e("[GetClaimRevocationStatusUseCase] Error: $error");
80+
.logError("[GetClaimRevocationStatusUseCase] Error: $error");
9481
rethrow;
9582
}
9683
}

lib/credential/domain/use_cases/get_claims_use_case.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:polygonid_flutter_sdk/common/domain/domain_constants.dart';
2-
import 'package:polygonid_flutter_sdk/common/domain/domain_logger.dart';
32
import 'package:polygonid_flutter_sdk/common/domain/entities/filter_entity.dart';
43
import 'package:polygonid_flutter_sdk/common/domain/error_exception.dart';
54
import 'package:polygonid_flutter_sdk/common/domain/use_case.dart';
@@ -42,7 +41,6 @@ class GetClaimsUseCase
4241
// if profileNonce is less than GENESIS_PROFILE_NONCE is invalid
4342
// because the profileNonce should be greater than or equal to GENESIS_PROFILE_NONCE
4443
if (param.profileNonce < GENESIS_PROFILE_NONCE) {
45-
_stacktraceManager.addTrace("[GetClaimsUseCase] Invalid profile nonce");
4644
_stacktraceManager.addError(
4745
"[GetClaimsUseCase] Invalid profile nonce, less than $GENESIS_PROFILE_NONCE");
4846
throw InvalidProfileException(
@@ -62,10 +60,8 @@ class GetClaimsUseCase
6260
} on PolygonIdSDKException catch (_) {
6361
rethrow;
6462
} catch (error) {
65-
_stacktraceManager.addTrace("[GetClaimsUseCase] Error: $error");
66-
_stacktraceManager.addError(
63+
_stacktraceManager.logError(
6764
"[GetClaimsUseCase] Error while getting claims from the DB\n${error.toString()}");
68-
logger().e("[GetClaimsUseCase] Error: $error");
6965
throw GetClaimsException(
7066
errorMessage:
7167
'Error while getting claims from the DB\n${error.toString()}',

lib/credential/domain/use_cases/remove_all_claims_use_case.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:polygonid_flutter_sdk/common/infrastructure/stacktrace_stream_manager.dart';
22

3-
import '../../../common/domain/domain_logger.dart';
43
import '../../../common/domain/use_case.dart';
54
import '../repositories/credential_repository.dart';
65

@@ -30,13 +29,10 @@ class RemoveAllClaimsUseCase extends FutureUseCase<RemoveAllClaimsParam, void> {
3029
genesisDid: param.did,
3130
encryptionKey: param.encryptionKey,
3231
);
33-
logger().i("[RemoveAllClaimsUseCase] Claims have been removed: $param");
34-
_stacktraceManager.addTrace(
32+
_stacktraceManager.logTrace(
3533
"[RemoveAllClaimsUseCase] Claims have been removed: $param");
3634
} catch (error) {
37-
logger().e("[RemoveAllClaimsUseCase] Error: $error");
38-
_stacktraceManager.addTrace("[RemoveAllClaimsUseCase] Error: $error");
39-
_stacktraceManager.addError("[RemoveAllClaimsUseCase] Error: $error");
35+
_stacktraceManager.logError("[RemoveAllClaimsUseCase] Error: $error");
4036
rethrow;
4137
}
4238
}

lib/credential/domain/use_cases/remove_claims_use_case.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:polygonid_flutter_sdk/common/infrastructure/stacktrace_stream_manager.dart';
22

3-
import '../../../common/domain/domain_logger.dart';
43
import '../../../common/domain/use_case.dart';
54
import '../repositories/credential_repository.dart';
65

@@ -33,13 +32,10 @@ class RemoveClaimsUseCase extends FutureUseCase<RemoveClaimsParam, void> {
3332
genesisDid: param.genesisDid,
3433
encryptionKey: param.encryptionKey,
3534
);
36-
logger().i(
37-
"[RemoveClaimsUseCase] Claims with those ids have been removed: $param");
38-
_stacktraceManager.addTrace(
35+
36+
_stacktraceManager.logTrace(
3937
"[RemoveClaimsUseCase] Claims with those ids have been removed: $param");
4038
} catch (error) {
41-
logger().e("[RemoveClaimsUseCase] Error: $error");
42-
_stacktraceManager.addTrace("[RemoveClaimsUseCase] Error: $error");
4339
_stacktraceManager.addError("[RemoveClaimsUseCase] Error: $error");
4440
rethrow;
4541
}

lib/credential/domain/use_cases/save_claims_use_case.dart

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import 'package:polygonid_flutter_sdk/common/domain/domain_logger.dart';
21
import 'package:polygonid_flutter_sdk/common/domain/use_case.dart';
32
import 'package:polygonid_flutter_sdk/common/infrastructure/stacktrace_stream_manager.dart';
4-
import 'package:polygonid_flutter_sdk/credential/domain/repositories/credential_repository.dart';
53
import 'package:polygonid_flutter_sdk/credential/domain/entities/claim_entity.dart';
4+
import 'package:polygonid_flutter_sdk/credential/domain/repositories/credential_repository.dart';
65

76
class SaveClaimsParam {
87
final List<ClaimEntity> claims;
@@ -34,15 +33,11 @@ class SaveClaimsUseCase
3433
genesisDid: param.genesisDid,
3534
encryptionKey: param.encryptionKey,
3635
);
37-
logger()
38-
.i("[SaveClaimsUseCase] All claims have been saved: ${param.claims}");
39-
_stacktraceManager
40-
.addTrace("[SaveClaimsUseCase] All claims have been saved");
36+
_stacktraceManager.logTrace(
37+
"[SaveClaimsUseCase] All claims have been saved: ${param.claims}");
4138
return param.claims;
4239
} catch (error) {
43-
logger().e("[SaveClaimsUseCase] Error: $error");
44-
_stacktraceManager.addTrace("[SaveClaimsUseCase] Error: $error");
45-
_stacktraceManager.addError("[SaveClaimsUseCase] Error: $error");
40+
_stacktraceManager.logError("[SaveClaimsUseCase] Error: $error");
4641
rethrow;
4742
}
4843
}

0 commit comments

Comments
 (0)