Merge pull request #2711 from redpanda-data/json-status-updates

Switch to json formatted status events
redpanda-data · Jul 19, 2024 · 6ab5f76 · 6ab5f76
2 parents fce3e39 + 35e3814
commit 6ab5f76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/internal/impl/kafka/enterprise/integration_test.go b/internal/impl/kafka/enterprise/integration_test.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/redpanda-data/benthos/v4/public/service"
 	"github.com/redpanda-data/benthos/v4/public/service/integration"
-	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/encoding/protojson"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/kafka/enterprise"
 	"github.com/redpanda-data/connect/v4/internal/protoconnect"
@@ -213,12 +213,12 @@ max_message_bytes: 1MB
 
 	var m protoconnect.StatusEvent
 
-	require.NoError(t, proto.Unmarshal([]byte(outRecords[0]), &m))
+	require.NoError(t, protojson.Unmarshal([]byte(outRecords[0]), &m))
 	assert.Equal(t, protoconnect.StatusEvent_TYPE_INITIALIZING, m.Type)
 	assert.Equal(t, "baz", m.InstanceId)
 	assert.Equal(t, "buz", m.PipelineId)
 
-	require.NoError(t, proto.Unmarshal([]byte(outRecords[1]), &m))
+	require.NoError(t, protojson.Unmarshal([]byte(outRecords[1]), &m))
 	assert.Equal(t, protoconnect.StatusEvent_TYPE_EXITING, m.Type)
 	assert.Equal(t, "uh oh", m.ExitError.Message)
 	assert.Equal(t, "baz", m.InstanceId)

diff --git a/internal/impl/kafka/enterprise/status_updates.go b/internal/impl/kafka/enterprise/status_updates.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/redpanda-data/benthos/v4/public/service"
-	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/encoding/protojson"
 
 	"github.com/redpanda-data/connect/v4/internal/protoconnect"
 )
@@ -65,7 +65,7 @@ func (l *TopicLogger) sendStatusEvent(e *protoconnect.StatusEvent) {
 		return
 	}
 
-	data, err := proto.Marshal(e)
+	data, err := protojson.Marshal(e)
 	if err != nil {
 		l.fallbackLogger.Load().With("error", err).Error("Failed to marshal status event")
 		return