From e73657d7aa72ae25cd287d4ac3ee0188833b5bde Mon Sep 17 00:00:00 2001 From: Joe Tsai Date: Thu, 29 Sep 2022 13:28:51 -0700 Subject: [PATCH] logpolicy: directly expose the logtail server URL (#5788) Callers of LogHost often jump through hoops to undo the loss of information dropped by LogHost (e.g., the HTTP scheme). Signed-off-by: Joe Tsai --- logpolicy/logpolicy.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/logpolicy/logpolicy.go b/logpolicy/logpolicy.go index b8bd888e0..9ee8c89f9 100644 --- a/logpolicy/logpolicy.go +++ b/logpolicy/logpolicy.go @@ -70,8 +70,19 @@ func getLogTarget() string { return getLogTargetOnce.v } +// LogURL is the base URL for the configured logtail server, or the default. +// It is guaranteed to not terminate with any forward slashes. +func LogURL() string { + if v := getLogTarget(); v != "" { + return strings.TrimRight(v, "/") + } + return "https://" + logtail.DefaultHost +} + // LogHost returns the hostname only (without port) of the configured // logtail server, or the default. +// +// Deprecated: Use LogURL instead. func LogHost() string { if v := getLogTarget(); v != "" { if u, err := url.Parse(v); err == nil {