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

Commit e7d4524

Browse files
reyangreyang
authored
Refactor exporters into ext packages (#550)
* refactor exporters into ext packages * fix doc and system test * fix system test
1 parent 724bd0b commit e7d4524

48 files changed

Lines changed: 382 additions & 105 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ This example shows how to report the traces to Stackdriver Trace:
142142

143143
.. code:: python
144144
145-
from opencensus.trace.exporters import stackdriver_exporter
145+
from opencensus.ext.stackdriver import trace_exporter as stackdriver_exporter
146146
from opencensus.trace import tracer as tracer_module
147147
148148
exporter = stackdriver_exporter.StackdriverExporter(
@@ -166,7 +166,7 @@ This example shows how to configure OpenCensus to use a background thread:
166166
.. code:: python
167167
168168
from opencensus.common.transports.async_ import AsyncTransport
169-
from opencensus.trace.exporters import stackdriver_exporter
169+
from opencensus.ext.stackdriver import trace_exporter as stackdriver_exporter
170170
from opencensus.trace import tracer as tracer_module
171171
172172
exporter = stackdriver_exporter.StackdriverExporter(

‎contrib/opencensus-ext-django/examples/app/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
'SAMPLER':
6969
'opencensus.trace.samplers.always_on.AlwaysOnSampler',
7070
'EXPORTER':
71-
'opencensus.trace.exporters.stackdriver_exporter.StackdriverExporter',
71+
'opencensus.ext.stackdriver.trace_exporter.StackdriverExporter',
7272
'PROPAGATOR':
7373
'opencensus.trace.propagation.google_cloud_format.'
7474
'GoogleCloudFormatPropagator',

‎contrib/opencensus-ext-django/tests/test_django_middleware.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
from django.test.utils import teardown_test_environment
2020

2121
from opencensus.common.transports import sync
22-
from opencensus.ext.ocagent import trace_exporter
22+
from opencensus.ext.jaeger import trace_exporter as jaeger_exporter
23+
from opencensus.ext.ocagent import trace_exporter as ocagent_exporter
24+
from opencensus.ext.zipkin import trace_exporter as zipkin_exporter
2325
from opencensus.trace import execution_context
2426
from opencensus.trace import span as span_module
2527
from opencensus.trace import utils
2628
from opencensus.trace.exporters import print_exporter
27-
from opencensus.trace.exporters import zipkin_exporter
28-
from opencensus.trace.exporters import jaeger_exporter
2929
from opencensus.trace.propagation import google_cloud_format
3030
from opencensus.trace.samplers import always_on
3131
from opencensus.trace.samplers import probability
@@ -216,7 +216,7 @@ def test_constructor_ocagent_trace_exporter(self):
216216

217217
patch_ocagent_trace = mock.patch(
218218
'opencensus.ext.django.config.settings.EXPORTER',
219-
trace_exporter.TraceExporter)
219+
ocagent_exporter.TraceExporter)
220220

221221
patch_params = mock.patch(
222222
'opencensus.ext.django.config.settings.params',
@@ -227,14 +227,14 @@ def test_constructor_ocagent_trace_exporter(self):
227227

228228
self.assertIs(middleware._sampler, always_on.AlwaysOnSampler)
229229
self.assertIs(
230-
middleware._exporter, trace_exporter.TraceExporter)
230+
middleware._exporter, ocagent_exporter.TraceExporter)
231231
self.assertIs(
232232
middleware._propagator,
233233
google_cloud_format.GoogleCloudFormatPropagator)
234234

235235
assert isinstance(middleware.sampler, always_on.AlwaysOnSampler)
236236
assert isinstance(
237-
middleware.exporter, trace_exporter.TraceExporter)
237+
middleware.exporter, ocagent_exporter.TraceExporter)
238238
assert isinstance(
239239
middleware.propagator,
240240
google_cloud_format.GoogleCloudFormatPropagator)
@@ -254,7 +254,7 @@ def test_constructor_ocagent_trace_exporter_default_endpoint(self):
254254

255255
patch_ocagent_trace = mock.patch(
256256
'opencensus.ext.django.config.settings.EXPORTER',
257-
trace_exporter.TraceExporter)
257+
ocagent_exporter.TraceExporter)
258258

259259
patch_params = mock.patch(
260260
'opencensus.ext.django.config.settings.params',
@@ -265,7 +265,7 @@ def test_constructor_ocagent_trace_exporter_default_endpoint(self):
265265

266266
self.assertEqual(middleware.exporter.service_name, service_name)
267267
self.assertEqual(middleware.exporter.endpoint,
268-
trace_exporter.DEFAULT_ENDPOINT)
268+
ocagent_exporter.DEFAULT_ENDPOINT)
269269

270270
def test_constructor_probability_sampler(self):
271271
from opencensus.ext.django import middleware

‎contrib/opencensus-ext-flask/examples/custom.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
import hello_world_pb2
2525
import hello_world_pb2_grpc
26+
from opencensus.ext.flask.flask_middleware import FlaskMiddleware
27+
from opencensus.ext.grpc import client_interceptor
28+
from opencensus.ext.stackdriver import trace_exporter as stackdriver_exporter
2629
from opencensus.trace import config_integration
27-
from opencensus.trace.exporters import stackdriver_exporter
28-
from opencensus.trace.ext.flask.flask_middleware import FlaskMiddleware
29-
from opencensus.trace.ext.grpc import client_interceptor
3030
from opencensus.trace.samplers import probability
3131

3232
INTEGRATIONS = ['mysql', 'postgresql', 'sqlalchemy', 'requests']

‎contrib/opencensus-ext-flask/tests/test_flask_middleware.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
import mock
2323

2424
from opencensus.ext.flask import flask_middleware
25-
from opencensus.ext.ocagent import trace_exporter
25+
from opencensus.ext.jaeger import trace_exporter as jaeger_exporter
26+
from opencensus.ext.ocagent import trace_exporter as ocagent_exporter
27+
from opencensus.ext.stackdriver import trace_exporter as stackdriver_exporter
28+
from opencensus.ext.zipkin import trace_exporter as zipkin_exporter
2629
from opencensus.trace import execution_context
2730
from opencensus.trace import span as span_module
2831
from opencensus.trace import span_data
2932
from opencensus.trace import stack_trace
3033
from opencensus.trace import status
3134
from opencensus.trace.blank_span import BlankSpan
32-
from opencensus.trace.exporters import jaeger_exporter
3335
from opencensus.trace.exporters import print_exporter
34-
from opencensus.trace.exporters import stackdriver_exporter
35-
from opencensus.trace.exporters import zipkin_exporter
3636
from opencensus.trace.propagation import google_cloud_format
3737
from opencensus.trace.samplers import always_off, always_on, ProbabilitySampler
3838
from opencensus.trace.span_context import SpanContext
@@ -240,7 +240,7 @@ def test_init_app_config_ocagent_trace_exporter(self):
240240
app.config = {
241241
'OPENCENSUS_TRACE': {
242242
'SAMPLER': ProbabilitySampler,
243-
'EXPORTER': trace_exporter.TraceExporter,
243+
'EXPORTER': ocagent_exporter.TraceExporter,
244244
'PROPAGATOR': google_cloud_format.GoogleCloudFormatPropagator,
245245
},
246246
'OPENCENSUS_TRACE_PARAMS': {
@@ -254,7 +254,7 @@ def test_init_app_config_ocagent_trace_exporter(self):
254254

255255
self.assertIs(middleware.app, app)
256256
assert isinstance(
257-
middleware.exporter, trace_exporter.TraceExporter)
257+
middleware.exporter, ocagent_exporter.TraceExporter)
258258
self.assertEqual(middleware.exporter.service_name, 'foo')
259259
self.assertEqual(middleware.exporter.endpoint, 'localhost:50001')
260260

@@ -266,7 +266,7 @@ def test_init_app_config_ocagent_trace_exporter_default_endpoint(self):
266266
app.config = {
267267
'OPENCENSUS_TRACE': {
268268
'SAMPLER': ProbabilitySampler,
269-
'EXPORTER': trace_exporter.TraceExporter,
269+
'EXPORTER': ocagent_exporter.TraceExporter,
270270
'PROPAGATOR': google_cloud_format.GoogleCloudFormatPropagator,
271271
},
272272
'OPENCENSUS_TRACE_PARAMS': {
@@ -279,10 +279,10 @@ def test_init_app_config_ocagent_trace_exporter_default_endpoint(self):
279279

280280
self.assertIs(middleware.app, app)
281281
assert isinstance(
282-
middleware.exporter, trace_exporter.TraceExporter)
282+
middleware.exporter, ocagent_exporter.TraceExporter)
283283
self.assertEqual(middleware.exporter.service_name, 'foo')
284284
self.assertEqual(middleware.exporter.endpoint,
285-
trace_exporter.DEFAULT_ENDPOINT)
285+
ocagent_exporter.DEFAULT_ENDPOINT)
286286

287287
self.assertTrue(app.before_request.called)
288288
self.assertTrue(app.after_request.called)

‎contrib/opencensus-ext-grpc/examples/hello_world_client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import hello_world_pb2_grpc
2121

2222
from opencensus.trace.tracer import Tracer
23-
from opencensus.trace.exporters import stackdriver_exporter
24-
from opencensus.trace.ext.grpc import client_interceptor
23+
from opencensus.ext.grpc import client_interceptor
24+
from opencensus.ext.stackdriver import trace_exporter as stackdriver_exporter
2525

2626
HOST_PORT = 'localhost:50051'
2727

‎contrib/opencensus-ext-grpc/examples/hello_world_server.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import hello_world_pb2
2121
import hello_world_pb2_grpc
2222

23-
from opencensus.trace.ext.grpc import server_interceptor
23+
from opencensus.ext.grpc import server_interceptor
24+
from opencensus.ext.stackdriver import trace_exporter as stackdriver_exporter
2425
from opencensus.trace.samplers import always_on
25-
from opencensus.trace.exporters import stackdriver_exporter
2626

2727
_ONE_DAY_IN_SECONDS = 60 * 60 * 24
2828

‎contrib/opencensus-ext-jaeger/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Changelog
2+
3+
## Unreleased
4+
5+
- Initial version.

‎contrib/opencensus-ext-jaeger/README.rst‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
OpenCensus Jaeger Exporter
2+
============================================================================
3+
4+
Installation
5+
------------
6+
7+
::
8+
9+
pip install opencensus-ext-jaeger
10+
11+
Usage
12+
-----
13+
14+
.. code:: python
15+
16+
# TBD

‎contrib/opencensus-ext-jaeger/opencensus/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__path__ = __import__('pkgutil').extend_path(__path__, __name__)

0 commit comments

Comments
 (0)