Skip to content

Commit 172070d

Browse files
committed
Use idiomatic event naming, test search instrumentation
1 parent 090561c commit 172070d

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

lib/github/ldap.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def load_group(group_entry)
147147
#
148148
# Returns an Array of Net::LDAP::Entry.
149149
def search(options, &block)
150-
instrument "github_ldap.search", options.dup do |payload|
150+
instrument "search.github_ldap", options.dup do |payload|
151151
result =
152152
if options[:base]
153153
@connection.search(options, &block)

test/ldap_test.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,18 @@ def test_search_domains
6565
refute result.empty?
6666
assert_equal 'calavera', result.first[:uid].first
6767
end
68+
69+
def test_instruments_search
70+
events = @service.subscribe "search.github_ldap"
71+
result = @ldap.search(filter: "(uid=calavera)", :base => "dc=github,dc=com")
72+
refute_predicate result, :empty?
73+
payload, event_result = events.pop
74+
assert payload
75+
assert event_result
76+
assert_equal result, event_result
77+
assert_equal "(uid=calavera)", payload[:filter].to_s
78+
assert_equal "dc=github,dc=com", payload[:base]
79+
end
6880
end
6981

7082
class GitHubLdapTest < GitHub::Ldap::Test

test/test_helper.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ def self.start_server
2929
end
3030

3131
def options
32+
@service = MockInstrumentationService.new
3233
@options ||= GitHub::Ldap.server_options.merge \
3334
host: 'localhost',
34-
uid: 'uid'
35+
uid: 'uid',
36+
:instrumentation_service => @service
3537
end
3638
end
3739

0 commit comments

Comments
 (0)