Skip to content

Commit 7b0c1ab

Browse files
committed
Update regex to include / and .
1 parent fd5473f commit 7b0c1ab

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

lib/new_relic/agent.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class SerializationError < StandardError; end
118118
AUTOMATIC_TRACER_MAX_ATTEMPTS = 60 # 60 = try about twice a second for 30 seconds
119119

120120
# Event types must consist of only alphanumeric characters, '_', ':', or ' '.
121-
VALID_CUSTOM_EVENT_TYPE = /\A[\w: ]+\z/
121+
VALID_CUSTOM_EVENT_TYPE = /\A[\w:/. ]+\z/
122122

123123
attr_reader :error_group_callback
124124
attr_reader :llm_token_count_callback

test/multiverse/suites/agent_only/custom_analytics_events_test.rb

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,20 @@ def test_record_custom_event_returns_falsy_if_event_was_dropped
3838

3939
def test_record_custom_event_accepts_valid_event_types
4040
NewRelic::Agent.record_custom_event('ValidEvent', {})
41-
NewRelic::Agent.record_custom_event('Valid_Event', {})
42-
NewRelic::Agent.record_custom_event('Valid:Event', {})
43-
NewRelic::Agent.record_custom_event('Valid Event', {})
41+
NewRelic::Agent.record_custom_event('valid_Event_underscore', {})
42+
NewRelic::Agent.record_custom_event('Valid:Event:Colon', {})
43+
NewRelic::Agent.record_custom_event('Valid Event Space', {})
44+
NewRelic::Agent.record_custom_event('Valid.Event.Period', {})
45+
NewRelic::Agent.record_custom_event('Valid/Event/ForwardSlash', {})
46+
NewRelic::Agent.record_custom_event('Valid123Event456Numbers', {})
47+
NewRelic::Agent.record_custom_event('valideventlowercase', {})
4448
NewRelic::Agent.record_custom_event(:ValidSymbol, {})
45-
NewRelic::Agent.record_custom_event(:Valid_Symbol, {})
49+
NewRelic::Agent.record_custom_event(:Valid_Symbol_Underscore, {})
4650

4751
NewRelic::Agent.agent.send(:harvest_and_send_custom_event_data)
4852
events = last_posted_events
4953

50-
assert_equal(6, events.size)
54+
assert_equal(10, events.size)
5155
end
5256

5357
def test_record_custom_event_raises_on_invalid_event_types

0 commit comments

Comments
 (0)