Merge pull request #1479 from getlantern/thomas/issue-header

add headers to issue request

issue/issue.go

@@ -45,6 +45,7 @@ func SendReport(
 	country string,
 ) (err error) {
 	return sendReport(
+		userConfig,
 		userConfig.GetDeviceID(),
 		strconv.Itoa(int(userConfig.GetUserID())),
 		userConfig.GetToken(),
@@ -63,6 +64,7 @@ func SendReport(
 }
 
 func sendReport(
+	userConfig common.UserConfig,
 	deviceID string,
 	userID string,
 	proToken string,
@@ -144,6 +146,10 @@ func sendReport(
 	}
 	req.Header.Set("content-type", "application/x-protobuf")
 
+	common.AddCommonNonUserHeaders(userConfig, req)
+
+	log.Debugf("issue sendReport X-Lantern-Version header: %v", req.Header.Get("X-Lantern-Version"))
+
 	resp, err := httpClient.Do(req)
 	if err != nil {
 		return log.Errorf("unable to send issue report: %v", err)

issue/issue_test.go

@@ -7,6 +7,7 @@ import (
 
 	"gopkg.in/yaml.v2"
 
+	"github.com/getlantern/flashlight/v7/common"
 	"github.com/getlantern/flashlight/v7/config"
 	"github.com/getlantern/flashlight/v7/geolookup"
 	"github.com/getlantern/flashlight/v7/proxied"
@@ -53,15 +54,19 @@ func updateFronted() {
 
 func TestSendReport(t *testing.T) {
 	updateFronted()
+	//manually set library version since its only populated when run from a binary
+	common.LibraryVersion = "7.0.0"
+	UserConfigData := common.UserConfigData{}
 	err := sendReport(
+		&UserConfigData,
 		"34qsdf-24qsadf-32542q",
 		"1",
 		"token",
 		"en",
 		int(Request_NO_ACCESS),
 		"Description placeholder",
 		"pro",
-		"jay[email protected]",
+		"thomas[email protected]",
 		"7.1.1",
 		"Samsung Galaxy S10",
 		"SM-G973F",