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

Merge Correlation branch into master #422

Merged
merged 52 commits into from
Nov 11, 2020
Merged

Merge Correlation branch into master #422

merged 52 commits into from
Nov 11, 2020

Conversation

cgillum
Copy link
Collaborator

@cgillum cgillum commented Jul 16, 2020

The private preview was a success. Let's take the next step and get this merged into the main branch so it can be shipped with our nuget releases.

We'll want to do another pass on these changes to make sure we're not taking any changes that we don't want shipping.

FYI @TsuyoshiUshio

@cgillum cgillum self-assigned this Jul 16, 2020
@cgillum cgillum marked this pull request as draft July 16, 2020 21:37
@cgillum
Copy link
Collaborator Author

cgillum commented Jul 17, 2020

/azp run

@azure-pipelines
Copy link

No pipelines are associated with this pull request.

@cgillum
Copy link
Collaborator Author

cgillum commented Jul 17, 2020

/azp run

@azure-pipelines
Copy link

No pipelines are associated with this pull request.

@TsuyoshiUshio
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Commenter does not have sufficient privileges for PR 422 in repo Azure/durabletask

@cgillum
Copy link
Collaborator Author

cgillum commented Jul 20, 2020

/azp run

@azure-pipelines
Copy link

No pipelines are associated with this pull request.

Copy link
Contributor

@ConnorMcMahon ConnorMcMahon left a comment

Choose a reason for hiding this comment

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

About 1/2 way through.

samples/Correlation.Sample.Tests/StringExtensionsTest.cs Outdated Show resolved Hide resolved

### [TelemetryActivator](../TelemetryActivator.cs)

TelemetryActivator has a responsibility to track telemetry. Work with CorrelationTraceClient with giving Lambda to activate Application Insights. This class is a client-side implementation. So this class is **NOT** included in DurableTask namespaces.
Copy link
Contributor

Choose a reason for hiding this comment

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

not sure what is meant by with giving Lambda to activate Application Insights?

Copy link
Collaborator

Choose a reason for hiding this comment

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

CorrelationTraceClient is initialized by Setup method. https://github.com/Azure/durabletask/blob/correlation/src/DurableTask.Core/CorrelationTraceClient.cs#L42 The implementation is hidden on the Action . They don't have any dependency on Application Insights.
For the dependency of the Application Insights, configure the TelemetryActivator to enable Correlation feature.
https://github.com/Azure/durabletask/blob/correlation/samples/Correlation.Samples/TelemetryActivator.cs#L34-L51

src/DurableTask.Core/CorrelatedExceptionDetails.cs Outdated Show resolved Hide resolved
@davidmrdavid
Copy link
Collaborator

Aha!

So the test that's failing is not quite a bug I introduced. The test passes after Tsuyoshi's fix branch was merged here, but it fails after we pulled the latest master, which must have automerged some things incorrectly. I'll review the diff tomorrow and hopefully get this fixed!

@davidmrdavid
Copy link
Collaborator

Another update:

We appear to have a Heisenbug in our hands. When git-checking the commit that merges Tsuyoshi's Fix PR into this branch, the test will succeed when invoked normally but will fail when invoked with a debugger.

I'll consult with Tsuyoshi tomorrow to try to get to the bottom of this :)

@davidmrdavid
Copy link
Collaborator

@ConnorMcMahon @cgillum

I think this branch is ready to merge now. We've fixed the failing tests and bypassed the test-discovery exception we were seeing in the CI. I'll create a ticket for us to investigate the CI test discovery config, as it took a lot of time to diagnose and circumvent.

@cgillum
Copy link
Collaborator Author

cgillum commented Nov 11, 2020

Thanks for the hard work on this! I guess our CI is pretty sensitive to changes in test projects. Looking forward to the result of that investigation. I'll go ahead and merge this PR.

@davidmrdavid
Copy link
Collaborator

Tracking issue: #473

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.

None yet

5 participants