Chore/ensure telemetry generation up to date (#6280)

* remove data.avdl from pre commit trailing whitespace

* add telemetry schema check to ci.yml

* add gofumpt

* add go/bin to path so gofumpt can be called in makefile

* add go bin to path in make telemetry step

Author: Jim Ryan

.github/workflows/ci.yml

@@ -180,6 +180,14 @@ jobs:
           make update-codegen && git diff --name-only --exit-code pkg/**
           cd ../../.. && mv github.com/nginxinc/kubernetes-ingress kubernetes-ingress/kubernetes-ingress
 
+      - name: Install gofumpt
+        run: go install mvdan.cc/gofumpt@latest
+
+      - name: Check if telemetry schema changed
+        run: |
+          export PATH=$PATH:$(go env GOPATH)/bin
+          make telemetry-schema && git diff --name-only --exit-code internal/telemetry
+
   unit-tests:
     name: Unit Tests
     runs-on: ubuntu-22.04

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ repos:
     rev: v4.6.0
     hooks:
       - id: trailing-whitespace
-        exclude: '(\.md|\.snap)$'
+        exclude: '(\.md|\.snap|\.avdl)$'
       - id: end-of-file-fixer
         exclude: docs/layouts/shortcodes/nic-.*.html
       - id: check-yaml

internal/telemetry/data.avdl

@@ -8,115 +8,115 @@
 		/** The time our edge ingested the event */
 		long ingestTime;
 
-
+		
 		/** ProjectName is the name of the project. */
 		string? ProjectName = null;
-
+		
 		/** ProjectVersion is the version of the project. */
 		string? ProjectVersion = null;
-
+		
 		/** ProjectArchitecture is the architecture of the project. For example, "amd64". */
 		string? ProjectArchitecture = null;
-
+		
 		/** ClusterID is the unique id of the Kubernetes cluster where the project is installed.
 It is the UID of the `kube-system` Namespace. */
 		string? ClusterID = null;
-
+		
 		/** ClusterVersion is the Kubernetes version of the cluster. */
 		string? ClusterVersion = null;
-
+		
 		/** ClusterPlatform is the Kubernetes platform of the cluster. */
 		string? ClusterPlatform = null;
-
+		
 		/** InstallationID is the unique id of the project installation in the cluster. */
 		string? InstallationID = null;
-
+		
 		/** ClusterNodeCount is the number of nodes in the cluster. */
 		long? ClusterNodeCount = null;
-
+		
 		/** VirtualServers is the number of VirtualServer resources managed by the Ingress Controller. */
 		long? VirtualServers = null;
-
+		
 		/** VirtualServerRoutes is the number of VirtualServerRoute resources managed by the Ingress Controller. */
 		long? VirtualServerRoutes = null;
-
+		
 		/** TransportServers is the number of TransportServer resources managed by the Ingress Controller. */
 		long? TransportServers = null;
-
+		
 		/** Replicas is the number of NIC replicas. */
 		long? Replicas = null;
-
+		
 		/** Secrets is the number of Secret resources managed by the Ingress Controller. */
 		long? Secrets = null;
-
+		
 		/** ClusterIPServices is the number of ClusterIP services managed by NGINX Ingress Controller. */
 		long? ClusterIPServices = null;
-
+		
 		/** NodePortServices is the number of NodePort services managed by NGINX Ingress Controller. */
 		long? NodePortServices = null;
-
+		
 		/** LoadBalancerServices is the number of LoadBalancer services managed by NGINX Ingress Controller. */
 		long? LoadBalancerServices = null;
-
+		
 		/** ExternalNameServices is the number of ExternalName services managed by NGINX Ingress Controller. */
 		long? ExternalNameServices = null;
-
+		
 		/** RegularIngressCount is the number of Regular Ingress resources managed by NGINX Ingress Controller. */
 		long? RegularIngressCount = null;
-
+		
 		/** MasterIngressCount is the number of Regular Ingress resources managed by NGINX Ingress Controller. */
 		long? MasterIngressCount = null;
-
+		
 		/** MinionIngressCount is the number of Regular Ingress resources managed by NGINX Ingress Controller. */
 		long? MinionIngressCount = null;
-
+		
 		/** IngressClasses is the number of Ingress Classes. */
 		long? IngressClasses = null;
-
+		
 		/** AccessControlPolicies is the number of AccessControl policies managed by NGINX Ingress Controller */
 		long? AccessControlPolicies = null;
-
+		
 		/** RateLimitPolicies is the number of RateLimit policies managed by NGINX Ingress Controller */
 		long? RateLimitPolicies = null;
-
+		
 		/** APIKeyPolicies is the number of APIKey policies managed by NGINX Ingress Controller */
 		long? APIKeyPolicies = null;
-
+		
 		/** JWTAuthPolicies is the number of JWTAuth policies managed by NGINX Ingress Controller */
 		long? JWTAuthPolicies = null;
-
+		
 		/** BasicAuthPolicies is the number of BasicAuth policies managed by NGINX Ingress Controller */
 		long? BasicAuthPolicies = null;
-
+		
 		/** IngressMTLSPolicies is the number of IngressMTLS policies managed by NGINX Ingress Controller */
 		long? IngressMTLSPolicies = null;
-
+		
 		/** EgressMTLSPolicies is the number of EgressMTLS policies managed by NGINX Ingress Controller */
 		long? EgressMTLSPolicies = null;
-
+		
 		/** OIDCPolicies is the number of OIDC policies managed by NGINX Ingress Controller */
 		long? OIDCPolicies = null;
-
+		
 		/** WAFPolicies is the number of WAF policies managed by NGINX Ingress Controller */
 		long? WAFPolicies = null;
-
+		
 		/** GlobalConfiguration indicates if a GlobalConfiguration resource is used. */
 		boolean? GlobalConfiguration = null;
-
+		
 		/** IngressAnnotations is the list of annotations resources managed by NGINX Ingress Controller */
 		union {null, array<string>} IngressAnnotations = null;
-
+		
 		/** AppProtectVersion represents the version of AppProtect. */
 		string? AppProtectVersion = null;
-
+		
 		/** IsPlus represents whether NGINX is Plus or OSS */
 		boolean? IsPlus = null;
-
+		
 		/** InstallationFlags is the list of command line arguments configured for NGINX Ingress Controller */
 		union {null, array<string>} InstallationFlags = null;
-
+		
 		/** BuildOS represents the base operating system image */
 		string? BuildOS = null;
-
+		
 	}
 }