Skip to content

Commit 9330c3a

Browse files
committed
chore: clean up codes
1 parent 22e3c69 commit 9330c3a

File tree

91 files changed

+1930
-1210
lines changed

Some content is hidden

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

91 files changed

+1930
-1210
lines changed

β€Žapi/nginx_log/analytics.goβ€Ž

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func GetLogAnalytics(c *gin.Context) {
8383
}
8484

8585
// Get modern analytics service
86-
analyticsService := nginx_log.GetModernAnalytics()
86+
analyticsService := nginx_log.GetAnalytics()
8787
if analyticsService == nil {
8888
cosy.ErrHandler(c, nginx_log.ErrModernAnalyticsNotAvailable)
8989
return
@@ -130,7 +130,7 @@ func GetLogPreflight(c *gin.Context) {
130130
logPath := c.Query("log_path")
131131

132132
// Create preflight service and perform check
133-
preflightService := nginx_log.NewPreflightService()
133+
preflightService := nginx_log.NewPreflight()
134134
internalResponse, err := preflightService.CheckLogPreflight(logPath)
135135
if err != nil {
136136
cosy.ErrHandler(c, err)
@@ -170,13 +170,13 @@ func AdvancedSearchLogs(c *gin.Context) {
170170
return
171171
}
172172

173-
searcherService := nginx_log.GetModernSearcher()
173+
searcherService := nginx_log.GetSearcher()
174174
if searcherService == nil {
175175
cosy.ErrHandler(c, nginx_log.ErrModernSearcherNotAvailable)
176176
return
177177
}
178178

179-
analyticsService := nginx_log.GetModernAnalytics()
179+
analyticsService := nginx_log.GetAnalytics()
180180
if analyticsService == nil {
181181
cosy.ErrHandler(c, nginx_log.ErrModernAnalyticsNotAvailable)
182182
return
@@ -304,7 +304,7 @@ func AdvancedSearchLogs(c *gin.Context) {
304304
}
305305
}
306306

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
308308
pv := int(result.TotalHits)
309309
var uv, uniquePages int
310310
var facetUV, facetUniquePages int
@@ -321,18 +321,18 @@ func AdvancedSearchLogs(c *gin.Context) {
321321
}
322322
}
323323

324-
// Override with CardinalityCounter results for better accuracy
324+
// Override with Counter results for better accuracy
325325
if analyticsService != nil {
326326
// Get cardinality counts for UV (unique IPs)
327327
if uvResult := getCardinalityCount(ctx, "ip", searchReq); uvResult > 0 {
328328
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)
330330
}
331331

332332
// Get cardinality counts for Unique Pages (unique paths)
333333
if upResult := getCardinalityCount(ctx, "path_exact", searchReq); upResult > 0 {
334334
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)
336336
}
337337
}
338338

@@ -381,13 +381,13 @@ func GetLogEntries(c *gin.Context) {
381381
return
382382
}
383383

384-
searcherService := nginx_log.GetModernSearcher()
384+
searcherService := nginx_log.GetSearcher()
385385
if searcherService == nil {
386386
cosy.ErrHandler(c, nginx_log.ErrModernSearcherNotAvailable)
387387
return
388388
}
389389

390-
analyticsService := nginx_log.GetModernAnalytics()
390+
analyticsService := nginx_log.GetAnalytics()
391391
if analyticsService == nil {
392392
cosy.ErrHandler(c, nginx_log.ErrModernAnalyticsNotAvailable)
393393
return
@@ -521,7 +521,7 @@ func GetDashboardAnalytics(c *gin.Context) {
521521

522522
logger.Debugf("Dashboard API received log_path: '%s', start_date: '%s', end_date: '%s'", req.LogPath, req.StartDate, req.EndDate)
523523

524-
analyticsService := nginx_log.GetModernAnalytics()
524+
analyticsService := nginx_log.GetAnalytics()
525525
if analyticsService == nil {
526526
cosy.ErrHandler(c, nginx_log.ErrModernAnalyticsNotAvailable)
527527
return
@@ -628,7 +628,7 @@ func GetWorldMapData(c *gin.Context) {
628628
logger.Debugf("WorldMapData request - Path: '%s', StartTime: %d, EndTime: %d, Limit: %d",
629629
req.Path, req.StartTime, req.EndTime, req.Limit)
630630

631-
analyticsService := nginx_log.GetModernAnalytics()
631+
analyticsService := nginx_log.GetAnalytics()
632632
if analyticsService == nil {
633633
cosy.ErrHandler(c, nginx_log.ErrModernAnalyticsNotAvailable)
634634
return
@@ -729,7 +729,7 @@ func GetChinaMapData(c *gin.Context) {
729729
logger.Debugf("ChinaMapData request - Path: '%s', StartTime: %d, EndTime: %d, Limit: %d",
730730
req.Path, req.StartTime, req.EndTime, req.Limit)
731731

732-
analyticsService := nginx_log.GetModernAnalytics()
732+
analyticsService := nginx_log.GetAnalytics()
733733
if analyticsService == nil {
734734
cosy.ErrHandler(c, nginx_log.ErrModernAnalyticsNotAvailable)
735735
return
@@ -823,7 +823,7 @@ func GetGeoStats(c *gin.Context) {
823823
return
824824
}
825825

826-
analyticsService := nginx_log.GetModernAnalytics()
826+
analyticsService := nginx_log.GetAnalytics()
827827
if analyticsService == nil {
828828
cosy.ErrHandler(c, nginx_log.ErrModernAnalyticsNotAvailable)
829829
return
@@ -900,16 +900,17 @@ func getCardinalityCount(ctx context.Context, field string, searchReq *searcher.
900900
cardReq.Field, cardReq.StartTime, cardReq.EndTime, cardReq.LogPaths)
901901

902902
// Try to get the searcher to access cardinality counter
903-
searcherService := nginx_log.GetModernSearcher()
903+
searcherService := nginx_log.GetSearcher()
904904
if searcherService == nil {
905905
logger.Debugf("🚨 getCardinalityCount: ModernSearcher not available for field %s", field)
906906
return 0
907907
}
908908
logger.Debugf("πŸ” getCardinalityCount: ModernSearcher available, type: %T", searcherService)
909909

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")
913914
shards := ds.GetShards()
914915
logger.Debugf("πŸ” getCardinalityCount: Retrieved %d shards", len(shards))
915916
if len(shards) > 0 {
@@ -918,26 +919,26 @@ func getCardinalityCount(ctx context.Context, field string, searchReq *searcher.
918919
logger.Debugf("πŸ” getCardinalityCount: Shard %d: %v", i, shard != nil)
919920
}
920921

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)
924925
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)
926927
return 0
927928
}
928929

929930
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)
931932
return 0
932933
}
933934

934935
logger.Debugf("βœ… getCardinalityCount: Successfully got cardinality for field %s: %d", field, result.Cardinality)
935936
return int(result.Cardinality)
936937
} 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)
938939
}
939940
} 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)
941942
}
942943

943944
return 0

0 commit comments

Comments
Β (0)