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.

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

Fix MongoDB instrumentation for 2.29.0+ #3668

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Fix MongoDB instrumentation for 2.29.0+ #3668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f34b1e
Fix MongoDB instrumentation for 2.29.0+
Kielek Sep 26, 2024
c17fd4a
Merge branch 'main' into mongodb-fix
Kielek Sep 26, 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
25 changes: 24 additions & 1 deletion src/OpenTelemetry.AutoInstrumentation.Loader/Loader.NetFramework.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,30 @@ private static string ResolveManagedProfilerDirectory()
return null;
}

Logger.Debug("Requester [{0}] requested [{1}]", args?.RequestingAssembly?.FullName ?? "<null>", args?.Name ?? "<null>");
Logger.Debug("Requester [{0}] requested [{1}]", args.RequestingAssembly?.FullName ?? "<null>", args.Name ?? "<null>");

// All MongoDB* are signed and does not follow https://learn.microsoft.com/en-us/dotnet/standard/library-guidance/versioning#assembly-version
// There is no possibility to automatically redirect from 2.28.0 to 2.29.0.
// Loading assembly and ignoring this version.
if (assemblyName.StartsWith("MongoDB", StringComparison.OrdinalIgnoreCase) &&
(string.Equals(assemblyName, "MongoDB.Driver.Core", StringComparison.OrdinalIgnoreCase) ||
string.Equals(assemblyName, "MongoDB.Bson", StringComparison.OrdinalIgnoreCase) ||
string.Equals(assemblyName, "MongoDB.Libmongocrypt", StringComparison.OrdinalIgnoreCase)))
{
try
{
var mongoAssembly = Assembly.Load(assemblyName);
Logger.Debug<string, bool>("Assembly.Load(\"{0}\") succeeded={1}", assemblyName, mongoAssembly != null);
return mongoAssembly;
}
catch (Exception ex)
{
Logger.Debug(ex, "Assembly.Load(\"{0}\") Exception: {1}", assemblyName, ex.Message);
}

return null;
}

var path = Path.Combine(ManagedProfilerDirectory, $"{assemblyName}.dll");
if (File.Exists(path))
{
Expand Down
Loading