chore: more dsn tests

Author: vmihailenco

uptrace/client.go

@@ -54,10 +54,7 @@ func (c *client) ForceFlush(ctx context.Context) (lastErr error) {
 
 // TraceURL returns the trace URL for the span.
 func (c *client) TraceURL(span trace.Span) string {
-	return fmt.Sprintf(
-		"%s://%s/traces/%s",
-		c.dsn.Scheme, c.dsn.AppHost(), span.SpanContext().TraceID(),
-	)
+	return fmt.Sprintf("%s/traces/%s", c.dsn.AppAddr(), span.SpanContext().TraceID())
 }
 
 // ReportError reports an error as a span event creating a dummy span if necessary.

uptrace/dsn.go

@@ -20,15 +20,15 @@ func (dsn *DSN) String() string {
 	return dsn.original
 }
 
-func (dsn *DSN) AppHost() string {
+func (dsn *DSN) AppAddr() string {
 	if dsn.Host == "uptrace.dev" {
-		return "app.uptrace.dev"
+		return "https://app.uptrace.dev"
 	}
 	host, _, err := net.SplitHostPort(dsn.Host)
 	if err != nil {
 		return dsn.Host
 	}
-	return net.JoinHostPort(host, "15678")
+	return dsn.Scheme + "://" + net.JoinHostPort(host, "14318")
 }
 
 func (dsn *DSN) OTLPHost() string {

uptrace/dsn_test.go

@@ -24,4 +24,14 @@ func TestParseDSN(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, test.otlp, dsn.OTLPHost())
 	}
+
+	dsn, err := uptrace.ParseDSN("http://localhost:14317")
+	require.NoError(t, err)
+	require.Equal(t, "localhost:14317", dsn.OTLPHost())
+	require.Equal(t, "http://localhost:14318", dsn.AppAddr())
+
+	dsn, err = uptrace.ParseDSN("https://key@uptrace.dev/project_id")
+	require.NoError(t, err)
+	require.Equal(t, "otlp.uptrace.dev:4317", dsn.OTLPHost())
+	require.Equal(t, "https://app.uptrace.dev", dsn.AppAddr())
 }