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' #4841

Merged
merged 5 commits into from
Dec 28, 2023

Conversation

dotnet-maestro-bot
Copy link
Contributor

@dotnet-maestro-bot dotnet-maestro-bot commented Dec 27, 2023

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:

  • geeknoid

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 git@github.com: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 git@github.com:dotnet-maestro-bot/Common merge/main-to-dev
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com: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

Fixes dotnet#4819

Co-authored-by: Martin Taillefer <mataille@microsoft.com>
geeknoid and others added 2 commits December 27, 2023 14:17
* Separate EnableRedaction and EnableEnrichment

- Prior, calling EnableRedaction or EnableEnrichment would always enable
both enrichment and redaction together. Now, each call only affects the
specific feature it is intended.

Fixes dotnet#4683

* Update src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLoggerFactory.cs

Co-authored-by: Igor Velikorossov <RussKie@users.noreply.github.com>

---------

Co-authored-by: Martin Taillefer <mataille@microsoft.com>
Co-authored-by: Igor Velikorossov <RussKie@users.noreply.github.com>
- The generator now produces a warning when asked to log an object
which doesn't implement ToString(), IConvertible, or IFormattable.
Fixed dotnet#4835.

- Added support for the Transitive property in the LogProperties attribute. When
set to true, this causes automatic transitive traversal of a complex object, instead
of requiring manual annotations of individual properties. Fixes dotnet#4738.

- Introduce the [TagName] attribute to make it possible to control the tag name
used when logging a parameter or property. Fixes dotnet#4576.

- Fixed some situations where unnatural errors were produced as a
result of a prior error. The dummy follow-on errors are now avoided.

- Fixed handling of cases where parameters or properties were of type of the
non-generic IEnumerable. The specific type wasn't being recorgnized and treated
as an enumerable.

Co-authored-by: Martin Taillefer <mataille@microsoft.com>
@RussKie
Copy link
Member

RussKie commented Dec 27, 2023

@geeknoid could you please help with the MC?

@RussKie RussKie merged commit cf3cfb0 into dotnet:dev Dec 28, 2023
6 checks passed
@RussKie
Copy link
Member

RussKie commented Dec 28, 2023

Thank you @sebastienros

@github-actions github-actions bot locked and limited conversation to collaborators Jan 27, 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