1540844: Rename metrics package -> private

components/service/glean/scripts/sdk_generator.gradle

@@ -20,7 +20,7 @@ import groovy.json.JsonOutput
 // so that it will be shared between all libraries that use glean.  This is
 // important because it is approximately 300MB in installed size.
 
-String GLEAN_PARSER_VERSION = "0.20.2"
+String GLEAN_PARSER_VERSION = "0.21.0"
 // The version of Miniconda is explicitly specified.
 // Miniconda3-4.5.12 is known to not work on Windows.
 String MINICONDA_VERSION = "4.5.11"

components/service/glean/src/main/java/mozilla/components/service/glean/error/ErrorRecording.kt

@@ -7,9 +7,9 @@ package mozilla.components.service.glean.error
 
 import android.support.annotation.VisibleForTesting
 import mozilla.components.service.glean.Dispatchers
-import mozilla.components.service.glean.metrics.CommonMetricData
-import mozilla.components.service.glean.metrics.CounterMetricType
-import mozilla.components.service.glean.metrics.Lifetime
+import mozilla.components.service.glean.private.CommonMetricData
+import mozilla.components.service.glean.private.CounterMetricType
+import mozilla.components.service.glean.private.Lifetime
 import mozilla.components.service.glean.storages.CountersStorageEngine
 import mozilla.components.support.base.log.logger.Logger
 

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/BooleanMetricType.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/BooleanMetricType.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 import android.support.annotation.VisibleForTesting
 import mozilla.components.service.glean.Dispatchers

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/CommonMetricData.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/CommonMetricData.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 import mozilla.components.service.glean.Glean
 import mozilla.components.support.base.log.logger.Logger

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/CounterMetricType.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/CounterMetricType.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 import android.support.annotation.VisibleForTesting
 import mozilla.components.service.glean.Dispatchers

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/DatetimeMetricType.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/DatetimeMetricType.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 import android.support.annotation.VisibleForTesting
 import mozilla.components.service.glean.Dispatchers

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/EventMetricType.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/EventMetricType.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 import android.os.SystemClock
 import android.support.annotation.VisibleForTesting

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/HistogramType.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/HistogramType.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 /**
  * Enumeration of the different kinds of histograms supported by metrics based on histograms.

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/LabeledMetricType.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/LabeledMetricType.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 import mozilla.components.service.glean.storages.StorageEngine
 import mozilla.components.service.glean.storages.StorageEngineManager

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/StringListMetricType.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/StringListMetricType.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 import android.support.annotation.VisibleForTesting
 import mozilla.components.service.glean.Dispatchers

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/StringMetricType.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/StringMetricType.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 import android.support.annotation.VisibleForTesting
 import mozilla.components.service.glean.Dispatchers

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/TimeUnit.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/TimeUnit.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 /**
  * Enumeration of different resolutions supported by

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/TimespanMetricType.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/TimespanMetricType.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 import android.support.annotation.VisibleForTesting
 import mozilla.components.service.glean.storages.TimespansStorageEngine

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/TimingDistributionMetricType.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/TimingDistributionMetricType.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 import android.support.annotation.VisibleForTesting
 import mozilla.components.service.glean.Dispatchers

components/service/glean/src/main/java/mozilla/components/service/glean/metrics/UuidMetricType.kt → components/service/glean/src/main/java/mozilla/components/service/glean/private/UuidMetricType.kt

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.service.glean.metrics
+package mozilla.components.service.glean.private
 
 import android.support.annotation.VisibleForTesting
 import mozilla.components.service.glean.Dispatchers

components/service/glean/src/main/java/mozilla/components/service/glean/scheduler/MetricsPingScheduler.kt

@@ -18,7 +18,7 @@ import mozilla.components.service.glean.Glean
 import mozilla.components.support.base.log.logger.Logger
 import mozilla.components.service.glean.utils.getISOTimeString
 import mozilla.components.service.glean.utils.parseISOTimeString
-import mozilla.components.service.glean.metrics.TimeUnit
+import mozilla.components.service.glean.private.TimeUnit
 import java.util.Calendar
 import java.util.Date
 import java.util.concurrent.TimeUnit as AndroidTimeUnit

components/service/glean/src/main/java/mozilla/components/service/glean/storages/BooleansStorageEngine.kt

@@ -6,7 +6,7 @@ package mozilla.components.service.glean.storages
 
 import android.annotation.SuppressLint
 import android.content.SharedPreferences
-import mozilla.components.service.glean.metrics.CommonMetricData
+import mozilla.components.service.glean.private.CommonMetricData
 import mozilla.components.support.base.log.logger.Logger
 
 /**

components/service/glean/src/main/java/mozilla/components/service/glean/storages/CountersStorageEngine.kt

@@ -8,7 +8,7 @@ import android.annotation.SuppressLint
 import android.content.SharedPreferences
 import mozilla.components.service.glean.error.ErrorRecording.recordError
 import mozilla.components.service.glean.error.ErrorRecording.ErrorType
-import mozilla.components.service.glean.metrics.CommonMetricData
+import mozilla.components.service.glean.private.CommonMetricData
 import mozilla.components.support.base.log.logger.Logger
 
 /**

components/service/glean/src/main/java/mozilla/components/service/glean/storages/DatetimesStorageEngine.kt

@@ -6,8 +6,8 @@ package mozilla.components.service.glean.storages
 
 import android.annotation.SuppressLint
 import android.content.SharedPreferences
-import mozilla.components.service.glean.metrics.CommonMetricData
-import mozilla.components.service.glean.metrics.DatetimeMetricType
+import mozilla.components.service.glean.private.CommonMetricData
+import mozilla.components.service.glean.private.DatetimeMetricType
 import mozilla.components.service.glean.utils.getISOTimeString
 import mozilla.components.service.glean.utils.parseISOTimeString
 import mozilla.components.support.base.log.logger.Logger

components/service/glean/src/main/java/mozilla/components/service/glean/storages/EventsStorageEngine.kt

@@ -18,8 +18,8 @@ import kotlinx.coroutines.withTimeout
 import mozilla.components.service.glean.Dispatchers
 import mozilla.components.service.glean.error.ErrorRecording.recordError
 import mozilla.components.service.glean.error.ErrorRecording.ErrorType
-import mozilla.components.service.glean.metrics.EventMetricType
-import mozilla.components.service.glean.metrics.Lifetime
+import mozilla.components.service.glean.private.EventMetricType
+import mozilla.components.service.glean.private.Lifetime
 import mozilla.components.service.glean.utils.ensureDirectoryExists
 import mozilla.components.support.base.log.logger.Logger
 import org.json.JSONArray