Fix another nil pointer and make things nullable (#554)

* Fix another nil pointer and make things nullable * version bump
silverton-io · May 3, 2023 · 5f6caf6 · 5f6caf6
1 parent 4f9eec6
commit 5f6caf6
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 38 deletions.
diff --git a/.VERSION b/.VERSION
@@ -1 +1 @@
-v0.16.2
+v0.16.3
diff --git a/deploy/terraform/aws/lambda/variables.tf b/deploy/terraform/aws/lambda/variables.tf
@@ -29,7 +29,7 @@ variable "buz_domain" {
 variable "buz_version" {
   description = "The version of Buz to run."
   type        = string
-  default     = "v0.16.2"
+  default     = "v0.16.3"
 }
 
 variable "buz_lambda_memory_limit" {

diff --git a/deploy/terraform/gcp/cloud_run/variables.tf b/deploy/terraform/gcp/cloud_run/variables.tf
@@ -28,7 +28,7 @@ variable "buz_domain" {
 variable "buz_version" {
   description = "The version of Buz to run."
   type        = string
-  default     = "v0.16.2"
+  default     = "v0.16.3"
 }
 
 variable "buz_service_timeout_seconds" {

diff --git a/examples/quickstart/docker-compose.yml b/examples/quickstart/docker-compose.yml
@@ -20,7 +20,7 @@ x-dependency:
 services:
   buz:
     container_name: buz
-    image: ghcr.io/silverton-io/buz:v0.16.2
+    image: ghcr.io/silverton-io/buz:v0.16.3
     volumes:
       - type: bind
         source: ./buz/quickstart.conf.yml

diff --git a/pkg/protocol/snowplow/envelopeBuilder.go b/pkg/protocol/snowplow/envelopeBuilder.go
@@ -6,6 +6,7 @@ package snowplow
 
 import (
 	"io"
+	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/rs/zerolog/log"
@@ -19,7 +20,11 @@ import (
 
 func buildSnowplowEnvelope(conf config.Config, e SnowplowEvent) envelope.Envelope {
 	n := envelope.NewEnvelope(conf.App)
-	n.Timestamp = *e.DvceCreatedTstamp
+	if e.DvceCreatedTstamp != nil {
+		n.Timestamp = *e.DvceCreatedTstamp
+	} else {
+		n.Timestamp = time.Now()
+	}
 	n.Protocol = protocol.SNOWPLOW
 	n.Schema = *e.SelfDescribingEvent.SchemaName()
 	n.Payload = e.Map()

diff --git a/pkg/protocol/snowplow/event.go b/pkg/protocol/snowplow/event.go
@@ -37,7 +37,7 @@ type SnowplowEvent struct {
 	// Application parameters - https://docs.snowplowanalytics.com/docs/collecting-data/collecting-from-own-applications/snowplow-tracker-protocol/#common-parameters-platform-and-event-independent
 	NameTracker            *string                         `json:"name_tracker"`
 	AppId                  *string                         `json:"app_id"`
-	Platform               string                          `json:"platform"`
+	Platform               *string                         `json:"platform"`
 	EtlTstamp              *time.Time                      `json:"etl_tstamp"`
 	DvceCreatedTstamp      *time.Time                      `json:"dvce_created_tstamp"`
 	DvceSentTstamp         *time.Time                      `json:"dvce_sent_tstamp"`
@@ -158,19 +158,19 @@ func (e *SnowplowEvent) Map() map[string]interface{} {
 }
 
 type Page struct {
-	Url      string                 `json:"url"`
-	Title    *string                `json:"title"`
-	Scheme   string                 `json:"scheme"`
-	Host     string                 `json:"host"`
-	Port     string                 `json:"port"`
-	Path     string                 `json:"path"`
-	Query    map[string]interface{} `json:"query"`
-	Fragment *string                `json:"fragment"`
-	Medium   *string                `json:"medium"`
-	Source   *string                `json:"source"`
-	Term     *string                `json:"term"`
-	Content  *string                `json:"content"`
-	Campaign *string                `json:"campaign"`
+	Url      *string                 `json:"url"`
+	Title    *string                 `json:"title"`
+	Scheme   *string                 `json:"scheme"`
+	Host     *string                 `json:"host"`
+	Port     *string                 `json:"port"`
+	Path     *string                 `json:"path"`
+	Query    *map[string]interface{} `json:"query"`
+	Fragment *string                 `json:"fragment"`
+	Medium   *string                 `json:"medium"`
+	Source   *string                 `json:"source"`
+	Term     *string                 `json:"term"`
+	Content  *string                 `json:"content"`
+	Campaign *string                 `json:"campaign"`
 }
 
 type PageViewEvent struct{}

diff --git a/pkg/protocol/snowplow/eventBuilder.go b/pkg/protocol/snowplow/eventBuilder.go
@@ -161,13 +161,14 @@ func getPageFromParam(params map[string]interface{}, k string) (Page, error) {
 		}
 		qParams := util.QueryToMap(parsedUrl.Query())
 		frag := parsedUrl.Fragment
+		port := parsedUrl.Port()
 		page := Page{
-			Url:      *p,
-			Scheme:   parsedUrl.Scheme,
-			Host:     parsedUrl.Host,
-			Port:     parsedUrl.Port(),
-			Path:     parsedUrl.Path,
-			Query:    qParams,
+			Url:      p,
+			Scheme:   &parsedUrl.Scheme,
+			Host:     &parsedUrl.Host,
+			Port:     &port,
+			Path:     &parsedUrl.Path,
+			Query:    &qParams,
 			Fragment: &frag,
 			Medium:   getQueryParam(*parsedUrl, "utm_medium"),
 			Source:   getQueryParam(*parsedUrl, "utm_source"),
@@ -205,7 +206,7 @@ func setEvent(e *SnowplowEvent, params map[string]interface{}) {
 	eName := getStringParam(params, "e")
 	fingerprint := uuid.New()
 	e.AppId = getStringParam(params, "aid")
-	e.Platform = *getStringParam(params, "p")
+	e.Platform = getStringParam(params, "p")
 	e.Event = getEventType(*eName)
 	e.TxnId = getStringParam(params, "tid")
 	e.EventId = getStringParam(params, "eid")
@@ -230,13 +231,13 @@ func setPage(e *SnowplowEvent, params map[string]interface{}) {
 	page, _ := getPageFromParam(params, "url")
 	title := getStringParam(params, "page")
 	page.Title = title
-	e.PageUrl = &page.Url
+	e.PageUrl = page.Url
 	e.PageTitle = page.Title
-	e.PageUrlScheme = &page.Scheme
-	e.PageUrlHost = &page.Host
-	e.PageUrlPort = &page.Port
-	e.PageUrlPath = &page.Path
-	e.PageUrlQuery = &page.Query
+	e.PageUrlScheme = page.Scheme
+	e.PageUrlHost = page.Host
+	e.PageUrlPort = page.Port
+	e.PageUrlPath = page.Path
+	e.PageUrlQuery = page.Query
 	e.PageUrlFragment = page.Fragment
 	e.MktCampaign = page.Campaign
 	e.MktContent = page.Content
@@ -247,12 +248,12 @@ func setPage(e *SnowplowEvent, params map[string]interface{}) {
 
 func setReferrer(e *SnowplowEvent, params map[string]interface{}) {
 	refr, _ := getPageFromParam(params, "refr")
-	e.PageReferrer = &refr.Url
-	e.RefrUrlScheme = &refr.Scheme
-	e.RefrUrlHost = &refr.Host
-	e.RefrUrlPort = &refr.Port
-	e.RefrUrlPath = &refr.Path
-	e.RefrUrlQuery = &refr.Query
+	e.PageReferrer = refr.Url
+	e.RefrUrlScheme = refr.Scheme
+	e.RefrUrlHost = refr.Host
+	e.RefrUrlPort = refr.Port
+	e.RefrUrlPath = refr.Path
+	e.RefrUrlQuery = refr.Query
 	e.RefrUrlFragment = refr.Fragment
 	e.RefrCampaign = refr.Campaign
 	e.RefrContent = refr.Content