moved folders

Author: anamnavi

opencensus/grpc/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2018, OpenCensus Authors
+# Copyright 2017, OpenCensus Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -10,4 +10,10 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
+
+
+import measure
+import rpc_measure_constants
+import rpc_view_constants
+

opencensus/trace/measure.py opencensus/grpc/measure.pyopencensus/trace/measure.py renamed to opencensus/grpc/measure.py

@@ -1,5 +1,9 @@
 from opencensus.tags import tag_key
-import measure
+from opencensus.stats.measure import BaseMeasure
+from opencensus.stats.measure import MeasureInt
+from opencensus.stats.measure import MeasureFloat
+
+# import measure
 
 
 class RPCMeasureConstants:
@@ -36,109 +40,111 @@ def __init__(self):
 
 
         # client measures
-        self.grpc_client_sent_messages_per_rpc = measure.Measure(
+        self.grpc_client_sent_messages_per_rpc = MeasureInt(
             name="grpc.io/client/sent_messages_per_rpc",
             description="Number of messages sent in the RPC",
             unit=self.count)
 
-        self.grpc_client_sent_bytes_per_rpc = measure.Measure(
+        self.grpc_client_sent_bytes_per_rpc = MeasureFloat(
             name="grpc.io/client/sent_bytes_per_rpc",
             description="Total bytes sent across all request messages per RPC",
             unit=self.byte)
 
-        self.grpc_client_received_messages_per_rpc = measure.Measure(
+        self.grpc_client_received_messages_per_rpc = MeasureInt(
             name="grpc.io/client/received_messages_per_rpc",
             description="Number of response messages received per RPC",
             unit=self.count)
 
-        self.grpc_client_received_bytes_per_rpc = measure.Measure(
+        self.grpc_client_received_bytes_per_rpc = MeasureFloat(
             name="grpc.io/client/received_bytes_per_rpc",
             description="Total bytes received across all response messages per RPC",
             unit=self.byte)
 
-        self.grpc_client_roundtrip_latency = measure.Measure(
+        self.grpc_client_roundtrip_latency = MeasureFloat(
             name="grpc.io/client/roundtrip_latency",
             description="Time between first byte of request sent to"
                         " last byte of response received or terminal error.",
             unit=self.millisecond)
 
-        self.grpc_client_server_latency = measure.Measure(
+        self.grpc_client_server_latency = MeasureFloat(
             name="grpc.io/client/server_latency",
             description="Server latency in msecs",
             unit=self.millisecond)
 
-        self.grpc_client_started_rpcs = measure.Measure(
+        self.grpc_client_started_rpcs = MeasureInt(
             name="grpc.io/client/started_rpcs",
             description="Number of started client RPCs.",
             unit=self.count)
 
-        self.grpc_client_sent_messages_per_method = measure.Measure(
+        self.grpc_client_sent_messages_per_method = MeasureInt(
             name="grpc.io/client/sent_messages_per_method",
             description="Total messages sent per method.",
             unit=self.count)
 
-        self.grpc_client_received_messages_per_method = measure.Measure(
+        self.grpc_client_received_messages_per_method = MeasureInt(
             name="grpc.io/client/received_messages_per_method",
             description="Total messages received per method.",
             unit=self.count)
 
-        self.grpc_client_sent_bytes_per_method = measure.Measure(
+        self.grpc_client_sent_bytes_per_method = MeasureFloat(
             name="grpc.io/client/sent_bytes_per_method",
             description="Total bytes sent per method, recorded real-time as bytes are sent.",
             unit=self.byte)
 
-        self.grpc_client_received_bytes_per_method = measure.Measure(
+        self.grpc_client_received_bytes_per_method = MeasureFloat(
             name="grpc.io/client/received_bytes_per_method",
             description="Total bytes received per method,"
                         " recorded real-time as bytes are received.",
             unit=self.byte)
 
         # server measures
-        self.grpc_server_received_messages_per_rpc = measure.Measure(
+        self.grpc_server_received_messages_per_rpc = MeasureInt(
             name="grpc.io/server/received_messages_per_rpc",
             description="Number of messages received in each RPC",
             unit=self.count)
-        self.grpc_server_received_bytes_per_rpc = measure.Measure(
+
+        self.grpc_server_received_bytes_per_rpc = MeasureFloat(
             name="grpc.io/server/received_bytes_per_rpc",
             description="Total bytes received across all messages per RPC",
             unit=self.byte)
 
-        self.grpc_server_sent_messages_per_rpc = measure.Measure(
+        self.grpc_server_sent_messages_per_rpc = MeasureInt(
             name="grpc.io/server/sent_messages_per_rpc",
             description="Number of messages sent in each RPC",
             unit=self.count)
 
-        self.grpc_server_sent_bytes_per_rpc = measure.Measure(
+        self.grpc_server_sent_bytes_per_rpc = MeasureFloat(
             name="grpc.io/server/sent_bytes_per_rpc",
             description="Total bytes sent across all response messages per RPC",
             unit=self.byte)
-        self.grpc_server_server_latency = measure.Measure(
+
+        self.grpc_server_server_latency = MeasureFloat(
             name="grpc.io/server/server_latency",
             description="Time between first byte of request received"
                         " to last byte of response sent or terminal error.",
             unit=self.millisecond)
 
-        self.grpc_server_started_rpcs = measure.Measure(
+        self.grpc_server_started_rpcs = MeasureInt(
             name="grpc.io/server/started_rpcs",
             description="Number of started server RPCs.",
             unit=self.count)
 
-        self.grpc_server_sent_messages_per_method = measure.Measure(
+        self.grpc_server_sent_messages_per_method = MeasureInt(
             name="grpc.io/server/sent_messages_per_method",
             description="Total messages sent per method.",
             unit=self.count)
 
-        self.grpc_server_received_messages_per_method = measure.Measure(
+        self.grpc_server_received_messages_per_method = MeasureInt(
             name="grpc.io/server/received_messages_per_method",
             description="Total messages received per method.",
             unit=self.count)
 
-        self.grpc_server_sent_bytes_per_method = measure.Measure(
+        self.grpc_server_sent_bytes_per_method = MeasureFloat(
             name="grpc.io/server/sent_bytes_per_method",
             description="Total bytes sent per method, recorded real-time as bytes are sent.",
             unit=self.byte)
 
-        self.grpc_server_received_bytes_per_method = measure.Measure(
+        self.grpc_server_received_bytes_per_method = MeasureFloat(
             name="grpc.io/server/received_bytes_per_method",
             description="Total bytes received per method, recorded real-time as bytes are received.",
             unit=self.byte)

opencensus/trace/rpc_m_c_test.py opencensus/grpc/rpc_m_c_test.pyopencensus/trace/rpc_m_c_test.py renamed to opencensus/grpc/rpc_m_c_test.py

@@ -12,6 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import string
+
+NAME_MAX_LENGTH = 255
+ERROR_MSG_INVALID_NAME = "Name should be a ASCII string with a length " \
+                         "no greater than " + str(NAME_MAX_LENGTH) + " characters."
+
 
 class BaseMeasure(object):
     """ A measure is the type of metric that is being recorded with
@@ -28,6 +34,8 @@ class BaseMeasure(object):
 
     """
     def __init__(self, name, description, unit=None):
+        if len(name) > NAME_MAX_LENGTH or not all(ch in string.printable for ch in name):
+            raise ValueError(ERROR_MSG_INVALID_NAME)
         self._name = name
         self._description = description
         self._unit = unit

opencensus/trace/rpc_measure_constants.py opencensus/grpc/rpc_measure_constants.pyopencensus/trace/rpc_measure_constants.py renamed to opencensus/grpc/rpc_measure_constants.py

@@ -1,5 +1,9 @@
 import unittest
-import measure
+from opencensus.stats.measure import BaseMeasure
+from opencensus.stats.measure import MeasureInt
+from opencensus.stats.measure import MeasureFloat
+# import measure
+
 
 class MeasureTest(unittest.TestCase):
     """
@@ -10,9 +14,9 @@ def setUp(self):
         """
         setup performed before each test
         """
-        self.measure = measure.Measure("grpc_client_sent_messages_per_rpc",
-                                       "Number of messages sent in the RPC",
-                                       "1")
+        self.measure = MeasureInt("grpc.io/client/sent_messages_per_rpc",
+                                  "Number of messages sent in the RPC",
+                                  "1")  # grpc_client_sent_messages_per_rpc
         self.measure_exceeds_max_length = None
         self.measure_non_printable = None
 
@@ -21,7 +25,7 @@ def test_measure_name(self):
         tests measure module's get_name() method
         """
         self.assertEqual(self.measure.name,
-                         "grpc_client_sent_messages_per_rpc",
+                         "grpc.io/client/sent_messages_per_rpc",
                          "get_name() method not working")
 
     def test_measure_description(self):
@@ -46,7 +50,7 @@ def test_long_name_init(self):
         and assert that it raises ValueError as expected
         """
         with self.assertRaises(ValueError):
-            self.measure_exceeds_max_length = measure.Measure("a"*256, "some description", "1")
+            self.measure_exceeds_max_length = MeasureFloat("a"*256, "some description", "1")
 
     def test_unprintable_name_init(self):
         """
@@ -56,7 +60,7 @@ def test_unprintable_name_init(self):
         with self.assertRaises(ValueError):
             chr_list = ['0x41', '0x1B', '0x42']
             non_printable_str = "".join([chr(int(x, 16)) for x in chr_list])  # 'AB\x1b'
-            self.measure_non_printable = measure.Measure(non_printable_str, "some description", "1")
+            self.measure_non_printable = MeasureInt(non_printable_str, "some description", "1")
 
 
 if __name__ == '__main__':