-
Notifications
You must be signed in to change notification settings - Fork 552
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add tests update change log and split up test remove accidental dependabot change
- Loading branch information
Showing
7 changed files
with
200 additions
and
14 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ Thumbs.db | |
| .tools/ | ||
| .idea/ | ||
| .vscode/ | ||
| vendor/ | ||
| *.iml | ||
| *.so | ||
| coverage.* | ||
|
|
||
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
102 changes: 102 additions & 0 deletions
102
instrumentation/google.golang.org/grpc/otelgrpc/test/bufconn_mock.go
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,102 @@ | ||
| package test | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "google.golang.org/grpc/test/bufconn" | ||
| "net" | ||
| "time" | ||
| ) | ||
|
|
||
| const ( | ||
| mockIp = "1.1.1.1" | ||
| mockPort = 1234 | ||
| ) | ||
|
|
||
| var ( | ||
| mockAddr, _ = net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", mockIp, mockPort)) | ||
| ) | ||
|
|
||
| // bufConnMock wraps a bufconn.Lister for the sake of returning a valid address. This is so we can properly test | ||
| // returning net.sock.peer.addr and net.sock.peer.port attributes | ||
| type bufConnMock struct { | ||
| listener *bufconn.Listener | ||
| } | ||
|
|
||
| func NewMockBufConn(size int) *bufConnMock { | ||
| return &bufConnMock{ | ||
| listener: bufconn.Listen(size), | ||
| } | ||
| } | ||
|
|
||
| func (b *bufConnMock) Accept() (net.Conn, error) { | ||
| conn, err := b.listener.Accept() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &bufConn{ | ||
| conn: conn, | ||
| }, nil | ||
| } | ||
|
|
||
| func (b *bufConnMock) Close() error { | ||
| return b.listener.Close() | ||
| } | ||
|
|
||
| func (b *bufConnMock) Addr() net.Addr { | ||
| return mockAddr | ||
| } | ||
|
|
||
| func (b *bufConnMock) Dial() (net.Conn, error) { | ||
| // bufConnect's listener Dial implementation just calls | ||
| // DialContext under the covers so don't wrap the connection in our mock here | ||
| return b.listener.DialContext(context.Background()) | ||
| } | ||
|
|
||
| func (b *bufConnMock) DialContext(ctx context.Context) (net.Conn, error) { | ||
| conn, err := b.listener.DialContext(ctx) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &bufConn{ | ||
| conn: conn, | ||
| }, nil | ||
| } | ||
|
|
||
| type bufConn struct { | ||
| conn net.Conn | ||
| } | ||
|
|
||
| func (b *bufConn) Read(bytes []byte) (n int, err error) { | ||
| return b.conn.Read(bytes) | ||
| } | ||
|
|
||
| func (b *bufConn) Write(bytes []byte) (n int, err error) { | ||
| return b.conn.Write(bytes) | ||
| } | ||
|
|
||
| func (b *bufConn) Close() error { | ||
| return b.conn.Close() | ||
| } | ||
|
|
||
| func (b *bufConn) LocalAddr() net.Addr { | ||
| return mockAddr | ||
| } | ||
|
|
||
| func (b *bufConn) RemoteAddr() net.Addr { | ||
| return mockAddr | ||
| } | ||
|
|
||
| func (b *bufConn) SetDeadline(t time.Time) error { | ||
| return b.conn.SetDeadline(t) | ||
| } | ||
|
|
||
| func (b *bufConn) SetReadDeadline(t time.Time) error { | ||
| return b.conn.SetReadDeadline(t) | ||
| } | ||
|
|
||
| func (b *bufConn) SetWriteDeadline(t time.Time) error { | ||
| return b.conn.SetWriteDeadline(t) | ||
| } |
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