Skip to content

Commit

Permalink
Remove more makefile, add missing line in versions (#221)
Browse files Browse the repository at this point in the history
Fix two non-breaking problems discovered in the updated release process
as of v0.24.0.
  • Loading branch information
jmacd authored Jun 11, 2024
1 parent f751166 commit 327c826
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ endif
git commit -m "multimode changes $(RELEASE_CANDIDATE)"
# ensure a clean branch (that was a test--gotidy should be idempotent and should not change the working dir again)
git diff -s --exit-code || (echo "local repository not clean"; exit 1)
git add .
git commit -m "remove replace statements $(RELEASE_CANDIDATE)" || (echo "no multimod changes to commit")

# Install OTC's builder at the version WHICH MUST MATCH collector/otelarrowcol-build.yaml
BUILDER = builder
Expand Down
4 changes: 4 additions & 0 deletions pkg/otel/common/arrow/allocator.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ var limitRegexp = regexp.MustCompile(`memory limit exceeded: requested (\d+) out
// the code below. The formatting uses a "%v" which means we lose the
// error wrapping facility that would let us easily extract the
// object. Therefore, we use a regexp to unpack memory limit errors.
//
// TODO: https://github.com/apache/arrow/pull/41989 has fixed the
// upstream Arrow library, when Arrow v17 is released we can simplify
// this function to unwrap an error vs parse the message.
func NewLimitErrorFromError(err error) (error, bool) {
matches := limitRegexp.FindStringSubmatch(err.Error())
if len(matches) != 4 {
Expand Down
1 change: 1 addition & 0 deletions versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ module-sets:
- github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor
- github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor
- github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver
- github.com/open-telemetry/otel-arrow/collector/test

0 comments on commit 327c826

Please sign in to comment.