bigquery: use the proper table name for BQ destination

We have two ways of saving data to BQ:

 1. client --(UDP)--> evenkitdbq --> BQ
 2. app --(Google API)--> BQ

In both cases, we should use the same table name convention (`scope_eventname`)

Change-Id: Id4677c20eb54ff1742a3f732ea0fac41153a3934

bigquery/client.go

@@ -184,15 +184,15 @@ tagloop:
 	return nil
 }
 
-func TableName(event *pb.Event) string {
+// TableName defines the naming convention between event and BQ table name.
+func TableName(scope []string, name string) string {
 	var res []string
-	for _, scope := range event.Scope {
+	for _, scope := range scope {
 		res = append(res, nonSafeTableNameCharacters.ReplaceAllString(scope, "_"))
 	}
-	res = append(res, nonSafeTableNameCharacters.ReplaceAllString(event.Name, "_"))
+	res = append(res, nonSafeTableNameCharacters.ReplaceAllString(name, "_"))
 
-	name := strings.Join(res, "_")
-	all := multiUnderscore.ReplaceAllString(name, "_")
+	all := multiUnderscore.ReplaceAllString(strings.Join(res, "_"), "_")
 	all = strings.Trim(all, "_")
 	return all
 }

bigquery/destination.go

@@ -52,10 +52,11 @@ func (b *BigQueryDestination) Submit(events ...*eventkit.Event) {
 				Value: t.Value,
 			})
 		}
-		if _, found := records[event.Name]; !found {
-			records[event.Name] = make([]*Record, 0)
+		tableName := TableName(event.Scope, event.Name)
+		if _, found := records[tableName]; !found {
+			records[tableName] = make([]*Record, 0)
 		}
-		records[event.Name] = append(records[event.Name], &Record{
+		records[tableName] = append(records[tableName], &Record{
 			Application: Application{
 				Name:    b.appName,
 				Version: "0.0.1",

eventkitd-bigquery/bigquery/sink.go

@@ -34,7 +34,7 @@ func (b *BigQuerySink) Receive(ctx context.Context, unparsed *listener.Packet, p
 		eventTime := correctedStart.Add(time.Duration(event.TimestampOffsetNs) * time.Nanosecond)
 		correction := correctedStart.Sub(packet.StartTimestamp.AsTime())
 
-		k := bigquery.TableName(event)
+		k := bigquery.TableName(event.Scope, event.Name)
 
 		records[k] = append(records[k], &bigquery.Record{
 			Application: bigquery.Application{