Skip to content
This repository was archived by the owner on Sep 17, 2025. It is now read-only.

Fix build errors #362

Merged
reyang merged 2 commits into from
Oct 26, 2018
Merged

Fix build errors #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93b0bbf
avoid using keyword in package names
reyang Oct 25, 2018
39e1d2b
fix build error
reyang Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 opencensus/common/transports/async.py → opencensus/common/transports/async_.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion opencensus/stats/exporters/prometheus_exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ class PrometheusStatsExporter(base.StatsExporter):

:type transport:
:class:`opencensus.common.transports.sync.SyncTransport` or
:class:`opencensus.common.transports.async.AsyncTransport`
:class:`opencensus.common.transports.async_.AsyncTransport`
:param transport: An instance of a Transpor to send data with.

:type collector:
Expand Down
6 changes: 3 additions & 3 deletions opencensus/stats/exporters/stackdriver_exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from opencensus.stats import aggregation
from opencensus.stats import measure
from datetime import datetime
from opencensus.common.transports import async
from opencensus.common.transports import async_
from opencensus.common.monitored_resource_util.monitored_resource_util \
import MonitoredResourceUtil

Expand Down Expand Up @@ -109,7 +109,7 @@ def __init__(self,
options=Options(),
client=None,
default_labels={},
transport=async.AsyncTransport):
transport=async_.AsyncTransport):
self._options = options
self._client = client
self._transport = transport(self)
Expand Down Expand Up @@ -448,5 +448,5 @@ def as_float(value):
"""
try:
return float(value), True
except Exception as exception: # Catch all exception including ValueError
except Exception: # Catch all exception including ValueError
return None, False
2 changes: 1 addition & 1 deletion opencensus/trace/propagation/google_cloud_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from opencensus.trace.trace_options import TraceOptions

_TRACE_CONTEXT_HEADER_NAME = 'X-Cloud-Trace-Context'
_TRACE_CONTEXT_HEADER_FORMAT = '([0-9a-f]{32})(\/([0-9a-f]{16}))?(;o=(\d+))?'
_TRACE_CONTEXT_HEADER_FORMAT = r'([0-9a-f]{32})(\/([0-9a-f]{16}))?(;o=(\d+))?'
Copy link
Copy Markdown
Contributor Author

@reyang reyang Oct 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a separate issue which was caught by the latest pylint.
The string literal used for regular expression was not properly escaped.

_TRACE_CONTEXT_HEADER_RE = re.compile(_TRACE_CONTEXT_HEADER_FORMAT)
_TRACE_ID_DELIMETER = '/'
_SPAN_ID_DELIMETER = ';'
Expand Down
48 changes: 24 additions & 24 deletions tests/unit/common/transports/test_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import mock

from opencensus.common.transports import async
from opencensus.common.transports import async_

class Test_Worker(unittest.TestCase):

Expand All @@ -34,7 +34,7 @@ def test_constructor(self):
grace_period = 10
max_batch_size = 20

worker = async._Worker(exporter, grace_period=grace_period,
worker = async_._Worker(exporter, grace_period=grace_period,
max_batch_size=max_batch_size)

self.assertEqual(worker.exporter, exporter)
Expand All @@ -45,7 +45,7 @@ def test_constructor(self):

def test_start(self):
exporter = mock.Mock()
worker = async._Worker(exporter)
worker = async_._Worker(exporter)

mock_thread, mock_atexit = self._start_worker(worker)

Expand All @@ -54,7 +54,7 @@ def test_start(self):
self.assertTrue(worker._thread.daemon)
self.assertEqual(worker._thread._target, worker._thread_main)
self.assertEqual(
worker._thread._name, async._WORKER_THREAD_NAME)
worker._thread._name, async_._WORKER_THREAD_NAME)
mock_atexit.assert_called_once_with(worker._export_pending_data)

cur_thread = worker._thread
Expand All @@ -63,7 +63,7 @@ def test_start(self):

def test_stop(self):
exporter = mock.Mock()
worker = async._Worker(exporter)
worker = async_._Worker(exporter)

mock_thread, mock_atexit = self._start_worker(worker)

Expand All @@ -73,7 +73,7 @@ def test_stop(self):

self.assertEqual(worker._queue.qsize(), 1)
self.assertEqual(
worker._queue.get(), async._WORKER_TERMINATOR)
worker._queue.get(), async_._WORKER_TERMINATOR)
self.assertFalse(worker.is_alive)
self.assertIsNone(worker._thread)

Expand All @@ -82,7 +82,7 @@ def test_stop(self):

def test__export_pending_data(self):
exporter = mock.Mock()
worker = async._Worker(exporter)
worker = async_._Worker(exporter)

self._start_worker(worker)
worker._export_pending_data()
Expand All @@ -93,7 +93,7 @@ def test__export_pending_data(self):

def test__export_pending_data_non_empty_queue(self):
exporter = mock.Mock()
worker = async._Worker(exporter)
worker = async_._Worker(exporter)

self._start_worker(worker)
worker.enqueue(mock.Mock())
Expand All @@ -103,7 +103,7 @@ def test__export_pending_data_non_empty_queue(self):

def test__export_pending_data_did_not_join(self):
exporter = mock.Mock()
worker = async._Worker(exporter)
worker = async_._Worker(exporter)

self._start_worker(worker)
worker._thread._terminate_on_join = False
Expand All @@ -114,7 +114,7 @@ def test__export_pending_data_did_not_join(self):

def test__thread_main(self):
exporter = mock.Mock()
worker = async._Worker(exporter)
worker = async_._Worker(exporter)

trace1 = {
'traceId': 'test1',
Expand All @@ -127,7 +127,7 @@ def test__thread_main(self):

worker.enqueue(trace1)
worker.enqueue(trace2)
worker._queue.put_nowait(async._WORKER_TERMINATOR)
worker._queue.put_nowait(async_._WORKER_TERMINATOR)

worker._thread_main()

Expand All @@ -136,7 +136,7 @@ def test__thread_main(self):

def test__thread_main_batches(self):
exporter = mock.Mock()
worker = async._Worker(exporter, max_batch_size=2)
worker = async_._Worker(exporter, max_batch_size=2)

# Enqueue three records and the termination signal. This should be
# enough to perform two separate batches and a third loop with just
Expand All @@ -162,7 +162,7 @@ def test__thread_main_batches(self):
worker.enqueue(trace3)
worker.enqueue(trace4)

worker._queue.put_nowait(async._WORKER_TERMINATOR)
worker._queue.put_nowait(async_._WORKER_TERMINATOR)

worker._thread_main()

Expand All @@ -178,12 +178,12 @@ def emit(self, span):
self.exported.append(span)

exporter = Exporter()
worker = async._Worker(exporter, max_batch_size=2)
worker = async_._Worker(exporter, max_batch_size=2)

# Enqueue three records and the termination signal. This should be
# enough to perform two separate batches and a third loop with just
# the exit.
worker._queue.put_nowait(async._WORKER_TERMINATOR)
worker._queue.put_nowait(async_._WORKER_TERMINATOR)

# Worker should be terminated after sending span_data1, and
# span_data2 won't be exported.
Expand Down Expand Up @@ -214,7 +214,7 @@ def emit(self, span):
raise Exception("This exporter is broken !")

exporter = Exporter()
worker = async._Worker(exporter, max_batch_size=2)
worker = async_._Worker(exporter, max_batch_size=2)

span_data0 = [mock.Mock()]
span_data1 = [mock.Mock()]
Expand All @@ -223,7 +223,7 @@ def emit(self, span):
worker.enqueue(span_data0)
worker.enqueue(span_data1)
worker.enqueue(span_data2)
worker.enqueue(async._WORKER_TERMINATOR)
worker.enqueue(async_._WORKER_TERMINATOR)

worker._thread_main()

Expand All @@ -243,7 +243,7 @@ def test_flush(self):
from six.moves import queue

exporter = mock.Mock()
worker = async._Worker(exporter)
worker = async_._Worker(exporter)
worker._queue = mock.Mock(spec=queue.Queue)

# Queue is empty, should not block.
Expand All @@ -255,24 +255,24 @@ class TestAsyncTransport(unittest.TestCase):

def test_constructor(self):
patch_worker = mock.patch(
'opencensus.common.transports.async._Worker',
'opencensus.common.transports.async_._Worker',
autospec=True)
exporter = mock.Mock()

with patch_worker as mock_worker:
transport = async.AsyncTransport(exporter)
transport = async_.AsyncTransport(exporter)

self.assertTrue(transport.worker.start.called)
self.assertEqual(transport.exporter, exporter)

def test_export(self):
patch_worker = mock.patch(
'opencensus.common.transports.async._Worker',
'opencensus.common.transports.async_._Worker',
autospec=True)
exporter = mock.Mock()

with patch_worker as mock_worker:
transport = async.AsyncTransport(exporter)
transport = async_.AsyncTransport(exporter)

trace = {
'traceId': 'test',
Expand All @@ -285,12 +285,12 @@ def test_export(self):

def test_flush(self):
patch_worker = mock.patch(
'opencensus.common.transports.async._Worker',
'opencensus.common.transports.async_._Worker',
autospec=True)
exporter = mock.Mock()

with patch_worker as mock_worker:
transport = async.AsyncTransport(exporter)
transport = async_.AsyncTransport(exporter)

transport.flush()

Expand Down