From f8df1cd43206fb89739c6884f7ed341897a1ab80 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Sat, 2 Mar 2019 02:58:29 +0100 Subject: [PATCH] Address review feedback --- core/src/main/java/hudson/Functions.java | 3 ++- .../jenkins/telemetry/impl/AutoRefresh.java | 17 +++++++++++------ .../impl/AutoRefresh/description.jelly | 2 +- .../jenkins/telemetry/impl/Messages.properties | 1 + 4 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 core/src/main/resources/jenkins/telemetry/impl/Messages.properties diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 4d4277d735..ef5c322973 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -179,6 +179,7 @@ import org.kohsuke.accmod.restrictions.DoNotUse; @SuppressWarnings("rawtypes") public class Functions { private static final AtomicLong iota = new AtomicLong(); + private static Logger LOGGER = Logger.getLogger(Functions.class.getName()); public Functions() { } @@ -651,7 +652,7 @@ public class Functions { try { ExtensionList.lookupSingleton(AutoRefresh.class).recordRequest(request, refresh); } catch (Exception e) { - // ignore telemetry problems + LOGGER.log(Level.FINE, "Failed to record auto refresh status in telemetry", e); } } diff --git a/core/src/main/java/jenkins/telemetry/impl/AutoRefresh.java b/core/src/main/java/jenkins/telemetry/impl/AutoRefresh.java index 9ca458ebc1..a641db1ce4 100644 --- a/core/src/main/java/jenkins/telemetry/impl/AutoRefresh.java +++ b/core/src/main/java/jenkins/telemetry/impl/AutoRefresh.java @@ -54,7 +54,7 @@ public class AutoRefresh extends Telemetry { @Nonnull @Override public String getDisplayName() { - return "Use of auto refresh feature"; + return Messages.AutoRefresh_DisplayName(); } @Nonnull @@ -66,7 +66,7 @@ public class AutoRefresh extends Telemetry { @Nonnull @Override public LocalDate getEnd() { - return LocalDate.of(2019, 4, 10); + return LocalDate.of(2019, 5, 31); } @Override @@ -74,8 +74,11 @@ public class AutoRefresh extends Telemetry { if (sessionsBySetting.size() == 0) { return null; } - Map> currentSessions = new TreeMap<>(sessionsBySetting); - sessionsBySetting.clear(); + Map> currentSessions; + synchronized (sessionsBySetting) { + currentSessions = new TreeMap<>(sessionsBySetting); + sessionsBySetting.clear(); + } JSONObject payload = new JSONObject(); for (Map.Entry> entry : currentSessions.entrySet()) { @@ -94,8 +97,10 @@ public class AutoRefresh extends Telemetry { HttpSession session = request.getSession(false); if (session != null) { String sessionId = session.getId(); - sessionsBySetting.putIfAbsent(enabled, new HashSet<>()); - sessionsBySetting.get(enabled).add(sessionId); + synchronized (sessionsBySetting) { + sessionsBySetting.putIfAbsent(enabled, new HashSet<>()); + sessionsBySetting.get(enabled).add(sessionId); + } } } } diff --git a/core/src/main/resources/jenkins/telemetry/impl/AutoRefresh/description.jelly b/core/src/main/resources/jenkins/telemetry/impl/AutoRefresh/description.jelly index 0a10e901a7..e38f0f15cb 100644 --- a/core/src/main/resources/jenkins/telemetry/impl/AutoRefresh/description.jelly +++ b/core/src/main/resources/jenkins/telemetry/impl/AutoRefresh/description.jelly @@ -1,5 +1,5 @@ - This trial collects information about the "Auto Refresh" feature to determine whether use of the feature is used enough to not remove it in a future release of Jenkins. + This trial collects information about the "Auto Refresh" feature to determine whether the feature is used enough to not remove it in a future release of Jenkins. We collect the number of HTTP sessions that have the feature (typically controlled via a cookie) enabled or disabled. diff --git a/core/src/main/resources/jenkins/telemetry/impl/Messages.properties b/core/src/main/resources/jenkins/telemetry/impl/Messages.properties new file mode 100644 index 0000000000..da589e5dba --- /dev/null +++ b/core/src/main/resources/jenkins/telemetry/impl/Messages.properties @@ -0,0 +1 @@ +AutoRefresh.DisplayName = Use of auto refresh feature \ No newline at end of file