report version number in user agent string

refs #628

2 files changed, 24 insertions, 4 deletions

diff --git a/platform/darwin/http_request_baton_cocoa.mm b/platform/darwin/http_request_baton_cocoa.mm
index 4030138970..50032b1e36 100644
--- a/platform/darwin/http_request_baton_cocoa.mm
+++ b/platform/darwin/http_request_baton_cocoa.mm
@@ -2,7 +2,7 @@
 #include <mbgl/util/std.hpp>
 #include <mbgl/util/parsedate.h>
 #include <mbgl/util/time.hpp>
-#include <mbgl/util/constants.hpp>
+#include <mbgl/util/version.hpp>
 
 #include <uv.h>
 
@@ -15,6 +15,8 @@ namespace mbgl {
 dispatch_once_t request_initialize = 0;
 NSURLSession *session = nullptr;
 
+NSString *userAgent = nil;
+
 void HTTPRequestBaton::start(const util::ptr<HTTPRequestBaton> &ptr) {
     assert(std::this_thread::get_id() == ptr->thread_id);
 
@@ -29,6 +31,14 @@ void HTTPRequestBaton::start(const util::ptr<HTTPRequestBaton> &ptr) {
         sessionConfig.URLCache = nil;
 
         session = [NSURLSession sessionWithConfiguration:sessionConfig];
+
+        // Write user agent string
+        NSDictionary *systemVersion = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
+        userAgent = [NSString stringWithFormat:@"MapboxGL/%d.%d.%d (+https://mapbox.com/mapbox-gl/; %s; %@ %@)",
+            version::major, version::minor, version::patch, version::revision,
+            [systemVersion objectForKey:@"ProductName"],
+            [systemVersion objectForKey:@"ProductVersion"]
+        ];
     });
 
     NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:@(baton->path.c_str())]];
@@ -41,7 +51,7 @@ void HTTPRequestBaton::start(const util::ptr<HTTPRequestBaton> &ptr) {
         }
     }
 
-    [request addValue:@(util::userAgent) forHTTPHeaderField:@"User-Agent"];
+    [request addValue:userAgent forHTTPHeaderField:@"User-Agent"];
 
     NSURLSessionDataTask *task = [session dataTaskWithRequest:request
                                             completionHandler:^(NSData *data, NSURLResponse *res, NSError *error) {
diff --git a/platform/default/http_request_baton_curl.cpp b/platform/default/http_request_baton_curl.cpp
index 42915d3e79..b993ced6ac 100644
--- a/platform/default/http_request_baton_curl.cpp
+++ b/platform/default/http_request_baton_curl.cpp
@@ -3,11 +3,13 @@
 #include <mbgl/util/time.hpp>
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/std.hpp>
-#include <mbgl/util/constants.hpp>
+#include <mbgl/util/version.hpp>
 
 #include <uv.h>
 #include <curl/curl.h>
 
+#include <sys/utsname.h>
+
 #include <queue>
 #include <cassert>
 #include <cstring>
@@ -406,9 +408,17 @@ size_t curl_header_cb(char * const buffer, const size_t size, const size_t nmemb
     return length;
 }
 
+std::string buildUserAgentString() {
+    utsname name;
+    uname(&name);
+    return util::sprintf<128>("MapboxGL/%d.%d.%d (+https://mapbox.com/mapbox-gl/; %s; %s %s)",
+        version::major, version::minor, version::patch, version::revision, name.sysname, name.release);
+}
+
 // This function must run in the CURL thread.
 void start_request(void *const ptr) {
     assert(std::this_thread::get_id() == thread_id);
+    static const std::string userAgent = buildUserAgentString();
 
     // The Context object stores information that we need to retain throughout the request, such
     // as the actual CURL easy handle, the baton, and the list of headers. The Context itself is
@@ -445,7 +455,7 @@ void start_request(void *const ptr) {
     curl_easy_setopt(context->handle, CURLOPT_HEADERFUNCTION, curl_header_cb);
     curl_easy_setopt(context->handle, CURLOPT_HEADERDATA, &context->baton->response);
     curl_easy_setopt(context->handle, CURLOPT_ACCEPT_ENCODING, "gzip, deflate");
-    curl_easy_setopt(context->handle, CURLOPT_USERAGENT, util::userAgent);
+    curl_easy_setopt(context->handle, CURLOPT_USERAGENT, userAgent.c_str());
     curl_easy_setopt(context->handle, CURLOPT_SHARE, share);
 
     // Start requesting the information.