Skip to content

Commit bb742da

Browse files
sdk
1 parent 5f59578 commit bb742da

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

modules/module-mongodb-storage/src/storage/MongoReportStorage.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,17 @@ export class MongoReportStorage implements storage.ReportStorageFactory {
124124
$count: 'count'
125125
}
126126
],
127-
unique_sdks: [
127+
sdk_versions_array: [
128128
{
129129
$group: {
130-
_id: '$sdk'
130+
_id: '$sdk',
131+
count: { $sum: 1 }
132+
}
133+
},
134+
{
135+
$project: {
136+
k: '$_id',
137+
v: '$count'
131138
}
132139
}
133140
]
@@ -138,7 +145,7 @@ export class MongoReportStorage implements storage.ReportStorageFactory {
138145
unique_users_count: { $ifNull: [{ $arrayElemAt: ['$unique_users.count', 0] }, 0] },
139146
unique_user_sdk_count: { $ifNull: [{ $arrayElemAt: ['$unique_user_sdk.count', 0] }, 0] },
140147
unique_user_client_count: { $ifNull: [{ $arrayElemAt: ['$unique_user_client.count', 0] }, 0] },
141-
sdk_versions: '$unique_sdks._id'
148+
sdk_versions: { $arrayToObject: '$sdk_versions_array' }
142149
}
143150
}
144151
])

packages/types/src/events.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,17 @@ export type InstanceRequest = {
5151
};
5252

5353
export type ListCurrentConnections = {
54-
user_count: number;
55-
client_count: number;
56-
user_per_sdk: {
54+
unique_user_count: number;
55+
unique_user_client_count: number;
56+
unique_user_sdk_count: number;
57+
sdk_versions: {
5758
[sdk_version: string]: number;
5859
};
5960
};
6061
export type ScrapeSdkDataRequest = {
6162
scrape_time: TimeFrames;
6263
};
63-
export type ListCurrentConnectionsResponse = ListCurrentConnections & InstanceRequest;
64+
export type ListCurrentConnectionsResponse = ListCurrentConnections;
6465

6566
export type EventHandlerFunc<K extends EmitterEngineEvents> = (data: SubscribeEvents[K]) => Promise<void> | void;
6667
export interface EmitterEvent<K extends EmitterEngineEvents> {

0 commit comments

Comments
 (0)