Fix compactor ignore configurable S3 headers (#3154)

* Fix compactor use of configurable S3 headers * Update changelog
grafana · Nov 20, 2023 · 57c3300 · 57c3300
1 parent 44761ce
commit 57c3300
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * [ENHANCEMENT] Update poller to make use of previous results and reduce backend load. [#2652](https://github.com/grafana/tempo/pull/2652) (@zalegrala)
 * [ENHANCEMENT] Improve TraceQL regex performance in certain queries. [#3139](https://github.com/grafana/tempo/pull/3139) (@joe-elliott)
 * [ENHANCEMENT] Improve TraceQL performance in complex queries. [#3113](https://github.com/grafana/tempo/pull/3113) (@joe-elliott)
+* [BUGFIX] Fix compactor ignore configured S3 headers [#3149](https://github.com/grafana/tempo/pull/3154) (@Batkilin) 
 
 ## v2.3.0 / 2023-10-30
 

diff --git a/tempodb/backend/s3/compactor.go b/tempodb/backend/s3/compactor.go
@@ -20,6 +20,8 @@ func (rw *readerWriter) MarkBlockCompacted(blockID uuid.UUID, tenantID string) e
 		return backend.ErrEmptyBlockID
 	}
 
+	putObjectOptions := getPutObjectOptions(rw)
+
 	metaFileName := backend.MetaFileName(blockID, tenantID, rw.cfg.Prefix)
 	// copy meta.json to meta.compacted.json
 	_, err := rw.core.CopyObject(
@@ -30,7 +32,7 @@ func (rw *readerWriter) MarkBlockCompacted(blockID uuid.UUID, tenantID string) e
 		backend.CompactedMetaFileName(blockID, tenantID, rw.cfg.Prefix),
 		nil,
 		minio.CopySrcOptions{},
-		minio.PutObjectOptions{},
+		putObjectOptions,
 	)
 	if err != nil {
 		return fmt.Errorf("error copying obj meta to compacted obj meta: %w", err)