diff --git a/tracing/tracing.go b/tracing/tracing.go
index 835769078291d711b1f63550ee3f34b7264f3d82..739eda6efd0783627857b9881657becc35094019 100644
--- a/tracing/tracing.go
+++ b/tracing/tracing.go
@@ -72,7 +72,10 @@ func getServiceName() string {
 	if s := os.Getenv("TRACING_SERVICE"); s != "" {
 		return s
 	}
-	return filepath.Base(os.Args[0])
+	if s, err := os.Executable(); err == nil {
+		return filepath.Base(s)
+	}
+	return "unknown_service"
 }
 
 func defaultResource(serviceName string) *resource.Resource {
@@ -143,7 +146,7 @@ func initTracing(serviceName string) {
 
 // Init tracing support, if not using WrapHandler.
 func Init() {
-	initTracing("")
+	initTracing(getServiceName())
 }
 
 // WrapTransport optionally wraps a http.RoundTripper with OpenCensus
@@ -152,7 +155,7 @@ func Init() {
 // Must call Init() first.
 func WrapTransport(t http.RoundTripper) http.RoundTripper {
 	if Enabled {
-		t = othttp.NewTransport(t)
+		t = othttp.NewTransport(t, othttp.WithPublicEndpoint())
 	}
 	return t
 }