Merge branch...

Merge branch '199193-track-total-number-of-instances-using-an-external-container-registry' into 'master'

Rename container registry top-level key in usage ping payload

See merge request gitlab-org/gitlab!37800

doc/development/telemetry/usage_ping.md

@@ -738,8 +738,8 @@ appear to be associated to any of the services running, since they all appear to
 | `server`                                                  | `topology > nodes > node_services`   | `enablement`  |                  |         | The type of web server used (Unicorn or Puma)                              |
 | `network_policy_forwards`                                 | `counts`                             | `defend`      |                  | EE      | Cumulative count of forwarded packets by Container Network                 |
 | `network_policy_drops`                                    | `counts`                             | `defend`      |                  | EE      | Cumulative count of dropped packets by Container Network                   |
-| `vendor`                                                  | `container_registry`                 | `package`     |                  | CE+EE   | The Container Registry vendor (GitLab or third-party)                      |
-| `version`                                                 | `container_registry`                 | `package`     |                  | CE+EE   | The Container Registry version (only when vendor is GitLab)                |
+| `vendor`                                                  | `container_registry_server`          | `package`     |                  | CE+EE   | The Container Registry vendor (GitLab or third-party)                      |
+| `version`                                                 | `container_registry_server`          | `package`     |                  | CE+EE   | The Container Registry version (only when vendor is GitLab)                |
 
 ## Example Usage Ping payload
 
@@ -814,7 +814,7 @@ The following is example content of the Usage Ping payload.
     "enabled": true,
     "version": "1.17.0"
   },
-  "container_registry": {
+  "container_registry_server": {
     "vendor": "gitlab",
     "version": "2.9.1-gitlab"
   },

lib/gitlab/usage_data.rb

@@ -255,7 +255,7 @@ module Gitlab
             enabled: alt_usage_data(fallback: nil) { Gitlab.config.pages.enabled },
             version: alt_usage_data { Gitlab::Pages::VERSION }
           },
-          container_registry: {
+          container_registry_server: {
             vendor: alt_usage_data(fallback: nil) { Gitlab::CurrentSettings.container_registry_vendor },
             version: alt_usage_data(fallback: nil) { Gitlab::CurrentSettings.container_registry_version }
           },

spec/lib/gitlab/usage_data_spec.rb

@@ -591,8 +591,8 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
         expect(subject[:gitaly][:clusters]).to be >= 0
         expect(subject[:gitaly][:filesystems]).to be_an(Array)
         expect(subject[:gitaly][:filesystems].first).to be_a(String)
-        expect(subject[:container_registry][:vendor]).to eq('gitlab')
-        expect(subject[:container_registry][:version]).to eq('x.y.z')
+        expect(subject[:container_registry_server][:vendor]).to eq('gitlab')
+        expect(subject[:container_registry_server][:version]).to eq('x.y.z')
       end
     end