Skip to content

Commit 62861d2

Browse files
committed
Review feedback
1 parent a354e0b commit 62861d2

3 files changed

Lines changed: 7 additions & 15 deletions

File tree

instrumentation/active_record/Appraisals

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,8 @@ if RUBY_ENGINE == 'jruby'
3232
gem 'activerecord-jdbcsqlite3-adapter', "~> #{version}"
3333
end
3434
end
35+
36+
appraise 'activerecord-latest' do
37+
gem 'activerecord-jdbcsqlite3-adapter',
38+
end
3539
end
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
env:
2+
unsupported_interpreters: jruby

instrumentation/net_ldap/lib/opentelemetry/instrumentation/net/ldap/instrumentation_service.rb

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ def instrument(event, payload)
3232
'ldap.auth.username' => auth[:username].to_s,
3333
'ldap.operation.type' => operation_type,
3434
'ldap.request.message' => begin
35-
raw = payload.to_json
36-
utf8_clean?(raw) ? raw : nil
35+
payload.to_json
3736
rescue JSON::GeneratorError
3837
nil
3938
end,
@@ -100,19 +99,6 @@ def annotate_span_with_response(span, response)
10099

101100
span.status = OpenTelemetry::Trace::Status.error
102101
end
103-
104-
def utf8_clean?(value)
105-
case value
106-
when String
107-
value.scrub == value
108-
when Hash
109-
value.all? { |k, v| utf8_clean?(k) && utf8_clean?(v) }
110-
when Array
111-
value.all? { |v| utf8_clean?(v) }
112-
else
113-
true
114-
end
115-
end
116102
end
117103
end
118104
end

0 commit comments

Comments
 (0)