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

Distributed Tracing: Adds configuration to disable network level tracing in sdk permanently #4333

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ static async Task Main()
AppContext.SetSwitch("Azure.Experimental.EnableActivitySource", true);
_traceProvider = Sdk.CreateTracerProviderBuilder()
.AddSource("Azure.Cosmos.Operation", // Cosmos DB source for operation level telemetry
"Azure.Cosmos.Request", // Cosmos DB source for DIRECT Mode network request level telemetry
sourabh1007 marked this conversation as resolved.
Show resolved Hide resolved
"Sample.Application")
.AddAzureMonitorTraceExporter(o => o.ConnectionString = aiConnectionString) // Set up exporter of your choice
.AddHttpClientInstrumentation() // Added to capture HTTP telemetry
Expand Down
7 changes: 7 additions & 0 deletions Microsoft.Azure.Cosmos/src/DocumentClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6654,9 +6654,16 @@ private void InitializeDirectConnectivity(IStoreClientFactory storeClientFactory
}
else
{
// It is decided to switch this feature off completely for external users but keep it unchanged for internal users,
// due to the nature of information, we are collecting here. RNTBD is internal protocol and we do not expose it to the customers.
Documents.Telemetry.DistributedTracingOptions distributedTracingOptions = new ()
{
#if INTERNAL
IsDistributedTracingEnabled = !this.cosmosClientTelemetryOptions.DisableDistributedTracing
sourabh1007 marked this conversation as resolved.
Show resolved Hide resolved
sourabh1007 marked this conversation as resolved.
Show resolved Hide resolved
#else
IsDistributedTracingEnabled = false
#endif

};

StoreClientFactory newClientFactory = new StoreClientFactory(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,7 @@ internal static class OpenTelemetryRecorderFactory
clientContext: clientContext,
config: requestOptions?.CosmosThresholdOptions ?? clientContext.ClientOptions?.CosmosClientTelemetryOptions.CosmosThresholdOptions);
}
#if !INTERNAL
// Need a parent activity which groups all network activities under it and is logged in diagnostics and used for tracing purpose.
// If there are listeners at network level then scope is enabled and it tries to create activity.
// However, if available listeners are not subscribed to network event then it will lead to scope being enabled but no activity is created.
else
{
DiagnosticScope requestScope = LazyScopeFactory.Value.CreateScope(name: $"{OpenTelemetryAttributeKeys.NetworkLevelPrefix}.{operationName}");
openTelemetryRecorder = requestScope.IsEnabled ? OpenTelemetryCoreRecorder.CreateNetworkLevelParentActivity(networkScope: requestScope) : openTelemetryRecorder;
}

// If there are no listeners at operation level and network level and no parent activity created.
// Then create a dummy activity as there should be a parent level activity always to send a traceid to the backend services through context propagation.
// The parent activity id is logged in diagnostics and used for tracing purpose.
if (Activity.Current is null)
{
openTelemetryRecorder = OpenTelemetryCoreRecorder.CreateParentActivity(operationName);
}
#endif
// Safety check as diagnostic logs should not break the code.
if (Activity.Current?.TraceId != null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,6 @@
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="error.type">400/1001</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="Batch Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">207</ATTRIBUTE>
</ACTIVITY>
<EVENT name="FailedRequest" />
</OTelActivities></Output>
</Result>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -343,13 +343,6 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="Batch Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -687,13 +680,6 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="Batch Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -1031,13 +1017,6 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="Batch Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -1375,13 +1354,6 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="Batch Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -1719,13 +1691,6 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="Batch Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -2063,13 +2028,6 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="Batch Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -2407,13 +2365,6 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="Batch Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -2751,13 +2702,6 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="Batch Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -3095,13 +3039,6 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="Batch Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -3439,13 +3376,6 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="Batch Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1118,20 +1118,6 @@
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="ReadFeed Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="ReadFeed Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">304</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -1878,20 +1864,6 @@
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="ReadFeed Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="ReadFeed Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">304</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -2619,20 +2591,6 @@
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="ReadFeed Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="ReadFeed Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">304</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -3380,20 +3338,6 @@
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="ReadFeed Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="ReadFeed Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">304</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
<EVENT name="LatencyOverThreshold" />
Expand Down Expand Up @@ -3718,13 +3662,6 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Request" operationName="Request.RequestAsync" displayName="ReadFeed Document">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
<ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.url">Some Value</ATTRIBUTE>
<ATTRIBUTE key="rntbd.sub_status_code">0</ATTRIBUTE>
<ATTRIBUTE key="rntbd.status_code">200</ATTRIBUTE>
</ACTIVITY>
<EVENT name="LatencyOverThreshold" />
</OTelActivities></Output>
</Result>
Expand Down