Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
657c34e
add opencensus impl
SuyogSoti Jul 9, 2019
8573e23
dont need to check for noop tracer
SuyogSoti Jul 9, 2019
989c4dc
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-pytho…
SuyogSoti Jul 9, 2019
3f64325
get rid of span and trace id
SuyogSoti Jul 9, 2019
0b04d80
fix span instance
SuyogSoti Jul 9, 2019
9f4e507
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-pytho…
SuyogSoti Jul 9, 2019
7b728d8
added documentation
SuyogSoti Jul 9, 2019
bfd355c
added documentation and refactor names of a few variables
SuyogSoti Jul 9, 2019
cd06c97
write test for opencensus wrapper
SuyogSoti Jul 10, 2019
a9f7a6f
put opencensus in the dev requirements
SuyogSoti Jul 10, 2019
b8f63df
initial common
SuyogSoti Jul 10, 2019
408c5ad
only import the wrapper when necessary
SuyogSoti Jul 10, 2019
9baf366
add check for the exporter
SuyogSoti Jul 10, 2019
f4c52fd
rework logic and fix some settings
SuyogSoti Jul 10, 2019
d439df9
added initial decorator
SuyogSoti Jul 10, 2019
f256d62
some mroe documentation
SuyogSoti Jul 10, 2019
9067279
added decorators
SuyogSoti Jul 10, 2019
eee5e09
small change
SuyogSoti Jul 10, 2019
6050bd7
some minor fixes
SuyogSoti Jul 10, 2019
c9faa4b
test patch happening
SuyogSoti Jul 10, 2019
6d35557
fix space
SuyogSoti Jul 10, 2019
0f6c1f7
share a function
SuyogSoti Jul 10, 2019
2bfffe5
clearer logic for setting span context
SuyogSoti Jul 10, 2019
c1f6d69
better logic
SuyogSoti Jul 10, 2019
18890ea
better logic
SuyogSoti Jul 10, 2019
6a4a545
fix environ variable
SuyogSoti Jul 11, 2019
e7b5707
test the way opencensus does it
SuyogSoti Jul 11, 2019
aaf2152
middle of tests
SuyogSoti Jul 11, 2019
7ccf041
only load if opencensus has already been imported
SuyogSoti Jul 11, 2019
6a01918
fix spelling mistake
SuyogSoti Jul 11, 2019
36572c5
temp
SuyogSoti Jul 11, 2019
d9a2d95
Merge branch 'opencensus_impl' into temp
SuyogSoti Jul 11, 2019
280173f
finish writing tests for common
SuyogSoti Jul 11, 2019
b3f44fb
charles fixes
SuyogSoti Jul 11, 2019
9cb1bd9
Merge branch 'opencensus_impl' into temp
SuyogSoti Jul 11, 2019
77e0ccf
fix tests
SuyogSoti Jul 11, 2019
1e9c7dc
fix test settings
SuyogSoti Jul 11, 2019
d72248e
to header should not take a dict
SuyogSoti Jul 11, 2019
135d1c0
from header should be class method
SuyogSoti Jul 11, 2019
56e8269
Merge branch 'opencensus_impl' into temp
SuyogSoti Jul 11, 2019
73203c2
initial tests
SuyogSoti Jul 11, 2019
e304d40
dont create trace and get rid of end_tracer
SuyogSoti Jul 11, 2019
ff5627d
dont need to save the trace
SuyogSoti Jul 11, 2019
1e4b03a
more little fixes
SuyogSoti Jul 11, 2019
d55bca1
Merge branch 'opencensus_impl' into temp
SuyogSoti Jul 11, 2019
72e0dd4
some intermediatary changes
SuyogSoti Jul 11, 2019
aa5b671
fix type annotations
SuyogSoti Jul 11, 2019
0ce1a22
rst fix types
SuyogSoti Jul 11, 2019
b9c7d72
add :class:annotations
SuyogSoti Jul 11, 2019
57b2a57
fix line wrapping
SuyogSoti Jul 11, 2019
9b6260e
Merge branch 'opencensus_impl' into temp
SuyogSoti Jul 11, 2019
8b1ed8f
added tests for decorator
SuyogSoti Jul 12, 2019
c041818
rename opencensus wrapper
SuyogSoti Jul 12, 2019
8da57ec
Merge branch 'opencensus_impl' into overall
SuyogSoti Jul 12, 2019
56d2e7d
intermediate changes
SuyogSoti Jul 12, 2019
de6f552
use spans the right way
SuyogSoti Jul 12, 2019
691eb3d
some formatting
SuyogSoti Jul 12, 2019
6a1f733
Merge branch 'opencensus_impl' into overall
SuyogSoti Jul 12, 2019
20d5afe
some grammar
SuyogSoti Jul 12, 2019
c55c901
Merge branch 'opencensus_impl' into overall
SuyogSoti Jul 12, 2019
3e80b1e
restructure settings and make tests pass
SuyogSoti Jul 12, 2019
3f9f4ae
rename get_parent
SuyogSoti Jul 12, 2019
412bf7a
fix typings
SuyogSoti Jul 12, 2019
3c6ab1c
use protocol and from_headers becomes links
SuyogSoti Jul 12, 2019
de8b5f4
Merge branch 'opencensus_impl' into overall
SuyogSoti Jul 12, 2019
de41353
ramifications of opencensus wrapper being a protocol
SuyogSoti Jul 12, 2019
db2f865
add tests for link
SuyogSoti Jul 12, 2019
7c637e6
Merge branch 'opencensus_impl' into overall
SuyogSoti Jul 12, 2019
27c9876
added async tests
SuyogSoti Jul 12, 2019
ac9ff09
delete the unit test thing
SuyogSoti Jul 12, 2019
f0ba4ee
fix merge conflict
SuyogSoti Jul 12, 2019
ff07c55
added add_attribute
SuyogSoti Jul 13, 2019
30fd165
added add_attribute
SuyogSoti Jul 13, 2019
644fe2a
added tests for add attributes
SuyogSoti Jul 13, 2019
e556a69
add initial policy
SuyogSoti Jul 13, 2019
fc6a284
Merge branch 'opencensus_impl' into add_decorator
SuyogSoti Jul 13, 2019
8f137c1
remove unused import
SuyogSoti Jul 13, 2019
a6e4ee8
Merge branch 'opencensus_impl' into overall
SuyogSoti Jul 13, 2019
8e8aa21
Merge branch 'master' into add_decorator
SuyogSoti Jul 13, 2019
a373e40
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-pytho…
SuyogSoti Jul 15, 2019
0c37b38
added docstrings
SuyogSoti Jul 15, 2019
b925782
minor docstring formatting
SuyogSoti Jul 15, 2019
4dd6ba9
fix pylint errors
SuyogSoti Jul 15, 2019
fae494a
don't rely on opencensus children to check
SuyogSoti Jul 15, 2019
e484bcf
use exporter to not rely on parent.children
SuyogSoti Jul 15, 2019
76c75bc
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-pytho…
SuyogSoti Jul 15, 2019
f2119da
Merge branch 'add_decorator' into overall
SuyogSoti Jul 15, 2019
1eba4cd
added documentation and span attributes
SuyogSoti Jul 16, 2019
6e5b05f
added test tracing policy
SuyogSoti Jul 16, 2019
9d0159c
test should only propagate
SuyogSoti Jul 16, 2019
aa14218
made test tracing helper
SuyogSoti Jul 16, 2019
ce5c667
Merge branch 'add_decorator' into overall
SuyogSoti Jul 16, 2019
bc35a5f
decrease flakiness of test
SuyogSoti Jul 16, 2019
c99bf19
Merge branch 'add_decorator' into overall
SuyogSoti Jul 16, 2019
85e5e48
simplify get parent
SuyogSoti Jul 16, 2019
91d1d25
calling a decorator decorator is redundant
SuyogSoti Jul 16, 2019
603d4f6
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-pytho…
SuyogSoti Jul 16, 2019
d347f2e
Merge branch 'add_decorator' into overall
SuyogSoti Jul 16, 2019
236ef8b
middle of writing tests
SuyogSoti Jul 16, 2019
056bc2e
fix settings
SuyogSoti Jul 16, 2019
103c44e
Merge branch 'add_decorator' into overall
SuyogSoti Jul 16, 2019
4adb5c3
add tests
SuyogSoti Jul 16, 2019
a7ede6b
test propogation also happens
SuyogSoti Jul 16, 2019
720c44e
more elegant code
SuyogSoti Jul 16, 2019
c8574fe
Merge branch 'add_decorator' into overall
SuyogSoti Jul 16, 2019
c3d7eb8
await async stuff
SuyogSoti Jul 16, 2019
f503b6e
add await for async
SuyogSoti Jul 16, 2019
b5fb8a1
Merge branch 'add_decorator' into add_policy
SuyogSoti Jul 16, 2019
6743bd1
should only have to wait a 1/1000 of a second
SuyogSoti Jul 16, 2019
c070b77
fix tests spans too short
SuyogSoti Jul 17, 2019
df7f09e
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-pytho…
SuyogSoti Jul 17, 2019
d106a16
accidentally deleted setup.cfg
SuyogSoti Jul 17, 2019
6f7a85f
fix merge conflict
SuyogSoti Jul 17, 2019
dc86986
add component
SuyogSoti Jul 17, 2019
31f43ec
merge conflict
SuyogSoti Jul 17, 2019
ab01300
add set_http_attributes
SuyogSoti Jul 17, 2019
1b9e5d4
fix span network name
SuyogSoti Jul 17, 2019
03f75e2
fix http request types
SuyogSoti Jul 17, 2019
c097ed9
fix more types
SuyogSoti Jul 17, 2019
b4f7094
bryan fixes
SuyogSoti Jul 17, 2019
d0a5137
more efficient tests
SuyogSoti Jul 17, 2019
583cf38
non flakey tests
SuyogSoti Jul 17, 2019
c28fe34
make tracing only use my context
SuyogSoti Jul 17, 2019
290f272
test user agent on exception
SuyogSoti Jul 17, 2019
3090416
pylint formatting
SuyogSoti Jul 17, 2019
ca59363
delete unused import
SuyogSoti Jul 17, 2019
ff8fdeb
fix spelling
SuyogSoti Jul 17, 2019
11ecf0e
pylint
SuyogSoti Jul 17, 2019
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
some minor fixes
  • Loading branch information
SuyogSoti committed Jul 10, 2019
commit 6050bd7d80d4eccc4c763c19c3a356877406b855
4 changes: 2 additions & 2 deletions sdk/core/azure-core/azure/core/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def _get_opencensus_wrapper():
# type: () -> OpencensusWrapper
"""Returns the OpencensusWrapper if opencensus is installed else returns None"""
try:
from azure.core.tracing.ext.opencensus import OpencensusWrapper
from azure.core.tracing.ext.opencensus_wrapper import OpencensusWrapper

return OpencensusWrapper
except ImportError:
Expand All @@ -138,7 +138,7 @@ def convert_tracing_impl(value):
:raises ValueError: If conversion to AbstractSpan fails

"""
if isinstance(value, AbstractSpan):
if issubclass(value.__class__, AbstractSpan):
return value

_impl_dict = {"opencensus": _get_opencensus_wrapper()}
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core/azure/core/tracing/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def _get_opencensus_wrapper():
# type: () -> OpencensusWrapper
"""Returns the OpencensusWrapper if opencensus is installed else returns None"""
try:
from azure.core.tracing.ext.opencensus import OpencensusWrapper
from azure.core.tracing.ext.opencensus_wrapper import OpencensusWrapper

return OpencensusWrapper
except ImportError:
Expand All @@ -46,7 +46,7 @@ def set_span_contexts(wrapped_span, span_instance=None, impl_wrapper=None):
# type: (AbstractSpan, AbstractSpan) -> None
tracing_context.current_span.set(wrapped_span)
impl_wrapper = impl_wrapper or wrapped_span
tracing_context.tracing_impl.set(impl_wrapper)
tracing_context.tracing_impl.set(impl_wrapper.__class__)
if wrapped_span is not None or (
span_instance is not None and impl_wrapper is not None
):
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core/azure/core/tracing/decorator.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def wrapper_use_tracer(self, *args, **kwargs):
common.set_span_contexts(
original_span_from_sdk_context,
span_instance=original_span_instance,
wrapper_class=parent_span,
impl_wrapper=parent_span,
)
else:
ans = func(self, *args, **kwargs)
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core/azure/core/tracing/decorator_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ async def wrapper_use_tracer(self, *args, **kwargs):
common.set_span_contexts(
original_span_from_sdk_context,
span_instance=original_span_instance,
wrapper_class=parent_span,
impl_wrapper=parent_span,
)
else:
ans = await func(self, *args, **kwargs)
Expand Down