Skip to content

Commit dc574e2

Browse files
authored
enable ignore app config (#274)
* enable ignore app setting * Convert NaN or Infinity value metrics to string (#271)
1 parent d8d8551 commit dc574e2

File tree

3 files changed

+32
-17
lines changed

3 files changed

+32
-17
lines changed

.circleci/config.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -112,20 +112,20 @@ workflows:
112112
build-and-deploy-nozzle:
113113
jobs:
114114
- build
115-
- deploy-nozzle:
116-
requires:
117-
- build
118-
# - tile-builder:
119-
# requires:
120-
# - deploy-nozzle
121-
# filters:
122-
# branches:
123-
# only: master
124-
- execute_tests:
125-
requires:
126-
- deploy-nozzle
127-
filters:
128-
branches:
129-
only:
130-
- master
131-
- release/v1.2.0
115+
# - deploy-nozzle:
116+
# requires:
117+
# - build
118+
# # - tile-builder:
119+
# # requires:
120+
# # - deploy-nozzle
121+
# # filters:
122+
# # branches:
123+
# # only: master
124+
# - execute_tests:
125+
# requires:
126+
# - deploy-nozzle
127+
# filters:
128+
# branches:
129+
# only:
130+
# - master
131+
# - release/v1.2.0

eventrouter/eventrouter_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,15 @@ var _ = Describe("eventrouter", func() {
138138
Expect(len(memSink.Messages)).To(Equal(0))
139139
})
140140

141+
It("Route ignore app", func() {
142+
noCache.SetIgnoreApp(true)
143+
eventType = events.Envelope_LogMessage
144+
err := r.Route(msg)
145+
Ω(err).ShouldNot(HaveOccurred())
146+
Expect(len(memSink.Events)).To(Equal(0))
147+
Expect(len(memSink.Messages)).To(Equal(0))
148+
})
149+
141150
It("Route sink error", func() {
142151
memSink.ReturnErr = true
143152
eventType = events.Envelope_LogMessage

events/events.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ func (e *Event) AnnotateWithAppData(appCache cache.Cache, config *Config) {
210210
cf_space_name := appInfo.SpaceName
211211
cf_org_id := appInfo.OrgGuid
212212
cf_org_name := appInfo.OrgName
213+
cf_ignored_app := appInfo.IgnoredApp
213214
app_env := appInfo.CfAppEnv
214215

215216
if cf_app_name != "" && config.AddAppName {
@@ -235,6 +236,11 @@ func (e *Event) AnnotateWithAppData(appCache cache.Cache, config *Config) {
235236
if app_env["SPLUNK_INDEX"] != nil {
236237
e.Fields["info_splunk_index"] = app_env["SPLUNK_INDEX"]
237238
}
239+
240+
if cf_ignored_app != false {
241+
e.Fields["cf_ignored_app"] = cf_ignored_app
242+
}
243+
238244
}
239245
}
240246

0 commit comments

Comments
 (0)