Merge c8bcd8b into 17ba68c

Author: clouvet

internal/config/config.go

@@ -154,6 +154,7 @@ func (cfg *Config) applyEnv() {
 	cfg.APIBaseURL = env.FirstOrDefault(cfg.APIBaseURL, apiBaseURLEnvKey)
 	cfg.FlapsBaseURL = env.FirstOrDefault(cfg.FlapsBaseURL, flapsBaseURLEnvKey)
 	cfg.MetricsBaseURL = env.FirstOrDefault(cfg.MetricsBaseURL, metricsBaseURLEnvKey)
+	cfg.MetricsToken = env.FirstOrDefault(cfg.MetricsToken, MetricsTokenEnvKey, AccessTokenEnvKey, APITokenEnvKey)
 	cfg.SyntheticsBaseURL = env.FirstOrDefault(cfg.SyntheticsBaseURL, syntheticsBaseURLEnvKey)
 	cfg.SendMetrics = env.IsTruthy(SendMetricsEnvKey) || cfg.SendMetrics
 	cfg.SyntheticsAgent = env.IsTruthy(SyntheticsAgentEnvKey) || cfg.SyntheticsAgent

internal/metrics/db.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
 	"os"
 	"os/exec"
@@ -38,8 +39,6 @@ func FlushMetrics(ctx context.Context) error {
 
 	iostream := iostreams.FromContext(ctx)
 
-	// On CI, always block on metrics send. This sucks, but the alternative is not getting metrics from CI at all. There are timeouts in place to prevent this from taking more than 15 seconds
-
 	if iostream.IsInteractive() {
 		flyctl, err := os.Executable()
 		if err != nil {
@@ -76,33 +75,85 @@ func FlushMetrics(ctx context.Context) error {
 	return nil
 }
 
-// / Spens up to 15 seconds sending all metrics collected so far to flyctl-metrics post endpoint
-func SendMetrics(ctx context.Context, json string) error {
-	authToken, err := GetMetricsToken(ctx)
+func SendMetrics(ctx context.Context, jsonData string) error {
+	cfg := config.FromContext(ctx)
+	metricsToken, err := GetMetricsToken(ctx)
 	if err != nil {
-		return err
+		fmt.Fprintf(os.Stderr, "Warning: Metrics token unavailable: %v\n", err)
+		return nil
 	}
 
-	cfg := config.FromContext(ctx)
-	request, err := http.NewRequest("POST", cfg.MetricsBaseURL+"/metrics_post", bytes.NewBuffer([]byte(json)))
+	baseURL := cfg.MetricsBaseURL
+	endpoint := baseURL + "/metrics_post"
+	userAgent := fmt.Sprintf("flyctl/%s", buildinfo.Info().Version)
+
+	errChan := make(chan error, 1)
+
+	go sendMetricsRequest(endpoint, metricsToken, userAgent, []byte(jsonData), errChan)
+
+	err = waitForCompletion(errChan)
 	if err != nil {
-		return err
+		fmt.Fprintf(os.Stderr, "Warning: Metrics send issue: %v\n", err)
+	}
+
+	return nil
+}
+
+func sendMetricsRequest(endpoint, token, userAgent string, data []byte, errChan chan<- error) {
+	request, err := http.NewRequest("POST", endpoint, bytes.NewBuffer(data))
+	if err != nil {
+		errChan <- fmt.Errorf("failed to create request: %w", err)
+		return
 	}
 
-	request.Header.Set("Authorization", authToken)
-	request.Header.Set("User-Agent", fmt.Sprintf("flyctl/%s", buildinfo.Info().Version))
+	request.Header.Set("Authorization", "Bearer "+token)
+	request.Header.Set("User-Agent", userAgent)
 
-	retryTransport := rehttp.NewTransport(http.DefaultTransport, rehttp.RetryAll(rehttp.RetryMaxRetries(3), rehttp.RetryTimeoutErr()), rehttp.ConstDelay(0))
+	client := createHTTPClient()
 
-	client := http.Client{
+	resp, err := client.Do(request)
+	if err != nil {
+		errChan <- fmt.Errorf("failed to send metrics: %w", err)
+		return
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		body, _ := io.ReadAll(resp.Body)
+		errChan <- fmt.Errorf("metrics send failed with status %d: %s", resp.StatusCode, string(body))
+		return
+	}
+
+	_, err = io.Copy(io.Discard, resp.Body)
+	if err != nil {
+		errChan <- fmt.Errorf("failed to read response body: %w", err)
+		return
+	}
+
+	errChan <- nil
+}
+
+func createHTTPClient() *http.Client {
+	retryTransport := rehttp.NewTransport(
+		http.DefaultTransport,
+		rehttp.RetryAll(
+			rehttp.RetryMaxRetries(3),
+			rehttp.RetryTimeoutErr(),
+		),
+		rehttp.ConstDelay(0),
+	)
+
+	return &http.Client{
 		Transport: retryTransport,
 		Timeout:   time.Second * 5,
 	}
+}
 
-	resp, err := client.Do(request)
-	if err != nil {
+func waitForCompletion(errChan <-chan error) error {
+	select {
+	case err := <-errChan:
 		return err
+	case <-time.After(15 * time.Second):
+		return fmt.Errorf("metrics send timed out after 15 seconds")
 	}
-
-	return resp.Body.Close()
 }