Expose NewNetTCP and NewNetUDP

Author: iluxa

.golangci.yml

@@ -26,6 +26,6 @@ linters-settings:
     # Ignore "See: URL"
     - 'See:'
   goimports:
-      local-prefixes: github.com/prometheus/procfs
+      local-prefixes: github.com/kubeshark/procfs
   misspell:
     locale: US

CONTRIBUTING.md

@@ -25,7 +25,7 @@ Prometheus uses GitHub to manage reviews of pull requests.
 
 Should you wish to work on an issue, please claim it first by commenting on the GitHub issue that you want to work on it. This is to prevent duplicated efforts from contributors on the same issue.
 
-Please check the [`help-wanted`](https://github.com/prometheus/procfs/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) label to find issues that are good for getting started. If you have questions about one of the issues, with or without the tag, please comment on them and one of the maintainers will clarify it. For a quicker response, contact us over [IRC](https://prometheus.io/community).
+Please check the [`help-wanted`](https://github.com/kubeshark/procfs/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) label to find issues that are good for getting started. If you have questions about one of the issues, with or without the tag, please comment on them and one of the maintainers will clarify it. For a quicker response, contact us over [IRC](https://prometheus.io/community).
 
 For quickly compiling and testing your changes do:
 ```

README.md

@@ -6,9 +6,9 @@ metrics from the pseudo-filesystems /proc and /sys.
 *WARNING*: This package is a work in progress. Its API may still break in
 backwards-incompatible ways without warnings. Use it at your own risk.
 
-[![Go Reference](https://pkg.go.dev/badge/github.com/prometheus/procfs.svg)](https://pkg.go.dev/github.com/prometheus/procfs)
-[![CircleCI](https://circleci.com/gh/prometheus/procfs/tree/master.svg?style=svg)](https://circleci.com/gh/prometheus/procfs/tree/master)
-[![Go Report Card](https://goreportcard.com/badge/github.com/prometheus/procfs)](https://goreportcard.com/report/github.com/prometheus/procfs)
+[![Go Reference](https://pkg.go.dev/badge/github.com/kubeshark/procfs.svg)](https://pkg.go.dev/github.com/kubeshark/procfs)
+[![CircleCI](https://circleci.com/gh/kubeshark/procfs/tree/master.svg?style=svg)](https://circleci.com/gh/kubeshark/procfs/tree/master)
+[![Go Report Card](https://goreportcard.com/badge/github.com/kubeshark/procfs)](https://goreportcard.com/report/github.com/kubeshark/procfs)
 
 ## Usage
 

bcache/get.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/fs"
+	"github.com/kubeshark/procfs/internal/fs"
 )
 
 // FS represents the pseudo-filesystem proc, which provides an interface to

blockdevice/stats.go

@@ -21,9 +21,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/prometheus/procfs"
-	"github.com/prometheus/procfs/internal/fs"
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs"
+	"github.com/kubeshark/procfs/internal/fs"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // Info contains identifying information for a block device such as a disk drive.

btrfs/get.go

@@ -22,9 +22,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs"
-	"github.com/prometheus/procfs/internal/fs"
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs"
+	"github.com/kubeshark/procfs/internal/fs"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // FS represents the pseudo-filesystem sys, which provides an interface to

cmdline.go

@@ -16,7 +16,7 @@ package procfs
 import (
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // CmdLine returns the command line of the kernel.

cpuinfo.go

@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // CPUInfo contains general information about a system CPU found in /proc/cpuinfo.

crypto.go

@@ -20,7 +20,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // Crypto holds info parsed from /proc/crypto.

doc.go

@@ -22,7 +22,7 @@
 //		"fmt"
 //		"log"
 //
-//		"github.com/prometheus/procfs"
+//		"github.com/kubeshark/procfs"
 //	)
 //
 //	func main() {

ext4/ext4.go

@@ -18,8 +18,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/fs"
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/fs"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 const (

fs.go

@@ -14,7 +14,7 @@
 package procfs
 
 import (
-	"github.com/prometheus/procfs/internal/fs"
+	"github.com/kubeshark/procfs/internal/fs"
 )
 
 // FS represents the pseudo-filesystem sys, which provides an interface to

fscache.go

@@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // Fscacheinfo represents fscache statistics.

go.mod

@@ -1,4 +1,4 @@
-module github.com/prometheus/procfs
+module github.com/kubeshark/procfs
 
 go 1.21
 

internal/util/valueparser_test.go

@@ -18,7 +18,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 func TestValueParser(t *testing.T) {

ipvs.go

@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // IPVSStats holds IPVS statistics, as exposed by the kernel in `/proc/net/ip_vs_stats`.

iscsi/get.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // GetStats is the main iscsi status information func for

iscsi/get_test.go

@@ -17,7 +17,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/prometheus/procfs/iscsi"
+	"github.com/kubeshark/procfs/iscsi"
 )
 
 func TestGetStats(t *testing.T) {

iscsi/iscsi.go

@@ -18,7 +18,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/fs"
+	"github.com/kubeshark/procfs/internal/fs"
 )
 
 // iscsi target started with /sys/kernel/config/target/iscsi/iqn*

kernel_random.go

@@ -19,7 +19,7 @@ package procfs
 import (
 	"os"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // KernelRandom contains information about to the kernel's random number generator.

loadavg.go

@@ -18,7 +18,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // LoadAvg represents an entry in /proc/loadavg.

meminfo.go

@@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // Meminfo represents memory statistics.

mountinfo.go

@@ -20,7 +20,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // A MountInfo is a type that describes the details, options

net_conntrackstat.go

@@ -20,7 +20,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // A ConntrackStatEntry represents one line from net/stat/nf_conntrack

net_protocols.go

@@ -20,7 +20,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // NetProtocolStats stores the contents from /proc/net/protocols.

net_route.go

@@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 const (

net_sockstat.go

@@ -20,7 +20,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // A NetSockstat contains the output of /proc/net/sockstat{,6} for IPv4 or IPv6,

net_softnet.go

@@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // For the proc file format details,

net_tcp.go

@@ -27,14 +27,14 @@ type (
 // read from /proc/net/tcp.
 // Deprecated: Use github.com/mdlayher/netlink#Conn (with syscall.AF_INET) instead.
 func (fs FS) NetTCP() (NetTCP, error) {
-	return newNetTCP(fs.proc.Path("net/tcp"))
+	return NewNetTCP(fs.proc.Path("net/tcp"))
 }
 
 // NetTCP6 returns the IPv6 kernel/networking statistics for TCP datagrams
 // read from /proc/net/tcp6.
 // Deprecated: Use github.com/mdlayher/netlink#Conn (with syscall.AF_INET6) instead.
 func (fs FS) NetTCP6() (NetTCP, error) {
-	return newNetTCP(fs.proc.Path("net/tcp6"))
+	return NewNetTCP(fs.proc.Path("net/tcp6"))
 }
 
 // NetTCPSummary returns already computed statistics like the total queue lengths
@@ -51,8 +51,8 @@ func (fs FS) NetTCP6Summary() (*NetTCPSummary, error) {
 	return newNetTCPSummary(fs.proc.Path("net/tcp6"))
 }
 
-// newNetTCP creates a new NetTCP{,6} from the contents of the given file.
-func newNetTCP(file string) (NetTCP, error) {
+// NewNetTCP creates a new NetTCP{,6} from the contents of the given file.
+func NewNetTCP(file string) (NetTCP, error) {
 	n, err := newNetIPSocket(file)
 	n1 := NetTCP(n)
 	return n1, err

net_tcp_test.go

@@ -115,7 +115,7 @@ func Test_newNetTCP(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := newNetTCP(tt.file)
+			got, err := NewNetTCP(tt.file)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("newNetTCP() error = %v, wantErr %v", err, tt.wantErr)
 				return

net_udp.go

@@ -26,13 +26,13 @@ type (
 // NetUDP returns the IPv4 kernel/networking statistics for UDP datagrams
 // read from /proc/net/udp.
 func (fs FS) NetUDP() (NetUDP, error) {
-	return newNetUDP(fs.proc.Path("net/udp"))
+	return NewNetUDP(fs.proc.Path("net/udp"))
 }
 
 // NetUDP6 returns the IPv6 kernel/networking statistics for UDP datagrams
 // read from /proc/net/udp6.
 func (fs FS) NetUDP6() (NetUDP, error) {
-	return newNetUDP(fs.proc.Path("net/udp6"))
+	return NewNetUDP(fs.proc.Path("net/udp6"))
 }
 
 // NetUDPSummary returns already computed statistics like the total queue lengths
@@ -47,8 +47,8 @@ func (fs FS) NetUDP6Summary() (*NetUDPSummary, error) {
 	return newNetUDPSummary(fs.proc.Path("net/udp6"))
 }
 
-// newNetUDP creates a new NetUDP{,6} from the contents of the given file.
-func newNetUDP(file string) (NetUDP, error) {
+// NewNetUDP creates a new NetUDP{,6} from the contents of the given file.
+func NewNetUDP(file string) (NetUDP, error) {
 	n, err := newNetIPSocket(file)
 	n1 := NetUDP(n)
 	return n1, err

net_udp_test.go

@@ -120,7 +120,7 @@ func Test_newNetUDP(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := newNetUDP(tt.file)
+			got, err := NewNetUDP(tt.file)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("newNetUDP() error = %v, wantErr %v", err, tt.wantErr)
 				return

net_wireless.go

@@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // Wireless models the content of /proc/net/wireless.

nfs/nfs.go

@@ -19,7 +19,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/fs"
+	"github.com/kubeshark/procfs/internal/fs"
 )
 
 // ReplyCache models the "rc" line.

nfs/parse_nfs.go

@@ -19,7 +19,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // ParseClientRPCStats returns stats read from /proc/net/rpc/nfs.

nfs/parse_nfs_test.go

@@ -18,7 +18,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/prometheus/procfs/nfs"
+	"github.com/kubeshark/procfs/nfs"
 )
 
 func TestNewNFSClientRPCStats(t *testing.T) {

nfs/parse_nfsd.go

@@ -19,7 +19,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // ParseServerRPCStats returns stats read from /proc/net/rpc/nfsd.

nfs/parse_nfsd_test.go

@@ -18,7 +18,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/prometheus/procfs/nfs"
+	"github.com/kubeshark/procfs/nfs"
 )
 
 func TestNewNFSdServerRPCStats(t *testing.T) {

proc.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/procfs/internal/util"
+	"github.com/kubeshark/procfs/internal/util"
 )
 
 // Proc provides information about a running process.