Scala Common Enrich: added validation that v_collector is set (closes #…

…1600)
snowplow · Sep 25, 2015 · dcf0e74 · dcf0e74
1 parent 4c28448
commit dcf0e74
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...in/scala/com.snowplowanalytics.snowplow.enrich/common/enrichments/EnrichmentManager.scala b/...in/scala/com.snowplowanalytics.snowplow.enrich/common/enrichments/EnrichmentManager.scala
@@ -206,6 +206,12 @@ object EnrichmentManager {
 
     val secondPassTransform = event.transform(sourceMap, secondPassTransformMap)
 
+    // The load fails if the collector version is not set
+    val collectorVersionSet = event.v_collector match {
+      case ("" | null) => "Collector version not set".fail
+      case _ => unitSuccess
+    }
+
     // Potentially update the page_url and set the page URL components
     val pageUri = WPE.extractPageUri(raw.context.refererUri, Option(event.page_url))
     for (uri <- pageUri; u <- uri) {
@@ -429,10 +435,11 @@ object EnrichmentManager {
       collectorTstamp.toValidationNel         |@|
       client.toValidationNel                  |@|
       uaParser.toValidationNel                |@|
+      collectorVersionSet.toValidationNel     |@|
       pageUri.toValidationNel                 |@|
       geoLocation.toValidationNel             |@|
       refererUri.toValidationNel) {
-      (_,_,_,_,_,_,_) => ()
+      (_,_,_,_,_,_,_,_) => ()
     }
     val second = 
       (transform                              |@|