-
Notifications
You must be signed in to change notification settings - Fork 0
Thomas metrics #101
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
Merged
Merged
Thomas metrics #101
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
a6092d6
update gitignore
thomasjib 8628e73
add metrics tracking
thomasjib 14f8188
remove extra connection wrap
thomasjib 291c366
add tracker test
thomasjib ef884a4
move metrics into trackers
thomasjib 33df481
fix typo
thomasjib 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 hidden or 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 |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| /data/ | ||
| /dist/ | ||
| **/.DS_Store |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or 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,25 @@ | ||
| package metrics | ||
|
|
||
| import ( | ||
| "context" | ||
| "net" | ||
|
|
||
| "github.com/sagernet/sing-box/adapter" | ||
| N "github.com/sagernet/sing/common/network" | ||
| ) | ||
|
|
||
| var _ (adapter.ConnectionTracker) = (*MetricsTracker)(nil) | ||
|
|
||
| type MetricsTracker struct{} | ||
|
|
||
| func NewTracker() (*MetricsTracker, error) { | ||
| return &MetricsTracker{}, nil | ||
| } | ||
|
|
||
| func (t *MetricsTracker) RoutedConnection(ctx context.Context, conn net.Conn, metadata adapter.InboundContext, matchedRule adapter.Rule, matchOutbound adapter.Outbound) net.Conn { | ||
| return NewConn(conn, &metadata) | ||
| } | ||
|
|
||
| func (t *MetricsTracker) RoutedPacketConnection(ctx context.Context, conn N.PacketConn, metadata adapter.InboundContext, matchedRule adapter.Rule, matchOutbound adapter.Outbound) N.PacketConn { | ||
| return NewPacketConn(conn, &metadata) | ||
| } |
This file contains hidden or 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,102 @@ | ||
| package metrics | ||
|
|
||
| import ( | ||
| "context" | ||
| "net" | ||
| "strings" | ||
| "sync" | ||
| "testing" | ||
|
|
||
| sdkotel "go.opentelemetry.io/otel" | ||
|
|
||
| "github.com/sagernet/sing-box/adapter" | ||
| "go.opentelemetry.io/otel/attribute" | ||
| "go.opentelemetry.io/otel/sdk/metric" | ||
| "go.opentelemetry.io/otel/sdk/metric/metricdata" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestTracker(t *testing.T) { | ||
| var wg sync.WaitGroup | ||
| reader := metric.NewManualReader() | ||
| provider := metric.NewMeterProvider(metric.WithReader(reader)) | ||
| sdkotel.SetMeterProvider(provider) | ||
|
|
||
| SetupMetricsManager("", "") | ||
|
|
||
| metricsTracker, err := NewTracker() | ||
| assert.NoError(t, err) | ||
|
|
||
| client, server := net.Pipe() | ||
| defer client.Close() | ||
| defer server.Close() | ||
|
|
||
| ctx := context.Background() | ||
| serverTracked := metricsTracker.RoutedConnection(ctx, server, adapter.InboundContext{}, nil, nil) | ||
|
|
||
| clientSentMessage := []byte("A client sent a short request...") | ||
| wg.Add(1) | ||
| serverReceive := 0 | ||
| go func() { | ||
| defer wg.Done() | ||
| buf := make([]byte, len(clientSentMessage)) | ||
| serverReceive, err = serverTracked.Read(buf) | ||
| assert.NoError(t, err) | ||
| }() | ||
|
|
||
| _, err = client.Write(clientSentMessage) | ||
| assert.NoError(t, err) | ||
|
|
||
| serverSentMessage := []byte("...and the server sent a short response.") | ||
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
| buf := make([]byte, len(serverSentMessage)) | ||
| _, err = client.Read(buf) | ||
| assert.NoError(t, err) | ||
| }() | ||
|
|
||
| serverTransmit, err := serverTracked.Write(serverSentMessage) | ||
| assert.NoError(t, err) | ||
|
|
||
| wg.Wait() | ||
| var rm metricdata.ResourceMetrics | ||
| reader.Collect(ctx, &rm) | ||
|
|
||
| ioCounter := extractCountersByAttribute(rm, "proxy.io") | ||
| results := map[string]int64{} | ||
| for k, v := range ioCounter { | ||
| if strings.Contains(k, "direction=transmit") { | ||
| results["transmit"] += v | ||
| } else if strings.Contains(k, "direction=receive") { | ||
| results["receive"] += v | ||
| } | ||
| } | ||
| for k, v := range results { | ||
| t.Logf("%s: %d\n", k, v) | ||
| } | ||
| if results["transmit"] != int64(serverTransmit) { | ||
| t.Errorf("transmit bytes did not match, got %d, want %d", results["transmit"], serverTransmit) | ||
| } | ||
| if results["receive"] != int64(serverReceive) { | ||
| t.Errorf("receive bytes did not match, got %d, want %d", results["receive"], serverReceive) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| func extractCountersByAttribute(rm metricdata.ResourceMetrics, name string) map[string]int64 { | ||
| result := make(map[string]int64) | ||
| for _, sm := range rm.ScopeMetrics { | ||
| for _, m := range sm.Metrics { | ||
| if m.Name == name { | ||
| sum := m.Data.(metricdata.Sum[int64]) | ||
| for _, dp := range sum.DataPoints { | ||
| key := dp.Attributes.Encoded(attribute.DefaultEncoder()) | ||
| result[string(key)] = dp.Value | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return result | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.