Skip to content

Commit a131d1a

Browse files
author
Andrew Xue
committed
address comments
1 parent 7732d03 commit a131d1a

File tree

17 files changed

+23
-134
lines changed

17 files changed

+23
-134
lines changed

docs/examples/cloud_trace_exporter/README.rst

+4-28
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,17 @@ To use this exporter you first need to:
1818
1919
pip install opentelemetry-api
2020
pip install opentelemetry-sdk
21-
pip install opentelemetry-ext-cloud-trace
21+
pip install opentelemetry-exporter-cloud-trace
2222
2323
* Run example
2424

2525
.. code-block:: sh
2626
2727
python basic_trace.py
2828
29-
Server-Client Example
30-
--------------------------
31-
32-
* Installation
33-
34-
.. code-block:: sh
35-
36-
pip install flask
37-
pip install requests
38-
pip install opentelemetry-api
39-
pip install opentelemetry-sdk
40-
pip install opentelemetry-ext-cloud-trace
41-
pip install opentelemetry-ext-flask
42-
43-
* Start server
44-
45-
.. code-block:: sh
46-
47-
python server.py
48-
49-
* Run client
50-
51-
.. code-block:: sh
52-
53-
python client.py
54-
5529
Checking Output
5630
--------------------------
5731

58-
After running any of these examples, you can go to `Cloud Trace overview <https://console.cloud.google.com/traces/list>`_ to see the results.
32+
After running any of these examples, you can go to `Cloud Trace overview <https://console.cloud.google.com/traces/list>`_ to see the results.
33+
34+
* `More information about exporters in general <https://opentelemetry-python.readthedocs.io/en/stable/getting-started.html#configure-exporters-to-emit-spans-elsewhere>`_

docs/examples/cloud_trace_exporter/basic_trace.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from opentelemetry import trace
2-
from opentelemetry.ext.cloud_trace import CloudTraceSpanExporter
2+
from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter
33
from opentelemetry.sdk.trace import TracerProvider
44
from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor
55

docs/examples/cloud_trace_exporter/client.py

-34
This file was deleted.

docs/examples/cloud_trace_exporter/server.py

-46
This file was deleted.

docs/ext/cloud_trace/cloud_trace.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OpenTelemetry Cloud Trace Exporter
22
==================================
33

4-
.. automodule:: opentelemetry.ext.cloud_trace
4+
.. automodule:: opentelemetry.exporter.cloud_trace
55
:members:
66
:undoc-members:
77
:show-inheritance:

ext/opentelemetry-ext-cloud-trace/README.rst renamed to ext/opentelemetry-exporter-cloud-trace/README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Installation
88

99
::
1010

11-
pip install opentelemetry-ext-cloud-trace
11+
pip install opentelemetry-exporter-cloud-trace
1212

1313
Usage
1414
-----
1515

1616
.. code:: python
1717
1818
from opentelemetry import trace
19-
from opentelemetry.ext.cloud_trace import CloudTraceSpanExporter
19+
from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter
2020
from opentelemetry.sdk.trace import TracerProvider
2121
from opentelemetry.sdk.trace.export import (
2222
SimpleExportSpanProcessor,

ext/opentelemetry-ext-cloud-trace/setup.cfg renamed to ext/opentelemetry-exporter-cloud-trace/setup.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
# limitations under the License.
1414
#
1515
[metadata]
16-
name = opentelemetry-ext-cloud-trace
16+
name = opentelemetry-exporter-cloud-trace
1717
description = Cloud Trace integration for OpenTelemetry
1818
long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python/ext/opentelemetry-ext-cloud-trace
22+
url = https://github.com/open-telemetry/opentelemetry-python/ext/opentelemetry-exporter-cloud-trace
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

ext/opentelemetry-ext-cloud-trace/setup.py renamed to ext/opentelemetry-exporter-cloud-trace/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
BASE_DIR = os.path.dirname(__file__)
1919
VERSION_FILENAME = os.path.join(
20-
BASE_DIR, "src", "opentelemetry", "ext", "cloud_trace", "version.py"
20+
BASE_DIR, "src", "opentelemetry", "exporter", "cloud_trace", "version.py"
2121
)
2222
PACKAGE_INFO = {}
2323
with open(VERSION_FILENAME) as f:

ext/opentelemetry-ext-cloud-trace/src/opentelemetry/ext/cloud_trace/__init__.py renamed to ext/opentelemetry-exporter-cloud-trace/src/opentelemetry/exporter/cloud_trace/__init__.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
.. code-block:: python
2222
2323
from opentelemetry import trace
24-
from opentelemetry.ext.cloud_trace import CloudTraceSpanExporter
24+
from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter
2525
from opentelemetry.sdk.trace import TracerProvider
2626
from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor
2727
@@ -88,25 +88,25 @@ def export(self, spans: Sequence[Span]) -> SpanExportResult:
8888
spans: Tuple of spans to export
8989
"""
9090
cloud_trace_spans = []
91-
for span in self.translate_to_cloud_trace(spans):
91+
for span in self._translate_to_cloud_trace(spans):
9292
try:
9393
cloud_trace_spans.append(self.client.create_span(**span))
9494
# pylint: disable=broad-except
9595
except Exception as ex:
96-
logger.warning("Error %s when creating span %s", ex, span)
96+
logger.error("Error when creating span %s", span, exc_info=ex)
9797

9898
try:
9999
self.client.batch_write_spans(
100100
"projects/{}".format(self.project_id), cloud_trace_spans,
101101
)
102102
# pylint: disable=broad-except
103103
except Exception as ex:
104-
logger.warning("Error while writing to Cloud Trace: %s", ex)
104+
logger.error("Error while writing to Cloud Trace", exc_info=ex)
105105
return SpanExportResult.FAILURE
106106

107107
return SpanExportResult.SUCCESS
108108

109-
def translate_to_cloud_trace(
109+
def _translate_to_cloud_trace(
110110
self, spans: Sequence[Span]
111111
) -> List[Dict[str, Any]]:
112112
"""Translate the spans to Cloud Trace format.
@@ -286,7 +286,7 @@ def _format_attribute_value(value: types.AttributeValue) -> AttributeValue:
286286
value = _get_truncatable_str_object(value)
287287
elif isinstance(value, float):
288288
value_type = "string_value"
289-
value = _get_truncatable_str_object(str(value))
289+
value = _get_truncatable_str_object("{:0.4f}".format(value))
290290
else:
291291
logger.warning(
292292
"ignoring attribute value %s of type %s. Values type must be one "

ext/opentelemetry-ext-cloud-trace/tests/test_cloud_trace_exporter.py renamed to ext/opentelemetry-exporter-cloud-trace/tests/test_cloud_trace_exporter.py

+3-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from google.cloud.trace_v2.proto.trace_pb2 import TruncatableString
2121
from google.rpc.status_pb2 import Status
2222

23-
from opentelemetry.ext.cloud_trace import (
23+
from opentelemetry.exporter.cloud_trace import (
2424
CloudTraceSpanExporter,
2525
_extract_attributes,
2626
_extract_events,
@@ -29,15 +29,15 @@
2929
_truncate_str,
3030
)
3131
from opentelemetry.sdk.trace import Event, Span
32-
from opentelemetry.trace import Link, SpanContext, SpanKind
32+
from opentelemetry.trace import DefaultSpan, Link, SpanContext, SpanKind
3333
from opentelemetry.trace.status import Status as SpanStatus
3434
from opentelemetry.trace.status import StatusCanonicalCode
3535

3636

3737
class TestCloudTraceSpanExporter(unittest.TestCase):
3838
def setUp(self):
3939
self.client_patcher = mock.patch(
40-
"opentelemetry.ext.cloud_trace.TraceServiceClient"
40+
"opentelemetry.exporter.cloud_trace.TraceServiceClient"
4141
)
4242
self.client_patcher.start()
4343
self.project_id = "PROJECT"
@@ -254,6 +254,3 @@ def test_extract_links(self):
254254
]
255255
),
256256
)
257-
258-
def test_truncate_string(self):
259-
self.assertEqual("111", _truncate_str("1111", 3)[0])

ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/exporter.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
import os
1717
from urllib.parse import urlparse
1818

19+
import opentelemetry.trace as trace_api
1920
from ddtrace.ext import SpanTypes as DatadogSpanTypes
2021
from ddtrace.internal.writer import AgentWriter
2122
from ddtrace.span import Span as DatadogSpan
22-
23-
import opentelemetry.trace as trace_api
2423
from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
2524
from opentelemetry.trace.status import StatusCanonicalCode
2625

ext/opentelemetry-ext-datadog/tests/test_datadog_exporter.py

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from unittest import mock
2020

2121
from ddtrace.internal.writer import AgentWriter
22-
2322
from opentelemetry import trace as trace_api
2423
from opentelemetry.ext import datadog
2524
from opentelemetry.sdk import trace

opentelemetry-sdk/CHANGELOG.md

-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ Released 2020-05-27
1616
([#729](https://github.com/open-telemetry/opentelemetry-python/pull/729))
1717
- deep copy empty attributes
1818
([#714](https://github.com/open-telemetry/opentelemetry-python/pull/714))
19-
- Add cloud trace exporter
20-
([#698](https://github.com/open-telemetry/opentelemetry-python/pull/698))
2119

2220
## 0.7b1
2321

scripts/coverage.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ cov ext/opentelemetry-ext-flask
2424
cov ext/opentelemetry-ext-requests
2525
cov ext/opentelemetry-ext-jaeger
2626
cov ext/opentelemetry-ext-opentracing-shim
27-
cov ext/opentelemetry-ext-cloud-trace
27+
cov ext/opentelemetry-exporter-cloud-trace
2828
cov ext/opentelemetry-ext-wsgi
2929
cov ext/opentelemetry-ext-zipkin
3030
cov docs/examples/opentelemetry-example-app

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ changedir =
150150
test-ext-opencensusexporter: ext/opentelemetry-ext-opencensusexporter/tests
151151
test-ext-prometheus: ext/opentelemetry-ext-prometheus/tests
152152
test-ext-pymongo: ext/opentelemetry-ext-pymongo/tests
153-
test-ext-cloud-trace: ext/opentelemetry-ext-cloud-trace/tests
153+
test-exporter-cloud-trace: ext/opentelemetry-exporter-cloud-trace/tests
154154
test-ext-psycopg2: ext/opentelemetry-ext-psycopg2/tests
155155
test-ext-pymysql: ext/opentelemetry-ext-pymysql/tests
156156
test-ext-asgi: ext/opentelemetry-ext-asgi/tests

0 commit comments

Comments
 (0)