Skip to content

fix: ensure valid json message attribute value #2428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thompson-tomo wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −3
Open

fix: ensure valid json message attribute value #2428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions instrumentation/net_ldap/.github-ci.yml
View file
Open in desktop

This file was deleted.

16 changes: 15 additions & 1 deletion ...umentation/net_ldap/lib/opentelemetry/instrumentation/net/ldap/instrumentation_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ def instrument(event, payload)
'ldap.auth.username' => auth[:username].to_s,
'ldap.operation.type' => operation_type,
'ldap.request.message' => begin
payload.to_json
raw = payload.to_json
utf8_clean?(raw) ? raw : nil
rescue JSON::GeneratorError
nil
end,
Expand Down Expand Up @@ -99,6 +100,19 @@ def annotate_span_with_response(span, response)

span.status = OpenTelemetry::Trace::Status.error
end

def utf8_clean?(value)
case value
when String
value.scrub == value
when Hash
value.all? { |k, v| utf8_clean?(k) && utf8_clean?(v) }
when Array
value.all? { |v| utf8_clean?(v) }
else
true
end
end
end
end
end
Expand Down
Loading