fix: refactor attributes merge

Author: hannahramadan

instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/dup/instrumentation.rb

@@ -33,12 +33,13 @@ def request(req, body = nil, &)
                   'url.scheme' => USE_SSL_TO_SCHEME[use_ssl?],
                   'server.address' => @address,
                   'server.port' => @port
-                }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-
+                }
                 path, query = split_path_and_query(req.path)
-                attributes['url.path'] = path unless attributes.key?('url.path')
+                attributes['url.path'] = path
                 attributes['url.query'] = query if query
 
+                attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
                 tracer.in_span(
                   req.method,
                   attributes: attributes,

instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/stable/instrumentation.rb

@@ -28,12 +28,13 @@ def request(req, body = nil, &)
                   'url.scheme' => USE_SSL_TO_SCHEME[use_ssl?],
                   'server.address' => @address,
                   'server.port' => @port
-                }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-
+                }
                 path, query = split_path_and_query(req.path)
-                attributes['url.path'] = path unless attributes.key?('url.path')
+                attributes['url.path'] = path
                 attributes['url.query'] = query if query
 
+                attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
                 tracer.in_span(
                   req.method.to_s,
                   attributes: attributes,