Skip to content

Commit b16477b

Browse files
authored
Backport storage extension checkpoint fix (#2526)
* Add Vendor files for the patch * Add Patch file for storage extension checkpoint
1 parent 93fcca8 commit b16477b

File tree

14,332 files changed

+4371843
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

14,332 files changed

+4371843
-0
lines changed

patches/fileStorageCheckpoint.patch

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
diff --git a/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/file.go b/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/file.go
2+
index cc458513..699aa87d 100644
3+
--- a/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/file.go
4+
+++ b/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/file.go
5+
@@ -150,8 +150,12 @@ func (m *Manager) poll(ctx context.Context) {
6+
// Any new files that appear should be consumed entirely
7+
m.readerFactory.FromBeginning = true
8+
if m.persister != nil {
9+
- if err := checkpoint.Save(context.Background(), m.persister, m.knownFiles); err != nil {
10+
- m.Errorw("save offsets", zap.Error(err))
11+
+ allCheckpoints := make([]*reader.Metadata, 0, len(m.knownFiles)+len(m.previousPollFiles))
12+
+ allCheckpoints = append(allCheckpoints, m.knownFiles...)
13+
+ for _, r := range m.previousPollFiles {
14+
+ allCheckpoints = append(allCheckpoints, r.Metadata)
15+
+ }
16+
+ if err := checkpoint.Save(context.Background(), m.persister, allCheckpoints); err != nil { m.Errorw("save offsets", zap.Error(err))
17+
}
18+
}
19+
}

vendor/cloud.google.com/go/compute/LICENSE

Lines changed: 202 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/cloud.google.com/go/compute/internal/version.go

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/cloud.google.com/go/compute/metadata/CHANGES.md

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)