all: remove go.lsp.dev/pkg dependency

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

Author: zchee

conn.go

@@ -11,10 +11,6 @@ import (
 	"sync/atomic"
 
 	"github.com/segmentio/encoding/json"
-
-	"go.lsp.dev/pkg/event"
-	"go.lsp.dev/pkg/event/label"
-	"go.lsp.dev/pkg/event/tag"
 )
 
 // Conn is the common interface to jsonrpc clients and servers.
@@ -95,17 +91,6 @@ func (c *conn) Call(ctx context.Context, method string, params, result interface
 		return id, fmt.Errorf("marshaling call parameters: %w", err)
 	}
 
-	ctx, done := event.Start(ctx, method,
-		tag.Method.Of(method),
-		tag.RPCDirection.Of(tag.Outbound),
-		tag.RPCID.Of(fmt.Sprintf("%q", id)),
-	)
-	defer func() {
-		recordStatus(ctx, err)
-		done()
-	}()
-	event.Metric(ctx, tag.Started.Of(1))
-
 	// We have to add ourselves to the pending map before we send, otherwise we
 	// are racing the response. Also add a buffer to rchan, so that if we get a
 	// wire response between the time this call is cancelled and id is deleted
@@ -123,8 +108,7 @@ func (c *conn) Call(ctx context.Context, method string, params, result interface
 	}()
 
 	// now we are ready to send
-	n, err := c.write(ctx, call)
-	event.Metric(ctx, tag.SentBytes.Of(n))
+	_, err = c.write(ctx, call)
 	if err != nil {
 		// sending failed, we will never get a response, so don't leave it pending
 		return id, err
@@ -162,28 +146,13 @@ func (c *conn) Notify(ctx context.Context, method string, params interface{}) (e
 		return fmt.Errorf("marshaling notify parameters: %w", err)
 	}
 
-	ctx, done := event.Start(ctx, method,
-		tag.Method.Of(method),
-		tag.RPCDirection.Of(tag.Outbound),
-	)
-	defer func() {
-		recordStatus(ctx, err)
-		done()
-	}()
-
-	event.Metric(ctx, tag.Started.Of(1))
-	n, err := c.write(ctx, notify)
-	event.Metric(ctx, tag.SentBytes.Of(n))
+	_, err = c.write(ctx, notify)
 
 	return err
 }
 
 func (c *conn) replier(req Message, spanDone func()) Replier {
 	return func(ctx context.Context, result interface{}, err error) error {
-		defer func() {
-			recordStatus(ctx, err)
-			spanDone()
-		}()
 		call, ok := req.(*Call)
 		if !ok {
 			// request was a notify, no need to respond
@@ -195,8 +164,7 @@ func (c *conn) replier(req Message, spanDone func()) Replier {
 			return err
 		}
 
-		n, err := c.write(ctx, response)
-		event.Metric(ctx, tag.SentBytes.Of(n))
+		_, err = c.write(ctx, response)
 		if err != nil {
 			// TODO(iancottrell): if a stream write fails, we really need to shut down the whole stream
 			return err
@@ -226,7 +194,7 @@ func (c *conn) run(ctx context.Context, handler Handler) {
 
 	for {
 		// get the next message
-		msg, n, err := c.stream.Read(ctx)
+		msg, _, err := c.stream.Read(ctx)
 		if err != nil {
 			// The stream failed, we cannot continue.
 			c.fail(err)
@@ -235,27 +203,7 @@ func (c *conn) run(ctx context.Context, handler Handler) {
 
 		switch msg := msg.(type) {
 		case Request:
-			labels := []label.Label{
-				tag.Method.Of(msg.Method()),
-				tag.RPCDirection.Of(tag.Inbound),
-				{}, // reserved for ID if present
-			}
-			if call, ok := msg.(*Call); ok {
-				labels[len(labels)-1] = tag.RPCID.Of(fmt.Sprintf("%q", call.ID()))
-			} else {
-				labels = labels[:len(labels)-1]
-			}
-
-			reqCtx, spanDone := event.Start(ctx, msg.Method(), labels...)
-			event.Metric(reqCtx,
-				tag.Started.Of(1),
-				tag.ReceivedBytes.Of(n),
-			)
-
-			if err := handler(reqCtx, c.replier(msg, spanDone), msg); err != nil {
-				// delivery failed, not much we can do
-				event.Error(reqCtx, "jsonrpc2 message delivery failed", err)
-			}
+			handler(ctx, c.replier(msg, func() {}), msg)
 
 		case *Response:
 			// If method is not set, this should be a response, in which case we must
@@ -293,12 +241,3 @@ func (c *conn) fail(err error) {
 	c.err.Store(err)
 	c.stream.Close()
 }
-
-// recordStatus records the status code based on the error.
-func recordStatus(ctx context.Context, err error) {
-	if err != nil {
-		event.Label(ctx, tag.StatusCode.Of("ERROR"))
-	} else {
-		event.Label(ctx, tag.StatusCode.Of("OK"))
-	}
-}

go.mod

@@ -1,8 +1,12 @@
 module go.lsp.dev/jsonrpc2
 
-go 1.16
+go 1.17
+
+replace go.lsp.dev/pkg => ../pkg
+
+require github.com/segmentio/encoding v0.3.4
 
 require (
-	github.com/segmentio/encoding v0.2.17
-	go.lsp.dev/pkg v0.0.0-20210125030640-b6310ac75a91
+	github.com/segmentio/asm v1.1.3 // indirect
+	golang.org/x/sys v0.0.0-20211110154304-99a53858aa08 // indirect
 )

go.sum

@@ -1,6 +1,6 @@
-github.com/klauspost/cpuid/v2 v2.0.5 h1:qnfhwbFriwDIX51QncuNU5mEMf+6KE3t7O8V2KQl3Dg=
-github.com/klauspost/cpuid/v2 v2.0.5/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/segmentio/encoding v0.2.17 h1:cgfmPc44u1po1lz5bSgF00gLCROBjDNc7h+H7I20zpc=
-github.com/segmentio/encoding v0.2.17/go.mod h1:7E68jTSWMnNoYhHi1JbLd7NBSB6XfE4vzqhR88hDBQc=
-go.lsp.dev/pkg v0.0.0-20210125030640-b6310ac75a91 h1:JPKNt/RzBcOc89rhZ4Vl6U05Y1nN37FAc8PTKE3hssk=
-go.lsp.dev/pkg v0.0.0-20210125030640-b6310ac75a91/go.mod h1:gtSHRuYfbCT0qnbLnovpie/WEmqyJ7T4n6VXiFMBtcw=
+github.com/segmentio/asm v1.1.3 h1:WM03sfUOENvvKexOLp+pCqgb/WDjsi7EK8gIsICtzhc=
+github.com/segmentio/asm v1.1.3/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
+github.com/segmentio/encoding v0.3.4 h1:WM4IBnxH8B9TakiM2QD5LyNl9JSndh88QbHqVC+Pauc=
+github.com/segmentio/encoding v0.3.4/go.mod h1:n0JeuIqEQrQoPDGsjo8UNd1iA0U8d8+oHAA4E3G3OxM=
+golang.org/x/sys v0.0.0-20211110154304-99a53858aa08 h1:WecRHqgE09JBkh/584XIE6PMz5KKE/vER4izNUi30AQ=
+golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

handler.go

@@ -7,8 +7,6 @@ import (
 	"context"
 	"fmt"
 	"sync"
-
-	"go.lsp.dev/pkg/event"
 )
 
 // Handler is invoked to handle incoming requests.
@@ -111,13 +109,9 @@ func AsyncHandler(handler Handler) (h Handler) {
 			return innerReply(ctx, result, err)
 		}
 
-		_, queueDone := event.Start(ctx, "queued")
 		go func() {
 			<-waitForPrevious
-			queueDone()
-			if err := handler(ctx, reply, req); err != nil {
-				event.Error(ctx, "jsonrpc2 async message delivery failed", err)
-			}
+			handler(ctx, reply, req)
 		}()
 		return nil
 	})

serve.go

@@ -11,8 +11,6 @@ import (
 	"net"
 	"os"
 	"time"
-
-	"go.lsp.dev/pkg/event"
 )
 
 // NOTE: This file provides an experimental API for serving multiple remote
@@ -114,10 +112,9 @@ func Serve(ctx context.Context, ln net.Listener, server StreamServer, idleTimeou
 		case err := <-doneListening:
 			return err
 
-		case err := <-closedConns:
-			if !isClosingError(err) {
-				event.Error(ctx, "closed a connection", err)
-			}
+		case <-closedConns:
+			// if !isClosingError(err) {
+			// }
 
 			activeConns--
 			if activeConns == 0 {