1
0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2024-12-02 08:52:21 +02:00

Minor styling improvements - initialisms (#220)

* Minor styling improvements - initialisms

* fix typo
This commit is contained in:
Matej Gera 2019-10-23 01:12:45 +02:00 committed by rghetia
parent e4052cf674
commit cf62d12648
4 changed files with 14 additions and 13 deletions

View File

@ -14,8 +14,9 @@ import (
"strconv"
"strings"
"go.opentelemetry.io/exporter/trace/jaeger/internal/gen-go/jaeger"
"github.com/apache/thrift/lib/go/thrift"
"go.opentelemetry.io/exporter/trace/jaeger/internal/gen-go/jaeger"
)
func Usage() {
@ -34,8 +35,8 @@ func main() {
var protocol string
var urlString string
var framed bool
var useHttp bool
var parsedUrl *url.URL
var useHTTP bool
var parsedURL *url.URL
var trans thrift.TTransport
_ = strconv.Atoi
_ = math.Abs
@ -45,19 +46,19 @@ func main() {
flag.StringVar(&protocol, "P", "binary", "Specify the protocol (binary, compact, simplejson, json)")
flag.StringVar(&urlString, "u", "", "Specify the url")
flag.BoolVar(&framed, "framed", false, "Use framed transport")
flag.BoolVar(&useHttp, "http", false, "Use http")
flag.BoolVar(&useHTTP, "http", false, "Use http")
flag.Parse()
if len(urlString) > 0 {
var err error
parsedUrl, err = url.Parse(urlString)
parsedURL, err = url.Parse(urlString)
if err != nil {
fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
flag.Usage()
}
host = parsedUrl.Host
useHttp = len(parsedUrl.Scheme) <= 0 || parsedUrl.Scheme == "http"
} else if useHttp {
host = parsedURL.Host
useHTTP = len(parsedURL.Scheme) <= 0 || parsedURL.Scheme == "http"
} else if useHTTP {
_, err := url.Parse(fmt.Sprint("http://", host, ":", port))
if err != nil {
fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
@ -67,8 +68,8 @@ func main() {
cmd := flag.Arg(0)
var err error
if useHttp {
trans, err = thrift.NewTHttpClient(parsedUrl.String())
if useHTTP {
trans, err = thrift.NewTHttpClient(parsedURL.String())
} else {
portStr := fmt.Sprint(port)
if strings.Contains(host, ":") {

View File

@ -542,4 +542,4 @@ var injectB3SingleleHeader = []injectTest{
propagation.B3ParentSpanIDHeader,
},
},
}
}

View File

@ -143,7 +143,7 @@ func TestHTTPB3Propagator_GetAllKeys(t *testing.T) {
}
}
func TestHttpB3PropagatorWithSingleHeader_GetAllKeys(t *testing.T) {
func TestHTTPB3PropagatorWithSingleHeader_GetAllKeys(t *testing.T) {
propagator := propagation.HTTPB3Propagator{true}
want := []string{
propagation.B3SingleHeader,

View File

@ -466,7 +466,7 @@ func TestInjectCorrelationContextToHTTPReq(t *testing.T) {
}
}
func TestHttpTraceContextPropagator_GetAllKeys(t *testing.T) {
func TestHTTPTraceContextPropagator_GetAllKeys(t *testing.T) {
var propagator propagation.HTTPTraceContextPropagator
want := []string{"Traceparent", "Correlation-Context"}
got := propagator.GetAllKeys()