Merge pull request #1044 from rust-lang/log-requests

Log all requests and when they finish

Author: shepmaster

tests/Gemfile.lock

@@ -3,49 +3,51 @@ GEM
   specs:
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    capybara (3.39.2)
+    base64 (0.2.0)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     launchy (2.5.2)
       addressable (~> 2.8)
     matrix (0.4.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    nokogiri (1.15.5)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     public_suffix (5.0.4)
     racc (1.7.3)
-    rack (3.0.8)
+    rack (3.0.9)
     rack-test (2.1.0)
       rack (>= 1.3)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.0)
     rubyzip (2.3.2)
-    selenium-webdriver (4.16.0)
+    selenium-webdriver (4.17.0)
+      base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)

ui/Cargo.lock

@@ -21,6 +21,7 @@ openssl-probe = "0.1.2"
 orchestrator = { path = "../compiler/base/orchestrator" }
 prometheus = "0.13.0"
 regex = "1.0.0"
+rusqlite = { version = "0.30.0", default-features = false, features = ["bundled"] }
 serde = { version = "1.0", features = ["rc"] }
 serde_derive = "1.0"
 serde_json = "1.0"

ui/Cargo.toml

@@ -17,6 +17,7 @@ const DEFAULT_PORT: u16 = 5000;
 mod env;
 mod gist;
 mod metrics;
+mod request_database;
 mod sandbox;
 mod server_axum;
 
@@ -43,6 +44,7 @@ struct Config {
     gh_token: Option<String>,
     metrics_token: Option<String>,
     feature_flags: FeatureFlags,
+    request_db_path: Option<PathBuf>,
     port: u16,
     root: PathBuf,
 }
@@ -98,12 +100,15 @@ impl Config {
 
         let feature_flags = FeatureFlags {};
 
+        let request_db_path = env::var_os("PLAYGROUND_REQUEST_DATABASE").map(Into::into);
+
         Self {
             address,
             cors_enabled,
             gh_token,
             metrics_token,
             feature_flags,
+            request_db_path,
             port,
             root,
         }
@@ -129,6 +134,17 @@ impl Config {
         GhToken::new(&self.gh_token)
     }
 
+    fn request_database(&self) -> request_database::Database {
+        use request_database::Database;
+
+        let request_db = match &self.request_db_path {
+            Some(path) => Database::initialize(path),
+            None => Database::initialize_memory(),
+        };
+
+        request_db.expect("Unable to open request log database")
+    }
+
     fn server_socket_addr(&self) -> SocketAddr {
         let address = self.address.parse().expect("Invalid address");
         SocketAddr::new(address, self.port)
@@ -293,7 +309,7 @@ struct ErrorJson {
     error: String,
 }
 
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 struct CompileRequest {
     target: String,
     #[serde(rename = "assemblyFlavor")]
@@ -324,7 +340,7 @@ struct CompileResponse {
     stderr: String,
 }
 
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 struct ExecuteRequest {
     channel: String,
     mode: String,
@@ -347,7 +363,7 @@ struct ExecuteResponse {
     stderr: String,
 }
 
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 struct FormatRequest {
     #[serde(default)]
     channel: Option<String>,
@@ -366,7 +382,7 @@ struct FormatResponse {
     stderr: String,
 }
 
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 struct ClippyRequest {
     #[serde(default)]
     channel: Option<String>,
@@ -385,7 +401,7 @@ struct ClippyResponse {
     stderr: String,
 }
 
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 struct MiriRequest {
     code: String,
     #[serde(default)]
@@ -400,7 +416,7 @@ struct MiriResponse {
     stderr: String,
 }
 
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 struct MacroExpansionRequest {
     code: String,
     #[serde(default)]
@@ -462,7 +478,7 @@ struct MetaGistResponse {
     code: String,
 }
 
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 struct EvaluateRequest {
     version: String,
     optimize: String,