@@ -83,7 +83,7 @@ func GetLogAnalytics(c *gin.Context) {
83
83
}
84
84
85
85
// Get modern analytics service
86
- analyticsService := nginx_log .GetModernAnalytics ()
86
+ analyticsService := nginx_log .GetAnalytics ()
87
87
if analyticsService == nil {
88
88
cosy .ErrHandler (c , nginx_log .ErrModernAnalyticsNotAvailable )
89
89
return
@@ -130,7 +130,7 @@ func GetLogPreflight(c *gin.Context) {
130
130
logPath := c .Query ("log_path" )
131
131
132
132
// Create preflight service and perform check
133
- preflightService := nginx_log .NewPreflightService ()
133
+ preflightService := nginx_log .NewPreflight ()
134
134
internalResponse , err := preflightService .CheckLogPreflight (logPath )
135
135
if err != nil {
136
136
cosy .ErrHandler (c , err )
@@ -170,13 +170,13 @@ func AdvancedSearchLogs(c *gin.Context) {
170
170
return
171
171
}
172
172
173
- searcherService := nginx_log .GetModernSearcher ()
173
+ searcherService := nginx_log .GetSearcher ()
174
174
if searcherService == nil {
175
175
cosy .ErrHandler (c , nginx_log .ErrModernSearcherNotAvailable )
176
176
return
177
177
}
178
178
179
- analyticsService := nginx_log .GetModernAnalytics ()
179
+ analyticsService := nginx_log .GetAnalytics ()
180
180
if analyticsService == nil {
181
181
cosy .ErrHandler (c , nginx_log .ErrModernAnalyticsNotAvailable )
182
182
return
@@ -304,7 +304,7 @@ func AdvancedSearchLogs(c *gin.Context) {
304
304
}
305
305
}
306
306
307
- // 2. Calculate summary stats from the overall results using CardinalityCounter for accuracy
307
+ // 2. Calculate summary stats from the overall results using Counter for accuracy
308
308
pv := int (result .TotalHits )
309
309
var uv , uniquePages int
310
310
var facetUV , facetUniquePages int
@@ -321,18 +321,18 @@ func AdvancedSearchLogs(c *gin.Context) {
321
321
}
322
322
}
323
323
324
- // Override with CardinalityCounter results for better accuracy
324
+ // Override with Counter results for better accuracy
325
325
if analyticsService != nil {
326
326
// Get cardinality counts for UV (unique IPs)
327
327
if uvResult := getCardinalityCount (ctx , "ip" , searchReq ); uvResult > 0 {
328
328
uv = uvResult
329
- logger .Debugf ("π’ Search endpoint - UV from CardinalityCounter : %d (vs facet: %d)" , uvResult , facetUV )
329
+ logger .Debugf ("π’ Search endpoint - UV from Counter : %d (vs facet: %d)" , uvResult , facetUV )
330
330
}
331
331
332
332
// Get cardinality counts for Unique Pages (unique paths)
333
333
if upResult := getCardinalityCount (ctx , "path_exact" , searchReq ); upResult > 0 {
334
334
uniquePages = upResult
335
- logger .Debugf ("π’ Search endpoint - Unique Pages from CardinalityCounter : %d (vs facet: %d)" , upResult , facetUniquePages )
335
+ logger .Debugf ("π’ Search endpoint - Unique Pages from Counter : %d (vs facet: %d)" , upResult , facetUniquePages )
336
336
}
337
337
}
338
338
@@ -381,13 +381,13 @@ func GetLogEntries(c *gin.Context) {
381
381
return
382
382
}
383
383
384
- searcherService := nginx_log .GetModernSearcher ()
384
+ searcherService := nginx_log .GetSearcher ()
385
385
if searcherService == nil {
386
386
cosy .ErrHandler (c , nginx_log .ErrModernSearcherNotAvailable )
387
387
return
388
388
}
389
389
390
- analyticsService := nginx_log .GetModernAnalytics ()
390
+ analyticsService := nginx_log .GetAnalytics ()
391
391
if analyticsService == nil {
392
392
cosy .ErrHandler (c , nginx_log .ErrModernAnalyticsNotAvailable )
393
393
return
@@ -521,7 +521,7 @@ func GetDashboardAnalytics(c *gin.Context) {
521
521
522
522
logger .Debugf ("Dashboard API received log_path: '%s', start_date: '%s', end_date: '%s'" , req .LogPath , req .StartDate , req .EndDate )
523
523
524
- analyticsService := nginx_log .GetModernAnalytics ()
524
+ analyticsService := nginx_log .GetAnalytics ()
525
525
if analyticsService == nil {
526
526
cosy .ErrHandler (c , nginx_log .ErrModernAnalyticsNotAvailable )
527
527
return
@@ -628,7 +628,7 @@ func GetWorldMapData(c *gin.Context) {
628
628
logger .Debugf ("WorldMapData request - Path: '%s', StartTime: %d, EndTime: %d, Limit: %d" ,
629
629
req .Path , req .StartTime , req .EndTime , req .Limit )
630
630
631
- analyticsService := nginx_log .GetModernAnalytics ()
631
+ analyticsService := nginx_log .GetAnalytics ()
632
632
if analyticsService == nil {
633
633
cosy .ErrHandler (c , nginx_log .ErrModernAnalyticsNotAvailable )
634
634
return
@@ -729,7 +729,7 @@ func GetChinaMapData(c *gin.Context) {
729
729
logger .Debugf ("ChinaMapData request - Path: '%s', StartTime: %d, EndTime: %d, Limit: %d" ,
730
730
req .Path , req .StartTime , req .EndTime , req .Limit )
731
731
732
- analyticsService := nginx_log .GetModernAnalytics ()
732
+ analyticsService := nginx_log .GetAnalytics ()
733
733
if analyticsService == nil {
734
734
cosy .ErrHandler (c , nginx_log .ErrModernAnalyticsNotAvailable )
735
735
return
@@ -823,7 +823,7 @@ func GetGeoStats(c *gin.Context) {
823
823
return
824
824
}
825
825
826
- analyticsService := nginx_log .GetModernAnalytics ()
826
+ analyticsService := nginx_log .GetAnalytics ()
827
827
if analyticsService == nil {
828
828
cosy .ErrHandler (c , nginx_log .ErrModernAnalyticsNotAvailable )
829
829
return
@@ -900,16 +900,17 @@ func getCardinalityCount(ctx context.Context, field string, searchReq *searcher.
900
900
cardReq .Field , cardReq .StartTime , cardReq .EndTime , cardReq .LogPaths )
901
901
902
902
// Try to get the searcher to access cardinality counter
903
- searcherService := nginx_log .GetModernSearcher ()
903
+ searcherService := nginx_log .GetSearcher ()
904
904
if searcherService == nil {
905
905
logger .Debugf ("π¨ getCardinalityCount: ModernSearcher not available for field %s" , field )
906
906
return 0
907
907
}
908
908
logger .Debugf ("π getCardinalityCount: ModernSearcher available, type: %T" , searcherService )
909
909
910
- // Try to cast to DistributedSearcher to access CardinalityCounter
911
- if ds , ok := searcherService .(* searcher.DistributedSearcher ); ok {
912
- logger .Debugf ("π getCardinalityCount: Successfully cast to DistributedSearcher" )
910
+ // Use searcher to access Counter
911
+ if searcherService != nil {
912
+ ds := searcherService
913
+ logger .Debugf ("π getCardinalityCount: Successfully cast to Searcher" )
913
914
shards := ds .GetShards ()
914
915
logger .Debugf ("π getCardinalityCount: Retrieved %d shards" , len (shards ))
915
916
if len (shards ) > 0 {
@@ -918,26 +919,26 @@ func getCardinalityCount(ctx context.Context, field string, searchReq *searcher.
918
919
logger .Debugf ("π getCardinalityCount: Shard %d: %v" , i , shard != nil )
919
920
}
920
921
921
- cardinalityCounter := searcher .NewCardinalityCounter (shards )
922
- logger .Debugf ("π getCardinalityCount: Created CardinalityCounter " )
923
- result , err := cardinalityCounter .CountCardinality (ctx , cardReq )
922
+ cardinalityCounter := searcher .NewCounter (shards )
923
+ logger .Debugf ("π getCardinalityCount: Created Counter " )
924
+ result , err := cardinalityCounter .Count (ctx , cardReq )
924
925
if err != nil {
925
- logger .Debugf ("π¨ getCardinalityCount: CardinalityCounter failed for field %s: %v" , field , err )
926
+ logger .Debugf ("π¨ getCardinalityCount: Counter failed for field %s: %v" , field , err )
926
927
return 0
927
928
}
928
929
929
930
if result .Error != "" {
930
- logger .Debugf ("π¨ getCardinalityCount: CardinalityCounter returned error for field %s: %s" , field , result .Error )
931
+ logger .Debugf ("π¨ getCardinalityCount: Counter returned error for field %s: %s" , field , result .Error )
931
932
return 0
932
933
}
933
934
934
935
logger .Debugf ("β
getCardinalityCount: Successfully got cardinality for field %s: %d" , field , result .Cardinality )
935
936
return int (result .Cardinality )
936
937
} else {
937
- logger .Debugf ("π¨ getCardinalityCount: DistributedSearcher has no shards for field %s" , field )
938
+ logger .Debugf ("π¨ getCardinalityCount: Searcher has no shards for field %s" , field )
938
939
}
939
940
} else {
940
- logger .Debugf ("π¨ getCardinalityCount: Searcher is not DistributedSearcher (type: %T) for field %s" , searcherService , field )
941
+ logger .Debugf ("π¨ getCardinalityCount: Searcher is not Searcher (type: %T) for field %s" , searcherService , field )
941
942
}
942
943
943
944
return 0
0 commit comments