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

3.x merge from master #236

Merged
merged 42 commits into from
Mar 21, 2022
Merged

3.x merge from master #236

merged 42 commits into from
Mar 21, 2022

Conversation

jon-armen
Copy link
Contributor

Description of changes:

Merging latest master into 3.x branch

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

srprash and others added 30 commits June 10, 2020 00:08
* Bump AWSSDK.Core dependency version

* Bumped AWSSDK.Core version as range.

* Removed redundant dependency
* Applied HttpWebRequest to get sampling info and removed dependency on AWSSDK.XRay

* Fixed lock issue and switched to HttpClient

* Added and modified documentations.

* Added documentations.

* Set ExpectContinue header as false by default
)

* Adding limitation for EFCore with multiple DbCommandInterceptor

* Adding doc ref for AsyncLocal
To avoid concurrent thread access to the dictionary causing an exception
* Enable tracing S3 id pairs and fix SNS naming issue.

* Changed AWSSDK.Core version

* Changed parameter names and updated comments.

* Set parameters as default
* Added support for EntityFramework 6 for .NET framework.
* Added release workflow

* Added space line

* Update configuration
* Switching out AppVeyor for GH workflow

* Running workflow on linux as well. building wth release config
* Add smoke test of distribution channel

* Updated AWSXRayRecorder.sln

* Points to the latest version
Bumps System.Net.Http from 4.3.3 to 4.3.4.

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Increase monitoring frequency to 30 minutes
Increase continuous monitoring to 10 minutes
Add a target framework moniker for .NET Core 3.1.
willarmiros and others added 11 commits November 8, 2021 16:02
…eference

Add netcoreapp3.1 target framework
* Update appveyor.yml

* Update appveyor.yml
* Update continuous-monitoring.yml

* Update netcoreapp version in .csproj file

* Update continuous-monitoring.yml

* Update AWSXRayRecorder.SmokeTests.csproj
* Add Source Link support for enhanced debugging experience

* NetFramework does not support embedded pdb

Co-authored-by: Jon Armen <[email protected]>
@jon-armen jon-armen changed the title 3.x 3.x merge from master Mar 17, 2022
@srprash srprash merged commit 88c1227 into aws:3.x Mar 21, 2022
jon-armen added a commit to jon-armen/aws-xray-sdk-dotnet that referenced this pull request Apr 15, 2022
* Create stale.yml (aws#136)

* Release commit for v2.9.0 (aws#137)

* Added 2 seconds timeout for EC2 metadata requests (aws#138)

* Update NOTICE so it only has third party licenses and no proprietary notice (aws#139)

* Fixing link to EFCore usage section (aws#143)

* Added EF Core installation instruction step (aws#145)

* Fixing race condition for initializing and running timer in RulePoller (aws#154)

* Bump AWSSDK.Core dependency version (aws#155)

* Bump AWSSDK.Core dependency version

* Bumped AWSSDK.Core version as range.

* Removed redundant dependency

* Applied HttpClient to get sampling info (aws#159)

* Applied HttpWebRequest to get sampling info and removed dependency on AWSSDK.XRay

* Fixed lock issue and switched to HttpClient

* Added and modified documentations.

* Added documentations.

* Set ExpectContinue header as false by default

* Adding limitation for EFCore with multiple DbCommandInterceptor (aws#164)

* Adding limitation for EFCore with multiple DbCommandInterceptor

* Adding doc ref for AsyncLocal

* Updated xraycontext to use a concurrent dictionary (aws#157)

To avoid concurrent thread access to the dictionary causing an exception

* Enable tracing S3 id pairs and fix SNS naming issue. (aws#168)

* Enable tracing S3 id pairs and fix SNS naming issue.

* Changed AWSSDK.Core version

* Changed parameter names and updated comments.

* Set parameters as default

* Fixed appvoyer building configuration issue. (aws#173)

* Add tracing support for EntityFramework 6 (.NET Framework) (aws#171)

* Added support for EntityFramework 6 for .NET framework.

* Added release workflow (aws#179)

* Added release workflow

* Added space line

* Update configuration

* Switching out AppVeyor for GH workflow (aws#181)

* Switching out AppVeyor for GH workflow

* Running workflow on linux as well. building wth release config

* Revert "Switching out AppVeyor for GH workflow (aws#181)" (aws#185)

This reverts commit 34134f0.

* Added public key token (aws#186)

* Release commit for v2.10.0 (aws#187)

* Updated API Doc (aws#188)

* Add smoke test of distribution channel (aws#189)

* Add smoke test of distribution channel

* Updated AWSXRayRecorder.sln

* Points to the latest version

* Publish metric on distribution availability (aws#190)

* Run test on ubuntu (aws#191)

* Bump System.Net.Http from 4.3.3 to 4.3.4 in /sdk/src/Core (aws#193)

Bumps System.Net.Http from 4.3.3 to 4.3.4.

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Release commit for v2.10.1 (aws#194)

* Update continuous-monitoring.yml

* Increase continuous monitoring to 10 minutes

* Add netcoreapp3.1 target framework

Add a target framework moniker for .NET Core 3.1.

* Create CODEOWNERS

* Update appveyor.yml (aws#226)

* Update appveyor.yml

* Update appveyor.yml

* Update .netappcore version for smoke tests (aws#228)

* Update continuous-monitoring.yml

* Update netcoreapp version in .csproj file

* Update continuous-monitoring.yml

* Update AWSXRayRecorder.SmokeTests.csproj

* Use GitHub workflow for CI on PRs and master builds (aws#231)

* Update continuous-monitoring.yml

* Add Source Link support for enhanced debugging experience (aws#229)

* Add Source Link support for enhanced debugging experience

* NetFramework does not support embedded pdb

Co-authored-by: Jon Armen <[email protected]>

* Finding the same exception in different subsegments should reuse the same cause id (aws#210)

Co-authored-by: Jon Armen <[email protected]>

* Removed blocking call which was producing deadlocks from EC2Plugin. (aws#234)

* Adding 3.x for continous build

Co-authored-by: srprash <[email protected]>
Co-authored-by: Anuraag Agrawal <[email protected]>
Co-authored-by: Lu Peng <[email protected]>
Co-authored-by: Stephen D'Olier <[email protected]>
Co-authored-by: Bhautik Pipaliya <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: William Armiros <[email protected]>
Co-authored-by: martincostello <[email protected]>
Co-authored-by: Jon Armen <[email protected]>
Co-authored-by: Scott Munro <[email protected]>
jon-armen added a commit to jon-armen/aws-xray-sdk-dotnet that referenced this pull request Apr 15, 2022
* Create stale.yml (aws#136)

* Release commit for v2.9.0 (aws#137)

* Added 2 seconds timeout for EC2 metadata requests (aws#138)

* Update NOTICE so it only has third party licenses and no proprietary notice (aws#139)

* Fixing link to EFCore usage section (aws#143)

* Added EF Core installation instruction step (aws#145)

* Fixing race condition for initializing and running timer in RulePoller (aws#154)

* Bump AWSSDK.Core dependency version (aws#155)

* Bump AWSSDK.Core dependency version

* Bumped AWSSDK.Core version as range.

* Removed redundant dependency

* Applied HttpClient to get sampling info (aws#159)

* Applied HttpWebRequest to get sampling info and removed dependency on AWSSDK.XRay

* Fixed lock issue and switched to HttpClient

* Added and modified documentations.

* Added documentations.

* Set ExpectContinue header as false by default

* Adding limitation for EFCore with multiple DbCommandInterceptor (aws#164)

* Adding limitation for EFCore with multiple DbCommandInterceptor

* Adding doc ref for AsyncLocal

* Updated xraycontext to use a concurrent dictionary (aws#157)

To avoid concurrent thread access to the dictionary causing an exception

* Enable tracing S3 id pairs and fix SNS naming issue. (aws#168)

* Enable tracing S3 id pairs and fix SNS naming issue.

* Changed AWSSDK.Core version

* Changed parameter names and updated comments.

* Set parameters as default

* Fixed appvoyer building configuration issue. (aws#173)

* Add tracing support for EntityFramework 6 (.NET Framework) (aws#171)

* Added support for EntityFramework 6 for .NET framework.

* Added release workflow (aws#179)

* Added release workflow

* Added space line

* Update configuration

* Switching out AppVeyor for GH workflow (aws#181)

* Switching out AppVeyor for GH workflow

* Running workflow on linux as well. building wth release config

* Revert "Switching out AppVeyor for GH workflow (aws#181)" (aws#185)

This reverts commit 34134f0.

* Added public key token (aws#186)

* Release commit for v2.10.0 (aws#187)

* Updated API Doc (aws#188)

* Add smoke test of distribution channel (aws#189)

* Add smoke test of distribution channel

* Updated AWSXRayRecorder.sln

* Points to the latest version

* Publish metric on distribution availability (aws#190)

* Run test on ubuntu (aws#191)

* Bump System.Net.Http from 4.3.3 to 4.3.4 in /sdk/src/Core (aws#193)

Bumps System.Net.Http from 4.3.3 to 4.3.4.

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Release commit for v2.10.1 (aws#194)

* Update continuous-monitoring.yml

* Increase continuous monitoring to 10 minutes

* Add netcoreapp3.1 target framework

Add a target framework moniker for .NET Core 3.1.

* Create CODEOWNERS

* Update appveyor.yml (aws#226)

* Update appveyor.yml

* Update appveyor.yml

* Update .netappcore version for smoke tests (aws#228)

* Update continuous-monitoring.yml

* Update netcoreapp version in .csproj file

* Update continuous-monitoring.yml

* Update AWSXRayRecorder.SmokeTests.csproj

* Use GitHub workflow for CI on PRs and master builds (aws#231)

* Update continuous-monitoring.yml

* Add Source Link support for enhanced debugging experience (aws#229)

* Add Source Link support for enhanced debugging experience

* NetFramework does not support embedded pdb

Co-authored-by: Jon Armen <[email protected]>

* Finding the same exception in different subsegments should reuse the same cause id (aws#210)

Co-authored-by: Jon Armen <[email protected]>

* Removed blocking call which was producing deadlocks from EC2Plugin. (aws#234)

* Adding 3.x for continous build

Co-authored-by: srprash <[email protected]>
Co-authored-by: Anuraag Agrawal <[email protected]>
Co-authored-by: Lu Peng <[email protected]>
Co-authored-by: Stephen D'Olier <[email protected]>
Co-authored-by: Bhautik Pipaliya <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: William Armiros <[email protected]>
Co-authored-by: martincostello <[email protected]>
Co-authored-by: Jon Armen <[email protected]>
Co-authored-by: Scott Munro <[email protected]>
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.

8 participants