chore: add ldap.operation.type attribute.

Author: scbjans

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

@@ -25,11 +25,14 @@ def initialize(args = {})
           end
 
           def instrument(event, payload)
+            operation_type, span_kind = event.split('.').then { |s| [s.first, s.last == 'net_ldap_connection' ? :internal : :client] }
+
             attributes = {
               'ldap.auth.method' => auth[:method].to_s,
               'ldap.auth.username' => auth[:username].to_s,
-              'ldap.tree.base' => base,
+              'ldap.operation.type' => operation_type,
               'ldap.request.message' => payload.to_json,
+              'ldap.tree.base' => base,
               OpenTelemetry::SemConv::SERVER::SERVER_ADDRESS => host || hosts,
               OpenTelemetry::SemConv::SERVER::SERVER_PORT => port,
               OpenTelemetry::SemConv::Incubating::PEER::PEER_SERVICE => instrumentation_config[:peer_service],
@@ -39,9 +42,8 @@ def instrument(event, payload)
             }
             attributes.delete_if { |_key, value| value.nil? }
 
-            span_name, span_kind = event.split('.').then { |s| [s.first, s.last == 'net_ldap_connection' ? :internal : :client] }
             tracer.in_span(
-              "LDAP #{span_name}",
+              "LDAP #{operation_type}",
               attributes: AttributeMapper.map(attributes),
               kind: span_kind
             ) do |span|

instrumentation/net_ldap/test/opentelemetry/instrumentation/net/ldap/instrumentation_test.rb

@@ -80,6 +80,7 @@ def modify(args)
         _(span.attributes['ldap.auth.username']).must_equal 'test_user'
         _(span.attributes['ldap.auth.method']).must_equal 'simple'
         _(span.attributes.values).wont_include 'test_password'
+        _(span.attributes['ldap.operation.type']).must_equal 'bind'
         _(span.attributes['ldap.request.message']).must_equal '{}'
         _(span.attributes['ldap.response.status_code']).must_equal 0
         _(span.attributes['ldap.tree.base']).must_equal 'dc=com'
@@ -103,6 +104,7 @@ def modify(args)
         _(span.attributes['ldap.auth.username']).must_equal 'test_user'
         _(span.attributes['ldap.auth.method']).must_equal 'simple'
         _(span.attributes.values).wont_include 'test_password'
+        _(span.attributes['ldap.operation.type']).must_equal 'search'
         _(span.attributes['ldap.request.message']).must_equal '{"filter":"(uid=user1)","paged_searches_supported":false,"base":"dc=com"}'
         _(span.attributes['ldap.response.status_code']).must_equal 0
         _(span.attributes['ldap.tree.base']).must_equal 'dc=com'
@@ -131,6 +133,7 @@ def modify(args)
         _(span.attributes['ldap.auth.username']).must_equal 'test_user'
         _(span.attributes['ldap.auth.method']).must_equal 'simple'
         _(span.attributes.values).wont_include 'test_password'
+        _(span.attributes['ldap.operation.type']).must_equal 'add'
         _(span.attributes['ldap.request.message']).must_equal '{}'
         _(span.attributes['ldap.tree.base']).must_equal 'dc=com'
         _(span.attributes['network.protocol.name']).must_equal 'ldap'
@@ -156,6 +159,7 @@ def modify(args)
         _(span.attributes['ldap.auth.username']).must_equal 'test_user'
         _(span.attributes['ldap.auth.method']).must_equal 'simple'
         _(span.attributes.values).wont_include 'test_password'
+        _(span.attributes['ldap.operation.type']).must_equal 'modify'
         _(span.attributes['ldap.request.message']).must_equal '{"dn":"CN=test,OU=test,DC=com","operations":[["replace","unicodePwd",["[REDACTED]"]]]}'
         _(span.attributes['ldap.response.status_code']).must_equal 0
         _(span.attributes['ldap.tree.base']).must_equal 'dc=com'