Register the profile manager at the WebHost scope only #8763
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
liliankasem
force-pushed
the
liliankasem/worker-profile-scope
branch
from
d89a4c9 to
dd0a902
Compare
brettsam
reviewed
Sep 19, 2022
jviau
approved these changes
Sep 19, 2022
src/WebJobs.Script/Workers/Rpc/Configuration/RpcWorkerConfigFactory.cs
Outdated
Show resolved
Hide resolved
liliankasem
force-pushed
the
liliankasem/worker-profile-scope
branch
from
10e8492 to
40199f2
Compare
brettsam
approved these changes
Sep 22, 2022
fabiocav
approved these changes
Sep 22, 2022
|
/backport to v3.x |
|
Started backporting to v3.x: https://github.com/Azure/azure-functions-host/actions/runs/3109489697 |
|
@liliankasem backporting to v3.x failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: register profile manager at the webhost scope only
Using index info to reconstruct a base tree...
M src/WebJobs.Script/ScriptHostBuilderExtensions.cs
M test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigFactoryTests.cs
Falling back to patching base and 3-way merge...
Auto-merging test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigFactoryTests.cs
Auto-merging src/WebJobs.Script/ScriptHostBuilderExtensions.cs
Applying: revert pattern matching becaue perf
Applying: Missing using statement for profiles namespace
Using index info to reconstruct a base tree...
M src/WebJobs.Script/ScriptHostBuilderExtensions.cs
M test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigFactoryTests.cs
Falling back to patching base and 3-way merge...
Auto-merging test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigFactoryTests.cs
Auto-merging src/WebJobs.Script/ScriptHostBuilderExtensions.cs
Applying: Fix license comment
Applying: Add tests for profile manager
Using index info to reconstruct a base tree...
M test/WebJobs.Script.Tests.Shared/TestHelpers.cs
M test/WebJobs.Script.Tests/Workers/Profiles/ProfilesTestUtilities.cs
Falling back to patching base and 3-way merge...
Auto-merging test/WebJobs.Script.Tests/Workers/Profiles/ProfilesTestUtilities.cs
Auto-merging test/WebJobs.Script.Tests.Shared/TestHelpers.cs
Applying: cleanup test
Applying: Address PR feedback
Applying: using statement fix
Using index info to reconstruct a base tree...
M test/WebJobs.Script.Tests.Shared/TestHelpers.cs
Falling back to patching base and 3-way merge...
Auto-merging test/WebJobs.Script.Tests.Shared/TestHelpers.cs
CONFLICT (content): Merge conflict in test/WebJobs.Script.Tests.Shared/TestHelpers.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0008 using statement fix
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
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.
resolves #8516
Change to DI WorkerProfileManager so there is only one instance