Merge branch 'vsukhin/feature/stream-service-logs' into sandbox/twrc

kubeshop · Dec 9, 2024 · 71095a1 · 71095a1
2 parents 89f410f + e56e548
commit 71095a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go
@@ -26,8 +26,8 @@ import (
 const (
 	clusterIDMeta          = "cluster-id"
 	cloudMigrateMeta       = "migrate"
-	orgIdMeta              = "environment-id"
-	envIdMeta              = "organization-id"
+	orgIdMeta              = "organization-id"
+	envIdMeta              = "environment-id"
 	healthcheckCommand     = "healthcheck"
 	dockerImageVersionMeta = "docker-image-version"
 )

diff --git a/pkg/agent/testworkflows.go b/pkg/agent/testworkflows.go
@@ -12,6 +12,7 @@ import (
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding/gzip"
+	"google.golang.org/grpc/metadata"
 
 	"github.com/kubeshop/testkube/internal/common"
 	agentclient "github.com/kubeshop/testkube/pkg/agent/client"
@@ -86,6 +87,8 @@ func (ag *Agent) runTestWorkflowNotificationsLoop(ctx context.Context) error {
 
 func (ag *Agent) runTestWorkflowServiceNotificationsLoop(ctx context.Context) error {
 	ctx = agentclient.AddAPIKeyMeta(ctx, ag.apiKey)
+	ctx = metadata.AppendToOutgoingContext(ctx, envIdMeta, ag.proContext.EnvID)
+	ctx = metadata.AppendToOutgoingContext(ctx, orgIdMeta, ag.proContext.OrgID)
 
 	ag.logger.Infow("initiating workflow service notifications streaming connection with Cloud API")
 	// creates a new Stream from the client side. ctx is used for the lifetime of the stream.
@@ -131,6 +134,8 @@ func (ag *Agent) runTestWorkflowServiceNotificationsLoop(ctx context.Context) er
 
 func (ag *Agent) runTestWorkflowParallelStepNotificationsLoop(ctx context.Context) error {
 	ctx = agentclient.AddAPIKeyMeta(ctx, ag.apiKey)
+	ctx = metadata.AppendToOutgoingContext(ctx, envIdMeta, ag.proContext.EnvID)
+	ctx = metadata.AppendToOutgoingContext(ctx, orgIdMeta, ag.proContext.OrgID)
 
 	ag.logger.Infow("initiating workflow parallel step notifications streaming connection with Cloud API")
 	// creates a new Stream from the client side. ctx is used for the lifetime of the stream.