contrib/schema.json

@@ -121,10 +121,6 @@
           "default": "127.0.0.1",
           "type": "string"
         },
-        "redisKeyTTL": {
-          "default": "24h",
-          "type": "string"
-        },
         "redisPassword": {
           "type": "string"
         },

helm/ambient-local-exporter/Chart.yaml

@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.12
+version: 0.1.10
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v0.18.1"
+appVersion: "v0.15.6"
 
 dependencies:
   - name: hull

pkg/ambient/config/config_recorder.go

@@ -22,5 +22,4 @@ type RedisConfig struct {
 	RedisDB          int    `yaml:"redisDB" env:"REDIS_DB" default:"0" json:"redisDB,omitempty"`
 	RedisTLS         bool   `yaml:"redisTLS" env:"REDIS_TLS" default:"false" json:"redisTLS,omitempty"`
 	RedisTLSInsecure bool   `yaml:"redisTLSInsecure" env:"REDIS_TLS_INSECURE" default:"false" json:"redisTLSInsecure,omitempty"`
-	RedisKeyTTL      string `yaml:"redisKeyTTL" env:"REDIS_KEY_TTL" default:"24h" json:"redisKeyTTL,omitempty"`
 }

pkg/weather/metrics_init.go

@@ -71,7 +71,7 @@ func MustInitMetrics(appCtx context.Context) *WeatherMetrics {
 		metric.WithDescription("Count of lightning strikes for current day"))
 	wm.LightningLastDistance, _ = wm.meter.Int64Gauge(MetricPrefix+"_lightning_last_distance",
 		metric.WithDescription("Last measured lightning distance"),
-		metric.WithUnit("km"))
+		metric.WithUnit("kph"))
 	wm.LightningLastTime, _ = wm.meter.Int64Gauge(MetricPrefix+"_lightning_last_time",
 		metric.WithDescription("Last lightning time (epoch)"),
 		metric.WithUnit("s"))

pkg/weather/recorder/recorders/redis/redis.go

@@ -5,7 +5,6 @@ import (
 	"crypto/tls"
 	"fmt"
 	"sync"
-	"time"
 
 	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
 	"go.opentelemetry.io/otel/attribute"
@@ -21,7 +20,6 @@ import (
 )
 
 const (
-	DEF_TTL     = "24h"
 	DEF_RETAIN  = 120
 	UPDATES_KEY = "weatherUpdates"
 	NAME        = "redis recorder"
@@ -29,7 +27,6 @@ const (
 
 type RedisRecorder struct {
 	baseCtx context.Context
-	keyTTL  time.Duration
 	tracer  trace.Tracer
 	redis   *redis.Client
 	config  *config.AmbientLocalExporterConfig
@@ -45,11 +42,8 @@ func (r *RedisRecorder) Ping(ctx context.Context) error {
 }
 
 func (r *RedisRecorder) Init(ctx context.Context, opts *recorders.RecorderOpts) {
-	r.baseCtx = opts.BaseCtx
-	r.log = zerolog.Ctx(r.baseCtx)
-
 	if opts.AppConfig.RecorderConfig.RedisConfig == nil {
-		r.log.Panic().Msg("refusing to init redis recorder with no redisConfig")
+		panic("refusing to init redis recorder with no redisConfig")
 	}
 
 	if opts.RetainLast < 1 {
@@ -59,18 +53,8 @@ func (r *RedisRecorder) Init(ctx context.Context, opts *recorders.RecorderOpts)
 	r.config = opts.AppConfig
 	r.keep = opts.RetainLast
 	r.RWMutex = &sync.RWMutex{}
-
-	keyTTL := opts.AppConfig.RecorderConfig.RedisConfig.RedisKeyTTL
-	if keyTTL == "" {
-		keyTTL = DEF_TTL
-	}
-
-	var err error
-	r.keyTTL, err = time.ParseDuration(keyTTL)
-	if err != nil {
-		r.log.Panic().Str("redisKeyTTL", keyTTL).Err(err).
-			Msg("invalid redis key ttl provided")
-	}
+	r.baseCtx = opts.BaseCtx
+	r.log = zerolog.Ctx(r.baseCtx)
 
 	r.tracer = otel.GetTracer(r.baseCtx, "redisRecorder")
 	ctx, span := r.tracer.Start(ctx, "redisRecorder.init", trace.WithAttributes(
@@ -78,7 +62,6 @@ func (r *RedisRecorder) Init(ctx context.Context, opts *recorders.RecorderOpts)
 		attribute.Int("retainLast", opts.RetainLast),
 		attribute.Int("redisPort", opts.AppConfig.RecorderConfig.RedisConfig.RedisPort),
 		attribute.Bool("tls", opts.AppConfig.RecorderConfig.RedisConfig.RedisTLS),
-		attribute.String("keyTTL", r.keyTTL.String()),
 	))
 	defer span.End()
 

pkg/weather/recorder/recorders/redis/set.go

@@ -48,7 +48,6 @@ func (r *RedisRecorder) set(ctx context.Context, data []byte) error {
 		pipe.LPush(ctx, r.Key(), data)
 		pipe.LTrim(ctx, r.Key(), 0, int64(r.keep)-1)
 		count = pipe.LLen(ctx, r.Key())
-		pipe.Expire(ctx, r.Key(), r.keyTTL)
 		return nil
 	})
 	if err != nil {