-
Notifications
You must be signed in to change notification settings - Fork 260
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
[Feature] Generate metrics from traces #3453
Merged
iancooper
merged 5 commits into
BrighterCommand:master
from
jtsalva:feature-3389-metrics-from-traces
Jan 3, 2025
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
5269bcb
[Feature] Generate metrics from traces #3389
jtsalva 1cf17ad
Merge branch 'master' into feature-3389-metrics-from-traces
jtsalva 6384a5e
Minor fixes
jtsalva 9721949
Merge branch 'master' into feature-3389-metrics-from-traces
iancooper 913d66f
Add name to new files
jtsalva File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
src/Paramore.Brighter.Extensions.Diagnostics/BrighterMetricsBuilderExtensions.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
#region Licence | ||
|
||
/* The MIT License (MIT) | ||
Copyright © 2025 Tim Salva <[email protected]> | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in | ||
all copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
THE SOFTWARE. */ | ||
|
||
#endregion | ||
|
||
using Microsoft.Extensions.DependencyInjection.Extensions; | ||
using OpenTelemetry.Metrics; | ||
using Paramore.Brighter.Observability; | ||
|
||
namespace Paramore.Brighter.Extensions.Diagnostics; | ||
|
||
public static class BrighterMetricsBuilderExtensions | ||
{ | ||
public static MeterProviderBuilder AddBrighterInstrumentation(this MeterProviderBuilder builder) | ||
{ | ||
builder.ConfigureServices(services => | ||
{ | ||
services.TryAddSingleton<IAmABrighterMessagingMeter, MessagingMeter>(); | ||
services.TryAddSingleton<IAmABrighterDbMeter, DbMeter>(); | ||
|
||
builder.AddMeter(BrighterSemanticConventions.MeterName); | ||
}); | ||
|
||
return builder; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
src/Paramore.Brighter/Observability/BrighterMetricsFromTracesProcessor.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
#region Licence | ||
|
||
/* The MIT License (MIT) | ||
Copyright © 2025 Tim Salva <[email protected]> | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in | ||
all copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
THE SOFTWARE. */ | ||
|
||
#endregion | ||
|
||
using System.Diagnostics; | ||
using OpenTelemetry; | ||
|
||
namespace Paramore.Brighter.Observability; | ||
|
||
/// <summary> | ||
/// Generates metrics from traces following OpenTelemetry Semantic Conventions 1.29.0 | ||
/// Unstable due to depending on experimental parts of the OpenTelemetry spec | ||
/// </summary> | ||
public sealed class BrighterMetricsFromTracesProcessor( | ||
IAmABrighterTracer brighterTracer, | ||
IAmABrighterDbMeter dbMeter, | ||
IAmABrighterMessagingMeter messagingMeter) | ||
: BaseProcessor<Activity> | ||
{ | ||
private readonly string _brighterActivitySourceName = brighterTracer.ActivitySource.Name; | ||
|
||
private bool Enabled => dbMeter.Enabled || messagingMeter.Enabled; | ||
|
||
public override void OnEnd(Activity? activity) | ||
{ | ||
if (!Enabled) return; | ||
|
||
if (activity == null) return; | ||
|
||
if (!activity.Source.Name.Equals(_brighterActivitySourceName)) return; | ||
|
||
if (activity.GetTagItem(BrighterSemanticConventions.InstrumentationDomain) is not string instrumentationDomain) return; | ||
|
||
switch (instrumentationDomain) | ||
{ | ||
case BrighterSemanticConventions.MessagingInstrumentationDomain: | ||
if (activity.GetTagItem(BrighterSemanticConventions.MessagingOperationType) is string operation) | ||
{ | ||
switch (operation) | ||
{ | ||
case "publish": | ||
messagingMeter.RecordClientOperation(activity); | ||
messagingMeter.AddClientSentMessage(activity); | ||
break; | ||
case "receive": | ||
messagingMeter.RecordClientOperation(activity); | ||
messagingMeter.AddClientConsumedMessage(activity); | ||
break; | ||
case "process": | ||
messagingMeter.RecordProcess(activity); | ||
break; | ||
default: | ||
messagingMeter.RecordClientOperation(activity); | ||
break; | ||
} | ||
} | ||
break; | ||
case BrighterSemanticConventions.DbInstrumentationDomain: | ||
dbMeter.RecordClientOperation(activity); | ||
break; | ||
} | ||
|
||
base.OnEnd(activity); | ||
} | ||
jtsalva marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it is a new file, you can add your own name for the copyright in the header. We just need you to sign the CLA so that we have good title to your work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How do I sign the CLA, is it a file in git somewhere?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ihttps://cla-assistant.io/BrighterCommand/Brighter?pullRequest=3453
Should work