Merge branch 'master' into cwarren-strongconsistency

Author: c-warren

activity/activity.go

@@ -102,6 +102,11 @@ func GetInfo(ctx context.Context) Info {
 	return internal.GetActivityInfo(ctx)
 }
 
+// HasInfo returns if the context contains activity information
+func HasInfo(ctx context.Context) bool {
+	return internal.HasActivityInfo(ctx)
+}
+
 // GetLogger returns a logger that can be used in activity
 func GetLogger(ctx context.Context) *zap.Logger {
 	return internal.GetActivityLogger(ctx)

internal/activity.go

@@ -224,6 +224,11 @@ func GetActivityInfo(ctx context.Context) ActivityInfo {
 	}
 }
 
+// HasActivityInfo returns if the context contains activity information
+func HasActivityInfo(ctx context.Context) bool {
+	return hasActivityEnv(ctx)
+}
+
 // HasHeartbeatDetails checks if there is heartbeat details from last attempt.
 func HasHeartbeatDetails(ctx context.Context) bool {
 	env := getActivityEnv(ctx)

internal/activity_test.go

@@ -233,3 +233,25 @@ func (s *activityTestSuite) TestGetWorkerStopChannel() {
 	channel := GetWorkerStopChannel(ctx)
 	s.NotNil(channel)
 }
+
+func (s *activityTestSuite) TestHasActivityInfo() {
+	// Test context without activity info
+	ctx := context.Background()
+	s.False(HasActivityInfo(ctx))
+
+	// Test context with activity info
+	activityEnv := &activityEnvironment{
+		activityID:   "test-activity-id",
+		activityType: ActivityType{Name: "test-activity-type"},
+	}
+	ctxWithActivity := context.WithValue(ctx, activityEnvContextKey, activityEnv)
+	s.True(HasActivityInfo(ctxWithActivity))
+
+	// Test context with nil activity env
+	ctxWithNilActivity := context.WithValue(ctx, activityEnvContextKey, nil)
+	s.False(HasActivityInfo(ctxWithNilActivity))
+
+	// Test context with other values in context
+	ctxWithOtherValue := context.WithValue(ctx, activityOptionsContextKey, "other-value")
+	s.False(HasActivityInfo(ctxWithOtherValue))
+}

internal/internal_activity.go

@@ -155,6 +155,11 @@ func getActivityEnv(ctx context.Context) *activityEnvironment {
 	return env.(*activityEnvironment)
 }
 
+func hasActivityEnv(ctx context.Context) bool {
+	env := ctx.Value(activityEnvContextKey)
+	return env != nil
+}
+
 func getActivityOptions(ctx Context) *activityOptions {
 	eap := ctx.Value(activityOptionsContextKey)
 	if eap == nil {