Skip to content

Commit bd36989

Browse files
author
alrex
authored
Merge branch 'main' into codeboten/issue-1166
2 parents 61b6262 + 77c9867 commit bd36989

43 files changed

Lines changed: 238 additions & 92 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.

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2727
- Added ProxyTracerProvider and ProxyTracer implementations to allow fetching provider
2828
and tracer instances before a global provider is set up.
2929
([#1726](https://github.com/open-telemetry/opentelemetry-python/pull/1726))
30+
- Added `__contains__` to `opentelementry.trace.span.TraceState`.
31+
([#1773](https://github.com/open-telemetry/opentelemetry-python/pull/1773))
3032
- `opentelemetry-opentracing-shim` Fix an issue in the shim where a Span was being wrapped
3133
in a NonRecordingSpan when it wasn't necessary.
3234
([#1776](https://github.com/open-telemetry/opentelemetry-python/pull/1776))

‎dev-requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pylint==2.6.0
22
flake8~=3.7
3-
isort~=5.6
4-
black>=19.3b0,==19.*
3+
isort~=5.8
4+
black~=20.8b1
55
httpretty~=1.0
66
mypy==0.812
77
sphinx~=2.1

‎docs/conf.py‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,27 @@
101101
# Even if wrapt is added to intersphinx_mapping, sphinx keeps failing
102102
# with "class reference target not found: ObjectProxy".
103103
("py:class", "ObjectProxy"),
104-
("py:class", "opentelemetry.trace._LinkBase",),
104+
(
105+
"py:class",
106+
"opentelemetry.trace._LinkBase",
107+
),
105108
# TODO: Understand why sphinx is not able to find this local class
106-
("py:class", "opentelemetry.propagators.textmap.TextMapPropagator",),
107-
("py:class", "opentelemetry.propagators.textmap.DefaultGetter",),
108-
("any", "opentelemetry.propagators.textmap.TextMapPropagator.extract",),
109-
("any", "opentelemetry.propagators.textmap.TextMapPropagator.inject",),
109+
(
110+
"py:class",
111+
"opentelemetry.propagators.textmap.TextMapPropagator",
112+
),
113+
(
114+
"py:class",
115+
"opentelemetry.propagators.textmap.DefaultGetter",
116+
),
117+
(
118+
"any",
119+
"opentelemetry.propagators.textmap.TextMapPropagator.extract",
120+
),
121+
(
122+
"any",
123+
"opentelemetry.propagators.textmap.TextMapPropagator.inject",
124+
),
110125
]
111126

112127
# Add any paths that contain templates here, relative to this directory.

‎docs/examples/opentracing/main.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
tracer_provider = trace.get_tracer_provider()
1414

1515
# Configure the tracer to export traces to Jaeger
16-
jaeger_exporter = JaegerExporter(agent_host_name="localhost", agent_port=6831,)
16+
jaeger_exporter = JaegerExporter(
17+
agent_host_name="localhost",
18+
agent_port=6831,
19+
)
1720
span_processor = SimpleSpanProcessor(jaeger_exporter)
1821
tracer_provider.add_span_processor(span_processor)
1922

‎docs/getting_started/jaeger_example.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
)
2626
)
2727

28-
jaeger_exporter = JaegerExporter(agent_host_name="localhost", agent_port=6831,)
28+
jaeger_exporter = JaegerExporter(
29+
agent_host_name="localhost",
30+
agent_port=6831,
31+
)
2932

3033
trace.get_tracer_provider().add_span_processor(
3134
BatchSpanProcessor(jaeger_exporter)

‎docs/getting_started/tests/test_flask.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ def test_flask(self):
2727
dirpath = os.path.dirname(os.path.realpath(__file__))
2828
server_script = "{}/../flask_example.py".format(dirpath)
2929
server = subprocess.Popen(
30-
[sys.executable, server_script], stdout=subprocess.PIPE,
30+
[sys.executable, server_script],
31+
stdout=subprocess.PIPE,
3132
)
3233
retry_strategy = Retry(total=10, backoff_factor=1)
3334
adapter = HTTPAdapter(max_retries=retry_strategy)

‎exporter/opentelemetry-exporter-jaeger-proto-grpc/examples/jaeger_exporter_example.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
# `EXPORTER_JAEGER_CERTIFICATE` with file containing creds.
1616

1717
jaeger_exporter = grpc.JaegerExporter(
18-
collector_endpoint="localhost:14250", insecure=True,
18+
collector_endpoint="localhost:14250",
19+
insecure=True,
1920
)
2021

2122
# create a BatchSpanProcessor and add the exporter to it

‎exporter/opentelemetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/translate/__init__.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ def _duration_from_two_time_stamps(
195195
See https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#duration
196196
"""
197197
duration = Duration(
198-
seconds=end.seconds - start.seconds, nanos=end.nanos - start.nanos,
198+
seconds=end.seconds - start.seconds,
199+
nanos=end.nanos - start.nanos,
199200
)
200201
# pylint: disable=chained-comparison
201202
if duration.seconds < 0 and duration.nanos > 0:
@@ -350,7 +351,10 @@ def _extract_logs(
350351
fields.append(tag)
351352

352353
fields.append(
353-
_get_string_key_value(key="message", value=event.name,)
354+
_get_string_key_value(
355+
key="message",
356+
value=event.name,
357+
)
354358
)
355359
event_ts = _proto_timestamp_from_epoch_nanos(event.timestamp)
356360
logs.append(model_pb2.Log(timestamp=event_ts, fields=fields))

‎exporter/opentelemetry-exporter-jaeger-proto-grpc/tests/test_jaeger_exporter_protobuf.py‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ def test_translate_to_jaeger(self):
126126

127127
event_timestamp = base_time + 50 * 10 ** 6
128128
# pylint:disable=protected-access
129-
event_timestamp_proto = pb_translator._proto_timestamp_from_epoch_nanos(
130-
event_timestamp
129+
event_timestamp_proto = (
130+
pb_translator._proto_timestamp_from_epoch_nanos(event_timestamp)
131131
)
132132

133133
event = trace.Event(
@@ -339,7 +339,9 @@ def test_translate_to_jaeger(self):
339339
duration=span2_duration,
340340
flags=0,
341341
tags=default_tags,
342-
process=model_pb2.Process(service_name="svc",),
342+
process=model_pb2.Process(
343+
service_name="svc",
344+
),
343345
),
344346
model_pb2.Span(
345347
operation_name=span_names[2],
@@ -370,15 +372,18 @@ def test_translate_to_jaeger(self):
370372
v_str="version",
371373
),
372374
],
373-
process=model_pb2.Process(service_name="svc",),
375+
process=model_pb2.Process(
376+
service_name="svc",
377+
),
374378
),
375379
]
376380

377381
# events are complicated to compare because order of fields
378382
# (attributes) in otel is not important but in jeager it is
379383
# pylint: disable=no-member
380384
self.assertCountEqual(
381-
spans[0].logs[0].fields, expected_spans[0].logs[0].fields,
385+
spans[0].logs[0].fields,
386+
expected_spans[0].logs[0].fields,
382387
)
383388

384389
self.assertEqual(spans, expected_spans)

‎exporter/opentelemetry-exporter-jaeger-thrift/tests/test_jaeger_exporter_thrift.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,9 @@ def test_translate_to_jaeger(self):
258258

259259
default_tags = [
260260
jaeger.Tag(
261-
key="span.kind", vType=jaeger.TagType.STRING, vStr="internal",
261+
key="span.kind",
262+
vType=jaeger.TagType.STRING,
263+
vStr="internal",
262264
),
263265
]
264266

@@ -522,7 +524,8 @@ def test_agent_client(self):
522524
spans = translate._translate(ThriftTranslator())
523525

524526
batch = jaeger.Batch(
525-
spans=spans, process=jaeger.Process(serviceName="xxx"),
527+
spans=spans,
528+
process=jaeger.Process(serviceName="xxx"),
526529
)
527530

528531
agent_client.emit(batch)

0 commit comments

Comments
 (0)