SONAR-19425 Rename docker to container in telemetry and system info

5 files changed, 20 insertions, 20 deletions

diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/DockerSupport.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/ContainerSupport.java
index 51dcc25029d..22a59f5207f 100644
--- a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/DockerSupport.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/ContainerSupport.java
@@ -19,10 +19,10 @@
  */
 package org.sonar.server.platform;
 
-public interface DockerSupport {
+public interface ContainerSupport {
   /**
    * @return {@code true} if we can detect that SQ is running inside a docker container
    */
-  boolean isRunningInDocker();
+  boolean isRunningInContainer();
 
 }
diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/DockerSupportImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/ContainerSupportImpl.java
index 84dac734045..38997c558f5 100644
--- a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/DockerSupportImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/ContainerSupportImpl.java
@@ -24,15 +24,15 @@ import java.nio.file.Files;
 import java.util.stream.Stream;
 import org.sonar.server.util.Paths2;
 
-public class DockerSupportImpl implements DockerSupport {
+public class ContainerSupportImpl implements ContainerSupport {
   private final Paths2 paths2;
 
-  public DockerSupportImpl(Paths2 paths2) {
+  public ContainerSupportImpl(Paths2 paths2) {
     this.paths2 = paths2;
   }
 
   @Override
-  public boolean isRunningInDocker() {
+  public boolean isRunningInContainer() {
     if (paths2.exists("/run/.containerenv")) {
       return true;
     }
diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/StandaloneSystemSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/StandaloneSystemSection.java
index c7f433985ef..0502556fef5 100644
--- a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/StandaloneSystemSection.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/StandaloneSystemSection.java
@@ -25,7 +25,7 @@ import org.sonar.api.platform.Server;
 import org.sonar.process.systeminfo.BaseSectionMBean;
 import org.sonar.process.systeminfo.protobuf.ProtobufSystemInfo;
 import org.sonar.server.log.ServerLogging;
-import org.sonar.server.platform.DockerSupport;
+import org.sonar.server.platform.ContainerSupport;
 import org.sonar.server.platform.OfficialDistribution;
 import org.sonar.server.platform.StatisticsSupport;
 
@@ -42,19 +42,19 @@ public class StandaloneSystemSection extends BaseSectionMBean implements SystemS
   private final Server server;
   private final ServerLogging serverLogging;
   private final OfficialDistribution officialDistribution;
-  private final DockerSupport dockerSupport;
+  private final ContainerSupport containerSupport;
   private final StatisticsSupport statisticsSupport;
   private final SonarRuntime sonarRuntime;
   private final CommonSystemInformation commonSystemInformation;
 
   public StandaloneSystemSection(Configuration config, Server server, ServerLogging serverLogging,
-    OfficialDistribution officialDistribution, DockerSupport dockerSupport, StatisticsSupport statisticsSupport,
+    OfficialDistribution officialDistribution, ContainerSupport containerSupport, StatisticsSupport statisticsSupport,
     SonarRuntime sonarRuntime, CommonSystemInformation commonSystemInformation) {
     this.config = config;
     this.server = server;
     this.serverLogging = serverLogging;
     this.officialDistribution = officialDistribution;
-    this.dockerSupport = dockerSupport;
+    this.containerSupport = containerSupport;
     this.statisticsSupport = statisticsSupport;
     this.sonarRuntime = sonarRuntime;
     this.commonSystemInformation = commonSystemInformation;
@@ -90,7 +90,7 @@ public class StandaloneSystemSection extends BaseSectionMBean implements SystemS
     setAttribute(protobuf, "Version", getVersion());
     setAttribute(protobuf, "Edition", sonarRuntime.getEdition().getLabel());
     setAttribute(protobuf, NCLOC.getName(), statisticsSupport.getLinesOfCode());
-    setAttribute(protobuf, "Docker", dockerSupport.isRunningInDocker());
+    setAttribute(protobuf, "Container", containerSupport.isRunningInContainer());
     setAttribute(protobuf, "External Users and Groups Provisioning", commonSystemInformation.getManagedInstanceProviderName());
     setAttribute(protobuf, "External User Authentication", commonSystemInformation.getExternalUserAuthentication());
     addIfNotEmpty(protobuf, "Accepted external identity providers",
diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSection.java
index 308b1733c1d..13fb551edc4 100644
--- a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSection.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSection.java
@@ -25,7 +25,7 @@ import org.sonar.api.server.ServerSide;
 import org.sonar.process.systeminfo.Global;
 import org.sonar.process.systeminfo.SystemInfoSection;
 import org.sonar.process.systeminfo.protobuf.ProtobufSystemInfo;
-import org.sonar.server.platform.DockerSupport;
+import org.sonar.server.platform.ContainerSupport;
 import org.sonar.server.platform.StatisticsSupport;
 import org.sonar.server.platform.monitoring.CommonSystemInformation;
 
@@ -37,15 +37,15 @@ import static org.sonar.process.systeminfo.SystemInfoUtils.setAttribute;
 public class GlobalSystemSection implements SystemInfoSection, Global {
 
   private final Server server;
-  private final DockerSupport dockerSupport;
+  private final ContainerSupport containerSupport;
   private final StatisticsSupport statisticsSupport;
   private final SonarRuntime sonarRuntime;
   private final CommonSystemInformation commonSystemInformation;
 
-  public GlobalSystemSection(Server server, DockerSupport dockerSupport, StatisticsSupport statisticsSupport, SonarRuntime sonarRuntime,
+  public GlobalSystemSection(Server server, ContainerSupport containerSupport, StatisticsSupport statisticsSupport, SonarRuntime sonarRuntime,
     CommonSystemInformation commonSystemInformation) {
     this.server = server;
-    this.dockerSupport = dockerSupport;
+    this.containerSupport = containerSupport;
     this.statisticsSupport = statisticsSupport;
     this.sonarRuntime = sonarRuntime;
     this.commonSystemInformation = commonSystemInformation;
@@ -59,7 +59,7 @@ public class GlobalSystemSection implements SystemInfoSection, Global {
     setAttribute(protobuf, "Server ID", server.getId());
     setAttribute(protobuf, "Edition", sonarRuntime.getEdition().getLabel());
     setAttribute(protobuf, NCLOC.getName() ,statisticsSupport.getLinesOfCode());
-    setAttribute(protobuf, "Docker", dockerSupport.isRunningInDocker());
+    setAttribute(protobuf, "Container", containerSupport.isRunningInContainer());
     setAttribute(protobuf, "High Availability", true);
     setAttribute(protobuf, "External Users and Groups Provisioning",
       commonSystemInformation.getManagedInstanceProviderName());
diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/telemetry/TelemetryDataLoaderImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/telemetry/TelemetryDataLoaderImpl.java
index 384286685ea..c5fe2bfe8f2 100644
--- a/server/sonar-webserver-core/src/main/java/org/sonar/server/telemetry/TelemetryDataLoaderImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/telemetry/TelemetryDataLoaderImpl.java
@@ -58,7 +58,7 @@ import org.sonar.db.newcodeperiod.NewCodePeriodDto;
 import org.sonar.db.qualitygate.ProjectQgateAssociationDto;
 import org.sonar.db.qualitygate.QualityGateDto;
 import org.sonar.server.management.ManagedInstanceService;
-import org.sonar.server.platform.DockerSupport;
+import org.sonar.server.platform.ContainerSupport;
 import org.sonar.server.property.InternalProperties;
 import org.sonar.server.qualitygate.QualityGateCaycChecker;
 import org.sonar.server.qualitygate.QualityGateFinder;
@@ -105,7 +105,7 @@ public class TelemetryDataLoaderImpl implements TelemetryDataLoader {
   private final PlatformEditionProvider editionProvider;
   private final Configuration configuration;
   private final InternalProperties internalProperties;
-  private final DockerSupport dockerSupport;
+  private final ContainerSupport containerSupport;
   private final QualityGateCaycChecker qualityGateCaycChecker;
   private final QualityGateFinder qualityGateFinder;
   private final ManagedInstanceService managedInstanceService;
@@ -118,7 +118,7 @@ public class TelemetryDataLoaderImpl implements TelemetryDataLoader {
   @Inject
   public TelemetryDataLoaderImpl(Server server, DbClient dbClient, PluginRepository pluginRepository,
     PlatformEditionProvider editionProvider, InternalProperties internalProperties, Configuration configuration,
-    DockerSupport dockerSupport, QualityGateCaycChecker qualityGateCaycChecker, QualityGateFinder qualityGateFinder,
+    ContainerSupport containerSupport, QualityGateCaycChecker qualityGateCaycChecker, QualityGateFinder qualityGateFinder,
     ManagedInstanceService managedInstanceService, CloudUsageDataProvider cloudUsageDataProvider) {
     this.server = server;
     this.dbClient = dbClient;
@@ -126,7 +126,7 @@ public class TelemetryDataLoaderImpl implements TelemetryDataLoader {
     this.editionProvider = editionProvider;
     this.internalProperties = internalProperties;
     this.configuration = configuration;
-    this.dockerSupport = dockerSupport;
+    this.containerSupport = containerSupport;
     this.qualityGateCaycChecker = qualityGateCaycChecker;
     this.qualityGateFinder = qualityGateFinder;
     this.managedInstanceService = managedInstanceService;
@@ -181,7 +181,7 @@ public class TelemetryDataLoaderImpl implements TelemetryDataLoader {
 
     return data
       .setInstallationVersion(installationVersionProperty.orElse(null))
-      .setInDocker(dockerSupport.isRunningInDocker())
+      .setInContainer(containerSupport.isRunningInContainer())
       .setManagedInstanceInformation(buildManagedInstanceInformation())
       .setCloudUsage(buildCloudUsage())
       .build();