Skip to content

Fix bug in OpenTelemetry SDK version validation code in StartupHook #2178

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
merged 2 commits into from
Feb 9, 2023
Merged

Fix bug in OpenTelemetry SDK version validation code in StartupHook #2178

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc2fe21
Fix bug in OpenTelemetry SDK version validation code in StartupHook
xiang17 Feb 8, 2023
fd6cae6
Merge branch 'main' into xiang17/FixOTelVersionValidateBug
xiang17 Feb 9, 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
50 changes: 20 additions & 30 deletions src/OpenTelemetry.AutoInstrumentation.StartupHook/StartupHook.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,43 +167,33 @@ private static List<string> GetExcludedApplicationNames()

private static void ThrowIfReferenceIncorrectOpenTelemetryVersion(string loaderAssemblyLocation)
{
var appReferenceAssemblies = Assembly.GetEntryAssembly()?.GetReferencedAssemblies();
if (appReferenceAssemblies == null)
{
return;
}

var index = Array.FindIndex(appReferenceAssemblies, assembly => assembly.Name == "OpenTelemetry");
string? oTelPackageVersion = null;

if (index != -1)
try
{
try
// Look up for type with an assembly name, will load the library.
// OpenTelemetry assembly load happens only if app has reference to the package.
var openTelemetryType = Type.GetType("OpenTelemetry.Sdk, OpenTelemetry");
if (openTelemetryType != null)
{
// Look up for type with an assembly name, will load the library.
// OpenTelemetry assembly load happens only if app has reference to the package.
var openTelemetryType = Type.GetType("OpenTelemetry.Sdk, OpenTelemetry");
if (openTelemetryType != null)
var loadedOTelAssembly = Assembly.GetAssembly(openTelemetryType);
var loadedOTelFileVersionInfo = FileVersionInfo.GetVersionInfo(loadedOTelAssembly?.Location);
var loadedOTelFileVersion = new Version(loadedOTelFileVersionInfo.FileVersion);

var autoInstrumentationOTelLocation = Path.Combine(loaderAssemblyLocation, "OpenTelemetry.dll");
var autoInstrumentationOTelFileVersionInfo = FileVersionInfo.GetVersionInfo(autoInstrumentationOTelLocation);
var autoInstrumentationOTelFileVersion = new Version(autoInstrumentationOTelFileVersionInfo.FileVersion);

if (loadedOTelFileVersion < autoInstrumentationOTelFileVersion)
{
var loadedOTelAssembly = Assembly.GetAssembly(openTelemetryType);
var loadedOTelFileVersionInfo = FileVersionInfo.GetVersionInfo(loadedOTelAssembly?.Location);
var loadedOTelfileVersion = new Version(loadedOTelFileVersionInfo.FileVersion);

var autoInstrumentationOTelLocation = Path.Combine(loaderAssemblyLocation, "OpenTelemetry.dll");
var autoInstrumentationOTelFileVersionInfo = FileVersionInfo.GetVersionInfo(autoInstrumentationOTelLocation);
var autoInstrumentationOTelFileVersion = new Version(autoInstrumentationOTelFileVersionInfo.FileVersion);

if (loadedOTelfileVersion < autoInstrumentationOTelFileVersion)
{
oTelPackageVersion = loadedOTelFileVersionInfo.FileVersion;
}
oTelPackageVersion = loadedOTelFileVersionInfo.FileVersion;
}
}
catch (Exception ex)
{
// Exception in evaluation should not throw or crash the process.
Logger.LogInformation($"Couldn't evaluate reference to OpenTelemetry Sdk in an app. Exception: {ex}");
}
}
catch (Exception ex)
{
// Exception in evaluation should not throw or crash the process.
Logger.LogInformation($"Couldn't evaluate reference to OpenTelemetry Sdk in an app. Exception: {ex}");
}

if (oTelPackageVersion != null)
Expand Down