Skip to content

Commit 8137dc7

Browse files
committed
fix(tracing): disable unused metrics/logging export
1 parent 8f2117f commit 8137dc7

1 file changed

Lines changed: 37 additions & 38 deletions

File tree

pkg/tracing/provider.go

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ package tracing
1919
import (
2020
"context"
2121

22-
"github.com/cloudwego/kitex/pkg/klog"
2322
"github.com/kitex-contrib/obs-opentelemetry/provider"
24-
"go.opentelemetry.io/otel"
25-
"go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc"
26-
"go.opentelemetry.io/otel/log/global"
27-
sdklog "go.opentelemetry.io/otel/sdk/log"
2823
"go.opentelemetry.io/otel/sdk/resource"
2924
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
3025
)
@@ -39,10 +34,12 @@ func NewOtelProvider(serviceName string, endpoint string) func(context.Context)
3934
provider.WithServiceName(serviceName),
4035
provider.WithExportEndpoint(endpoint),
4136
provider.WithResource(res),
42-
provider.WithInsecure())
37+
provider.WithInsecure(),
38+
provider.WithEnableMetrics(false),
39+
)
4340

4441
// manually written logger provider
45-
lp := newOtelLoggerProvider(serviceName, endpoint)
42+
// lp := newOtelLoggerProvider(serviceName, endpoint)
4643

4744
// return shutdown func
4845
return func(ctx context.Context) error {
@@ -52,52 +49,54 @@ func NewOtelProvider(serviceName string, endpoint string) func(context.Context)
5249
return err
5350
}
5451

55-
if err = lp.Shutdown(ctx); err != nil {
56-
otel.Handle(err) // handle by otel
57-
}
52+
// if err = lp.Shutdown(ctx); err != nil {
53+
// otel.Handle(err) // handle by otel
54+
// }
5855

5956
return err
6057
}
6158
}
6259

6360
// newOtelLoggerProvider 手动初始化 LoggerProvider
64-
func newOtelLoggerProvider(serviceName string, endpoint string) *sdklog.LoggerProvider {
65-
ctx := context.Background()
66-
67-
res := getResource(ctx, serviceName)
68-
69-
// log exporter
70-
logExp, err := otlploggrpc.New(ctx,
71-
otlploggrpc.WithEndpoint(endpoint),
72-
otlploggrpc.WithInsecure())
73-
if err != nil {
74-
klog.Fatalf("failed to create otlp log exporter: %s", err)
75-
return nil
76-
}
77-
78-
// log processor
79-
bp := sdklog.NewBatchProcessor(logExp)
80-
81-
// logger provider
82-
lp := sdklog.NewLoggerProvider(
83-
sdklog.WithResource(res),
84-
sdklog.WithProcessor(bp))
85-
86-
global.SetLoggerProvider(lp)
87-
88-
return lp
89-
}
61+
// func newOtelLoggerProvider(serviceName string, endpoint string) *sdklog.LoggerProvider {
62+
// ctx := context.Background()
63+
//
64+
// res := getResource(ctx, serviceName)
65+
//
66+
// // log exporter
67+
// logExp, err := otlploggrpc.New(ctx,
68+
// otlploggrpc.WithEndpoint(endpoint),
69+
// otlploggrpc.WithInsecure())
70+
// if err != nil {
71+
// klog.Fatalf("failed to create otlp log exporter: %s", err)
72+
// return nil
73+
// }
74+
//
75+
// // log processor
76+
// bp := sdklog.NewBatchProcessor(logExp)
77+
//
78+
// // logger provider
79+
// lp := sdklog.NewLoggerProvider(
80+
// sdklog.WithResource(res),
81+
// sdklog.WithProcessor(bp))
82+
//
83+
// global.SetLoggerProvider(lp)
84+
//
85+
// return lp
86+
// }
9087

9188
// getResource 一个 tracing/metrics/logging 通用的 Resource
9289
func getResource(ctx context.Context, serviceName string) *resource.Resource {
9390
// 参见 https://github.com/kitex-contrib/obs-opentelemetry/blob/main/provider/provider.go 下 newResource()
94-
res, err := resource.New(ctx,
91+
res, err := resource.New(
92+
ctx,
9593
resource.WithHost(),
9694
resource.WithFromEnv(),
9795
resource.WithProcessPID(),
9896
resource.WithTelemetrySDK(),
9997
resource.WithAttributes(
100-
semconv.ServiceNameKey.String(serviceName)), // service.name
98+
semconv.ServiceNameKey.String(serviceName),
99+
), // service.name
101100
)
102101
if err != nil {
103102
return resource.Default()

0 commit comments

Comments
 (0)