Skip to content

Msmq integration, taking into account all comments from PR #1457.#1463

Merged
anna-git merged 2 commits into
masterfrom
anna/msmq-inte
May 17, 2021
Merged

Msmq integration, taking into account all comments from PR #1457.#1463
anna-git merged 2 commits into
masterfrom
anna/msmq-inte

Conversation

@anna-git

Copy link
Copy Markdown
Contributor

Fixes #

Changes proposed in this pull request:
Taken into accounts all comments from #1457 because I couldn't rebase successfully despite all attempts

@DataDog/apm-dotnet

@anna-git
anna-git requested a review from a team as a code owner May 12, 2021 15:58
@lucaspimentel lucaspimentel mentioned this pull request May 12, 2021
Comment thread Datadog.Trace.sln
@lucaspimentel lucaspimentel added area:automatic-instrumentation Automatic instrumentation managed C# code (Datadog.Trace.ClrProfiler.Managed) type:new-feature labels May 12, 2021
@lucaspimentel
lucaspimentel requested a review from a team May 12, 2021 17:09
Comment thread src/Datadog.Trace.ClrProfiler.Managed/AutoInstrumentation/Msmq/MsmqCommon.cs Outdated
Comment thread test/test-applications/integrations/Samples.Msmq/Samples.Msmq.csproj Outdated
Comment thread test/Datadog.Trace.ClrProfiler.IntegrationTests/MsmqTests.cs
Comment thread src/Datadog.Trace/Tags.cs Outdated
Comment thread test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsComprehensive.g.cs Outdated
Comment thread test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs Outdated
@anna-git

Copy link
Copy Markdown
Contributor Author

did a rebase to get the fix for the build

@anna-git anna-git reopened this May 14, 2021
{
Command = command,
IsTransactionalQueue = messageQueue.Transactional.ToString(),
Path = messageQueue.Path,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For the Path tag (not the resource name), I think it would be desirable to include the machine name, that way users can filter further on that. Is that reasonable @lucaspimentel or should we not include the machine name on this tag?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The machine name property doesn't give me the machine name but just a "." so does seem useless..
The only way to get it is to use the format name property of the queue. So path and format name look almost the same..
Path: Private$\myQueue3
FormatName: DIRECT=OS:desktop-duevvft\Private$\myQueue3
we need the path for grouping by resource name:
span.ResourceName = $"{command} {messageQueue.Path}";

I can try to isolate the machine name by removing the "Path" part from the format name, it should cover all sorts of cases?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Got it. With that info, then I would recommend keeping what you have now so we don't spend extra cycles splitting and allocating new strings 😄

@zacharycmontoya zacharycmontoya left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM with one small question about a tag's value 👍🏼

@tonyredondo tonyredondo 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.

Nice job you did here!, just one nitpicking comment, non blocking.


namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.Msmq
{
internal class MsmqCommon

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.

nit: internal static

@kevingosse kevingosse left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM 👍

@anna-git
anna-git merged commit f822b94 into master May 17, 2021
@anna-git
anna-git deleted the anna/msmq-inte branch May 17, 2021 16:37
@andrewlock andrewlock added this to the 1.27.0 milestone Jun 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:automatic-instrumentation Automatic instrumentation managed C# code (Datadog.Trace.ClrProfiler.Managed) type:new-feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants