Add proxy configuration

Author: rokob

builder_derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "builder_derive"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Andrew Weiss <wvvwwvw@gmail.com>"]
 edition = "2018"
 

core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rollbar-rust"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Andrew Weiss <andrew@rollbar.com>"]
 edition = "2018"
 

core/src/configuration.rs

@@ -10,6 +10,7 @@ pub struct Configuration {
     pub code_version: Option<String>,
     pub log_level: Level,
     pub timeout: u64,
+    pub proxy: Option<String>,
 }
 
 impl Default for Configuration {
@@ -22,6 +23,7 @@ impl Default for Configuration {
             code_version: None,
             log_level: Level::Info,
             timeout: 10,
+            proxy: None,
         }
     }
 }

core/src/transport.rs

@@ -6,7 +6,7 @@ use std::time::Duration;
 
 use crate::configuration::Configuration;
 use crate::types::Item;
-use reqwest::Client;
+use reqwest::{Client, Proxy};
 
 const QUEUE_DEPTH: usize = 50;
 
@@ -32,11 +32,15 @@ impl HttpTransport {
         let (tx, rx) = sync_channel(QUEUE_DEPTH);
         let signal = Arc::new(Condvar::new());
         let shutdown = Arc::new(AtomicBool::new(false));
-        let client = Client::builder()
+        let client_builder = Client::builder()
             .gzip(true)
-            .timeout(Duration::from_secs(configuration.timeout))
-            .build()
-            .unwrap();
+            .timeout(Duration::from_secs(configuration.timeout));
+        let client_builder = if let Some(proxy) = &configuration.proxy {
+            client_builder.proxy(Proxy::all(proxy).unwrap())
+        } else {
+            client_builder
+        };
+        let client = client_builder.build().unwrap();
         #[allow(clippy::mutex_atomic)]
         let queue_depth = Arc::new(Mutex::new(0));
         let endpoint = configuration.endpoint.clone();

jvm_bare_agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rollbar-jvm-agent"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Andrew Weiss <wvvwwvw@gmail.com>"]
 edition = "2018"
 

jvm_bare_agent/src/lib.rs

@@ -16,10 +16,10 @@ 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::atomic::{AtomicBool, Ordering};
 use std::sync::Once;
 
-static INIT_SUCCESS: AtomicBool = ATOMIC_BOOL_INIT;
+static INIT_SUCCESS: AtomicBool = AtomicBool::new(false);
 
 static mut CONFIG: Option<Configuration> = None;
 static INIT: Once = Once::new();

jvm_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rollbar-jvm"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Andrew Weiss <wvvwwvw@gmail.com>"]
 build = "build.rs"
 edition = "2018"

jvm_sdk_agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rollbar-java-agent"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Andrew Weiss <wvvwwvw@gmail.com>"]
 edition = "2018"
 

jvm_sdk_agent/src/lib.rs

@@ -11,9 +11,9 @@ use rollbar_jvm::env::JvmTiEnv;
 use rollbar_jvm::jni::JniEnv;
 use rollbar_jvm::jvmti::{jint, jlocation, jmethodID, jobject, jthread, jvmtiEnv, JNIEnv, JavaVM};
 use std::os::raw::{c_char, c_void};
-use std::sync::atomic::{AtomicBool, Ordering, ATOMIC_BOOL_INIT};
+use std::sync::atomic::{AtomicBool, Ordering};
 
-static INIT_SUCCESS: AtomicBool = ATOMIC_BOOL_INIT;
+static INIT_SUCCESS: AtomicBool = AtomicBool::new(false);
 
 /// This is the Agent entry point that is called by the JVM during the loading phase.
 /// Any failures in this function will cause the JVM not to start which is strictly

pyagent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pyagent"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Andrew Weiss <wvvwwvw@gmail.com>"]
 edition = "2018"