mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-10-08 00:26:37 +08:00
fix(trace): 使用 NewSchemaless 避免 semconv schema 版本冲突
业务 Resource 改为 NewSchemaless 合并,继承 resource.Default() 的 SDK 内置 schema URL,不再硬编码 semconv 版本路径。
This commit is contained in:
@@ -8,10 +8,10 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
|
"go.opentelemetry.io/otel/attribute"
|
||||||
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
|
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
|
||||||
"go.opentelemetry.io/otel/sdk/resource"
|
"go.opentelemetry.io/otel/sdk/resource"
|
||||||
sdktrace "go.opentelemetry.io/otel/sdk/trace"
|
sdktrace "go.opentelemetry.io/otel/sdk/trace"
|
||||||
semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func newTracerProvider(cfg Config) (*sdktrace.TracerProvider, error) {
|
func newTracerProvider(cfg Config) (*sdktrace.TracerProvider, error) {
|
||||||
@@ -21,16 +21,15 @@ func newTracerProvider(cfg Config) (*sdktrace.TracerProvider, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// 初始化 Resource
|
// 业务属性不绑定 schema URL,合并时继承 resource.Default() 的 SDK 内置版本,避免 semconv 与 otel/sdk 升级不同步。
|
||||||
r, err := resource.Merge(
|
r, err := resource.Merge(
|
||||||
resource.Default(),
|
resource.Default(),
|
||||||
resource.NewWithAttributes(
|
resource.NewSchemaless(
|
||||||
semconv.SchemaURL,
|
attribute.String("service.name", cfg.AppName),
|
||||||
semconv.ServiceName(cfg.AppName),
|
attribute.String("host.name", hostname),
|
||||||
semconv.HostName(hostname),
|
attribute.String("k8s.namespace.name", os.Getenv("KUBERNETES_NAMESPACE")),
|
||||||
semconv.K8SNamespaceName(os.Getenv("KUBERNETES_NAMESPACE")),
|
attribute.String("k8s.pod.name", os.Getenv("KUBERNETES_POD_NAME")),
|
||||||
semconv.K8SPodName(os.Getenv("KUBERNETES_POD_NAME")),
|
attribute.String("k8s.pod.uid", os.Getenv("KUBERNETES_POD_UID")),
|
||||||
semconv.K8SPodUID(os.Getenv("KUBERNETES_POD_UID")),
|
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user