Use Aho-Corasick instead of regex, add extra data to items, propagate extra configuration

Author: rokob

jvm_bare_agent/Cargo.toml

@@ -10,7 +10,7 @@ crate_type = [ "cdylib" ]
 [dependencies]
 pretty_env_logger = "0.2.5"
 lazy_static = "1.2.0"
-regex = "1"
+aho-corasick = "0.6.10"
 log = "0.4"
 toml = "0.4"
 rollbar-jvm = { path = "../jvm_core" }

jvm_bare_agent/src/exceptions.rs

@@ -1,6 +1,6 @@
 use crate::rollbar::Rollbar;
+use aho_corasick::{AcAutomaton, Automaton};
 use lazy_static::lazy_static;
-use regex::RegexSet;
 use rollbar_jvm::env::JvmTiEnv;
 use rollbar_jvm::errors::*;
 use rollbar_jvm::jni::JniEnv;
@@ -44,58 +44,32 @@ pub fn callback(
     Ok(())
 }
 
-#[allow(clippy::trivial_regex)]
 fn should_ignore(class: &str) -> bool {
     lazy_static! {
-        static ref RE: RegexSet = RegexSet::new(&[
-            r"^com\.sun\.org",
-            r"^javax\.naming\.",
-            r"^java\.io\.EOFException",
-            r"^java\.io\.FileNotFoundException",
-            r"^java\.io\.IOException",
-            r"^java\.lang\.ArrayIndexOutOfBoundsException",
-            r"^java\.lang\.ClassNotFoundException",
-            r"^java\.lang\.IllegalStateException",
-            r"^java\.lang\.InterruptedException",
-            r"^java\.lang\.NoSuchFieldError",
-            r"^java\.lang\.NoSuchFieldException",
-            r"^java\.lang\.NoSuchMethodException",
-            r"^java\.net\.MalformedURLException",
-            r"^java\.net\.SocketException",
-            r"^java\.security\.cert\.CertificateParsingException",
-            r"^java\.security\.PrivilegedActionException",
-            r"^java\.security\.SignatureException",
-            r"^java\.util\.zip\.ZipException",
-            r"^javax\.crypto\.BadPaddingException",
-        ])
-        .unwrap();
+        static ref AUT: AcAutomaton<&'static str> = [
+            "com.sun.org",
+            "javax.naming.",
+            "java.io.EOFException",
+            "java.io.FileNotFoundException",
+            "java.io.IOException",
+            "java.lang.ArrayIndexOutOfBoundsException",
+            "java.lang.ClassNotFoundException",
+            "java.lang.IllegalStateException",
+            "java.lang.InterruptedException",
+            "java.lang.NoSuchFieldError",
+            "java.lang.NoSuchFieldException",
+            "java.lang.NoSuchMethodException",
+            "java.net.MalformedURLException",
+            "java.net.SocketException",
+            "java.security.cert.CertificateParsingException",
+            "java.security.PrivilegedActionException",
+            "java.security.SignatureException",
+            "java.util.zip.ZipException",
+            "javax.crypto.BadPaddingException",
+        ]
+        .iter()
+        .cloned()
+        .collect();
     }
-    RE.is_match(class)
+    AUT.find(class).next().is_some()
 }
-/*
-    if class.starts_with("com.sun.org") || class.starts_with("javax.naming.") {
-        return true;
-    }
-    match class {
-        "java.io.EOFException"
-        | "java.io.FileNotFoundException"
-        | "java.io.IOException"
-        | "java.lang.ArrayIndexOutOfBoundsException"
-        | "java.lang.ClassNotFoundException"
-        | "java.lang.IllegalStateException"
-        | "java.lang.InterruptedException"
-        | "java.lang.NoSuchFieldError"
-        | "java.lang.NoSuchFieldException"
-        | "java.lang.NoSuchMethodException"
-        | "java.net.MalformedURLException"
-        | "java.net.SocketException"
-        | "java.security.cert.CertificateParsingException"
-        | "java.security.PrivilegedActionException"
-        | "java.security.SignatureException"
-        | "java.util.zip.ZipException"
-        | "javax.crypto.BadPaddingException" => return true,
-        _ => {}
-    }
-    false
-}
-*/

jvm_bare_agent/src/lib.rs

@@ -14,17 +14,17 @@ use rollbar_jvm::env::JvmTiEnv;
 use rollbar_jvm::jni::JniEnv;
 use rollbar_jvm::jvmti::*;
 use rollbar_rust::Configuration;
+use std::env;
 use std::os::raw::{c_char, c_void};
 use std::sync::atomic::{AtomicBool, Ordering, ATOMIC_BOOL_INIT};
 use std::sync::Once;
-use std::env;
 
 static INIT_SUCCESS: AtomicBool = ATOMIC_BOOL_INIT;
 
 static mut CONFIG: Option<Configuration> = None;
 static INIT: Once = Once::new();
 
-const ACCESS_TOKEN_KEY: &'static str = "ROLLBAR_TOKEN";
+const ACCESS_TOKEN_KEY: &str = "ROLLBAR_TOKEN";
 
 lazy_static! {
     static ref ROLLBAR: Rollbar = build_client();
@@ -53,10 +53,10 @@ fn initialize_configuration() -> bool {
                             let mut conf = Configuration::default();
                             conf.access_token = Some(token);
                             CONFIG = Some(conf);
-                        },
+                        }
                         Err(e) => {
                             debug!("Error loading {}: {}", ACCESS_TOKEN_KEY, e);
-                        },
+                        }
                     }
                 }
             }

jvm_bare_agent/src/rollbar.rs

@@ -1,4 +1,4 @@
-use rollbar_rust::types::{DataBuilder, Item};
+use rollbar_rust::types::{DataBuilder, Item, Notifier, Server};
 use rollbar_rust::{constants, Configuration, HttpTransport, Transport, Uuid};
 use std::time::Duration;
 
@@ -25,9 +25,22 @@ impl Rollbar {
 
     pub fn send(&self, builder: DataBuilder) {
         let data = builder
-            .notifier(constants::NOTIFIER.clone())
+            .notifier(
+                Notifier::builder()
+                    .name("rollbar-jvm-agent")
+                    .version(constants::VERSION)
+                    .build(),
+            )
             .platform(constants::PLATFORM)
             .uuid(Uuid::new())
+            .maybe_environment(self.conf.environment.clone())
+            .server(
+                Server::builder()
+                    .cpu(constants::ARCH)
+                    .maybe_host(self.conf.host.clone())
+                    .maybe_code_version(self.conf.code_version.clone())
+                    .build(),
+            )
             .build();
 
         let item = Item::builder()