Skip to content

[Event Hubs] add enqueueTime to Process span links #10932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YijunXieMS merged 32 commits into from
Apr 29, 2020
Merged

[Event Hubs] add enqueueTime to Process span links #10932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
cb13bd8
Increment version
Feb 14, 2020
38e9f65
Update Development Status
Feb 14, 2020
aa30bc0
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Feb 15, 2020
c4710ea
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Feb 20, 2020
053f073
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Feb 24, 2020
f0697f7
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 6, 2020
c83241a
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 6, 2020
18c6fba
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 6, 2020
607f134
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 9, 2020
88fd7d1
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 9, 2020
fcbaf65
Remove typing.Deque for Py3.5.3
Mar 9, 2020
f52e2d9
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 10, 2020
8aaaf1e
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 11, 2020
a12351c
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 25, 2020
cc9dbb9
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 27, 2020
932336a
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 30, 2020
2742ca0
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Mar 31, 2020
72ab463
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 2, 2020
213bb9d
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 3, 2020
b312d19
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 6, 2020
0638b9a
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 6, 2020
c7bd430
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 7, 2020
de47f42
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 7, 2020
2fcc005
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 15, 2020
cfa9d81
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 20, 2020
ac224c1
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 23, 2020
1305495
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 27, 2020
2183d32
Merge branch 'master' of github.com:Azure/azure-sdk-for-python
Apr 29, 2020
8e810d7
Add enqueuedTime into trace_link_message
Apr 20, 2020
c886b5e
Use azure-core 1.5.0 for tracing links
Apr 23, 2020
d637887
Update azure-core version in shared_requirements.txt
Apr 29, 2020
b2d394e
Add azure-core to dev_req of checkpointstore
Apr 29, 2020
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
1 change: 1 addition & 0 deletions sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
../../core/azure-core
../azure-eventhub
1 change: 1 addition & 0 deletions sdk/eventhub/azure-eventhub-checkpointstoreblob/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
../../core/azure-core
../azure-eventhub
8 changes: 5 additions & 3 deletions sdk/eventhub/azure-eventhub/azure/eventhub/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
PROP_LAST_ENQUEUED_TIME_UTC,
PROP_RUNTIME_INFO_RETRIEVAL_TIME_UTC,
PROP_LAST_ENQUEUED_OFFSET,
)
PROP_TIMESTAMP)

if TYPE_CHECKING:
# pylint: disable=ungrouped-imports
Expand Down Expand Up @@ -193,12 +193,14 @@ def trace_link_message(events, parent_span=None):
if event.properties:
traceparent = event.properties.get(b"Diagnostic-Id", "").decode("ascii")
if traceparent:
current_span.link(traceparent)
current_span.link(
traceparent,
attributes={"enqueuedTime": event.message.annotations.get(PROP_TIMESTAMP)}
)
except Exception as exp: # pylint:disable=broad-except
_LOGGER.warning("trace_link_message had an exception %r", exp)



def event_position_selector(value, inclusive=False):
# type: (Union[int, str, datetime.datetime], bool) -> bytes
"""Creates a selector expression of the offset."""
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/azure-eventhub/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
zip_safe=False,
packages=find_packages(exclude=exclude_packages),
install_requires=[
"azure-core<2.0.0,>=1.0.0",
"azure-core<2.0.0,>=1.5.0",
"uamqp<2.0,>=1.2.5",
],
extras_require={
Expand Down
2 changes: 1 addition & 1 deletion shared_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ six>=1.6
#override azure-core-tracing-opencensus azure-core<2.0.0,>=1.0.0
#override azure-core-tracing-opentelemetry azure-core<2.0.0,>=1.0.0
#override azure-cosmos azure-core<2.0.0,>=1.0.0
#override azure-eventhub azure-core<2.0.0,>=1.0.0
#override azure-eventhub azure-core<2.0.0,>=1.5.0
#override azure-identity azure-core<2.0.0,>=1.0.0
#override azure-keyvault-certificates msrest>=0.6.0
#override azure-keyvault-keys msrest>=0.6.0
Expand Down