SONAR-9721 Drop use of TelemetryUrl and TelemetryFrequency

server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryClient.java

@@ -31,17 +31,19 @@
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 
+import static org.sonar.core.config.TelemetryProperties.PROP_URL;
+
 @ServerSide
 public class TelemetryClient {
   private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
   private static final Logger LOG = Loggers.get(TelemetryClient.class);
 
   private final OkHttpClient okHttpClient;
-  private final TelemetryUrl serverUrl;
+  private final Configuration config;
 
   public TelemetryClient(OkHttpClient okHttpClient, Configuration config) {
     this.okHttpClient = okHttpClient;
-    this.serverUrl = new TelemetryUrl(config);
+    this.config = config;
   }
 
   void send(String json) {
@@ -55,7 +57,7 @@ void send(String json) {
 
   void optOut(String json) {
     Request.Builder request = new Request.Builder();
-    request.url(serverUrl.get());
+    request.url(serverUrl());
     RequestBody body = RequestBody.create(JSON, json);
     request.delete(body);
 
@@ -68,10 +70,14 @@ void optOut(String json) {
 
   private Request buildHttpRequest(String json) {
     Request.Builder request = new Request.Builder();
-    request.url(serverUrl.get());
+    request.url(serverUrl());
     RequestBody body = RequestBody.create(JSON, json);
     request.post(body);
     return request.build();
   }
 
+  private String serverUrl() {
+    return config.get(PROP_URL).orElseThrow(() -> new IllegalStateException(String.format("Setting '%s' must be provided.", PROP_URL)));
+  }
+
 }

server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDaemon.java

@@ -38,6 +38,7 @@
 import static org.sonar.api.utils.DateUtils.formatDate;
 import static org.sonar.api.utils.DateUtils.parseDate;
 import static org.sonar.core.config.TelemetryProperties.PROP_ENABLE;
+import static org.sonar.core.config.TelemetryProperties.PROP_FREQUENCY;
 import static org.sonar.core.config.TelemetryProperties.PROP_URL;
 
 @ServerSide
@@ -53,14 +54,12 @@ public class TelemetryDaemon implements Startable {
   private final InternalProperties internalProperties;
   private final Server server;
   private final System2 system2;
-  private final TelemetryFrequency frequencyInSeconds;
 
   private ScheduledExecutorService executorService;
 
   public TelemetryDaemon(TelemetryClient telemetryClient, Configuration config, InternalProperties internalProperties, Server server, System2 system2) {
     this.telemetryClient = telemetryClient;
     this.config = config;
-    this.frequencyInSeconds = new TelemetryFrequency(config);
     this.internalProperties = internalProperties;
     this.server = server;
     this.system2 = system2;
@@ -94,6 +93,7 @@ public void start() {
         .setNameFormat(THREAD_NAME_PREFIX + "%d")
         .setPriority(Thread.MIN_PRIORITY)
         .build());
+    int frequencyInSeconds = frequency();
     executorService.scheduleWithFixedDelay(() -> {
       try {
         Optional<Long> lastPing = internalProperties.read(I_PROP_LAST_PING).map(Long::valueOf);
@@ -114,7 +114,7 @@ public void start() {
         // fail silently
       }
     // do not check at start up to exclude test instance which are not up for a long time
-    }, frequencyInSeconds.get(), frequencyInSeconds.get(), TimeUnit.SECONDS);
+    }, frequencyInSeconds, frequencyInSeconds, TimeUnit.SECONDS);
   }
 
   @Override
@@ -130,4 +130,8 @@ public void stop() {
   private static long startOfDay(long now) {
     return parseDate(formatDate(now)).getTime();
   }
+
+  private int frequency() {
+    return config.getInt(PROP_FREQUENCY).orElseThrow(() -> new IllegalStateException(String.format("Setting '%s' must be provided.", PROP_FREQUENCY)));
+  }
 }