Skip to content

Commit 77b3fc9

Browse files
committed
use one tracer instance
1 parent 634f0bf commit 77b3fc9

6 files changed

Lines changed: 20 additions & 24 deletions

File tree

bash/bash.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"go.opentelemetry.io/otel"
2121
)
2222

23-
const name = "bash"
23+
var tracer = otel.Tracer("github.com/vscode-lcode/lcode/v2/bash")
2424

2525
type Bash struct {
2626
clients *ttlcache.Cache[string, *webdav.Client]
@@ -59,7 +59,7 @@ func (sh *Bash) Serve(l net.Listener) (err error) {
5959
}
6060

6161
func (sh *Bash) serve(conn net.Conn) (err error) {
62-
_, span := otel.Tracer(name).Start(context.Background(), "serve conn")
62+
_, span := tracer.Start(context.Background(), "serve conn")
6363
defer span.End()
6464
defer err0.Record(&err, span)
6565
defer err2.Handle(&err, func() {

bash/connect.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
. "github.com/lainio/err2/try"
1717
"github.com/vscode-lcode/lcode/v2/bash/webdav"
1818
"github.com/vscode-lcode/lcode/v2/util/err0"
19-
"go.opentelemetry.io/otel"
2019
)
2120

2221
type ID interface {
@@ -34,7 +33,7 @@ type IDGenerator func(client LcodeClient) (ID, error)
3433

3534
func (sh *Bash) Connect(r *bufio.Reader, conn net.Conn) (err error) {
3635
defer conn.Close()
37-
_, span := otel.Tracer(name).Start(context.Background(), "client connect")
36+
_, span := tracer.Start(context.Background(), "client connect")
3837
defer span.End()
3938
defer err2.Handle(&err, func() {
4039
if errors.Is(err, io.EOF) {

bash/webdav/client.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"go.opentelemetry.io/otel/trace"
2828
)
2929

30-
const name = "bash/webdav"
30+
var tracer = otel.Tracer("github.com/vscode-lcode/lcode/v2/bash/webdav")
3131

3232
type Client struct {
3333
conn net.Conn
@@ -69,7 +69,7 @@ func NewClient(conn net.Conn) *Client {
6969
}
7070

7171
func (c *Client) Open(r *bufio.Reader, version string, id string) (err error) {
72-
ctx, span := otel.Tracer(name).Start(context.Background(), "client open")
72+
ctx, span := tracer.Start(context.Background(), "client open")
7373
c.Ctx = ctx
7474
defer err0.Record(&err, span)
7575

@@ -102,7 +102,7 @@ func (c *Client) intFlag(version string) *flag.FlagSet {
102102
return f
103103
}
104104
func (c *Client) parseArgs(r *bufio.Reader, version string) (err error) {
105-
_, span := otel.Tracer(name).Start(c.Ctx, "client parse lcode args")
105+
_, span := tracer.Start(c.Ctx, "client parse lcode args")
106106
defer span.End()
107107
defer err0.Record(&err, span)
108108

@@ -126,7 +126,7 @@ func (c *Client) parseArgs(r *bufio.Reader, version string) (err error) {
126126
}
127127

128128
func (c *Client) initServerAddr(r *bufio.Reader, id string) (err error) {
129-
_, span := otel.Tracer(name).Start(c.Ctx, "client init server addr")
129+
_, span := tracer.Start(c.Ctx, "client init server addr")
130130
defer span.End()
131131
defer err0.Record(&err, span)
132132
defer err2.Handle(&err, func() {
@@ -153,7 +153,7 @@ func (c *Client) initServerAddr(r *bufio.Reader, id string) (err error) {
153153
}
154154

155155
func (c *Client) initID(r *bufio.Reader) (err error) {
156-
_, span := otel.Tracer(name).Start(c.Ctx, "client init id")
156+
_, span := tracer.Start(c.Ctx, "client init id")
157157
defer span.End()
158158
defer err0.Record(&err, span)
159159

@@ -171,7 +171,7 @@ func (c *Client) StoreID(id string) (err error) {
171171
}
172172

173173
func (c *Client) initPWD(r *bufio.Reader) (err error) {
174-
_, span := otel.Tracer(name).Start(c.Ctx, "client init pwd")
174+
_, span := tracer.Start(c.Ctx, "client init pwd")
175175
defer span.End()
176176
defer err0.Record(&err, span)
177177

bash/webdav/file.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ import (
1414
"github.com/lainio/err2"
1515
. "github.com/lainio/err2/try"
1616
"github.com/vscode-lcode/lcode/v2/util/err0"
17-
"go.opentelemetry.io/otel"
1817
)
1918

2019
func (f *File) Readdir(count int) (files []fs.FileInfo, err error) {
21-
_, span := otel.Tracer(name).Start(f.Ctx, "file readdir")
20+
_, span := tracer.Start(f.Ctx, "file readdir")
2221
defer span.End()
2322
defer err0.Record(&err, span)
2423

@@ -79,7 +78,7 @@ func (f *File) _Stat() (finfo fs.FileInfo, err error) {
7978
return
8079
}
8180
func (f *File) _GetStat() (finfo fs.FileInfo, err error) {
82-
_, span := otel.Tracer(name).Start(f.Ctx, "file stat")
81+
_, span := tracer.Start(f.Ctx, "file stat")
8382
defer span.End()
8483
defer err2.Handle(&err, func() {
8584
if errors.Is(err, os.ErrNotExist) {

bash/webdav/file2.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/lainio/err2"
1616
. "github.com/lainio/err2/try"
1717
"github.com/vscode-lcode/lcode/v2/util/err0"
18-
"go.opentelemetry.io/otel"
1918
"go.opentelemetry.io/otel/attribute"
2019
"go.opentelemetry.io/otel/trace"
2120
"golang.org/x/net/webdav"
@@ -47,7 +46,7 @@ var _ webdav.File = (*File)(nil)
4746
var no uint64 = 0
4847

4948
func OpenFile(c *Client, filename string) *File {
50-
ctx, span := otel.Tracer(name).Start(c.Ctx, "file open")
49+
ctx, span := tracer.Start(c.Ctx, "file open")
5150
span.SetAttributes(
5251
attribute.String("filepath", filename),
5352
)
@@ -80,7 +79,7 @@ func (f *File) Close() error {
8079
}
8180

8281
func (f *File) Read(p []byte) (n int, err error) {
83-
_, span := otel.Tracer(name).Start(f.Ctx, "file read")
82+
_, span := tracer.Start(f.Ctx, "file read")
8483
defer span.End()
8584
defer err2.Handle(&err, func() {
8685
if errors.Is(err, io.EOF) {
@@ -108,7 +107,7 @@ func (f *File) Read(p []byte) (n int, err error) {
108107
}
109108

110109
func (f *File) Write(p []byte) (n int, err error) {
111-
_, span := otel.Tracer(name).Start(f.Ctx, "file write")
110+
_, span := tracer.Start(f.Ctx, "file write")
112111
defer span.End()
113112
defer err0.Record(&err, span)
114113

@@ -127,7 +126,7 @@ func (f *File) Write(p []byte) (n int, err error) {
127126
}
128127

129128
func (f *File) Seek(offset int64, whence int) (n int64, err error) {
130-
_, span := otel.Tracer(name).Start(f.Ctx, "file seek")
129+
_, span := tracer.Start(f.Ctx, "file seek")
131130
defer span.End()
132131
defer err2.Handle(&err, func() {
133132
span.RecordError(err)

bash/webdav/filesystem.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ import (
1111
"github.com/jellydator/ttlcache/v3"
1212
. "github.com/lainio/err2/try"
1313
"github.com/vscode-lcode/lcode/v2/util/err0"
14-
"go.opentelemetry.io/otel"
1514
"golang.org/x/net/webdav"
1615
)
1716

1817
var _ webdav.FileSystem = (*Client)(nil)
1918

2019
func (c *Client) Mkdir(ctx context.Context, name string, perm os.FileMode) (err error) {
21-
_, span := otel.Tracer(name).Start(c.Ctx, "fs mkdir")
20+
_, span := tracer.Start(c.Ctx, "fs mkdir")
2221
defer span.End()
2322
defer err0.Record(&err, span)
2423

@@ -27,15 +26,15 @@ func (c *Client) Mkdir(ctx context.Context, name string, perm os.FileMode) (err
2726
return
2827
}
2928
func (c *Client) OpenFile(ctx context.Context, name string, flag int, perm os.FileMode) (f webdav.File, err error) {
30-
_, span := otel.Tracer(name).Start(c.Ctx, "fs openfile")
29+
_, span := tracer.Start(c.Ctx, "fs openfile")
3130
defer span.End()
3231
defer err0.Record(&err, span)
3332

3433
f = OpenFile(c, name)
3534
return
3635
}
3736
func (c *Client) RemoveAll(ctx context.Context, name string) (err error) {
38-
_, span := otel.Tracer(name).Start(c.Ctx, "fs remove all")
37+
_, span := tracer.Start(c.Ctx, "fs remove all")
3938
defer span.End()
4039
defer err0.Record(&err, span)
4140

@@ -46,7 +45,7 @@ func (c *Client) RemoveAll(ctx context.Context, name string) (err error) {
4645
return
4746
}
4847
func (c *Client) Rename(ctx context.Context, oldName, newName string) (err error) {
49-
_, span := otel.Tracer(name).Start(c.Ctx, "fs rename")
48+
_, span := tracer.Start(c.Ctx, "fs rename")
5049
defer span.End()
5150
defer err0.Record(&err, span)
5251

@@ -59,7 +58,7 @@ func (c *Client) Rename(ctx context.Context, oldName, newName string) (err error
5958
}
6059

6160
func (c *Client) Stat(ctx context.Context, name string) (f os.FileInfo, err error) {
62-
_, span := otel.Tracer(name).Start(c.Ctx, "fs stat")
61+
_, span := tracer.Start(c.Ctx, "fs stat")
6362
defer span.End()
6463
defer err0.Record(&err, span)
6564

0 commit comments

Comments
 (0)