Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
dacfbc1
Revert change to acs_connection_id type
diondrapeck Jan 24, 2024
a9fc28f
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Jan 25, 2024
594794d
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Jan 25, 2024
9ed7442
Resolve merge conflict
diondrapeck Jan 29, 2024
9495639
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Jan 31, 2024
eb4669d
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 5, 2024
a1bc7b3
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 5, 2024
12a43ef
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 7, 2024
16bebb4
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 8, 2024
e5ee79f
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 20, 2024
e9fdd4f
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 21, 2024
b781b64
Implement working POC for trace logging
diondrapeck Feb 21, 2024
7bb78f3
Refactor to take ops_logger as argument
diondrapeck Feb 21, 2024
8283395
Remove debug statements and update tests
diondrapeck Feb 21, 2024
04f17be
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 21, 2024
cb00e18
Add check for OpsLogger type
diondrapeck Feb 21, 2024
693a12c
Add check for OpsLogger type in monitor_with_telemetry_mixing
diondrapeck Feb 22, 2024
86dc607
Update tests
diondrapeck Feb 22, 2024
332ecde
Address mypy errors
diondrapeck Feb 22, 2024
c3d4d1f
Address mypy errors
diondrapeck Feb 22, 2024
177b0fd
Suppress mypy error
diondrapeck Feb 22, 2024
015db3d
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Feb 22, 2024
0f16bca
Merge branch 'main' into fix-missing-parent-ids
diondrapeck Feb 26, 2024
d3844a7
Refactor log_record_to_telemetry and save trace_id, span_id, and acti…
diondrapeck Feb 27, 2024
49af81c
Remove name from span
diondrapeck Feb 27, 2024
91abebd
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python
diondrapeck Mar 1, 2024
b731b23
Merge branch 'main' into fix-missing-parent-ids
diondrapeck Mar 1, 2024
fbfc888
Merge branch 'fix-missing-parent-ids' of https://github.com/diondrape…
diondrapeck Mar 1, 2024
24cbc6d
Remove whitespace to eliminate pylint error
diondrapeck Mar 1, 2024
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
  • Loading branch information
diondrapeck committed Feb 7, 2024
commit 12a43efd103e7b8ee404f3febef4cbee4ccbe582

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.