From 82d68f64b110cb15529ff2cef03b35b7cc418dcd Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@redhat.com>
Date: Tue, 12 Nov 2024 10:01:57 -0500
Subject: [PATCH] Release 0.7.4

---
 CHANGELOG.md                   | 9 +++++++++
 Makefile                       | 2 +-
 config/kustomization.yaml      | 2 +-
 internal/pkg/build/version.txt | 2 +-
 pkg/domains/trace/tempo.go     | 3 +--
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc1193d..f0f8f71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 _Note unreleased changes here_
 
+## [0.7.4] - 2024-11-12
+
+### Added
+- Adjust log verbose level via API at runtime.
+- Added "ndjson" output type
+
+### Fixed
+- Trace domain fixes: OTEL rules, tempo select clauses and constraints, handle missing attributes. 
+
 ## [0.7.3] - 2024-11-01
 
 ### Fixed
diff --git a/Makefile b/Makefile
index 4aec158..30021ae 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ help: ## Display this help.
 	@grep -E '^## [A-Z0-9_]+: ' Makefile | sed 's/^## \([A-Z0-9_]*\): \(.*\)/\1#\2/' | column -s'#' -t
 
 ## VERSION: Semantic version for release, use -dev for development pre-release versions.
-VERSION?=0.7.4-dev
+VERSION?=0.7.4
 ## REGISTRY_BASE: Image registry base, for example quay.io/somebody
 REGISTRY_BASE?=$(error REGISTRY_BASE must be set to push images)
 ## IMGTOOL: May be podman or docker.
diff --git a/config/kustomization.yaml b/config/kustomization.yaml
index 1a5ae14..23f3a3f 100644
--- a/config/kustomization.yaml
+++ b/config/kustomization.yaml
@@ -16,4 +16,4 @@ labels:
 images:
 - name: quay.io/korrel8r/korrel8r
   newName: quay.io/korrel8r/korrel8r
-  newTag: 0.7.3
+  newTag: 0.7.4
diff --git a/internal/pkg/build/version.txt b/internal/pkg/build/version.txt
index 1ebd2fb..0a1ffad 100644
--- a/internal/pkg/build/version.txt
+++ b/internal/pkg/build/version.txt
@@ -1 +1 @@
-0.7.4-dev
+0.7.4
diff --git a/pkg/domains/trace/tempo.go b/pkg/domains/trace/tempo.go
index 9bb00cf..9b1ecb7 100644
--- a/pkg/domains/trace/tempo.go
+++ b/pkg/domains/trace/tempo.go
@@ -97,7 +97,6 @@ func defaultSelect(traceQL string) string {
 func formatTime(t time.Time) string { return strconv.FormatInt(t.UTC().Unix(), 10) }
 
 func (c *client) get(ctx context.Context, traceQL string, constraint *korrel8r.Constraint, collect func(*Span)) error {
-	// FIXME constraint
 	u := *c.base // Copy, don't modify base.
 	v := url.Values{query: []string{defaultSelect(traceQL)}}
 	if limit := constraint.GetLimit(); limit > 0 {
@@ -148,7 +147,7 @@ func (tt *tempoTrace) collect(spans tempoSpanSet, collect func(*Span)) {
 			Status:    Status{Code: StatusUnset}, // Default
 		}
 		span.Attributes = ts.Attributes.Map()
-		span.Attributes[otel.AttrServiceName] = tt.RootServiceName // FIXME
+		span.Attributes[otel.AttrServiceName] = tt.RootServiceName
 		// Tempo HTTP API stores span status description as "status" attribute.
 		// Move it to the status field and deduce the status code.
 		span.Status.Description, _ = span.Attributes[statusAttr].(string)