pkg/ambient/ambient.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"fmt"
 	"net/http"
-	"sync"
 
 	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
 	"github.com/rs/zerolog"
@@ -121,40 +120,26 @@ func (aw *AmbientWeather) handleProviderRequest(
 	// Uses a weather update to allow awn to publish to wunderground and
 	// visa versa.
 	if station := update.StationConfig; station != nil {
-		// Perform proxy updates in parallel if enabled
-		var proxyWg sync.WaitGroup
-
 		if station.ProxyToAWN {
-			proxyWg.Add(1)
+			err := aw.awnProvider.ProxyReq(ctx, update)
-			go func() {
+			if err != nil {
-				defer proxyWg.Done()
+				zerolog.Ctx(aw.appCtx).Err(err).Msg("failed to proxy to ambient weather")
-				err := aw.awnProvider.ProxyReq(ctx, update)
+				return
-				if err != nil {
+			}
-					zerolog.Ctx(aw.appCtx).Err(err).Msg("failed to proxy to ambient weather")
+			zerolog.Ctx(aw.appCtx).Debug().
-					return
+				Str("station", station.Name).
-				}
+				Msg("proxied weather update to awn")
-				zerolog.Ctx(aw.appCtx).Debug().
-					Str("station", station.Name).
-					Msg("proxied weather update to awn")
-			}()
 		}
-
 		if station.ProxyToWunderground {
-			proxyWg.Add(1)
+			err := aw.wuProvider.ProxyReq(ctx, update)
-			go func() {
+			if err != nil {
-				defer proxyWg.Done()
+				zerolog.Ctx(aw.appCtx).Err(err).Msg("failed to proxy to ambient weather")
-				err := aw.wuProvider.ProxyReq(ctx, update)
+				return
-				if err != nil {
+			}
-					zerolog.Ctx(aw.appCtx).Err(err).Msg("failed to proxy to ambient weather")
+			zerolog.Ctx(aw.appCtx).Debug().
-					return
+				Str("station", station.Name).
-				}
+				Msg("proxied weather update to wunderground")
-				zerolog.Ctx(aw.appCtx).Debug().
-					Str("station", station.Name).
-					Msg("proxied weather update to wunderground")
-			}()
 		}
-
-		proxyWg.Wait()
 	}
 }
 

pkg/provider/awn/proxy.go

@@ -8,7 +8,6 @@ import (
 
 	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
 	"github.com/go-resty/resty/v2"
-	"github.com/rs/zerolog/log"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 
@@ -44,18 +43,12 @@ func (awn *AWNProvider) ProxyReq(ctx context.Context, update *weather.WeatherUpd
 		Get(awnURL)
 	if err != nil {
 		span.RecordError(err)
-		span.SetAttributes(
-			attribute.String("query", resp.Request.QueryParam.Encode()),
-			attribute.String("body", string(resp.Body())),
-		)
 		span.SetStatus(codes.Error, err.Error())
-		log.Err(err).Any("query", resp.Request.PathParams).
-			Int("statusCode", resp.StatusCode()).
-			Msg("awn proxy failed")
 	}
 
 	span.SetAttributes(
 		attribute.Int("statusCode", resp.StatusCode()),
+		attribute.String("body", string(resp.Body())),
 	)
 
 	return err

pkg/provider/wunderground/proxy.go

@@ -6,7 +6,6 @@ import (
 	"net/url"
 
 	"github.com/go-resty/resty/v2"
-	"github.com/rs/zerolog/log"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"k8s.io/utils/ptr"
@@ -41,17 +40,13 @@ func (wu *WUProvider) ProxyReq(ctx context.Context, update *weather.WeatherUpdat
 		span.SetStatus(codes.Error, err.Error())
 		span.SetAttributes(
 			attribute.String("query", resp.Request.QueryParam.Encode()),
-			attribute.String("body", string(resp.Body())),
 		)
 		span.RecordError(err)
-		log.Err(err).
-			Int("statusCode", resp.StatusCode()).
-			Any("query", resp.Request.PathParams).
-			Msg("wunderground proxy failed")
 	}
 
 	span.SetAttributes(
 		attribute.Int("statusCode", resp.StatusCode()),
+		attribute.String("body", string(resp.Body())),
 	)
 
 	return err