Merge branch 'trunk' into add-locators.html

dotnet/src/webdriver/DevTools/DevToolsSession.cs

@@ -542,6 +542,11 @@ private void MonitorMessageQueue()
                 }
                 catch (Exception ex)
                 {
+                    if (logger.IsEnabled(LogEventLevel.Error))
+                    {
+                        logger.Error($"Unexpected error occured while processing message: {ex}");
+                    }
+
                     LogError("Unexpected error occured while processing message: {0}", ex);
                 }
             }
@@ -578,6 +583,11 @@ private void ProcessMessage(string message)
                 }
                 else
                 {
+                    if (logger.IsEnabled(LogEventLevel.Error))
+                    {
+                        logger.Error($"Recieved Unknown Response {commandId}: {message}");
+                    }
+
                     LogError("Recieved Unknown Response {0}: {1}", commandId, message);
                 }
 

java/src/org/openqa/selenium/remote/TracedCommandExecutor.java

@@ -37,7 +37,7 @@ public TracedCommandExecutor(CommandExecutor delegate, Tracer tracer) {
 
   @Override
   public Response execute(Command command) throws IOException {
-    try (Span commandSpan = tracer.getCurrentContext().createSpan("command")) {
+    try (Span commandSpan = tracer.getCurrentContext().createSpan(command.getName())) {
       SessionId sessionId = command.getSessionId();
       if (sessionId != null) {
         commandSpan.setAttribute("sessionId", sessionId.toString());

java/test/org/openqa/selenium/remote/TracedCommandExecutorTest.java

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.remote;
 
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -48,7 +49,7 @@ class TracedCommandExecutorTest {
   public void createMocksAndTracedCommandExecutor() {
     MockitoAnnotations.initMocks(this);
     when(tracer.getCurrentContext()).thenReturn(traceContext);
-    when(traceContext.createSpan("command")).thenReturn(span);
+    when(traceContext.createSpan(anyString())).thenReturn(span);
     tracedCommandExecutor = new TracedCommandExecutor(commandExecutor, tracer);
   }
 
@@ -109,4 +110,18 @@ void canCreateSpanWithCommandName() throws IOException {
     verify(span, times(1)).close();
     verifyNoMoreInteractions(span);
   }
+
+  @Test
+  void canCreateSpanWithCommandNameAsSpanName() throws IOException {
+    SessionId sessionId = new SessionId(UUID.randomUUID());
+    Command command = new Command(sessionId, "findElement");
+
+    tracedCommandExecutor.execute(command);
+
+    verify(traceContext).createSpan("findElement");
+    verify(span).setAttribute("sessionId", sessionId.toString());
+    verify(span).setAttribute("command", "findElement");
+    verify(span).close();
+    verifyNoMoreInteractions(span);
+  }
 }

rust/Cargo.Bazel.lock

@@ -1,5 +1,5 @@
 {
-  "checksum": "778a62d50d430548a64ececb679a81afba2ffa2ac1553d2e95807253aa723ac7",
+  "checksum": "ba73e39704c230ab36d29779338a27060fadfde0a7e9b957428668f5fdb9c271",
   "crates": {
     "addr2line 0.21.0": {
       "name": "addr2line",
@@ -4539,6 +4539,100 @@
       ],
       "license_file": "LICENSE-APACHE"
     },
+    "fs2 0.4.3": {
+      "name": "fs2",
+      "version": "0.4.3",
+      "package_url": "https://github.com/danburkert/fs2-rs",
+      "repository": {
+        "Http": {
+          "url": "https://static.crates.io/crates/fs2/0.4.3/download",
+          "sha256": "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+        }
+      },
+      "targets": [
+        {
+          "Library": {
+            "crate_name": "fs2",
+            "crate_root": "src/lib.rs",
+            "srcs": {
+              "allow_empty": true,
+              "include": [
+                "**/*.rs"
+              ]
+            }
+          }
+        }
+      ],
+      "library_target_name": "fs2",
+      "common_attrs": {
+        "compile_data_glob": [
+          "**"
+        ],
+        "deps": {
+          "common": [],
+          "selects": {
+            "cfg(unix)": [
+              {
+                "id": "libc 0.2.168",
+                "target": "libc"
+              }
+            ],
+            "cfg(windows)": [
+              {
+                "id": "winapi 0.3.9",
+                "target": "winapi"
+              }
+            ]
+          }
+        },
+        "edition": "2015",
+        "version": "0.4.3"
+      },
+      "license": "MIT/Apache-2.0",
+      "license_ids": [
+        "Apache-2.0",
+        "MIT"
+      ],
+      "license_file": "LICENSE-APACHE"
+    },
+    "fs_extra 1.3.0": {
+      "name": "fs_extra",
+      "version": "1.3.0",
+      "package_url": "https://github.com/webdesus/fs_extra",
+      "repository": {
+        "Http": {
+          "url": "https://static.crates.io/crates/fs_extra/1.3.0/download",
+          "sha256": "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+        }
+      },
+      "targets": [
+        {
+          "Library": {
+            "crate_name": "fs_extra",
+            "crate_root": "src/lib.rs",
+            "srcs": {
+              "allow_empty": true,
+              "include": [
+                "**/*.rs"
+              ]
+            }
+          }
+        }
+      ],
+      "library_target_name": "fs_extra",
+      "common_attrs": {
+        "compile_data_glob": [
+          "**"
+        ],
+        "edition": "2018",
+        "version": "1.3.0"
+      },
+      "license": "MIT",
+      "license_ids": [
+        "MIT"
+      ],
+      "license_file": "LICENSE"
+    },
     "futures 0.3.30": {
       "name": "futures",
       "version": "0.3.30",
@@ -13320,6 +13414,14 @@
               "id": "flate2 1.0.35",
               "target": "flate2"
             },
+            {
+              "id": "fs2 0.4.3",
+              "target": "fs2"
+            },
+            {
+              "id": "fs_extra 1.3.0",
+              "target": "fs_extra"
+            },
             {
               "id": "infer 0.16.0",
               "target": "infer"
@@ -18553,7 +18655,12 @@
         ],
         "crate_features": {
           "common": [
-            "winbase"
+            "fileapi",
+            "handleapi",
+            "processthreadsapi",
+            "std",
+            "winbase",
+            "winerror"
           ],
           "selects": {}
         },
@@ -22185,6 +22292,8 @@
     "env_logger 0.11.5",
     "exitcode 1.1.2",
     "flate2 1.0.35",
+    "fs2 0.4.3",
+    "fs_extra 1.3.0",
     "infer 0.16.0",
     "log 0.4.22",
     "regex 1.11.1",

rust/Cargo.toml

@@ -36,6 +36,8 @@ debpkg = "0.6.0"
 anyhow = { version = "1.0.94", default-features = false, features = ["backtrace", "std"] }
 apple-flat-package = "0.20.0"
 which = "7.0.0"
+fs2 = "0.4.3"
+fs_extra = "1.3.0"
 
 [dev-dependencies]
 assert_cmd = "2.0.16"

rust/src/files.rs

@@ -27,6 +27,7 @@ use apple_flat_package::PkgReader;
 use bzip2::read::BzDecoder;
 use directories::BaseDirs;
 use flate2::read::GzDecoder;
+use fs_extra::dir::{move_dir, CopyOptions};
 use regex::Regex;
 use std::fs;
 use std::fs::File;
@@ -143,7 +144,7 @@ pub fn uncompress(
     } else if extension.eq_ignore_ascii_case(EXE) {
         uncompress_sfx(compressed_file, target, log)?
     } else if extension.eq_ignore_ascii_case(DEB) {
-        uncompress_deb(compressed_file, target, log, os, volume.unwrap_or_default())?
+        uncompress_deb(compressed_file, target, log, volume.unwrap_or_default())?
     } else if extension.eq_ignore_ascii_case(MSI) {
         install_msi(compressed_file, log, os)?
     } else if extension.eq_ignore_ascii_case(XML) || extension.eq_ignore_ascii_case(HTML) {
@@ -158,6 +159,7 @@ pub fn uncompress(
             extension
         )));
     }
+
     Ok(())
 }
 
@@ -176,15 +178,23 @@ pub fn uncompress_sfx(compressed_file: &str, target: &Path, log: &Logger) -> Res
     sevenz_rust::decompress(file_reader, zip_parent).unwrap();
 
     let zip_parent_str = path_to_string(zip_parent);
-    let target_str = path_to_string(target);
     let core_str = format!(r"{}\core", zip_parent_str);
+    move_folder_content(&core_str, &target, &log)?;
+
+    Ok(())
+}
+
+pub fn move_folder_content(source: &str, target: &Path, log: &Logger) -> Result<(), Error> {
     log.trace(format!(
-        "Moving extracted files and folders from {} to {}",
-        core_str, target_str
+        "Moving files and folders from {} to {}",
+        source,
+        target.display()
     ));
     create_parent_path_if_not_exists(target)?;
-    fs::rename(&core_str, &target_str)?;
-
+    let mut options = CopyOptions::new();
+    options.content_only = true;
+    options.skip_exist = true;
+    move_dir(source, target, &options)?;
     Ok(())
 }
 
@@ -261,7 +271,6 @@ pub fn uncompress_deb(
     compressed_file: &str,
     target: &Path,
     log: &Logger,
-    os: &str,
     label: &str,
 ) -> Result<(), Error> {
     let zip_parent = Path::new(compressed_file).parent().unwrap();
@@ -276,21 +285,17 @@ pub fn uncompress_deb(
     deb_pkg.data()?.unpack(zip_parent)?;
 
     let zip_parent_str = path_to_string(zip_parent);
-    let target_str = path_to_string(target);
     let opt_edge_str = format!("{}/opt/microsoft/{}", zip_parent_str, label);
-    let opt_edge_mv = format!("mv {} {}", opt_edge_str, target_str);
-    let command = Command::new_single(opt_edge_mv.clone());
-    log.trace(format!(
-        "Moving extracted files and folders from {} to {}",
-        opt_edge_str, target_str
-    ));
-    create_parent_path_if_not_exists(target)?;
-    run_shell_command_by_os(os, command)?;
-    let target_path = Path::new(target);
-    if target_path.parent().unwrap().read_dir()?.next().is_none() {
-        fs::rename(&opt_edge_str, &target_str)?;
+
+    // Exception due to bad symbolic link in unstable distributions. For example:
+    // microsoft-edge -> /opt/microsoft/msedge-beta/microsoft-edge-beta
+    if !label.eq("msedge") {
+        let link = format!("{}/microsoft-edge", opt_edge_str);
+        fs::remove_file(Path::new(&link)).unwrap_or_default();
     }
 
+    move_folder_content(&opt_edge_str, &target, &log)?;
+
     Ok(())
 }
 
@@ -337,14 +342,12 @@ pub fn uncompress_tar(decoder: &mut dyn Read, target: &Path, log: &Logger) -> Re
     let mut buffer: Vec<u8> = Vec::new();
     decoder.read_to_end(&mut buffer)?;
     let mut archive = Archive::new(Cursor::new(buffer));
-    if !target.exists() {
-        for entry in archive.entries()? {
-            let mut entry_decoder = entry?;
-            let entry_path: PathBuf = entry_decoder.path()?.iter().skip(1).collect();
-            let entry_target = target.join(entry_path);
-            fs::create_dir_all(entry_target.parent().unwrap())?;
-            entry_decoder.unpack(entry_target)?;
-        }
+    for entry in archive.entries()? {
+        let mut entry_decoder = entry?;
+        let entry_path: PathBuf = entry_decoder.path()?.iter().skip(1).collect();
+        let entry_target = target.join(entry_path);
+        fs::create_dir_all(entry_target.parent().unwrap())?;
+        entry_decoder.unpack(entry_target)?;
     }
     Ok(())
 }