WIP [AzureMonitor] update vendored OTel libraries #48608
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e_otel1.11_vendored
TimothyMothra
commented
Mar 6, 2025
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| #if NETSTANDARD2_0 // HACK; FIX FOR AMBIGUITY |
There was a problem hiding this comment.
Hack to fix compile
TimothyMothra
commented
Mar 6, 2025
| @@ -174,7 +174,7 @@ public void SqlClientCallsAreCollectedSuccessfully( | |||
| serviceCollection.Configure<SqlClientTraceInstrumentationOptions>(options => | |||
| { | |||
| options.SetDbStatementForText = captureTextCommandContent; | |||
| options.SetDbStatementForStoredProcedure = captureStoredProcedureCommandName; | |||
| //options.SetDbStatementForStoredProcedure = captureStoredProcedureCommandName; // TODO: THIS WAS REMOVED: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2284 | |||
There was a problem hiding this comment.
TODO: need to clean up
TimothyMothra
commented
Mar 6, 2025
| @@ -99,7 +99,7 @@ public void VerifySqlClientDependency( | |||
| .AddSqlClientInstrumentation(options => | |||
| { | |||
| options.SetDbStatementForText = true; | |||
| options.SetDbStatementForStoredProcedure = true; | |||
| //options.SetDbStatementForStoredProcedure = true; // TODO: THIS WAS REMOVED: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2284 | |||
There was a problem hiding this comment.
TODO: need to clean up
TimothyMothra
commented
Mar 6, 2025
| @@ -170,7 +170,7 @@ public void VerifySqlClientDependencyWithException( | |||
| .AddSqlClientInstrumentation(options => | |||
| { | |||
| options.SetDbStatementForText = true; | |||
| options.SetDbStatementForStoredProcedure = true; | |||
| //options.SetDbStatementForStoredProcedure = true; // TODO: THIS WAS REMOVED: https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2284 | |||
There was a problem hiding this comment.
TODO: need to clean up
TimothyMothra
commented
Mar 6, 2025
| /// </summary> | ||
| /// <param name="configurationBuilder">The <see cref="IConfigurationBuilder"/> to add to.</param> | ||
| /// <returns>The <see cref="IConfigurationBuilder"/>.</returns> | ||
| public static IConfigurationBuilder AddEnvironmentVariablesVENDORED(this IConfigurationBuilder configurationBuilder) |
There was a problem hiding this comment.
HACK renamed to fix compile
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up to #48574
This PR updates the vendored OTel libraries.
Steps followed to Sync Vendored code
OpenTelemetry.Instrumentation.SqlClient2a. Clone the OpenTelemetry.NET Repository
Azure.Monitor.OpenTelemetry.AspNetCore'sVendoringdirectory:OpenTelemetry.Instrumentation.SqlClientSharedOpenTelemetry.ResourceDetectors.Azure3a. Clone the OpenTelemetry.NET Contrib Repository
Azure.Monitor.OpenTelemetry.AspNetCore'sVendoringdirectory:OpenTelemetry.ResourceDetectors.AzureShared#nullable enabletoOpenTelemetry.ResourceDetoctors.Azurefiles. OurAzure.Monitor.OpenTelemetry.AspNetCoreproject does not yet support nullables.#pragma warning disableAZC0102andAZC0104toAzure.VmMetaDataRequestor.cs. These are code standards that only exist in this Azure SDK reop.