Merge pull request #85 from rauls5382/tls

Merge commits from Go distribution

internal/driver/fetch.go

@@ -16,6 +16,7 @@ package driver
 
 import (
 	"bytes"
+	"crypto/tls"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -487,12 +488,27 @@ func adjustURL(source string, duration, timeout time.Duration) (string, time.Dur
 
 // httpGet is a wrapper around http.Get; it is defined as a variable
 // so it can be redefined during for testing.
-var httpGet = func(url string, timeout time.Duration) (*http.Response, error) {
+var httpGet = func(source string, timeout time.Duration) (*http.Response, error) {
+	url, err := url.Parse(source)
+	if err != nil {
+		return nil, err
+	}
+
+	var tlsConfig *tls.Config
+	if url.Scheme == "https+insecure" {
+		tlsConfig = &tls.Config{
+			InsecureSkipVerify: true,
+		}
+		url.Scheme = "https"
+		source = url.String()
+	}
+
 	client := &http.Client{
 		Transport: &http.Transport{
 			ResponseHeaderTimeout: timeout + 5*time.Second,
-			Proxy: http.ProxyFromEnvironment,
+			Proxy:           http.ProxyFromEnvironment,
+			TLSClientConfig: tlsConfig,
 		},
 	}
-	return client.Get(url)
+	return client.Get(source)
 }

profile/legacy_profile.go

@@ -710,15 +710,12 @@ func parseContention(b []byte) (*Profile, error) {
 	const delimiter = "="
 	for s.Scan() {
 		line := s.Text()
-
-		if line = strings.TrimSpace(line); line == "" {
+		if line = strings.TrimSpace(line); isSpaceOrComment(line) {
 			continue
 		}
-
 		if strings.HasPrefix(line, "---") {
 			break
 		}
-
 		attr := strings.SplitN(line, delimiter, 2)
 		if len(attr) != 2 {
 			break
@@ -761,30 +758,31 @@ func parseContention(b []byte) (*Profile, error) {
 		if strings.HasPrefix(line, "---") {
 			break
 		}
-		value, addrs, err := parseContentionSample(line, p.Period, cpuHz)
-		if err != nil {
-			return nil, err
-		}
-		var sloc []*Location
-		for _, addr := range addrs {
-			// Addresses from stack traces point to the next instruction after
-			// each call. Adjust by -1 to land somewhere on the actual call.
-			addr--
-			loc := locs[addr]
-			if locs[addr] == nil {
-				loc = &Location{
-					Address: addr,
+		if !isSpaceOrComment(line) {
+			value, addrs, err := parseContentionSample(line, p.Period, cpuHz)
+			if err != nil {
+				return nil, err
+			}
+			var sloc []*Location
+			for _, addr := range addrs {
+				// Addresses from stack traces point to the next instruction after
+				// each call. Adjust by -1 to land somewhere on the actual call.
+				addr--
+				loc := locs[addr]
+				if locs[addr] == nil {
+					loc = &Location{
+						Address: addr,
+					}
+					p.Location = append(p.Location, loc)
+					locs[addr] = loc
 				}
-				p.Location = append(p.Location, loc)
-				locs[addr] = loc
+				sloc = append(sloc, loc)
 			}
-			sloc = append(sloc, loc)
+			p.Sample = append(p.Sample, &Sample{
+				Value:    value,
+				Location: sloc,
+			})
 		}
-		p.Sample = append(p.Sample, &Sample{
-			Value:    value,
-			Location: sloc,
-		})
-
 		if !s.Scan() {
 			break
 		}