make version of ts_mon compatible with appengine

infra_libs/ts_mon/__init__.py

Index: infra_libs/ts_mon/__init__.py
diff --git a/infra_libs/ts_mon/__init__.py b/infra_libs/ts_mon/__init__.py
index b41008acd178a84e1d485375e4634af040d3164c..cb78a038de690d73c454c97b5698b8f9c92b462c 100644
--- a/infra_libs/ts_mon/__init__.py
+++ b/infra_libs/ts_mon/__init__.py
@@ -5,21 +5,9 @@
 from infra_libs.ts_mon.config import add_argparse_options
 from infra_libs.ts_mon.config import process_argparse_options
 
-from infra_libs.ts_mon.distribution import Distribution
-from infra_libs.ts_mon.distribution import FixedWidthBucketer
-from infra_libs.ts_mon.distribution import GeometricBucketer
-
-from infra_libs.ts_mon.errors import MonitoringError
-from infra_libs.ts_mon.errors import MonitoringDecreasingValueError
-from infra_libs.ts_mon.errors import MonitoringDuplicateRegistrationError
-from infra_libs.ts_mon.errors import MonitoringIncrementUnsetValueError
-from infra_libs.ts_mon.errors import MonitoringInvalidFieldTypeError
-from infra_libs.ts_mon.errors import MonitoringInvalidValueTypeError
-from infra_libs.ts_mon.errors import MonitoringTooManyFieldsError
-from infra_libs.ts_mon.errors import MonitoringNoConfiguredMonitorError
-from infra_libs.ts_mon.errors import MonitoringNoConfiguredTargetError
-
-from infra_libs.ts_mon.helpers import ScopedIncrementCounter
+from infra_libs.ts_mon.monitors import ApiMonitor
+from infra_libs.ts_mon.monitors import DiskMonitor
+from infra_libs.ts_mon.monitors import NullMonitor
 
 from infra_libs.ts_mon.interface import close
 from infra_libs.ts_mon.interface import send
@@ -27,17 +15,28 @@ from infra_libs.ts_mon.interface import flush
 from infra_libs.ts_mon.interface import register
 from infra_libs.ts_mon.interface import unregister
 
-from infra_libs.ts_mon.targets import DeviceTarget
-from infra_libs.ts_mon.targets import TaskTarget
-
-from infra_libs.ts_mon.metrics import BooleanMetric
-from infra_libs.ts_mon.metrics import CounterMetric
-from infra_libs.ts_mon.metrics import CumulativeMetric
-from infra_libs.ts_mon.metrics import DistributionMetric
-from infra_libs.ts_mon.metrics import FloatMetric
-from infra_libs.ts_mon.metrics import GaugeMetric
-from infra_libs.ts_mon.metrics import StringMetric
-
-from infra_libs.ts_mon.monitors import ApiMonitor
-from infra_libs.ts_mon.monitors import DiskMonitor
-from infra_libs.ts_mon.monitors import NullMonitor
+from infra_libs.ts_mon.common.distribution import Distribution
+from infra_libs.ts_mon.common.distribution import FixedWidthBucketer
+from infra_libs.ts_mon.common.distribution import GeometricBucketer
+
+from infra_libs.ts_mon.common.errors import MonitoringError
+from infra_libs.ts_mon.common.errors import MonitoringDecreasingValueError
+from infra_libs.ts_mon.common.errors import MonitoringDuplicateRegistrationError
+from infra_libs.ts_mon.common.errors import MonitoringIncrementUnsetValueError
+from infra_libs.ts_mon.common.errors import MonitoringInvalidFieldTypeError
+from infra_libs.ts_mon.common.errors import MonitoringInvalidValueTypeError
+from infra_libs.ts_mon.common.errors import MonitoringTooManyFieldsError
+from infra_libs.ts_mon.common.errors import MonitoringNoConfiguredMonitorError
+from infra_libs.ts_mon.common.errors import MonitoringNoConfiguredTargetError
+
+from infra_libs.ts_mon.common.helpers import ScopedIncrementCounter
+
+from infra_libs.ts_mon.common.metrics import BooleanMetric
+from infra_libs.ts_mon.common.metrics import CounterMetric
+from infra_libs.ts_mon.common.metrics import CumulativeMetric
+from infra_libs.ts_mon.common.metrics import DistributionMetric
+from infra_libs.ts_mon.common.metrics import FloatMetric
+from infra_libs.ts_mon.common.metrics import GaugeMetric
+from infra_libs.ts_mon.common.metrics import StringMetric
+
+from infra_libs.ts_mon.common.targets import TaskTarget