-
Notifications
You must be signed in to change notification settings - Fork 93
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
Bump MongoDB.Driver.Core.Extensions.DiagnosticSources from 1.1.0 to 1.2.0 in /src/OpenTelemetry.AutoInstrumentation.AdditionalDeps #1320
Bump MongoDB.Driver.Core.Extensions.DiagnosticSources from 1.1.0 to 1.2.0 in /src/OpenTelemetry.AutoInstrumentation.AdditionalDeps #1320
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@RassK PTAL
EDIT: I saw the release has some fixes that make it worth bumping. E.g. jbogard/MongoDB.Driver.Core.Extensions.DiagnosticSources#18. Right now the build is not working. I have currently no idea what I have done wrong 😞
src/OpenTelemetry.AutoInstrumentation/Instrumentations/MongoDb/MongoClientIntegration.cs
Outdated
Show resolved
Hide resolved
@dependabot rebase |
Looks like this PR has been edited by someone other than Dependabot. That means Dependabot can't rebase it - sorry! If you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request |
2b5d786
to
6931997
Compare
I have tested it locally also with 2.17.1. |
@rajkumar-rangaraj, after upgrade to https://www.nuget.org/packages/MongoDB.Driver.Core/2.13.3 AdditionalDeps functionality expects to have native code library available in our store. For now, our build pipeline includes into the store only managed libs. Do you know easy way (without manual copying) to put it into the correct place? I suppose that it can be related to https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Package.xml but I do not found solution yet. Steps to reproduce
{
"profiles": {
"TestApplication.Smoke": {
"commandName": "Project",
"commandLineArgs": "",
"environmentVariables": {
"CORECLR_ENABLE_PROFILING": "1",
"CORECLR_PROFILER": "{918728DD-259F-4A6A-AC2B-B85E1B658318}",
"CORECLR_PROFILER_PATH": "$(SolutionDir)bin\\tracer-home\\win-x64\\OpenTelemetry.AutoInstrumentation.Native.dll",
"DOTNET_STARTUP_HOOKS": "$(SolutionDir)bin\\tracer-home\\netcoreapp3.1\\OpenTelemetry.AutoInstrumentation.StartupHook.dll",
"DOTNET_SHARED_STORE": "$(SolutionDir)bin\\tracer-home\\store",
"DOTNET_ADDITIONAL_DEPS": "$(SolutionDir)bin\\tracer-home\\AdditionalDeps",
"OTEL_TRACES_EXPORTER": "zipkin",
"OTEL_EXPORTER_ZIPKIN_ENDPOINT": "http://127.0.0.1:9411/api/v2/spans",
"OTEL_DOTNET_AUTO_DEBUG": "1",
"OTEL_DOTNET_AUTO_TRACES_CONSOLE_EXPORTER_ENABLED": "true",
"OTEL_DOTNET_AUTO_INTEGRATIONS_FILE": "$(SolutionDir)bin\\tracer-home\\integrations.json",
"OTEL_DOTNET_AUTO_HOME": "$(SolutionDir)bin\\tracer-home\\",
"OTEL_DOTNET_AUTO_METRICS_CONSOLE_EXPORTER_ENABLED": "true",
"LONG_RUNNING": "true"
}
}
}
} The result is
If I put file manually in correct places (here and one more for https://www.nuget.org/packages/MongoDB.Libmongocrypt/1.2.2 everything works fine. |
e8c7393
to
2da9caa
Compare
Bumps [MongoDB.Driver.Core.Extensions.DiagnosticSources](https://github.com/jbogard/MongoDB.Driver.Core.Extensions.DiagnosticSources) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/jbogard/MongoDB.Driver.Core.Extensions.DiagnosticSources/releases) - [Commits](jbogard/MongoDB.Driver.Core.Extensions.DiagnosticSources@1.1.0...1.2.0) --- updated-dependencies: - dependency-name: MongoDB.Driver.Core.Extensions.DiagnosticSources dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
2da9caa
to
a17e65d
Compare
a17e65d
to
22551b9
Compare
\store\x86\netcoreapp3.1\mongodb.bson\2.3.0\lib\netstandard1.5\MongoDB.Bson.dll, | ||
\store\x86\netcoreapp3.1\mongodb.driver.core.extensions.diagnosticsources\1.1.0\lib\netstandard2.0\MongoDB.Driver.Core.Extensions.DiagnosticSources.dll, | ||
\store\x86\netcoreapp3.1\mongodb.driver.core\2.3.0\lib\netstandard1.5\MongoDB.Driver.Core.dll, | ||
\store\x86\netcoreapp3.1\system.diagnostics.diagnosticsource\5.0.0\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rajkumar-rangaraj, side-effect of bump. New version references DiagnosticSource v 6 so it was automatically removed.
test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
Show resolved
Hide resolved
…umentation.AdditionalDeps/MongoDB.Driver.Core.Extensions.DiagnosticSources-1.2.0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some maybe helpful nits, all good.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The change itself looks good.
I do have a question about the dependencies that are being added to the additional deps. Aren't they dependencies of the library being instrumented? It seems that they would be already present on the application it self. I'm assuming that instrumentation helper/middleman indirectly depends on those. Is that correct?
Anyway, the change looks good. This question of indirect dependencies, if real, can and should be addressed separately.
/store/x64/net6.0/mongodb.bson/2.3.0/lib/netstandard1.5/MongoDB.Bson.dll, | ||
/store/x64/net6.0/mongodb.driver.core.extensions.diagnosticsources/1.1.0/lib/netstandard2.0/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll, | ||
/store/x64/net6.0/mongodb.driver.core/2.3.0/lib/netstandard1.5/MongoDB.Driver.Core.dll, | ||
/store/x64/net6.0/mongodb.bson/2.13.3/lib/netstandard2.1/MongoDB.Bson.dll, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need all of these libraries or just should have MongoDB.Driver.Core.Extensions.DiagnosticSources.dll
to resolve dependencies?
Maybe we need to make AdditionalDeps
little smarter to avoid the dependencies that are not needed.
These libraries not only increase the size of the package, also it may not be used by an app itself as the version of MongoDB.Driver.Core.dll
and its dependencies are old.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is really good question. I suppose that it is the same scenario as we have for https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/src/CommonExcludedAssets.props
If you don't mind I would like to cover it by separate issue. This PR is big enough.
Co-authored-by: Paulo Janotti <[email protected]>
@rajkumar-rangaraj, @pjanotti - your concers should be handled in scope of #1382, |
Bumps MongoDB.Driver.Core.Extensions.DiagnosticSources from 1.1.0 to 1.2.0.
Release notes
Sourced from MongoDB.Driver.Core.Extensions.DiagnosticSources's releases.
Commits
d2e453b
Merge pull request #18 from mishamyte/adjust-otel-tags12fefe6
Merge pull request #17 from pengweiqhca/patch-1da2a17d
Adjusted OTEL tags to correspond speca76c444
Downgrade MongoDB.Driver.Core version.d82ab5e
Merge pull request #15 from mishamyte/bump-dependencies9a78a27
Just supressed with NoWarn6cf021c
Changed Driver.Core to Driver4df688d
Updated READMEbcd7310
Updated GitHub pipelines7188cbf
Bumped vulnerable transitive deps for testsDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)