event-reporter: added runtime version reporting with each event

codefresh-io · Nov 20, 2024 · 5d9da4f · 5d9da4f
1 parent 06395af
commit 5d9da4f
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 94 deletions.
diff --git a/cmd/event-reporter-server/commands/event_reporter_server.go b/cmd/event-reporter-server/commands/event_reporter_server.go
@@ -96,6 +96,7 @@ func NewCommand() *cobra.Command {
 		codefreshUrl             string
 		codefreshToken           string
 		shardingAlgorithm        string
+		runtimeVersion           string
 		rootpath                 string
 		useGrpc                  bool
 
@@ -179,10 +180,11 @@ func NewCommand() *cobra.Command {
 				ApplicationNamespaces:    applicationNamespaces,
 				ApplicationServiceClient: getApplicationClient(useGrpc, applicationServerAddress, argocdToken, rootpath),
 				CodefreshConfig: &codefresh.CodefreshConfig{
-					BaseURL:     codefreshUrl,
-					AuthToken:   codefreshToken,
-					TlsInsecure: codefreshTlsInsecure,
-					CaCertPath:  codefreshTlsCertPath,
+					BaseURL:        codefreshUrl,
+					AuthToken:      codefreshToken,
+					TlsInsecure:    codefreshTlsInsecure,
+					CaCertPath:     codefreshTlsCertPath,
+					RuntimeVersion: runtimeVersion,
 				},
 				RateLimiterOpts: &reporter.RateLimiterOpts{
 					Enabled:      rateLimiterEnabled,
@@ -236,6 +238,7 @@ func NewCommand() *cobra.Command {
 	command.Flags().StringVar(&codefreshUrl, "codefresh-url", env.StringFromEnv("CODEFRESH_URL", "https://g.codefresh.io"), "Codefresh API url")
 	command.Flags().StringVar(&codefreshToken, "codefresh-token", env.StringFromEnv("CODEFRESH_TOKEN", ""), "Codefresh token")
 	command.Flags().StringVar(&shardingAlgorithm, "sharding-method", env.StringFromEnv(common.EnvEventReporterShardingAlgorithm, common.DefaultEventReporterShardingAlgorithm), "Enables choice of sharding method. Supported sharding methods are : [legacy] ")
+	command.Flags().StringVar(&runtimeVersion, "codefresh-runtime-version", env.StringFromEnv("CODEFRESH_RUNTIME_VERSION", ""), "Codefresh runtime version to be reported with each event to platform")
 	command.Flags().StringSliceVar(&applicationNamespaces, "application-namespaces", env.StringsFromEnv("ARGOCD_APPLICATION_NAMESPACES", []string{}, ","), "List of additional namespaces where application resources can be managed in")
 	command.Flags().BoolVar(&useGrpc, "grpc", env.ParseBoolFromEnv("USE_GRPC", false), "Use grpc for interact with argocd server")
 	command.Flags().BoolVar(&rateLimiterEnabled, "rate-limiter-enabled", env.ParseBoolFromEnv("RATE_LIMITER_ENABLED", false), "Use rate limiter for prevent queue to be overflowed")

diff --git a/event_reporter/reporter/application_event_reporter.go b/event_reporter/reporter/application_event_reporter.go
@@ -45,6 +45,7 @@ type applicationEventReporter struct {
 	applicationServiceClient appclient.ApplicationClient
 	metricsServer            *metrics.MetricsServer
 	db                       db.ArgoDB
+	runtimeVersion           string
 }
 
 type ApplicationEventReporter interface {
@@ -66,6 +67,7 @@ func NewApplicationEventReporter(cache *servercache.Cache, applicationServiceCli
 		appLister:                appLister,
 		metricsServer:            metricsServer,
 		db:                       db,
+		runtimeVersion:           codefreshConfig.RuntimeVersion,
 	}
 }
 
@@ -201,7 +203,7 @@ func (s *applicationEventReporter) StreamApplicationEvents(
 	} else {
 		// will get here only for root applications (not managed as a resource by another application)
 		logCtx.Info("processing as root application")
-		appEvent, err := s.getApplicationEventPayload(ctx, a, appTree, eventProcessingStartedAt, applicationVersions, argoTrackingMetadata)
+		appEvent, err := s.getApplicationEventPayload(ctx, a, appTree, eventProcessingStartedAt, applicationVersions, argoTrackingMetadata, s.runtimeVersion)
 		if err != nil {
 			s.metricsServer.IncErroredEventsCounter(metrics.MetricParentAppEventType, metrics.MetricEventGetPayloadErrorType, a.Name)
 			return fmt.Errorf("failed to get application event: %w", err)
@@ -363,6 +365,7 @@ func (s *applicationEventReporter) processResource(
 			desiredManifests:     reportedEntityParentApp.desiredManifests,
 		},
 		argoTrackingMetadata,
+		s.runtimeVersion,
 	)
 	if err != nil {
 		s.metricsServer.IncErroredEventsCounter(metricsEventType, metrics.MetricEventGetPayloadErrorType, reportedEntityParentApp.app.Name)

diff --git a/event_reporter/reporter/event_payload.go b/event_reporter/reporter/event_payload.go
@@ -24,6 +24,7 @@ func getResourceEventPayload(
 	rr *ReportedResource,
 	reportedEntityParentApp *ReportedEntityParentApp,
 	argoTrackingMetadata *ArgoTrackingMetadata,
+	runtimeVersion string,
 ) (*events.Event, error) {
 	var (
 		err          error
@@ -136,11 +137,12 @@ func getResourceEventPayload(
 	}
 
 	payload := events.EventPayload{
-		Timestamp:   appEventProcessingStartedAt,
-		Object:      object,
-		Source:      &source,
-		Errors:      getResourceEventPayloadErrors(rr, reportedEntityParentApp),
-		AppVersions: applicationVersionsEvents,
+		Timestamp:      appEventProcessingStartedAt,
+		Object:         object,
+		Source:         &source,
+		Errors:         getResourceEventPayloadErrors(rr, reportedEntityParentApp),
+		AppVersions:    applicationVersionsEvents,
+		RuntimeVersion: runtimeVersion,
 	}
 
 	if payload.AppVersions != nil {
@@ -289,6 +291,7 @@ func (s *applicationEventReporter) getApplicationEventPayload(
 	eventProcessingStartedAt string,
 	applicationVersions *apiclient.ApplicationVersions,
 	argoTrackingMetadata *ArgoTrackingMetadata,
+	runtimeVersion string,
 ) (*events.Event, error) {
 	var (
 		syncStarted  = metav1.Now()
@@ -365,11 +368,12 @@ func (s *applicationEventReporter) getApplicationEventPayload(
 	errors = append(errors, parseAggregativeHealthErrorsOfApplication(a, appTree)...)
 
 	payload := events.EventPayload{
-		Timestamp:   eventProcessingStartedAt,
-		Object:      object,
-		Source:      source,
-		Errors:      errors,
-		AppVersions: applicationVersionsEvents,
+		Timestamp:      eventProcessingStartedAt,
+		Object:         object,
+		Source:         source,
+		Errors:         errors,
+		AppVersions:    applicationVersionsEvents,
+		RuntimeVersion: runtimeVersion,
 	}
 
 	logCtx.Infof("AppVersion before encoding: %v", utils.SafeString(payload.AppVersions.AppVersion))