Fix value type (#383)

* Fix size logging * Add changelog entry
grafana · Nov 30, 2020 · c0cb2fa · c0cb2fa
1 parent 7da2664
commit c0cb2fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 * [BUGFIX] Frequent errors logged by compactor regarding meta not found [#327](https://github.com/grafana/tempo/pull/327)
 * [BUGFIX] Fix distributors panicking on rollout [#343](https://github.com/grafana/tempo/pull/343)
 * [BUGFIX] Fix ingesters occassionally double flushing [#364](https://github.com/grafana/tempo/pull/364)
+* [BUGFIX] Fix S3 backend logs "unsupported value type" [#381](https://github.com/grafana/tempo/issues/381)
 
 ## v0.3.0
 

diff --git a/tempodb/backend/s3/s3.go b/tempodb/backend/s3/s3.go
@@ -177,7 +177,7 @@ func (rw *readerWriter) WriteBlockMeta(ctx context.Context, tracker backend.Appe
 	}
 
 	for i, b := range bBloom {
-		size, err := rw.core.Client.PutObject(
+		info, err := rw.core.Client.PutObject(
 			ctx,
 			rw.cfg.Bucket,
 			util.BloomFileName(blockID, tenantID, i),
@@ -188,10 +188,10 @@ func (rw *readerWriter) WriteBlockMeta(ctx context.Context, tracker backend.Appe
 		if err != nil {
 			return errors.Wrap(err, "error uploading bloom filter to s3")
 		}
-		level.Debug(rw.logger).Log("msg", "block bloom uploaded to s3", "shard", i, "size", size)
+		level.Debug(rw.logger).Log("msg", "block bloom uploaded to s3", "shard", i, "size", info.Size)
 	}
 
-	size, err := rw.core.Client.PutObject(
+	info, err := rw.core.Client.PutObject(
 		ctx,
 		rw.cfg.Bucket,
 		util.IndexFileName(blockID, tenantID),
@@ -202,15 +202,15 @@ func (rw *readerWriter) WriteBlockMeta(ctx context.Context, tracker backend.Appe
 	if err != nil {
 		return errors.Wrap(err, "error uploading index to s3")
 	}
-	level.Debug(rw.logger).Log("msg", "block index uploaded to s3", "size", size)
+	level.Debug(rw.logger).Log("msg", "block index uploaded to s3", "size", info.Size)
 
 	bMeta, err := json.Marshal(meta)
 	if err != nil {
 		return errors.Wrap(err, "error unmarshalling block meta json")
 	}
 
 	// write meta last.  this will prevent blocklist from returning a partial block
-	size, err = rw.core.Client.PutObject(
+	info, err = rw.core.Client.PutObject(
 		ctx,
 		rw.cfg.Bucket,
 		util.MetaFileName(blockID, tenantID),
@@ -221,7 +221,7 @@ func (rw *readerWriter) WriteBlockMeta(ctx context.Context, tracker backend.Appe
 	if err != nil {
 		return errors.Wrap(err, "error uploading block meta to s3")
 	}
-	level.Debug(rw.logger).Log("msg", "block meta uploaded to s3", "size", size)
+	level.Debug(rw.logger).Log("msg", "block meta uploaded to s3", "size", info.Size)
 
 	return nil
 }