better User-Agent

Author: lightbody

src/main/java/net/lightbody/bmp/proxy/Main.java

@@ -13,6 +13,7 @@
 import org.eclipse.jetty.servlet.ServletContextHandler;
 
 import javax.servlet.ServletContextEvent;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 import java.util.logging.ConsoleHandler;
@@ -22,27 +23,19 @@
 
 public class Main {
     private static final Log LOG = new Log();
+    private static String VERSION = null;
 
     public static void main(String[] args) throws Exception {
         configureLogging();
 
-        String version = "UNKNOWN/DEVELOPMENT";
-        InputStream is = Main.class.getResourceAsStream("/version.prop");
-
-        if (is != null) {
-            Properties props = new Properties();
-            props.load(is);
-            version = props.getProperty("version");
-        }
-
         final Injector injector = Guice.createInjector(new ConfigModule(args), new JettyModule(), new SitebricksModule() {
             @Override
             protected void configureSitebricks() {
                 scan(ProxyResource.class.getPackage());
             }
         });
 
-        LOG.info("Starting BrowserMob Proxy version {}", version);
+        LOG.info("Starting BrowserMob Proxy version {}", getVersion());
 
         Server server = injector.getInstance(Server.class);
         GuiceServletContextListener gscl = new GuiceServletContextListener() {
@@ -59,6 +52,23 @@ protected Injector getInjector() {
         server.join();
     }
 
+    public static String getVersion() throws IOException {
+        if (VERSION == null) {
+            String version = "UNKNOWN/DEVELOPMENT";
+            InputStream is = Main.class.getResourceAsStream("/version.prop");
+
+            if (is != null) {
+                Properties props = new Properties();
+                props.load(is);
+                version = props.getProperty("version");
+            }
+
+            VERSION = version;
+        }
+
+        return VERSION;
+    }
+
     public static void configureLogging() {
         Logger logger = Logger.getLogger("");
         Handler[] handlers = logger.getHandlers();

src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java

@@ -31,6 +31,7 @@
 
 import net.lightbody.bmp.core.har.*;
 import net.lightbody.bmp.proxy.BlacklistEntry;
+import net.lightbody.bmp.proxy.Main;
 import net.lightbody.bmp.proxy.WhitelistEntry;
 import net.lightbody.bmp.proxy.util.*;
 
@@ -740,7 +741,7 @@ private BrowserMobHttpResponse execute(BrowserMobHttpRequest req, int depth) {
         try {
             // set the User-Agent if it's not already set
             if (method.getHeaders("User-Agent").length == 0) {
-                method.addHeader("User-Agent", "BrowserMob VU/1.0");
+                method.addHeader("User-Agent", "bmp.lightbody.net/" + Main.getVersion());
             }
 
             // was the request mocked out?