chore: bump minimal API version to 1.7, rename ldap.base to ldap.tree.base, add runtime dependency on semconv ~> 1.36

Author: scbjans

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

@@ -27,7 +27,7 @@ def initialize(args = {})
           def instrument(event, payload)
             attributes = {
               'ldap.auth' => auth.except(:password).to_json,
-              'ldap.base' => base,
+              'ldap.tree.base' => base,
               'ldap.encryption' => encryption.to_json,
               'ldap.request.message' => payload.to_json,
               OpenTelemetry::SemConv::SERVER::SERVER_ADDRESS => host || hosts,

instrumentation/net_ldap/opentelemetry-instrumentation-net_ldap.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = ">= #{File.read(File.expand_path('../../gemspecs/RUBY_REQUIREMENT', __dir__))}"
 
-  spec.add_dependency 'opentelemetry-api', '~> 1.0'
-  spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
+  spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.24'
+  spec.add_dependency 'opentelemetry-semantic_conventions', '~> 1.36'
 
   if spec.respond_to?(:metadata)
     spec.metadata['changelog_uri'] = "https://rubydoc.info/gems/#{spec.name}/#{spec.version}/file/CHANGELOG.md"

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

@@ -76,10 +76,10 @@ def modify(args)
         _(exporter.finished_spans.size).must_equal 1
         _(span.name).must_equal 'bind.net_ldap'
         _(span.attributes['ldap.auth']).must_equal '{"method":"anonymous"}'
-        _(span.attributes['ldap.base']).must_equal 'dc=com'
         _(span.attributes['ldap.encryption']).must_equal '{"method":"simple_tls","tls_options":{"foo":"bar"}}'
         _(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'
         _(span.attributes['network.protocol.name']).must_equal 'ldap'
         _(span.attributes['peer.service']).must_equal 'test:ldap'
         _(span.attributes['server.address']).must_equal 'test.mocked.com'
@@ -95,10 +95,10 @@ def modify(args)
         _(exporter.finished_spans.size).must_equal 1
         _(span.name).must_equal 'search.net_ldap'
         _(span.attributes['ldap.auth']).must_equal '{"method":"anonymous"}'
-        _(span.attributes['ldap.base']).must_equal 'dc=com'
         _(span.attributes['ldap.encryption']).must_equal '{"method":"simple_tls","tls_options":{"foo":"bar"}}'
         _(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'
         _(span.attributes['network.protocol.name']).must_equal 'ldap'
         _(span.attributes['peer.service']).must_equal 'test:ldap'
         _(span.attributes['server.address']).must_equal 'test.mocked.com'
@@ -119,9 +119,9 @@ def modify(args)
         _(span.attributes['error.message']).must_equal 'Connection timed out - user specified timeout'
         _(span.attributes['error.type']).must_equal 'Net::LDAP::Error'
         _(span.attributes['ldap.auth']).must_equal '{"method":"anonymous"}'
-        _(span.attributes['ldap.base']).must_equal 'dc=com'
         _(span.attributes['ldap.encryption']).must_equal '{"method":"simple_tls","tls_options":{"foo":"bar"}}'
         _(span.attributes['ldap.request.message']).must_equal '{}'
+        _(span.attributes['ldap.tree.base']).must_equal 'dc=com'
         _(span.attributes['network.protocol.name']).must_equal 'ldap'
         _(span.attributes['peer.service']).must_equal 'test:ldap'
         _(span.attributes['server.address']).must_equal 'test.mocked.com'
@@ -140,10 +140,10 @@ def modify(args)
         _(exporter.finished_spans.size).must_equal 1
         _(span.name).must_equal 'modify.net_ldap'
         _(span.attributes['ldap.auth']).must_equal '{"method":"anonymous"}'
-        _(span.attributes['ldap.base']).must_equal 'dc=com'
         _(span.attributes['ldap.encryption']).must_equal '{"method":"simple_tls","tls_options":{"foo":"bar"}}'
         _(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'
         _(span.attributes['network.protocol.name']).must_equal 'ldap'
         _(span.attributes['peer.service']).must_equal 'test:ldap'
         _(span.attributes['server.address']).must_equal 'test.mocked.com'