Skip to content

Commit 8a9660e

Browse files
Christian862Christian862
committed
Merge branch 'main' of github.com:hypertrace/hypertrace-ui into NavItemRequiresTwoClicks
2 parents 7f4a4f1 + 020afb4 commit 8a9660e

22 files changed

+90
-85
lines changed

‎projects/observability/src/pages/api-trace-detail/api-trace-detail.service.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe('Api TraceDetailService', () => {
5050
name: attributeKey,
5151
displayName: 'Duration',
5252
units: 'ms',
53-
type: AttributeMetadataType.Number,
53+
type: AttributeMetadataType.Long,
5454
scope: scope,
5555
onlySupportsAggregation: false,
5656
onlySupportsGrouping: false,

‎projects/observability/src/pages/explorer/explorer-dashboard-builder.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ describe('Explorer dashboard builder', () => {
7777
of({
7878
name: name,
7979
displayName: capitalize(name),
80-
type: AttributeMetadataType.Number
80+
type: AttributeMetadataType.Long
8181
})
8282
} as MetadataService,
8383
MockService(FilterBuilderLookupService)

‎projects/observability/src/pages/explorer/explorer-dashboard-builder.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ export class ExplorerDashboardBuilder {
154154

155155
private getRendererForType(type: AttributeMetadataType): string {
156156
switch (type) {
157-
case AttributeMetadataType.Number:
157+
case AttributeMetadataType.Long:
158+
case AttributeMetadataType.Double:
158159
return CoreTableCellRendererType.Number;
159160
case AttributeMetadataType.Timestamp:
160161
return CoreTableCellRendererType.Timestamp;

‎projects/observability/src/pages/explorer/explorer-service.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('Explorer service', () => {
2020
name: 'duration',
2121
displayName: 'Duration',
2222
units: 'ms',
23-
type: AttributeMetadataType.Number,
23+
type: AttributeMetadataType.Long,
2424
scope: scope,
2525
onlySupportsAggregation: false,
2626
onlySupportsGrouping: false,

‎projects/observability/src/pages/trace-detail/trace-detail.service.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ describe('TraceDetailService', () => {
6464
name: attributeKey,
6565
displayName: 'Latency',
6666
units: 'ms',
67-
type: AttributeMetadataType.Number,
67+
type: AttributeMetadataType.Long,
6868
scope: scope,
6969
onlySupportsAggregation: false,
7070
onlySupportsGrouping: false,

‎projects/observability/src/shared/components/explore-query-editor/explore-query-editor.component.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('Explore query editor', () => {
3030
scope: ObservabilityTraceType.Api,
3131
displayName: 'First',
3232
units: 'ms',
33-
type: AttributeMetadataType.Number,
33+
type: AttributeMetadataType.Long,
3434
onlySupportsAggregation: false,
3535
onlySupportsGrouping: false,
3636
allowedAggregations: [MetricAggregationType.Average, MetricAggregationType.Sum],
@@ -41,7 +41,7 @@ describe('Explore query editor', () => {
4141
scope: ObservabilityTraceType.Api,
4242
displayName: 'Second',
4343
units: 'ms',
44-
type: AttributeMetadataType.Number,
44+
type: AttributeMetadataType.Long,
4545
onlySupportsAggregation: false,
4646
onlySupportsGrouping: false,
4747
allowedAggregations: [MetricAggregationType.Average, MetricAggregationType.Sum],

‎projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source.model.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ describe('API call count data source model', () => {
4040
{
4141
[numCallsSpec.resultAlias()]: {
4242
value: 100,
43-
type: AttributeMetadataType.Number
43+
type: AttributeMetadataType.Long
4444
}
4545
}
4646
]

‎projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.test.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ describe('Explore cartesian data source model', () => {
4848
name: name,
4949
displayName: 'Duration',
5050
units: 'ms',
51-
type: AttributeMetadataType.Number,
51+
type: AttributeMetadataType.Long,
5252
scope: context,
5353
onlySupportsAggregation: false,
5454
onlySupportsGrouping: false,
@@ -99,14 +99,14 @@ describe('Explore cartesian data source model', () => {
9999
{
100100
'sum(foo)': {
101101
value: 10,
102-
type: AttributeMetadataType.Number
102+
type: AttributeMetadataType.Long
103103
},
104104
[GQL_EXPLORE_RESULT_INTERVAL_KEY]: startTime
105105
},
106106
{
107107
'sum(foo)': {
108108
value: 15,
109-
type: AttributeMetadataType.Number
109+
type: AttributeMetadataType.Long
110110
},
111111
[GQL_EXPLORE_RESULT_INTERVAL_KEY]: secondIntervalTime
112112
}
@@ -168,7 +168,7 @@ describe('Explore cartesian data source model', () => {
168168
{
169169
'sum(foo)': {
170170
value: 10,
171-
type: AttributeMetadataType.Number
171+
type: AttributeMetadataType.Long
172172
},
173173
baz: {
174174
value: 'first',
@@ -178,7 +178,7 @@ describe('Explore cartesian data source model', () => {
178178
{
179179
'sum(foo)': {
180180
value: 15,
181-
type: AttributeMetadataType.Number
181+
type: AttributeMetadataType.Long
182182
},
183183
baz: {
184184
value: 'second',
@@ -232,7 +232,7 @@ describe('Explore cartesian data source model', () => {
232232
{
233233
'sum(foo)': {
234234
value: 10,
235-
type: AttributeMetadataType.Number
235+
type: AttributeMetadataType.Long
236236
},
237237
baz: {
238238
value: 'first',
@@ -243,7 +243,7 @@ describe('Explore cartesian data source model', () => {
243243
{
244244
'sum(foo)': {
245245
value: 15,
246-
type: AttributeMetadataType.Number
246+
type: AttributeMetadataType.Long
247247
},
248248
baz: {
249249
value: 'first',
@@ -254,7 +254,7 @@ describe('Explore cartesian data source model', () => {
254254
{
255255
'sum(foo)': {
256256
value: 20,
257-
type: AttributeMetadataType.Number
257+
type: AttributeMetadataType.Long
258258
},
259259
baz: {
260260
value: 'second',
@@ -265,7 +265,7 @@ describe('Explore cartesian data source model', () => {
265265
{
266266
'sum(foo)': {
267267
value: 25,
268-
type: AttributeMetadataType.Number
268+
type: AttributeMetadataType.Long
269269
},
270270
baz: {
271271
value: 'second',

‎projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.test.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ describe('Explore result', () => {
1010
{
1111
'sum(foo)': {
1212
value: 10,
13-
type: AttributeMetadataType.Number
13+
type: AttributeMetadataType.Long
1414
},
1515
[GQL_EXPLORE_RESULT_INTERVAL_KEY]: new Date(0)
1616
},
1717
{
1818
'sum(foo)': {
1919
value: 15,
20-
type: AttributeMetadataType.Number
20+
type: AttributeMetadataType.Long
2121
},
2222
[GQL_EXPLORE_RESULT_INTERVAL_KEY]: new Date(1)
2323
},
2424
{
2525
'sum(foo)': {
2626
value: 20,
27-
type: AttributeMetadataType.Number
27+
type: AttributeMetadataType.Long
2828
},
2929
[GQL_EXPLORE_RESULT_INTERVAL_KEY]: new Date(2)
3030
}
@@ -53,7 +53,7 @@ describe('Explore result', () => {
5353
{
5454
'sum(foo)': {
5555
value: 10,
56-
type: AttributeMetadataType.Number
56+
type: AttributeMetadataType.Long
5757
},
5858
group: {
5959
value: 'first',
@@ -63,7 +63,7 @@ describe('Explore result', () => {
6363
{
6464
'sum(foo)': {
6565
value: 15,
66-
type: AttributeMetadataType.Number
66+
type: AttributeMetadataType.Long
6767
},
6868
group: {
6969
value: 'second',
@@ -73,7 +73,7 @@ describe('Explore result', () => {
7373
{
7474
'sum(foo)': {
7575
value: 20,
76-
type: AttributeMetadataType.Number
76+
type: AttributeMetadataType.Long
7777
},
7878
group: {
7979
value: 'third',
@@ -96,7 +96,7 @@ describe('Explore result', () => {
9696
{
9797
'sum(foo)': {
9898
value: 10,
99-
type: AttributeMetadataType.Number
99+
type: AttributeMetadataType.Long
100100
},
101101
group: {
102102
value: 'first',
@@ -106,7 +106,7 @@ describe('Explore result', () => {
106106
{
107107
'sum(foo)': {
108108
value: 15,
109-
type: AttributeMetadataType.Number
109+
type: AttributeMetadataType.Long
110110
},
111111
group: {
112112
value: '__Other',
@@ -128,7 +128,7 @@ describe('Explore result', () => {
128128
{
129129
'sum(foo)': {
130130
value: 10,
131-
type: AttributeMetadataType.Number
131+
type: AttributeMetadataType.Long
132132
},
133133
group: {
134134
value: 'first',
@@ -139,7 +139,7 @@ describe('Explore result', () => {
139139
{
140140
'sum(foo)': {
141141
value: 15,
142-
type: AttributeMetadataType.Number
142+
type: AttributeMetadataType.Long
143143
},
144144
group: {
145145
value: 'first',
@@ -150,7 +150,7 @@ describe('Explore result', () => {
150150
{
151151
'sum(foo)': {
152152
value: 20,
153-
type: AttributeMetadataType.Number
153+
type: AttributeMetadataType.Long
154154
},
155155
group: {
156156
value: 'second',
@@ -161,7 +161,7 @@ describe('Explore result', () => {
161161
{
162162
'sum(foo)': {
163163
value: 25,
164-
type: AttributeMetadataType.Number
164+
type: AttributeMetadataType.Long
165165
},
166166
group: {
167167
value: 'second',

‎projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.test.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ describe('Explorer Visualization cartesian data source model', () => {
4646
name: name,
4747
displayName: 'Duration',
4848
units: 'ms',
49-
type: AttributeMetadataType.Number,
49+
type: AttributeMetadataType.Long,
5050
scope: context,
5151
onlySupportsAggregation: false,
5252
onlySupportsGrouping: false,
@@ -118,14 +118,14 @@ describe('Explorer Visualization cartesian data source model', () => {
118118
{
119119
'sum(foo)': {
120120
value: 10,
121-
type: AttributeMetadataType.Number
121+
type: AttributeMetadataType.Long
122122
},
123123
[GQL_EXPLORE_RESULT_INTERVAL_KEY]: startTime
124124
},
125125
{
126126
'sum(foo)': {
127127
value: 15,
128-
type: AttributeMetadataType.Number
128+
type: AttributeMetadataType.Long
129129
},
130130
[GQL_EXPLORE_RESULT_INTERVAL_KEY]: secondIntervalTime
131131
}
@@ -188,7 +188,7 @@ describe('Explorer Visualization cartesian data source model', () => {
188188
{
189189
'sum(foo)': {
190190
value: 10,
191-
type: AttributeMetadataType.Number
191+
type: AttributeMetadataType.Long
192192
},
193193
baz: {
194194
value: 'first',
@@ -198,7 +198,7 @@ describe('Explorer Visualization cartesian data source model', () => {
198198
{
199199
'sum(foo)': {
200200
value: 15,
201-
type: AttributeMetadataType.Number
201+
type: AttributeMetadataType.Long
202202
},
203203
baz: {
204204
value: 'second',
@@ -254,7 +254,7 @@ describe('Explorer Visualization cartesian data source model', () => {
254254
{
255255
'sum(foo)': {
256256
value: 10,
257-
type: AttributeMetadataType.Number
257+
type: AttributeMetadataType.Long
258258
},
259259
baz: {
260260
value: 'first',
@@ -265,7 +265,7 @@ describe('Explorer Visualization cartesian data source model', () => {
265265
{
266266
'sum(foo)': {
267267
value: 15,
268-
type: AttributeMetadataType.Number
268+
type: AttributeMetadataType.Long
269269
},
270270
baz: {
271271
value: 'first',
@@ -276,7 +276,7 @@ describe('Explorer Visualization cartesian data source model', () => {
276276
{
277277
'sum(foo)': {
278278
value: 20,
279-
type: AttributeMetadataType.Number
279+
type: AttributeMetadataType.Long
280280
},
281281
baz: {
282282
value: 'second',
@@ -287,7 +287,7 @@ describe('Explorer Visualization cartesian data source model', () => {
287287
{
288288
'sum(foo)': {
289289
value: 25,
290-
type: AttributeMetadataType.Number
290+
type: AttributeMetadataType.Long
291291
},
292292
baz: {
293293
value: 'second',

0 commit comments

Comments
 (0)