@@ -12,25 +12,21 @@ import (
12
12
13
13
"github.com/rudderlabs/rudder-go-kit/config"
14
14
"github.com/rudderlabs/rudder-go-kit/jsonrs"
15
- "github.com/rudderlabs/rudder-go-kit/logger"
16
15
"github.com/rudderlabs/rudder-go-kit/stats"
17
16
)
18
17
19
18
const tableName = `tracked_users_reports`
20
19
21
- const problematicHLLValue = "5c78313139303766"
22
-
23
20
type TrackedUsersInAppAggregator struct {
24
- db * sql.DB
25
- stats stats.Stats
26
- logger logger.Logger
21
+ db * sql.DB
22
+ stats stats.Stats
27
23
28
24
reportsCounter stats.Measurement
29
25
aggReportsCounter stats.Measurement
30
26
}
31
27
32
- func NewTrackedUsersInAppAggregator (db * sql.DB , s stats.Stats , conf * config.Config , module string , logger logger. Logger ) * TrackedUsersInAppAggregator {
33
- t := TrackedUsersInAppAggregator {db : db , stats : s , logger : logger }
28
+ func NewTrackedUsersInAppAggregator (db * sql.DB , s stats.Stats , conf * config.Config , module string ) * TrackedUsersInAppAggregator {
29
+ t := TrackedUsersInAppAggregator {db : db , stats : s }
34
30
tags := stats.Tags {
35
31
"instance" : conf .GetString ("INSTANCE_ID" , "1" ),
36
32
"table" : tableName ,
@@ -59,14 +55,6 @@ func (a *TrackedUsersInAppAggregator) Aggregate(ctx context.Context, start, end
59
55
if err != nil {
60
56
return nil , fmt .Errorf ("cannot scan row %w" , err )
61
57
}
62
-
63
- if r .UserIDHLLHex == problematicHLLValue || r .AnonymousIDHLLHex == problematicHLLValue || r .IdentifiedAnonymousIDHLLHex == problematicHLLValue {
64
- a .logger .Errorn ("found problematic hll value from database" ,
65
- logger .NewStringField ("workspace_id" , r .WorkspaceID ),
66
- logger .NewStringField ("source_id" , r .SourceID ),
67
- )
68
- }
69
-
70
58
r .UserIDHLL , err = a .decodeHLL (r .UserIDHLLHex )
71
59
if err != nil {
72
60
return nil , fmt .Errorf ("cannot decode hll %w" , err )
@@ -97,7 +85,7 @@ func (a *TrackedUsersInAppAggregator) Aggregate(ctx context.Context, start, end
97
85
return nil , fmt .Errorf ("rows errors %w" , err )
98
86
}
99
87
100
- jsonReports , err = marshalReports (aggReportsMap , a . logger )
88
+ jsonReports , err = marshalReports (aggReportsMap )
101
89
if err != nil {
102
90
return nil , fmt .Errorf ("error marshalling reports %w" , err )
103
91
}
@@ -120,21 +108,13 @@ func (a *TrackedUsersInAppAggregator) decodeHLL(encoded string) (*hll.Hll, error
120
108
return & hll , nil
121
109
}
122
110
123
- func marshalReports (aggReportsMap map [string ]* TrackedUsersReport , log logger. Logger ) ([]json.RawMessage , error ) {
111
+ func marshalReports (aggReportsMap map [string ]* TrackedUsersReport ) ([]json.RawMessage , error ) {
124
112
jsonReports := make ([]json.RawMessage , 0 , len (aggReportsMap ))
125
113
for _ , v := range aggReportsMap {
126
114
data , err := jsonrs .Marshal (v )
127
115
if err != nil {
128
116
return nil , err
129
117
}
130
-
131
- if v .UserIDHLLHex == problematicHLLValue || v .AnonymousIDHLLHex == problematicHLLValue || v .IdentifiedAnonymousIDHLLHex == problematicHLLValue {
132
- log .Errorn ("found problematic hll value in marshalled data" ,
133
- logger .NewStringField ("workspace_id" , v .WorkspaceID ),
134
- logger .NewStringField ("source_id" , v .SourceID ),
135
- )
136
- }
137
-
138
118
jsonReports = append (jsonReports , data )
139
119
}
140
120
return jsonReports , nil
0 commit comments