Skip to content

Prepare hotfixes for 1.28.4, based on 1.28.2#1705

Merged
zacharycmontoya merged 8 commits into
release/1.28.4from
zach/release/1.28.4
Aug 28, 2021
Merged

Prepare hotfixes for 1.28.4, based on 1.28.2#1705
zacharycmontoya merged 8 commits into
release/1.28.4from
zach/release/1.28.4

Conversation

@zacharycmontoya

@zacharycmontoya zacharycmontoya commented Aug 26, 2021

Copy link
Copy Markdown
Contributor

Changes proposed in this pull request:
This PR is set to merge into the release/1.28.4 branch, which is based on the 1.28.2 release (set at the v1.28.2 tag). To minimize risk while deploying fixes for customers, this PR is only porting the following changes to be released:

Please let me know if I'm missing any fixes that should go in, or if you think some fixes should not go into this hotfix release.

@DataDog/apm-dotnet

@zacharycmontoya zacharycmontoya added the status:do-not-merge Work is done. Can review, but do not merge yet. label Aug 26, 2021
@zacharycmontoya zacharycmontoya requested a review from a team as a code owner August 26, 2021 20:31
@zacharycmontoya zacharycmontoya self-assigned this Aug 26, 2021
kevingosse and others added 6 commits August 26, 2021 14:08
)

* Read performance counter values from environment variables in AAS
* Log a specific error message when permissions are unsufficient to read performance counters
* Disable performance counters when initialization failed
…r configuration (#1700)

Environment.CurrentDirectory does not necessarily point to the directory containing the application. The most obvious example is Windows Services, where Environment.CurrentDirectory points to C:\Windows\System32

Using AppDomain.CurrentDomain.BaseDirectory seems to be a better (and safer) alternative.

Tested the following scenarios, and they behave as expected
* asp.net sites,  (iis express + iis)
* asp.net in a virtual directory ((iis express + iis)
* Owin self hosted
* Owin hosted in a windows service
* ASP.NET Core app hosted in iis
* `dotnet run` on an asp.net core app (returns the bin directory, whereas Environment.CurrentDirectory returns the app directory/content root)
* `dotnet dll`/running .exe directly. Returns app directory instead of the console's current directory (e.g. if entering full path to exe)
@zacharycmontoya zacharycmontoya removed the status:do-not-merge Work is done. Can review, but do not merge yet. label Aug 27, 2021

@andrewlock andrewlock left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@zacharycmontoya zacharycmontoya merged commit 120af66 into release/1.28.4 Aug 28, 2021
@zacharycmontoya zacharycmontoya deleted the zach/release/1.28.4 branch August 28, 2021 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants