Merge pull request #171 from m-lab/parser-fix

Add more metrics logging, onlyIfNull -> overwrite

Author: gfr10598

parser/ndt.go

@@ -575,9 +575,9 @@ func (n *NDTParser) fixValues(r schema.Web100ValueMap) {
 	// snapshot addresses are always authoritative.  Other sources don't handle
 	// ipv6 correctly.  So, always substitute, unless for some reason the snapshot
 	// value is missing.
-	logEntry.SubstituteString(false, []string{"connection_spec", "local_ip"},
+	logEntry.SubstituteString(true, []string{"connection_spec", "local_ip"},
 		[]string{"snap", "LocalAddress"})
-	logEntry.SubstituteString(false, []string{"connection_spec", "remote_ip"},
+	logEntry.SubstituteString(true, []string{"connection_spec", "remote_ip"},
 		[]string{"snap", "RemAddress"})
 
 	// Handle local_af.
@@ -599,13 +599,13 @@ func (n *NDTParser) fixValues(r schema.Web100ValueMap) {
 	// file is missing, they may be empty.  In that case, we replace them
 	// with values from the log entry, (which usually come from the snapshot.)
 	// TODO - make these the ONLY representation of client/server tuple.
-	r.SubstituteString(true, []string{"connection_spec", "server_ip"},
+	r.SubstituteString(false, []string{"connection_spec", "server_ip"},
 		[]string{"web100_log_entry", "connection_spec", "local_ip"})
-	r.SubstituteInt64(true, []string{"connection_spec", "server_af"},
+	r.SubstituteInt64(false, []string{"connection_spec", "server_af"},
 		[]string{"web100_log_entry", "connection_spec", "local_af"})
-	r.SubstituteString(true, []string{"connection_spec", "client_ip"},
+	r.SubstituteString(false, []string{"connection_spec", "client_ip"},
 		[]string{"web100_log_entry", "connection_spec", "remote_ip"})
-	r.SubstituteInt64(true, []string{"connection_spec", "client_af"},
+	r.SubstituteInt64(false, []string{"connection_spec", "client_af"},
 		[]string{"web100_log_entry", "connection_spec", "local_af"})
 
 	start, ok := snap.GetInt64([]string{"StartTimeStamp"})

schema/web100.go

@@ -85,14 +85,16 @@ func (s Web100ValueMap) SetString(name string, value string) {
 	s[name] = value
 }
 
-func (r Web100ValueMap) SubstituteString(onlyIfNull bool, target []string, source []string) {
+// if overwrite is false, will only add missing values.
+// if overwrite is true, will overwrite existing values.
+func (r Web100ValueMap) SubstituteString(overwrite bool, target []string, source []string) {
 	m := r.GetMap(target[:len(target)-1])
 	if m == nil {
 		// Error ?
 		log.Printf("No such path: %v\n", target)
 		return
 	}
-	if _, notNull := m[target[len(target)-1]]; onlyIfNull && notNull {
+	if _, notNull := m[target[len(target)-1]]; notNull && !overwrite {
 		// All good
 		return
 	}
@@ -104,14 +106,16 @@ func (r Web100ValueMap) SubstituteString(onlyIfNull bool, target []string, sourc
 	m[target[len(target)-1]] = value
 }
 
-func (r Web100ValueMap) SubstituteInt64(onlyIfNull bool, target []string, source []string) {
+// if overwrite is false, will only add missing values.
+// if overwrite is true, will overwrite existing values.
+func (r Web100ValueMap) SubstituteInt64(overwrite bool, target []string, source []string) {
 	m := r.GetMap(target[:len(target)-1])
 	if m == nil {
 		// Error ?
 		log.Printf("No such path: %v\n", target)
 		return
 	}
-	if _, notNull := m[target[len(target)-1]]; onlyIfNull && notNull {
+	if _, notNull := m[target[len(target)-1]]; notNull && !overwrite {
 		// All good
 		return
 	}