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.

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

[automated] Merge branch 'main' => 'dev' #4849

Merged
merged 4 commits into from
Jan 4, 2024

Conversation

dotnet-maestro-bot
Copy link
Contributor

@dotnet-maestro-bot dotnet-maestro-bot commented Jan 2, 2024

I detected changes in the main branch which have not been merged yet to dev. I'm a robot and am configured to help you automatically keep dev up to date, so I've opened this PR.

This PR merges commits made on main by the following committers:

  • xakep139

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout main
git pull --ff-only
git checkout dev
git pull --ff-only
git merge --no-ff main

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/Common HEAD:merge/main-to-dev
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/Common HEAD:merge/main-to-dev

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-dev'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/main-to-dev dev
git pull https://github.com/dotnet-maestro-bot/Common merge/main-to-dev
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/Common HEAD:merge/main-to-dev
or if you are using SSH
git checkout -b merge/main-to-dev dev
git pull [email protected]:dotnet-maestro-bot/Common merge/main-to-dev
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/Common HEAD:merge/main-to-dev

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

Microsoft Reviewers: Open in CodeFlow

* Log outgoing HTTP path parameters in Structured mode
geeknoid and others added 2 commits January 3, 2024 05:09
- When using [TagName] to control the name of a logging tag, the
expectation is that the logging message (if present) should be using
the tag name instead of the parameter name. SO:

```
[LoggerMessage(1, LogLevel.Information, "My message {foo.bar}")]
public static partial void Log(this ILogger logger, [TagName("foo.bar") string msg);
```

Fixes dotnet#4848

Co-authored-by: Martin Taillefer <[email protected]>
@sebastienros
Copy link
Member

Should these correctness errors be fixed in main?

test/Libraries/Microsoft.Extensions.Http.Diagnostics.Tests/Logging/AcceptanceTests.cs(363,70): error xUnit1030: (NETCORE_ENGINEERING_TELEMETRY=Build) Test methods should not call ConfigureAwait(false), as it may bypass parallelization limits. Omit ConfigureAwait, or use ConfigureAwait(true) to avoid CA2007. (https://xunit.net/xunit.analyzers/rules/xUnit1030)

@xakep139
Copy link
Contributor

xakep139 commented Jan 4, 2024

Should these correctness errors be fixed in main?

Yes, I will fix those in #4842

* Support content headers in HttpClient logging

* add benchmark

* fix xUnit1030

* unblock the build
@xakep139 xakep139 merged commit 38edd17 into dotnet:dev Jan 4, 2024
6 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Feb 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants