Skip to content

Commit 475d85a

Browse files
committed
Merge branch 'main' of github.com:dkrizic/feature
2 parents e7a8758 + abf18ef commit 475d85a

21 files changed

Lines changed: 834 additions & 876 deletions

File tree

‎cli/telemetry/otelslog/otelslog.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Package otelslog provides an [slog.Handler] that attaches OpenTelemetry trace details to logs.
1+
// Package injectctx provides an [slog.Handler] that attaches OpenTelemetry trace details to logs.
22
package otelslog
33

44
import (
@@ -41,7 +41,7 @@ type Handler struct {
4141
// Handle implements [slog.Handler].
4242
func (h Handler) Handle(ctx context.Context, record slog.Record) error {
4343
if h.Handler == nil {
44-
return errors.New("otelslog: handler is missing")
44+
return errors.New("injectctx: handler is missing")
4545
}
4646

4747
spanContext := trace.SpanContextFromContext(ctx)

‎demo/README.md‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,39 @@ Then open [http://localhost:80](http://localhost:80) in your browser.```
1313
```mermaid
1414
graph TD
1515
style OC fill:lightgreen
16+
style GC fill:lightblue
17+
style APP fill:lightyellow
1618
U[User]
1719
subgraph DC[Docker Compose Network]
1820
T[Traefik]
19-
F[Frontend]
20-
CLI[CLI]
21-
S[Service]
21+
subgraph APP[Application]
22+
F[Frontend]
23+
CLI[CLI]
24+
S[Service]
25+
end
2226
subgraph OC[OpenTelemetry Collector]
2327
GRPC[gRPC Receiver]
2428
PIPE[Processing Pipeline]
2529
EXP[OTLP Exporter]
2630
end
2731
end
28-
GC[Grafana Cloud]
32+
subgraph GC[Grafana Cloud]
33+
TMP[Tempo]
34+
LOK[Loki]
35+
MIM[Mimir]
36+
GRF[Grafana]
37+
GRF-->TMP
38+
GRF-->LOK
39+
GRF-->MIM
40+
end
2941
T-->|HTTP|F
3042
F-->|gRPC|S
3143
CLI-->|gRPC|S
3244
S-->|Signals|GRPC
3345
GRPC-.->PIPE
3446
PIPE-.->EXP
35-
U-->T
47+
U-->|Browser|T
48+
U-->|Exec|CLI
3649
EXP-.->GC
3750
T-.->|Signals|GRPC
3851
F-.->|Signals|GRPC

‎service/go.mod‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ go 1.25.5
55
require (
66
github.com/stretchr/testify v1.11.1
77
github.com/urfave/cli/v3 v3.6.1
8+
go.opentelemetry.io/contrib/bridges/otelslog v0.14.0
89
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0
910
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0
1011
go.opentelemetry.io/contrib/instrumentation/runtime v0.64.0
1112
go.opentelemetry.io/otel v1.39.0
13+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.15.0
1214
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.39.0
1315
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0
16+
go.opentelemetry.io/otel/log v0.15.0
1417
go.opentelemetry.io/otel/metric v1.39.0
1518
go.opentelemetry.io/otel/sdk v1.39.0
19+
go.opentelemetry.io/otel/sdk/log v0.15.0
1620
go.opentelemetry.io/otel/sdk/metric v1.39.0
1721
go.opentelemetry.io/otel/trace v1.39.0
1822
google.golang.org/grpc v1.78.0

‎service/go.sum‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
103103
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
104104
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
105105
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
106+
go.opentelemetry.io/contrib/bridges/otelslog v0.14.0 h1:eypSOd+0txRKCXPNyqLPsbSfA0jULgJcGmSAdFAnrCM=
107+
go.opentelemetry.io/contrib/bridges/otelslog v0.14.0/go.mod h1:CRGvIBL/aAxpQU34ZxyQVFlovVcp67s4cAmQu8Jh9mc=
106108
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0 h1:RN3ifU8y4prNWeEnQp2kRRHz8UwonAEYZl8tUzHEXAk=
107109
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0/go.mod h1:habDz3tEWiFANTo6oUE99EmaFUrCNYAAg3wiVmusm70=
108110
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 h1:ssfIgGNANqpVFCndZvcuyKbl0g+UAVcbBcqGkG28H0Y=
@@ -111,16 +113,24 @@ go.opentelemetry.io/contrib/instrumentation/runtime v0.64.0 h1:/+/+UjlXjFcdDlXxK
111113
go.opentelemetry.io/contrib/instrumentation/runtime v0.64.0/go.mod h1:Ldm/PDuzY2DP7IypudopCR3OCOW42NJlN9+mNEroevo=
112114
go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
113115
go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
116+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.15.0 h1:W+m0g+/6v3pa5PgVf2xoFMi5YtNR06WtS7ve5pcvLtM=
117+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.15.0/go.mod h1:JM31r0GGZ/GU94mX8hN4D8v6e40aFlUECSQ48HaLgHM=
114118
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.39.0 h1:cEf8jF6WbuGQWUVcqgyWtTR0kOOAWY1DYZ+UhvdmQPw=
115119
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.39.0/go.mod h1:k1lzV5n5U3HkGvTCJHraTAGJ7MqsgL1wrGwTj1Isfiw=
116120
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 h1:f0cb2XPmrqn4XMy9PNliTgRKJgS5WcL/u0/WRYGz4t0=
117121
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0/go.mod h1:vnakAaFckOMiMtOIhFI2MNH4FYrZzXCYxmb1LlhoGz8=
118122
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 h1:in9O8ESIOlwJAEGTkkf34DesGRAc/Pn8qJ7k3r/42LM=
119123
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0/go.mod h1:Rp0EXBm5tfnv0WL+ARyO/PHBEaEAT8UUHQ6AGJcSq6c=
124+
go.opentelemetry.io/otel/log v0.15.0 h1:0VqVnc3MgyYd7QqNVIldC3dsLFKgazR6P3P3+ypkyDY=
125+
go.opentelemetry.io/otel/log v0.15.0/go.mod h1:9c/G1zbyZfgu1HmQD7Qj84QMmwTp2QCQsZH1aeoWDE4=
120126
go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
121127
go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
122128
go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
123129
go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
130+
go.opentelemetry.io/otel/sdk/log v0.15.0 h1:WgMEHOUt5gjJE93yqfqJOkRflApNif84kxoHWS9VVHE=
131+
go.opentelemetry.io/otel/sdk/log v0.15.0/go.mod h1:qDC/FlKQCXfH5hokGsNg9aUBGMJQsrUyeOiW5u+dKBQ=
132+
go.opentelemetry.io/otel/sdk/log/logtest v0.14.0 h1:Ijbtz+JKXl8T2MngiwqBlPaHqc4YCaP/i13Qrow6gAM=
133+
go.opentelemetry.io/otel/sdk/log/logtest v0.14.0/go.mod h1:dCU8aEL6q+L9cYTqcVOk8rM9Tp8WdnHOPLiBgp0SGOA=
124134
go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
125135
go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
126136
go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=

‎service/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/dkrizic/feature/service/constant"
1111
"github.com/dkrizic/feature/service/meta"
1212
"github.com/dkrizic/feature/service/service"
13-
"github.com/dkrizic/feature/service/telemetry/otelslog"
13+
"github.com/dkrizic/feature/service/telemetry/injectctx"
1414
"github.com/urfave/cli/v3" // imports as package "cli"
1515
)
1616

@@ -147,7 +147,7 @@ func beforeAction(ctx context.Context, cmd *cli.Command) (context.Context, error
147147
handler = slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})
148148
}
149149

150-
otelhandler := otelslog.NewHandler(handler)
150+
otelhandler := injectctx.NewHandler(handler)
151151

152152
logger := slog.New(otelhandler)
153153
slog.SetDefault(logger)

‎service/service/feature/feature.go‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
"github.com/dkrizic/feature/service/service/feature/v1"
88
"github.com/dkrizic/feature/service/service/persistence"
9+
"github.com/dkrizic/feature/service/telemetry/localmetrics"
910
"go.opentelemetry.io/otel"
1011
"google.golang.org/grpc"
1112
"google.golang.org/protobuf/types/known/emptypb"
@@ -16,10 +17,14 @@ type FeatureService struct {
1617
persistence persistence.Persistence
1718
}
1819

19-
func NewFeatureService(p persistence.Persistence) *FeatureService {
20+
func NewFeatureService(p persistence.Persistence) (*FeatureService, error) {
21+
err := localmetrics.New()
22+
if err != nil {
23+
slog.Error("Failed to initialize local metrics", "error", err)
24+
}
2025
return &FeatureService{
2126
persistence: p,
22-
}
27+
}, nil
2328
}
2429

2530
func (fs *FeatureService) GetAll(empty *emptypb.Empty, stream grpc.ServerStreamingServer[featurev1.KeyValue]) error {
@@ -30,7 +35,6 @@ func (fs *FeatureService) GetAll(empty *emptypb.Empty, stream grpc.ServerStreami
3035
if err != nil {
3136
return err
3237
}
33-
count := 0
3438
for _, kv := range values {
3539
err := stream.Send(&featurev1.KeyValue{
3640
Key: kv.Key,
@@ -39,8 +43,11 @@ func (fs *FeatureService) GetAll(empty *emptypb.Empty, stream grpc.ServerStreami
3943
if err != nil {
4044
return err
4145
}
42-
count++
4346
}
47+
count := len(values)
48+
localmetrics.ActiveGauge().Record(ctx, int64(count))
49+
localmetrics.GetAllCounter().Add(ctx, 1)
50+
4451
slog.InfoContext(ctx, "GetAll completed", "count", count)
4552
return nil
4653
}
@@ -57,6 +64,12 @@ func (fs *FeatureService) PreSet(ctx context.Context, kv *featurev1.KeyValue) (*
5764
return nil, err
5865
}
5966
slog.InfoContext(ctx, "PreSet completed", "key", kv.Key, "value", kv.Value)
67+
count, err := fs.persistence.Count(ctx)
68+
if err != nil {
69+
return nil, err
70+
}
71+
localmetrics.ActiveGauge().Record(ctx, int64(count))
72+
localmetrics.PresetCounter().Add(ctx, 1)
6073
return &emptypb.Empty{}, nil
6174
}
6275

@@ -72,6 +85,12 @@ func (fs *FeatureService) Set(ctx context.Context, kv *featurev1.KeyValue) (*emp
7285
return nil, err
7386
}
7487
slog.InfoContext(ctx, "Set completed", "key", kv.Key, "value", kv.Value)
88+
count, err := fs.persistence.Count(ctx)
89+
if err != nil {
90+
return nil, err
91+
}
92+
localmetrics.ActiveGauge().Record(ctx, int64(count))
93+
localmetrics.SetCounter().Add(ctx, 1)
7594
return &emptypb.Empty{}, nil
7695
}
7796

@@ -84,6 +103,12 @@ func (fs *FeatureService) Get(ctx context.Context, kv *featurev1.Key) (*featurev
84103
return nil, err
85104
}
86105
slog.InfoContext(ctx, "Get completed", "key", kv.Name, "value", result)
106+
count, err := fs.persistence.Count(ctx)
107+
if err != nil {
108+
return nil, err
109+
}
110+
localmetrics.ActiveGauge().Record(ctx, int64(count))
111+
localmetrics.GetCounter().Add(ctx, 1)
87112
return &featurev1.Value{
88113
Name: result.Value,
89114
}, nil
@@ -98,5 +123,11 @@ func (fs *FeatureService) Delete(ctx context.Context, kv *featurev1.Key) (*empty
98123
return nil, err
99124
}
100125
slog.InfoContext(ctx, "Delete completed", "key", kv.Name)
126+
count, err := fs.persistence.Count(ctx)
127+
if err != nil {
128+
return nil, err
129+
}
130+
localmetrics.ActiveGauge().Record(ctx, int64(count))
131+
localmetrics.DeleteCounter().Add(ctx, 1)
101132
return &emptypb.Empty{}, nil
102133
}

0 commit comments

Comments
 (0)