@gitpod/gitpod-protocol 0.1.5-sje-kots-node-reqs.1 → 0.1.5-sje-no-log-envvars.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (147) hide show
  1. package/data/gitpod-schema.json +71 -129
  2. package/lib/accounting-protocol.d.ts +1 -0
  3. package/lib/accounting-protocol.d.ts.map +1 -1
  4. package/lib/accounting-protocol.js +4 -0
  5. package/lib/accounting-protocol.js.map +1 -1
  6. package/lib/admin-protocol.d.ts +4 -1
  7. package/lib/admin-protocol.d.ts.map +1 -1
  8. package/lib/admin-protocol.js.map +1 -1
  9. package/lib/attribution.d.ts +3 -0
  10. package/lib/attribution.d.ts.map +1 -1
  11. package/lib/attribution.js +10 -0
  12. package/lib/attribution.js.map +1 -1
  13. package/lib/billing-mode.d.ts +41 -0
  14. package/lib/billing-mode.d.ts.map +1 -0
  15. package/lib/billing-mode.js +44 -0
  16. package/lib/billing-mode.js.map +1 -0
  17. package/lib/encryption/encryption-engine.d.ts.map +1 -1
  18. package/lib/encryption/encryption-engine.js +3 -3
  19. package/lib/encryption/encryption-engine.js.map +1 -1
  20. package/lib/encryption/encryption-engine.spec.js +1 -1
  21. package/lib/encryption/encryption-engine.spec.js.map +1 -1
  22. package/lib/encryption/key-provider.js +1 -1
  23. package/lib/encryption/key-provider.js.map +1 -1
  24. package/lib/experiments/configcat-server.d.ts +2 -0
  25. package/lib/experiments/configcat-server.d.ts.map +1 -1
  26. package/lib/experiments/configcat-server.js +2 -1
  27. package/lib/experiments/configcat-server.js.map +1 -1
  28. package/lib/experiments/configcat.d.ts +1 -1
  29. package/lib/experiments/configcat.d.ts.map +1 -1
  30. package/lib/experiments/configcat.js +4 -5
  31. package/lib/experiments/configcat.js.map +1 -1
  32. package/lib/experiments/types.d.ts +2 -3
  33. package/lib/experiments/types.d.ts.map +1 -1
  34. package/lib/experiments/types.js.map +1 -1
  35. package/lib/gitpod-service.d.ts +23 -24
  36. package/lib/gitpod-service.d.ts.map +1 -1
  37. package/lib/gitpod-service.js +12 -0
  38. package/lib/gitpod-service.js.map +1 -1
  39. package/lib/ide-protocol.d.ts +8 -0
  40. package/lib/ide-protocol.d.ts.map +1 -1
  41. package/lib/index.d.ts +0 -1
  42. package/lib/index.d.ts.map +1 -1
  43. package/lib/index.js +0 -1
  44. package/lib/index.js.map +1 -1
  45. package/lib/messaging/client-call-metrics.d.ts +1 -17
  46. package/lib/messaging/client-call-metrics.d.ts.map +1 -1
  47. package/lib/messaging/client-call-metrics.js +1 -2
  48. package/lib/messaging/client-call-metrics.js.map +1 -1
  49. package/lib/messaging/error.d.ts +5 -1
  50. package/lib/messaging/error.d.ts.map +1 -1
  51. package/lib/messaging/error.js +11 -3
  52. package/lib/messaging/error.js.map +1 -1
  53. package/lib/plans.d.ts +1 -0
  54. package/lib/plans.d.ts.map +1 -1
  55. package/lib/plans.js +6 -2
  56. package/lib/plans.js.map +1 -1
  57. package/lib/protocol.d.ts +48 -18
  58. package/lib/protocol.d.ts.map +1 -1
  59. package/lib/protocol.js +34 -9
  60. package/lib/protocol.js.map +1 -1
  61. package/lib/team-subscription-protocol.d.ts +1 -0
  62. package/lib/team-subscription-protocol.d.ts.map +1 -1
  63. package/lib/team-subscription-protocol.js +4 -0
  64. package/lib/team-subscription-protocol.js.map +1 -1
  65. package/lib/teams-projects-protocol.d.ts +0 -1
  66. package/lib/teams-projects-protocol.d.ts.map +1 -1
  67. package/lib/teams-projects-protocol.js.map +1 -1
  68. package/lib/usage.d.ts +49 -10
  69. package/lib/usage.d.ts.map +1 -1
  70. package/lib/usage.js +6 -107
  71. package/lib/usage.js.map +1 -1
  72. package/lib/util/garbage-collected-cache.d.ts.map +1 -1
  73. package/lib/util/garbage-collected-cache.js +5 -0
  74. package/lib/util/garbage-collected-cache.js.map +1 -1
  75. package/lib/util/gitpod-host-url.d.ts +3 -0
  76. package/lib/util/gitpod-host-url.d.ts.map +1 -1
  77. package/lib/util/gitpod-host-url.js +18 -0
  78. package/lib/util/gitpod-host-url.js.map +1 -1
  79. package/lib/util/grpc.d.ts +19 -0
  80. package/lib/util/grpc.d.ts.map +1 -1
  81. package/lib/util/grpc.js +73 -1
  82. package/lib/util/grpc.js.map +1 -1
  83. package/lib/util/logging.spec.d.ts +7 -0
  84. package/lib/util/logging.spec.d.ts.map +1 -0
  85. package/lib/util/logging.spec.js +52 -0
  86. package/lib/util/logging.spec.js.map +1 -0
  87. package/lib/util/nice-grpc.d.ts +9 -0
  88. package/lib/util/nice-grpc.d.ts.map +1 -0
  89. package/lib/util/nice-grpc.js +119 -0
  90. package/lib/util/nice-grpc.js.map +1 -0
  91. package/lib/util/timeutil.d.ts +1 -0
  92. package/lib/util/timeutil.d.ts.map +1 -1
  93. package/lib/util/timeutil.js +7 -1
  94. package/lib/util/timeutil.js.map +1 -1
  95. package/lib/util/timeutil.spec.d.ts +2 -0
  96. package/lib/util/timeutil.spec.d.ts.map +1 -1
  97. package/lib/util/timeutil.spec.js +34 -0
  98. package/lib/util/timeutil.spec.js.map +1 -1
  99. package/lib/workspace-class.d.ts +14 -0
  100. package/lib/workspace-class.d.ts.map +1 -0
  101. package/lib/workspace-class.js +8 -0
  102. package/lib/workspace-class.js.map +1 -0
  103. package/lib/workspace-cluster.d.ts +1 -0
  104. package/lib/workspace-cluster.d.ts.map +1 -1
  105. package/lib/workspace-cluster.js.map +1 -1
  106. package/lib/workspace-instance.d.ts +1 -0
  107. package/lib/workspace-instance.d.ts.map +1 -1
  108. package/lib/wsready.js +1 -1
  109. package/package.json +7 -2
  110. package/pkg-yarn.lock +5 -2
  111. package/provenance-bundle.jsonl +1 -1
  112. package/src/accounting-protocol.ts +3 -0
  113. package/src/admin-protocol.ts +4 -1
  114. package/src/attribution.ts +11 -0
  115. package/src/billing-mode.ts +77 -0
  116. package/src/encryption/encryption-engine.spec.ts +1 -1
  117. package/src/encryption/encryption-engine.ts +7 -3
  118. package/src/encryption/key-provider.ts +1 -1
  119. package/src/experiments/configcat-server.ts +3 -0
  120. package/src/experiments/configcat.ts +3 -4
  121. package/src/experiments/types.ts +4 -5
  122. package/src/gitpod-service.ts +39 -26
  123. package/src/ide-protocol.ts +10 -0
  124. package/src/index.ts +0 -1
  125. package/src/messaging/client-call-metrics.ts +1 -20
  126. package/src/messaging/error.ts +16 -4
  127. package/src/plans.ts +6 -2
  128. package/src/protocol.ts +75 -25
  129. package/src/team-subscription-protocol.ts +3 -0
  130. package/src/teams-projects-protocol.ts +0 -1
  131. package/src/usage.ts +53 -128
  132. package/src/util/garbage-collected-cache.ts +5 -0
  133. package/src/util/gitpod-host-url.ts +21 -0
  134. package/src/util/grpc.ts +89 -0
  135. package/src/util/logging.spec.ts +23 -0
  136. package/src/util/nice-grpc.ts +93 -0
  137. package/src/util/timeutil.spec.ts +28 -1
  138. package/src/util/timeutil.ts +6 -0
  139. package/src/workspace-class.ts +14 -0
  140. package/src/workspace-cluster.ts +4 -0
  141. package/src/workspace-instance.ts +3 -0
  142. package/src/wsready.ts +1 -1
  143. package/lib/email-protocol.d.ts +0 -49
  144. package/lib/email-protocol.d.ts.map +0 -1
  145. package/lib/email-protocol.js +0 -28
  146. package/lib/email-protocol.js.map +0 -1
  147. package/src/email-protocol.ts +0 -65
package/lib/usage.d.ts CHANGED
@@ -4,19 +4,58 @@
4
4
  * See License-AGPL.txt in the project root for license information.
5
5
  */
6
6
  import { WorkspaceType } from "./protocol";
7
- export interface BillableSession {
7
+ export interface ListUsageRequest {
8
8
  attributionId: string;
9
- userId?: string;
10
- teamId?: string;
11
- instanceId: string;
9
+ from?: number;
10
+ to?: number;
11
+ order: Ordering;
12
+ pagination?: PaginationRequest;
13
+ }
14
+ export declare enum Ordering {
15
+ ORDERING_DESCENDING = 0,
16
+ ORDERING_ASCENDING = 1
17
+ }
18
+ export interface PaginationRequest {
19
+ perPage: number;
20
+ page: number;
21
+ }
22
+ export interface ListUsageResponse {
23
+ usageEntriesList: Usage[];
24
+ pagination?: PaginationResponse;
25
+ creditsUsed: number;
26
+ }
27
+ export interface PaginationResponse {
28
+ perPage: number;
29
+ totalPages: number;
30
+ total: number;
31
+ page: number;
32
+ }
33
+ export declare type UsageKind = "workspaceinstance" | "invoice";
34
+ export interface Usage {
35
+ id: string;
36
+ attributionId: string;
37
+ description: string;
38
+ credits: number;
39
+ effectiveTime?: number;
40
+ kind: UsageKind;
41
+ workspaceInstanceId: string;
42
+ draft: boolean;
43
+ metadata: WorkspaceInstanceUsageData | InvoiceUsageData;
44
+ }
45
+ export interface WorkspaceInstanceUsageData {
12
46
  workspaceId: string;
13
- workspaceType: BillableWorkspaceType;
47
+ workspaceType: WorkspaceType;
14
48
  workspaceClass: string;
49
+ contextURL: string;
15
50
  startTime: string;
16
- endTime: string;
17
- credits: number;
18
- projectId?: string;
51
+ endTime?: string;
52
+ userId: string;
53
+ userName: string;
54
+ userAvatarURL: string;
55
+ }
56
+ export interface InvoiceUsageData {
57
+ invoiceId: string;
58
+ startDate: string;
59
+ endDate: string;
19
60
  }
20
- export declare type BillableWorkspaceType = WorkspaceType;
21
- export declare const billableSessionDummyData: BillableSession[];
22
61
  //# sourceMappingURL=usage.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,WAAW,eAAe;IAE5B,aAAa,EAAE,MAAM,CAAC;IAGtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,UAAU,EAAE,MAAM,CAAC;IAEnB,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,qBAAqB,CAAC;IAGrC,cAAc,EAAE,MAAM,CAAC;IAGvB,SAAS,EAAE,MAAM,CAAC;IAGlB,OAAO,EAAE,MAAM,CAAC;IAGhB,OAAO,EAAE,MAAM,CAAC;IAGhB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,oBAAY,qBAAqB,GAAG,aAAa,CAAC;AAElD,eAAO,MAAM,wBAAwB,EAAE,eAAe,EAyGrD,CAAC"}
1
+ {"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAG3C,MAAM,WAAW,gBAAgB;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,QAAQ,CAAC;IAChB,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAClC;AAED,oBAAY,QAAQ;IAChB,mBAAmB,IAAI;IACvB,kBAAkB,IAAI;CACzB;AAED,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,oBAAY,SAAS,GAAG,mBAAmB,GAAG,SAAS,CAAC;AACxD,MAAM,WAAW,KAAK;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,0BAA0B,GAAG,gBAAgB,CAAC;CAC3D;AAGD,MAAM,WAAW,0BAA0B;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACnB"}
package/lib/usage.js CHANGED
@@ -5,111 +5,10 @@
5
5
  * See License-AGPL.txt in the project root for license information.
6
6
  */
7
7
  Object.defineProperty(exports, "__esModule", { value: true });
8
- exports.billableSessionDummyData = void 0;
9
- exports.billableSessionDummyData = [
10
- {
11
- attributionId: "some-attribution-id",
12
- userId: "prebuild",
13
- teamId: "prebuild",
14
- instanceId: "some-instance-id",
15
- workspaceId: "some-workspace-id",
16
- workspaceType: "prebuild",
17
- workspaceClass: "XL",
18
- startTime: new Date(Date.now() + -3 * 24 * 3600 * 1000).toISOString(),
19
- endTime: new Date().toISOString(),
20
- credits: 320,
21
- projectId: "project-123",
22
- },
23
- {
24
- attributionId: "some-attribution-id2",
25
- userId: "some-user",
26
- teamId: "some-team",
27
- instanceId: "some-instance-id2",
28
- workspaceId: "some-workspace-id2",
29
- workspaceType: "regular",
30
- workspaceClass: "standard",
31
- startTime: new Date(Date.now() + -5 * 24 * 3600 * 1000).toISOString(),
32
- endTime: new Date().toISOString(),
33
- credits: 130,
34
- projectId: "project-123",
35
- },
36
- {
37
- attributionId: "some-attribution-id3",
38
- userId: "some-other-user",
39
- teamId: "some-other-team",
40
- instanceId: "some-instance-id3",
41
- workspaceId: "some-workspace-id3",
42
- workspaceType: "regular",
43
- workspaceClass: "XL",
44
- startTime: new Date(Date.now() + -5 * 24 * 3600 * 1000).toISOString(),
45
- endTime: new Date(Date.now() + -4 * 24 * 3600 * 1000).toISOString(),
46
- credits: 150,
47
- projectId: "project-134",
48
- },
49
- {
50
- attributionId: "some-attribution-id4",
51
- userId: "some-other-user2",
52
- teamId: "some-other-team2",
53
- instanceId: "some-instance-id4",
54
- workspaceId: "some-workspace-id4",
55
- workspaceType: "regular",
56
- workspaceClass: "standard",
57
- startTime: new Date(Date.now() + -10 * 24 * 3600 * 1000).toISOString(),
58
- endTime: new Date(Date.now() + -9 * 24 * 3600 * 1000).toISOString(),
59
- credits: 330,
60
- projectId: "project-137",
61
- },
62
- {
63
- attributionId: "some-attribution-id5",
64
- userId: "some-other-user3",
65
- teamId: "some-other-team3",
66
- instanceId: "some-instance-id5",
67
- workspaceId: "some-workspace-id5",
68
- workspaceType: "regular",
69
- workspaceClass: "XL",
70
- startTime: new Date(Date.now() + -2 * 24 * 3600 * 1000).toISOString(),
71
- endTime: new Date().toISOString(),
72
- credits: 222,
73
- projectId: "project-138",
74
- },
75
- {
76
- attributionId: "some-attribution-id6",
77
- userId: "some-other-user4",
78
- teamId: "some-other-team4",
79
- instanceId: "some-instance-id6",
80
- workspaceId: "some-workspace-id3",
81
- workspaceType: "regular",
82
- workspaceClass: "XL",
83
- startTime: new Date(Date.now() + -7 * 24 * 3600 * 1000).toISOString(),
84
- endTime: new Date(Date.now() + -6 * 24 * 3600 * 1000).toISOString(),
85
- credits: 300,
86
- projectId: "project-134",
87
- },
88
- {
89
- attributionId: "some-attribution-id8",
90
- userId: "some-other-user5",
91
- teamId: "some-other-team5",
92
- instanceId: "some-instance-id8",
93
- workspaceId: "some-workspace-id3",
94
- workspaceType: "regular",
95
- workspaceClass: "standard",
96
- startTime: new Date(Date.now() + -1 * 24 * 3600 * 1000).toISOString(),
97
- endTime: new Date().toISOString(),
98
- credits: 100,
99
- projectId: "project-567",
100
- },
101
- {
102
- attributionId: "some-attribution-id7",
103
- userId: "prebuild",
104
- teamId: "some-other-team7",
105
- instanceId: "some-instance-id7",
106
- workspaceId: "some-workspace-id7",
107
- workspaceType: "prebuild",
108
- workspaceClass: "XL",
109
- startTime: new Date(Date.now() + -1 * 24 * 3600 * 1000).toISOString(),
110
- endTime: new Date().toISOString(),
111
- credits: 200,
112
- projectId: "project-345",
113
- },
114
- ];
8
+ exports.Ordering = void 0;
9
+ var Ordering;
10
+ (function (Ordering) {
11
+ Ordering[Ordering["ORDERING_DESCENDING"] = 0] = "ORDERING_DESCENDING";
12
+ Ordering[Ordering["ORDERING_ASCENDING"] = 1] = "ORDERING_ASCENDING";
13
+ })(Ordering = exports.Ordering || (exports.Ordering = {}));
115
14
  //# sourceMappingURL=usage.js.map
package/lib/usage.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"usage.js","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"usage.js","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAaH,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,qEAAuB,CAAA;IACvB,mEAAsB,CAAA;AAC1B,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB"}
@@ -1 +1 @@
1
- {"version":3,"file":"garbage-collected-cache.d.ts","sourceRoot":"","sources":["../../src/util/garbage-collected-cache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,UAAU,UAAU,CAAC,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,CAAC,CAAC;IACT,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,qBAAqB,CAAC,CAAC;IAGpB,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,MAAM;IAAE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,MAAM;IAFzG,SAAS,CAAC,QAAQ,CAAC,KAAK,6BAAoC;gBAE7B,oBAAoB,EAAE,MAAM,EAAqB,iBAAiB,EAAE,MAAM;IAIlG,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAazB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAQ/B,MAAM,CAAC,GAAG,EAAE,MAAM;IAIzB,SAAS,CAAC,uBAAuB;IAIjC,SAAS,CAAC,cAAc;IASxB,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM;CAG3D"}
1
+ {"version":3,"file":"garbage-collected-cache.d.ts","sourceRoot":"","sources":["../../src/util/garbage-collected-cache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,UAAU,UAAU,CAAC,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,CAAC,CAAC;IACT,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,qBAAqB,CAAC,CAAC;IAGpB,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,MAAM;IAAE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,MAAM;IAFzG,SAAS,CAAC,QAAQ,CAAC,KAAK,6BAAoC;gBAE7B,oBAAoB,EAAE,MAAM,EAAqB,iBAAiB,EAAE,MAAM;IAIlG,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAazB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAa/B,MAAM,CAAC,GAAG,EAAE,MAAM;IAIzB,SAAS,CAAC,uBAAuB;IAIjC,SAAS,CAAC,cAAc;IASxB,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM;CAG3D"}
@@ -31,6 +31,11 @@ class GarbageCollectedCache {
31
31
  if (!entry) {
32
32
  return undefined;
33
33
  }
34
+ // Still valid?
35
+ if (entry.expiryDate < Date.now()) {
36
+ this.store.delete(entry.key);
37
+ return undefined;
38
+ }
34
39
  return entry.value;
35
40
  }
36
41
  delete(key) {
@@ -1 +1 @@
1
- {"version":3,"file":"garbage-collected-cache.js","sourceRoot":"","sources":["../../src/util/garbage-collected-cache.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,qCAAkC;AAQlC,MAAa,qBAAqB;IAG9B,YAA+B,oBAA4B,EAAqB,iBAAyB;QAA1E,yBAAoB,GAApB,oBAAoB,CAAQ;QAAqB,sBAAiB,GAAjB,iBAAiB,CAAQ;QAFtF,UAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;QAGxD,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACnC,CAAC;IAEM,GAAG,CAAC,GAAW,EAAE,KAAQ;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ,EAAE;YACV,kFAAkF;YAClF,OAAO;SACV;QACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YAChB,GAAG;YACH,KAAK;YACL,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE;SACpC,CAAC,CAAC;IACP,CAAC;IAEM,GAAG,CAAC,GAAW;QAClB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,KAAK,CAAC,KAAK,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,GAAW;QACrB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAES,uBAAuB;QAC7B,IAAA,eAAM,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IACvE,CAAC;IAES,cAAc;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE;YACrC,IAAI,KAAK,CAAC,UAAU,GAAG,GAAG,EAAE;gBACxB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aAChC;SACJ;IACL,CAAC;IAES,cAAc,CAAC,aAAsB;QAC3C,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC;IAC5E,CAAC;CACJ;AAhDD,sDAgDC"}
1
+ {"version":3,"file":"garbage-collected-cache.js","sourceRoot":"","sources":["../../src/util/garbage-collected-cache.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,qCAAkC;AAQlC,MAAa,qBAAqB;IAG9B,YAA+B,oBAA4B,EAAqB,iBAAyB;QAA1E,yBAAoB,GAApB,oBAAoB,CAAQ;QAAqB,sBAAiB,GAAjB,iBAAiB,CAAQ;QAFtF,UAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;QAGxD,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACnC,CAAC;IAEM,GAAG,CAAC,GAAW,EAAE,KAAQ;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ,EAAE;YACV,kFAAkF;YAClF,OAAO;SACV;QACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YAChB,GAAG;YACH,KAAK;YACL,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE;SACpC,CAAC,CAAC;IACP,CAAC;IAEM,GAAG,CAAC,GAAW;QAClB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,SAAS,CAAC;SACpB;QACD,eAAe;QACf,IAAI,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE;YAC/B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC7B,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,KAAK,CAAC,KAAK,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,GAAW;QACrB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAES,uBAAuB;QAC7B,IAAA,eAAM,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IACvE,CAAC;IAES,cAAc;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE;YACrC,IAAI,KAAK,CAAC,UAAU,GAAG,GAAG,EAAE;gBACxB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aAChC;SACJ;IACL,CAAC;IAES,cAAc,CAAC,aAAsB;QAC3C,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC;IAC5E,CAAC;CACJ;AArDD,sDAqDC"}
@@ -19,6 +19,7 @@ export declare class GitpodHostUrl {
19
19
  withApi(urlUpdate?: UrlUpdate): GitpodHostUrl;
20
20
  withContext(contextUrl: string): GitpodHostUrl;
21
21
  asWebsocket(): GitpodHostUrl;
22
+ asWorkspacePage(): GitpodHostUrl;
22
23
  asDashboard(): GitpodHostUrl;
23
24
  asLogin(): GitpodHostUrl;
24
25
  asUpgradeSubscription(): GitpodHostUrl;
@@ -33,5 +34,7 @@ export declare class GitpodHostUrl {
33
34
  get blobServe(): boolean;
34
35
  asSorry(message: string): GitpodHostUrl;
35
36
  asApiLogout(): GitpodHostUrl;
37
+ asIDEProxy(): GitpodHostUrl;
38
+ asIDEMetrics(): GitpodHostUrl;
36
39
  }
37
40
  //# sourceMappingURL=gitpod-host-url.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"gitpod-host-url.d.ts","sourceRoot":"","sources":["../../src/util/gitpod-host-url.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC5B;AACD,oBAAY,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;AAWjD,qBAAa,aAAa;IACtB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;gBAEN,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG;IAanC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM;IAInC,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAIvD,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAI/C,sBAAsB,IAAI,aAAa;IASvC,mBAAmB,CAAC,mBAAmB,EAAE,MAAM,GAAG,aAAa;IAI/D,IAAI,CAAC,SAAS,EAAE,SAAS;IAUzB,OAAO,CAAC,SAAS,CAAC,EAAE,SAAS;IAK7B,WAAW,CAAC,UAAU,EAAE,MAAM;IAI9B,WAAW,IAAI,aAAa;IAI5B,WAAW,IAAI,aAAa;IAI5B,OAAO,IAAI,aAAa;IAIxB,qBAAqB,IAAI,aAAa;IAItC,eAAe,IAAI,aAAa;IAIhC,UAAU,IAAI,aAAa;IAI3B,aAAa,IAAI,aAAa;IAI9B,OAAO,CAAC,WAAW,qBAAmB,GAAG,aAAa;IAOtD,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,aAAa;IAOtE,QAAQ;IAIR,mBAAmB;IAQnB,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAiBpC;IAED,IAAI,SAAS,IAAI,OAAO,CAQvB;IAED,OAAO,CAAC,OAAO,EAAE,MAAM;IAIvB,WAAW,IAAI,aAAa;CAG/B"}
1
+ {"version":3,"file":"gitpod-host-url.d.ts","sourceRoot":"","sources":["../../src/util/gitpod-host-url.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC5B;AACD,oBAAY,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;AAWjD,qBAAa,aAAa;IACtB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;gBAEN,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG;IAanC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM;IAInC,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAIvD,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAI/C,sBAAsB,IAAI,aAAa;IASvC,mBAAmB,CAAC,mBAAmB,EAAE,MAAM,GAAG,aAAa;IAI/D,IAAI,CAAC,SAAS,EAAE,SAAS;IAUzB,OAAO,CAAC,SAAS,CAAC,EAAE,SAAS;IAK7B,WAAW,CAAC,UAAU,EAAE,MAAM;IAI9B,WAAW,IAAI,aAAa;IAI5B,eAAe,IAAI,aAAa;IAIhC,WAAW,IAAI,aAAa;IAI5B,OAAO,IAAI,aAAa;IAIxB,qBAAqB,IAAI,aAAa;IAItC,eAAe,IAAI,aAAa;IAIhC,UAAU,IAAI,aAAa;IAI3B,aAAa,IAAI,aAAa;IAI9B,OAAO,CAAC,WAAW,qBAAmB,GAAG,aAAa;IAOtD,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,aAAa;IAOtE,QAAQ;IAIR,mBAAmB;IAQnB,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAiBpC;IAED,IAAI,SAAS,IAAI,OAAO,CAQvB;IAED,OAAO,CAAC,OAAO,EAAE,MAAM;IAIvB,WAAW,IAAI,aAAa;IAI5B,UAAU,IAAI,aAAa;IAQ3B,YAAY,IAAI,aAAa;CAQhC"}
@@ -66,6 +66,9 @@ class GitpodHostUrl {
66
66
  asWebsocket() {
67
67
  return this.with((url) => ({ protocol: url.protocol === "https:" ? "wss:" : "ws:" }));
68
68
  }
69
+ asWorkspacePage() {
70
+ return this.with((url) => ({ pathname: "/workspaces" }));
71
+ }
69
72
  asDashboard() {
70
73
  return this.with((url) => ({ pathname: "/" }));
71
74
  }
@@ -136,6 +139,21 @@ class GitpodHostUrl {
136
139
  asApiLogout() {
137
140
  return this.withApi((url) => ({ pathname: "/logout/" }));
138
141
  }
142
+ asIDEProxy() {
143
+ const hostSegments = this.url.host.split(".");
144
+ if (hostSegments[0] === "ide") {
145
+ return this;
146
+ }
147
+ return this.with((url) => ({ host: "ide." + url.host }));
148
+ }
149
+ asIDEMetrics() {
150
+ let newUrl = this;
151
+ const hostSegments = this.url.host.split(".");
152
+ if (hostSegments[0] !== "ide") {
153
+ newUrl = newUrl.asIDEProxy();
154
+ }
155
+ return newUrl.with((url) => ({ pathname: "/metrics-api" }));
156
+ }
139
157
  }
140
158
  exports.GitpodHostUrl = GitpodHostUrl;
141
159
  //# sourceMappingURL=gitpod-host-url.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"gitpod-host-url.js","sourceRoot":"","sources":["../../src/util/gitpod-host-url.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"gitpod-host-url.js","sourceRoot":"","sources":["../../src/util/gitpod-host-url.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@
3
3
  * Licensed under the GNU Affero General Public License (AGPL).
4
4
  * See License-AGPL.txt in the project root for license information.
5
5
  */
6
+ import * as grpc from "@grpc/grpc-js";
6
7
  export declare const defaultGRPCOptions: {
7
8
  "grpc.keepalive_timeout_ms": number;
8
9
  "grpc.keepalive_time_ms": number;
@@ -12,4 +13,22 @@ export declare const defaultGRPCOptions: {
12
13
  "grpc.max_reconnect_backoff_ms": number;
13
14
  "grpc.max_receive_message_length": number;
14
15
  };
16
+ export declare type GrpcMethodType = "unary" | "client_stream" | "server_stream" | "bidi_stream";
17
+ export interface IGrpcCallMetricsLabels {
18
+ service: string;
19
+ method: string;
20
+ type: GrpcMethodType;
21
+ }
22
+ export interface IGrpcCallMetricsLabelsWithCode extends IGrpcCallMetricsLabels {
23
+ code: string;
24
+ }
25
+ export declare const IClientCallMetrics: unique symbol;
26
+ export interface IClientCallMetrics {
27
+ started(labels: IGrpcCallMetricsLabels): void;
28
+ sent(labels: IGrpcCallMetricsLabels): void;
29
+ received(labels: IGrpcCallMetricsLabels): void;
30
+ handled(labels: IGrpcCallMetricsLabelsWithCode): void;
31
+ }
32
+ export declare function getGrpcMethodType(requestStream: boolean, responseStream: boolean): GrpcMethodType;
33
+ export declare function createClientCallMetricsInterceptor(metrics: IClientCallMetrics): grpc.Interceptor;
15
34
  //# sourceMappingURL=grpc.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"grpc.d.ts","sourceRoot":"","sources":["../../src/util/grpc.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;CAQ9B,CAAC"}
1
+ {"version":3,"file":"grpc.d.ts","sourceRoot":"","sources":["../../src/util/grpc.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AAGtC,eAAO,MAAM,kBAAkB;;;;;;;;CAQ9B,CAAC;AAEF,oBAAY,cAAc,GAAG,OAAO,GAAG,eAAe,GAAG,eAAe,GAAG,aAAa,CAAC;AAEzF,MAAM,WAAW,sBAAsB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,cAAc,CAAC;CACxB;AAED,MAAM,WAAW,8BAA+B,SAAQ,sBAAsB;IAC1E,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAE/D,MAAM,WAAW,kBAAkB;IAC/B,OAAO,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC9C,IAAI,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC3C,QAAQ,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC/C,OAAO,CAAC,MAAM,EAAE,8BAA8B,GAAG,IAAI,CAAC;CACzD;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,GAAG,cAAc,CAcjG;AAED,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAAC,WAAW,CA+ChG"}
package/lib/util/grpc.js CHANGED
@@ -5,7 +5,9 @@
5
5
  * See License-AGPL.txt in the project root for license information.
6
6
  */
7
7
  Object.defineProperty(exports, "__esModule", { value: true });
8
- exports.defaultGRPCOptions = void 0;
8
+ exports.createClientCallMetricsInterceptor = exports.getGrpcMethodType = exports.IClientCallMetrics = exports.defaultGRPCOptions = void 0;
9
+ const grpc = require("@grpc/grpc-js");
10
+ const constants_1 = require("@grpc/grpc-js/build/src/constants");
9
11
  exports.defaultGRPCOptions = {
10
12
  "grpc.keepalive_timeout_ms": 10000,
11
13
  "grpc.keepalive_time_ms": 60000,
@@ -15,4 +17,74 @@ exports.defaultGRPCOptions = {
15
17
  "grpc.max_reconnect_backoff_ms": 5000,
16
18
  "grpc.max_receive_message_length": 1024 * 1024 * 16,
17
19
  };
20
+ exports.IClientCallMetrics = Symbol("IClientCallMetrics");
21
+ function getGrpcMethodType(requestStream, responseStream) {
22
+ if (requestStream) {
23
+ if (responseStream) {
24
+ return "bidi_stream";
25
+ }
26
+ else {
27
+ return "client_stream";
28
+ }
29
+ }
30
+ else {
31
+ if (responseStream) {
32
+ return "server_stream";
33
+ }
34
+ else {
35
+ return "unary";
36
+ }
37
+ }
38
+ }
39
+ exports.getGrpcMethodType = getGrpcMethodType;
40
+ function createClientCallMetricsInterceptor(metrics) {
41
+ return (options, nextCall) => {
42
+ const methodDef = options.method_definition;
43
+ const method = methodDef.path.substring(methodDef.path.lastIndexOf("/") + 1);
44
+ const service = methodDef.path.substring(1, methodDef.path.length - method.length - 1);
45
+ const labels = {
46
+ service,
47
+ method,
48
+ type: getGrpcMethodType(options.method_definition.requestStream, options.method_definition.responseStream),
49
+ };
50
+ const requester = new grpc.RequesterBuilder()
51
+ .withStart((metadata, listener, next) => {
52
+ const newListener = new grpc.ListenerBuilder()
53
+ .withOnReceiveStatus((status, next) => {
54
+ try {
55
+ metrics.handled(Object.assign(Object.assign({}, labels), { code: constants_1.Status[status.code] }));
56
+ }
57
+ finally {
58
+ next(status);
59
+ }
60
+ })
61
+ .withOnReceiveMessage((message, next) => {
62
+ try {
63
+ metrics.received(labels);
64
+ }
65
+ finally {
66
+ next(message);
67
+ }
68
+ })
69
+ .build();
70
+ try {
71
+ metrics.started(labels);
72
+ }
73
+ finally {
74
+ next(metadata, newListener);
75
+ }
76
+ })
77
+ .withSendMessage((message, next) => {
78
+ try {
79
+ metrics.sent(labels);
80
+ }
81
+ finally {
82
+ next(message);
83
+ }
84
+ })
85
+ .build();
86
+ return new grpc.InterceptingCall(nextCall(options), requester);
87
+ };
88
+ }
89
+ exports.createClientCallMetricsInterceptor = createClientCallMetricsInterceptor;
18
90
  //# sourceMappingURL=grpc.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"grpc.js","sourceRoot":"","sources":["../../src/util/grpc.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEU,QAAA,kBAAkB,GAAG;IAC9B,2BAA2B,EAAE,KAAK;IAClC,wBAAwB,EAAE,KAAK;IAC/B,sCAAsC,EAAE,KAAK;IAC7C,qCAAqC,EAAE,CAAC;IACxC,8BAA8B,EAAE,EAAE;IAClC,+BAA+B,EAAE,IAAI;IACrC,iCAAiC,EAAE,IAAI,GAAG,IAAI,GAAG,EAAE;CACtD,CAAC"}
1
+ {"version":3,"file":"grpc.js","sourceRoot":"","sources":["../../src/util/grpc.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ /**
2
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
3
+ * Licensed under the GNU Affero General Public License (AGPL).
4
+ * See License-AGPL.txt in the project root for license information.
5
+ */
6
+ export {};
7
+ //# sourceMappingURL=logging.spec.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logging.spec.d.ts","sourceRoot":"","sources":["../../src/util/logging.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}
@@ -0,0 +1,52 @@
1
+ "use strict";
2
+ /**
3
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
4
+ * Licensed under the GNU Affero General Public License (AGPL).
5
+ * See License-AGPL.txt in the project root for license information.
6
+ */
7
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
11
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
12
+ };
13
+ var __metadata = (this && this.__metadata) || function (k, v) {
14
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15
+ };
16
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
17
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
18
+ return new (P || (P = Promise))(function (resolve, reject) {
19
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
20
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
21
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
22
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
23
+ });
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ const mocha_typescript_1 = require("mocha-typescript");
27
+ const logging_1 = require("./logging");
28
+ let TestLogging = class TestLogging {
29
+ testLogInfo_output() {
30
+ return __awaiter(this, void 0, void 0, function* () {
31
+ const testObj = {
32
+ null: null,
33
+ undefined: undefined,
34
+ empty: "",
35
+ foo: "bar",
36
+ number: 0,
37
+ };
38
+ logging_1.log.info("info logging test", testObj);
39
+ });
40
+ }
41
+ };
42
+ __decorate([
43
+ mocha_typescript_1.test,
44
+ __metadata("design:type", Function),
45
+ __metadata("design:paramtypes", []),
46
+ __metadata("design:returntype", Promise)
47
+ ], TestLogging.prototype, "testLogInfo_output", null);
48
+ TestLogging = __decorate([
49
+ mocha_typescript_1.suite
50
+ ], TestLogging);
51
+ module.exports = new TestLogging();
52
+ //# sourceMappingURL=logging.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logging.spec.js","sourceRoot":"","sources":["../../src/util/logging.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;AAEH,uDAA+C;AAC/C,uCAAgC;AAGhC,IAAM,WAAW,GAAjB,MAAM,WAAW;IACM,kBAAkB;;YACjC,MAAM,OAAO,GAAG;gBACZ,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE,SAAS;gBACpB,KAAK,EAAE,EAAE;gBACT,GAAG,EAAE,KAAK;gBACV,MAAM,EAAE,CAAC;aACZ,CAAC;YACF,aAAG,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC;KAAA;CACJ,CAAA;AAVS;IAAL,uBAAI;;;;qDASJ;AAVC,WAAW;IADhB,wBAAK;GACA,WAAW,CAWhB;AACD,MAAM,CAAC,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC"}
@@ -0,0 +1,9 @@
1
+ /**
2
+ * Copyright (c) 2022 Gitpod GmbH. All rights reserved.
3
+ * Licensed under the GNU Affero General Public License (AGPL).
4
+ * See License-AGPL.txt in the project root for license information.
5
+ */
6
+ import { ClientMiddleware } from "nice-grpc-common";
7
+ import { IClientCallMetrics } from "./grpc";
8
+ export declare function prometheusClientMiddleware(metrics: IClientCallMetrics): ClientMiddleware;
9
+ //# sourceMappingURL=nice-grpc.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"nice-grpc.d.ts","sourceRoot":"","sources":["../../src/util/nice-grpc.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAGH,gBAAgB,EAInB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAkB,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AA2B5D,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,kBAAkB,GAAG,gBAAgB,CAkDxF"}