Fix: refactors

Author: hannahramadan

instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/dup/event_handler.rb

@@ -199,7 +199,10 @@ def request_span_attributes(env)
               }
 
               attributes['url.query'] = env['QUERY_STRING'] unless env['QUERY_STRING'].empty?
-              attributes['http.user_agent'] = env['HTTP_USER_AGENT'] if env['HTTP_USER_AGENT']
+              if env['HTTP_USER_AGENT']
+                attributes['http.user_agent'] = env['HTTP_USER_AGENT']
+                attributes['user_agent.original'] = env['HTTP_USER_AGENT']
+              end
               attributes.merge!(extract_request_headers(env))
               attributes
             end

instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/dup/tracer_middleware.rb

@@ -127,6 +127,7 @@ def request_span_attributes(env:)
               attributes = {
                 'http.method' => env['REQUEST_METHOD'],
                 'http.host' => env['HTTP_HOST'] || 'unknown',
+                'server.address' => env['HTTP_HOST'] || 'unknown',
                 'http.scheme' => env['rack.url_scheme'],
                 'http.target' => env['QUERY_STRING'].empty? ? env['PATH_INFO'] : "#{env['PATH_INFO']}?#{env['QUERY_STRING']}",
                 'http.request.method' => env['REQUEST_METHOD'],
@@ -135,6 +136,10 @@ def request_span_attributes(env:)
               }
 
               attributes['url.query'] = env['QUERY_STRING'] unless env['QUERY_STRING'].empty?
+              if env['HTTP_USER_AGENT']
+                attributes['http.user_agent'] = env['HTTP_USER_AGENT']
+                attributes['user_agent.original'] = env['HTTP_USER_AGENT']
+              end
               attributes.merge!(allowed_request_headers(env))
             end
 
@@ -151,7 +156,7 @@ def create_request_span_name(request_uri_or_path_info, env)
               if (implementation = config[:url_quantization])
                 implementation.call(request_uri_or_path_info, env)
               else
-                env['REQUEST_METHOD'].to_s
+                env['REQUEST_METHOD']
               end
             end
 

instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/stable/tracer_middleware.rb

@@ -126,7 +126,7 @@ def tracer
             def request_span_attributes(env:)
               attributes = {
                 'http.request.method' => env['REQUEST_METHOD'],
-                'http.host' => env['HTTP_HOST'] || 'unknown',
+                'server.address' => env['HTTP_HOST'] || 'unknown',
                 'url.scheme' => env['rack.url_scheme'],
                 'url.path' => env['PATH_INFO']
               }
@@ -149,7 +149,7 @@ def create_request_span_name(request_uri_or_path_info, env)
               if (implementation = config[:url_quantization])
                 implementation.call(request_uri_or_path_info, env)
               else
-                env['REQUEST_METHOD'].to_s
+                env['REQUEST_METHOD']
               end
             end