fix machineID whitespaces and submit distro release

2 files changed, 18 insertions, 12 deletions

diff --git a/errtracker/errtracker.go b/errtracker/errtracker.go
index 9aedf3d712..8ab33e5268 100644
--- a/errtracker/errtracker.go
+++ b/errtracker/errtracker.go
@@ -31,6 +31,7 @@ import (
 
	"github.com/snapcore/snapd/arch"
	"github.com/snapcore/snapd/httputil"
+	"github.com/snapcore/snapd/release"
 )
 
 var (
@@ -45,17 +46,19 @@ func Report(snap, channel, errMsg string) error {
	if err != nil {
	return err
	}
+	machineID = bytes.TrimSpace(machineID)
	identifier := fmt.Sprintf("%x", sha512.Sum512(machineID))
 
	crashDbUrl := fmt.Sprintf("%s/%s", crashDbUrlBase, identifier)
 
	report := map[string]string{
-	"ProblemType": "Snap",
-	"Architecture": arch.UbuntuArchitecture(),
-	"Date": fmt.Sprintf("%s", timeNow()),
-	"Snap": snap,
-	"Channel": channel,
-	"ErrorMessage": errMsg,
+	"ProblemType": "Snap",
+	"Architecture": arch.UbuntuArchitecture(),
+	"DistroRelease": fmt.Sprintf("%s %s", release.ReleaseInfo.ID, release.ReleaseInfo.VersionID),
+	"Date": fmt.Sprintf("%s", timeNow()),
+	"Snap": snap,
+	"Channel": channel,
+	"ErrorMessage": errMsg,
	}
	reportBson, err := bson.Marshal(report)
	if err != nil {
diff --git a/errtracker/errtracker_test.go b/errtracker/errtracker_test.go
index 26e265b5b0..d11268172b 100644
--- a/errtracker/errtracker_test.go
+++ b/errtracker/errtracker_test.go
@@ -20,6 +20,7 @@
 package errtracker_test
 
 import (
+	"fmt"
	"io/ioutil"
	"net/http"
	"net/http/httptest"
@@ -32,6 +33,7 @@ import (
 
	"github.com/snapcore/snapd/arch"
	"github.com/snapcore/snapd/errtracker"
+	"github.com/snapcore/snapd/release"
 )
 
 // Hook up check.v1 into the "go test" runner
@@ -59,12 +61,13 @@ func (s *ErrtrackerTestSuite) TestReport(c *C) {
	err = bson.Unmarshal(b, &data)
	c.Assert(err, IsNil)
	c.Check(data, DeepEquals, map[string]string{
-	"ProblemType": "Snap",
-	"Snap": "some-snap",
-	"Date": "2017-02-17 09:51:00 +0000 UTC",
-	"Channel": "beta",
-	"ErrorMessage": "failed to do stuff",
-	"Architecture": arch.UbuntuArchitecture(),
+	"ProblemType": "Snap",
+	"DistroRelease": fmt.Sprintf("%s %s", release.ReleaseInfo.ID, release.ReleaseInfo.VersionID),
+	"Snap": "some-snap",
+	"Date": "2017-02-17 09:51:00 +0000 UTC",
+	"Channel": "beta",
+	"ErrorMessage": "failed to do stuff",
+	"Architecture": arch.UbuntuArchitecture(),
	})
	case 1:
	c.Check(r.Method, Equals, "POST")