Skip to content
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.

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

[Internal] OpenTelemetry: Direct Package update and replacing diagnostic files #3797

Merged
merged 22 commits into from
Apr 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
54bb621
Direct Package update and replacing dagnostic files
aavasthy Apr 4, 2023
3075125
Merge branch 'master' into users/aavasthy/distributedTracing_directPa…
aavasthy Apr 4, 2023
b6da31d
Resolve merge conflicts
aavasthy Apr 5, 2023
0f0bfc5
Merge branch 'master' into users/aavasthy/distributedTracing_directPa…
aavasthy Apr 5, 2023
ae93a46
Running updateCOnstracts script
aavasthy Apr 5, 2023
7ec2a89
Removed LinqTranslationWithCustomSerializerBaseline file
aavasthy Apr 6, 2023
217943c
Adding isDistributedTracingEnabled flag
aavasthy Apr 6, 2023
05f4b23
Merge branch 'master' into users/aavasthy/distributedTracing_directPa…
aavasthy Apr 7, 2023
ff297e9
Running update contracts
aavasthy Apr 9, 2023
f09f6e1
Merge branch 'master' into users/aavasthy/distributedTracing_directPa…
aavasthy Apr 9, 2023
d67debd
Running update contracts
aavasthy Apr 9, 2023
44de8c4
Merge branch 'users/aavasthy/distributedTracing_directPackageUpdate' …
aavasthy Apr 9, 2023
5c791cf
Running update contracts
aavasthy Apr 10, 2023
1c5c76c
Merge branch 'master' into users/aavasthy/distributedTracing_directPa…
aavasthy Apr 10, 2023
378f506
Merge branch 'users/aavasthy/distributedTracing_directPackageUpdate' …
aavasthy Apr 11, 2023
d940193
Merge branch 'master' into users/aavasthy/distributedTracing_directPa…
aavasthy Apr 11, 2023
fed263e
fix test
sourabh1007 Apr 12, 2023
d6866eb
Merge branch 'users/aavasthy/distributedTracing_directPackageUpdate' …
aavasthy Apr 14, 2023
1078328
Code cleanup for test fix
aavasthy Apr 14, 2023
e721ddb
Code cleanup for test fix
aavasthy Apr 14, 2023
d5c8f5f
Making regex expression readable
aavasthy Apr 17, 2023
b3e88c1
Adding comment for regex expression
aavasthy Apr 17, 2023
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
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ClientOfficialVersion>3.32.3</ClientOfficialVersion>
<ClientPreviewVersion>3.32.3</ClientPreviewVersion>
<ClientPreviewSuffixVersion>preview</ClientPreviewSuffixVersion>
<DirectVersion>3.30.4</DirectVersion>
<DirectVersion>3.30.6</DirectVersion>
<EncryptionOfficialVersion>2.0.1</EncryptionOfficialVersion>
<EncryptionPreviewVersion>2.0.1</EncryptionPreviewVersion>
<EncryptionPreviewSuffixVersion>preview</EncryptionPreviewSuffixVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Microsoft.Azure.Cosmos
{
using System;
using System.Runtime.Serialization;
using global::Azure.Core.Pipeline;
using global::Azure.Core;
using Microsoft.Azure.Cosmos.Telemetry;
using Microsoft.Azure.Cosmos.Telemetry.Diagnostics;

Expand Down
17 changes: 13 additions & 4 deletions Microsoft.Azure.Cosmos/src/DocumentClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ internal partial class DocumentClient : IDisposable, IAuthorizationTokenProvider
//RemoteCertificateValidationCallback
internal RemoteCertificateValidationCallback remoteCertificateValidationCallback;

//Distributed Tracing Flag
internal bool isDistributedTracingEnabled;

//SessionContainer.
internal ISessionContainer sessionContainer;

Expand Down Expand Up @@ -426,6 +429,7 @@ internal DocumentClient(Uri serviceEndpoint,
/// <param name="isLocalQuorumConsistency">Flag to allow Quorum Read with Eventual Consistency Account</param>
/// <param name="cosmosClientId"></param>
/// <param name="remoteCertificateValidationCallback">This delegate responsible for validating the third party certificate. </param>
/// <param name="isDistributedTracingEnabled">This is distributed tracing flag</param>
/// <remarks>
/// The service endpoint can be obtained from the Azure Management Portal.
/// If you are connecting using one of the Master Keys, these can be obtained along with the endpoint from the Azure Management Portal
Expand All @@ -452,7 +456,8 @@ internal DocumentClient(Uri serviceEndpoint,
IStoreClientFactory storeClientFactory = null,
bool isLocalQuorumConsistency = false,
string cosmosClientId = null,
RemoteCertificateValidationCallback remoteCertificateValidationCallback = null)
RemoteCertificateValidationCallback remoteCertificateValidationCallback = null,
bool isDistributedTracingEnabled = false)
ealsur marked this conversation as resolved.
Show resolved Hide resolved
{
if (sendingRequestEventArgs != null)
{
Expand Down Expand Up @@ -485,7 +490,8 @@ internal DocumentClient(Uri serviceEndpoint,
enableCpuMonitor: enableCpuMonitor,
storeClientFactory: storeClientFactory,
cosmosClientId: cosmosClientId,
remoteCertificateValidationCallback: remoteCertificateValidationCallback);
remoteCertificateValidationCallback: remoteCertificateValidationCallback,
isDistributedTracingEnabled: isDistributedTracingEnabled);
}

/// <summary>
Expand Down Expand Up @@ -668,7 +674,8 @@ internal virtual void Initialize(Uri serviceEndpoint,
IStoreClientFactory storeClientFactory = null,
TokenCredential tokenCredential = null,
string cosmosClientId = null,
RemoteCertificateValidationCallback remoteCertificateValidationCallback = null)
RemoteCertificateValidationCallback remoteCertificateValidationCallback = null,
bool isDistributedTracingEnabled = false)
{
if (serviceEndpoint == null)
{
Expand All @@ -677,6 +684,7 @@ internal virtual void Initialize(Uri serviceEndpoint,

this.clientId = cosmosClientId;
this.remoteCertificateValidationCallback = remoteCertificateValidationCallback;
this.isDistributedTracingEnabled = isDistributedTracingEnabled;

this.queryPartitionProvider = new AsyncLazy<QueryPartitionProvider>(async () =>
{
Expand Down Expand Up @@ -6658,7 +6666,8 @@ private void InitializeDirectConnectivity(IStoreClientFactory storeClientFactory
enableTcpConnectionEndpointRediscovery: this.ConnectionPolicy.EnableTcpConnectionEndpointRediscovery,
addressResolver: this.AddressResolver,
rntbdMaxConcurrentOpeningConnectionCount: this.rntbdMaxConcurrentOpeningConnectionCount,
remoteCertificateValidationCallback: this.remoteCertificateValidationCallback );
remoteCertificateValidationCallback: this.remoteCertificateValidationCallback,
isDistributedTracingEnabled: this.isDistributedTracingEnabled);

if (this.transportClientHandlerFactory != null)
{
Expand Down

This file was deleted.

Loading