Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: infra_libs/ts_mon/common/metrics.py

Issue 1260293009: make version of ts_mon compatible with appengine (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master
Patch Set: set correct metric and target fields Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« infra_libs/http_metrics.py ('K') | « infra_libs/ts_mon/common/helpers.py ('k') | infra_libs/ts_mon/common/targets.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: infra_libs/ts_mon/common/metrics.py
diff --git a/infra_libs/ts_mon/metrics.py b/infra_libs/ts_mon/common/metrics.py
similarity index 97%
rename from infra_libs/ts_mon/metrics.py
rename to infra_libs/ts_mon/common/metrics.py
index fa986e6e115441c8eaaf97f57c1577658d5e0337..589f49761eba4df79978acf23060fadac9b9393c 100644
--- a/infra_libs/ts_mon/metrics.py
+++ b/infra_libs/ts_mon/common/metrics.py
@@ -9,11 +9,16 @@ import copy
import threading
import time
-from monacq.proto import metrics_pb2
-
-from infra_libs.ts_mon import distribution
-from infra_libs.ts_mon import errors
-from infra_libs.ts_mon import interface
+try:
+ from infra_libs.ts_mon import interface
+ from infra_libs.ts_mon.common import distribution
+ from infra_libs.ts_mon.common import errors
+ from monacq.proto import metrics_pb2
+except ImportError:
+ from gae_ts_mon import interface
+ from gae_ts_mon.common import distribution
+ from gae_ts_mon.common import errors
+ from gae_ts_mon.proto import metrics_pb2
MICROSECONDS_PER_SECOND = 1000000
« infra_libs/http_metrics.py ('K') | « infra_libs/ts_mon/common/helpers.py ('k') | infra_libs/ts_mon/common/targets.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698