Skip to content

Commit

Permalink
Merge pull request redpanda-data#2734 from redpanda-data/limit-cloud-…
Browse files Browse the repository at this point in the history
…community-builds

Limit cloud and community build artifacts
  • Loading branch information
Jeffail authored Jul 24, 2024
2 parents d51b395 + 589a510 commit 094c057
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 20 deletions.
20 changes: 4 additions & 16 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,8 @@ builds:
- id: connect-cloud
main: cmd/redpanda-connect-cloud/main.go
binary: redpanda-connect
goos: [ windows, darwin, linux, freebsd, openbsd ]
goarch: [ amd64, arm, arm64 ]
goarm: [ 6, 7 ]
ignore:
- goos: windows
goarch: arm
- goos: darwin
goarch: arm
goos: [ darwin, linux ]
goarch: [ amd64, arm64 ]
env:
- CGO_ENABLED=0
ldflags: >
Expand All @@ -52,14 +46,8 @@ builds:
- id: connect-community
main: cmd/redpanda-connect-community/main.go
binary: redpanda-connect
goos: [ windows, darwin, linux, freebsd, openbsd ]
goarch: [ amd64, arm, arm64 ]
goarm: [ 6, 7 ]
ignore:
- goos: windows
goarch: arm
- goos: darwin
goarch: arm
goos: [ darwin, linux ]
goarch: [ amd64, arm64 ]
env:
- CGO_ENABLED=0
ldflags: >
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ Changelog

All notable changes to this project will be documented in this file.

## 4.32.1 - 2024-07-24

### Changed

- The number of release build artifacts for the `community` and `cloud` flavours have been reduced due to Github Action Runner disk space limitations.

## 4.32.0 - 2024-07-24

### Added
Expand Down
7 changes: 5 additions & 2 deletions internal/impl/kafka/enterprise/status_updates.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ func (l *TopicLogger) TriggerEventStopped(err error) {
}

func (l *TopicLogger) sendStatusEvent(e *protoconnect.StatusEvent) {
tmpO := l.o.Load()
if tmpO == nil || l.statusTopic == "" {
if l.statusTopic == "" {
return
}

Expand All @@ -75,6 +74,10 @@ func (l *TopicLogger) sendStatusEvent(e *protoconnect.StatusEvent) {
msg.SetBytes(data)
msg.MetaSetMut(topicMetaKey, l.statusTopic)

tmpO := l.o.Load()
if tmpO == nil {
return
}
_ = tmpO.WriteBatchNonBlocking(service.MessageBatch{msg}, func(ctx context.Context, err error) error {
return nil // TODO: Log nacks
}) // TODO: Log errors (occasionally)
Expand Down
8 changes: 6 additions & 2 deletions internal/impl/kafka/enterprise/topic_logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,7 @@ func (l *TopicLogger) Enabled(ctx context.Context, atLevel slog.Level) bool {

// Handle invokes the logger for the input record.
func (l *TopicLogger) Handle(ctx context.Context, r slog.Record) error {
tmpO := l.o.Load()
if tmpO == nil || l.logsTopic == "" {
if l.logsTopic == "" {
return nil
}

Expand Down Expand Up @@ -219,6 +218,10 @@ func (l *TopicLogger) Handle(ctx context.Context, r slog.Record) error {
msg.SetStructured(v)
msg.MetaSetMut(topicMetaKey, l.logsTopic)

tmpO := l.o.Load()
if tmpO == nil {
return nil
}
_ = tmpO.WriteBatchNonBlocking(service.MessageBatch{msg}, func(ctx context.Context, err error) error {
return nil // TODO: Log nacks
}) // TODO: Log errors (occasionally)
Expand Down Expand Up @@ -246,6 +249,7 @@ func (l *TopicLogger) Close(ctx context.Context) error {

o := l.o.Load()
if o != nil {
l.o.Store(nil)
if err := o.Close(ctx); err != nil {
return err
}
Expand Down

0 comments on commit 094c057

Please sign in to comment.