Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2eb9e4a
Fixed circular dependency that can happen when injecting custom samplers
jeremydvoss Nov 7, 2022
c2889d0
lint
jeremydvoss Nov 7, 2022
a71b20a
Deleted duplicate tests
jeremydvoss Nov 7, 2022
86fede5
lint
jeremydvoss Nov 7, 2022
55a4645
Merge branch 'main' into custom-sampler-fix
srikanthccv Nov 8, 2022
12a2fa2
lint
jeremydvoss Nov 8, 2022
48177cc
Merge branch 'custom-sampler-fix' of https://github.com/jeremydvoss/o…
jeremydvoss Nov 8, 2022
9769c91
lint
jeremydvoss Nov 8, 2022
03b98c4
lint
jeremydvoss Nov 8, 2022
5bacd39
lint
jeremydvoss Nov 8, 2022
8f2114b
Update opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init_…
jeremydvoss Nov 10, 2022
1db34b4
Update opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init_…
jeremydvoss Nov 10, 2022
7ab0619
typing
jeremydvoss Nov 10, 2022
bb22c13
Update opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init_…
jeremydvoss Nov 10, 2022
b31a55b
Update opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init_…
jeremydvoss Nov 15, 2022
7a394ae
Merge branch 'main' into custom-sampler-fix
ocelotl Nov 17, 2022
46bc6b8
Retry tests
jeremydvoss Nov 17, 2022
8185412
Merge branch 'custom-sampler-fix' of https://github.com/jeremydvoss/o…
jeremydvoss Nov 17, 2022
d871662
Fixed circular dependency that can happen when injecting custom samplers
jeremydvoss Nov 7, 2022
bf196db
lint
jeremydvoss Nov 7, 2022
d6fdccc
Deleted duplicate tests
jeremydvoss Nov 7, 2022
5dea454
lint
jeremydvoss Nov 7, 2022
96a027d
lint
jeremydvoss Nov 8, 2022
3a1611d
lint
jeremydvoss Nov 8, 2022
601507f
lint
jeremydvoss Nov 8, 2022
1175027
lint
jeremydvoss Nov 8, 2022
1609650
Update opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init_…
jeremydvoss Nov 10, 2022
671fa3d
Update opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init_…
jeremydvoss Nov 10, 2022
6958057
typing
jeremydvoss Nov 10, 2022
34049ef
Retry tests
jeremydvoss Nov 17, 2022
df684a2
Update opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init_…
jeremydvoss Nov 10, 2022
2124f7f
Update opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init_…
jeremydvoss Nov 15, 2022
8d3e9c2
Merge branch 'custom-sampler-fix' of https://github.com/jeremydvoss/o…
jeremydvoss Nov 17, 2022
99ef804
Updated contrib sha
jeremydvoss Nov 17, 2022
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
Prev Previous commit
Next Next commit
lint
  • Loading branch information
jeremydvoss committed Nov 17, 2022
commit 96a027d5e0674acc2758813cd96e3996416d346c
10 changes: 5 additions & 5 deletions opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ def _check_span_ended(func):
def wrapper(self, *args, **kwargs):
already_ended = False
with self._lock: # pylint: disable=protected-access
if self._end_time is None:
if self._end_time is None: # pylint: disable=protected-access
func(self, *args, **kwargs)
else:
already_ended = True
Expand Down Expand Up @@ -516,7 +516,7 @@ def _format_events(events):
f_event = OrderedDict()
f_event["name"] = event.name
f_event["timestamp"] = util.ns_to_iso_str(event.timestamp)
f_event["attributes"] = Span._format_attributes(event.attributes)
f_event["attributes"] = Span._format_attributes(event.attributes) # pylint: disable=protected-access
f_events.append(f_event)
return f_events

Expand All @@ -525,8 +525,8 @@ def _format_links(links):
f_links = []
for link in links:
f_link = OrderedDict()
f_link["context"] = Span._format_context(link.context)
f_link["attributes"] = Span._format_attributes(link.attributes)
f_link["context"] = Span._format_context(link.context) # pylint: disable=protected-access
f_link["attributes"] = Span._format_attributes(link.attributes) # pylint: disable=protected-access
f_links.append(f_link)
return f_links

Expand Down Expand Up @@ -688,7 +688,7 @@ def _from_env_if_absent(
)

# not removed for backward compat. please use SpanLimits instead.
SPAN_ATTRIBUTE_COUNT_LIMIT = SpanLimits._from_env_if_absent(
SPAN_ATTRIBUTE_COUNT_LIMIT = SpanLimits._from_env_if_absent( # pylint: disable=protected-access
None,
OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT,
_DEFAULT_OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT,
Expand Down