Merge v1.0.2 changes to master (#160)

* Adds a logger to catch errors bubbled up from annotating application metadata.

* Update glide.lock

* Removes unused hex ids to fix ginkgo typecheck failures from PR-146

* Tile update for PAS 2.4 (#157)

* update stemcell to xenial and added memory as a config param

* added logging to report error when unable to fetch copy of cache from remote

Author: luckyj5

cache/boltdb.go

@@ -284,7 +284,10 @@ func (c *Boltdb) invalidateCache() {
 					c.lock.Lock()
 					c.cache = apps
 					c.lock.Unlock()
+				} else {
+					c.config.Logger.Error("Unable to fetch copy of cache from remote", err)
 				}
+
 			case <-c.closing:
 				return
 			}

events/events.go

@@ -172,10 +172,12 @@ func (e *Event) AnnotateWithAppData(appCache cache.Cache) {
 
 	if cf_app_id != nil && appGuid != "<nil>" && cf_app_id != "" {
 		appInfo, err := appCache.GetApp(appGuid)
-		if err != nil || appInfo == nil {
+		if err != nil {
+			logrus.Error("Failed to fetch application metadata: ", err)
+			return
+		} else if appInfo == nil {
 			return
 		}
-
 		cf_app_name := appInfo.Name
 		cf_space_id := appInfo.SpaceGuid
 		cf_space_name := appInfo.SpaceName

eventsink/splunk_test.go

@@ -118,7 +118,6 @@ var _ = Describe("Splunk", func() {
 		var envelopeHttpStartStop *events.HttpStartStop
 		var startTimestamp, stopTimestamp int64
 		var requestId events.UUID
-		var requestIdHex, applicationIdHex string
 		var peerType events.PeerType
 		var method events.Method
 		var uri, remoteAddress, userAgent string
@@ -149,15 +148,13 @@ var _ = Describe("Splunk", func() {
 				Low:  &requestIdLow,
 				High: &requestIdHigh,
 			}
-			requestIdHex = "b12a3f87-83ab-4cf2-554b-042dc36e28f1"
 
 			applicationIdLow := uint64(10539615360601842564)
 			applicationIdHigh := uint64(3160954123591206558)
 			applicationId = events.UUID{
 				Low:  &applicationIdLow,
 				High: &applicationIdHigh,
 			}
-			applicationIdHex = "8463ec45-543c-4492-9ec6-f52707f7dd2b"
 
 			envelopeHttpStartStop = &events.HttpStartStop{
 				StartTimestamp: &startTimestamp,
@@ -646,4 +643,4 @@ var _ = Describe("Splunk", func() {
 		Ω(err).ShouldNot(HaveOccurred())
 	})
 
-})
+})

glide.lock

@@ -2,4 +2,5 @@
 history:
 - 0.2.1
 - 1.0.0
-version: 1.0.1
+- 1.0.1
+version: 1.0.2

tile/tile-history.yml

@@ -8,9 +8,9 @@ apply_open_security_group: true       # Apply open security group, default: fals
 allow_paid_service_plans: true        # Allow paid service plans, default: false
 
 stemcell_criteria:
-  os: ubuntu-trusty
+  os: ubuntu-xenial
   requires_cpi: false
-  version: '3421'
+  version: '97'
 
 properties:
 - name: author
@@ -109,16 +109,6 @@ forms:
     label: Additional Fields
     description: A set of user defined key:value pairs that are added to all Splunk events that do not occur in the event payload. Expected format - key1:value1, key2:value2, key3:value3
     optional: true
-  - name: add_app_info
-    type: boolean
-    default: false
-    label: Add App Information
-    description: Enriches raw data with application metadata, such as application name, space name, org name, etc.
-  - name: enable_event_tracing
-    type: boolean
-    label: Enable Event Tracing
-    default: false
-    description: Enables data loss tracing.
   - name: hec_retries
     type: integer
     label: HEC Retries
@@ -159,6 +149,21 @@ forms:
     label: App Limits
     default: 0
     description: The number of apps for which metadata is gathered when refreshing the app metadata cache (order based on app creation date). Set to 0 to remove limit.
+  - name: nozzle_memory
+    type: string
+    label: Nozzle Memory
+    description: Nozzle memory in MB.
+    default: 256M
+  - name: add_app_info
+    type: boolean
+    default: false
+    label: Add App Information
+    description: Enriches raw data with application metadata, such as application name, space name, org name, etc.
+  - name: enable_event_tracing
+    type: boolean
+    label: Enable Event Tracing
+    default: false
+    description: Enables data loss tracing.
   - name: ignore_missing_app
     type: boolean
     label: Ignore Missing App
@@ -170,7 +175,7 @@ packages:
   type: app
   label: Splunk-Firehose-Nozzle
   manifest:
-    memory: 256M
+    memory: (( .properties.nozzle_memory.value ))
     instances: (( .properties.scale_out_nozzle.value ))
     buildpack: binary_buildpack
     health-check-type: process
@@ -179,13 +184,3 @@ packages:
     command: ./splunk-firehose-nozzle
     env:
       GOPACKAGENAME: main
-
-
-
-
-
-
-
-
-
-