88 "github.com/pkg/errors"
99 "google.golang.org/grpc"
1010 "google.golang.org/grpc/credentials/insecure"
11- "k8s.io/client-go/pkg/version"
1211
1312 "go.opentelemetry.io/otel"
1413 "go.opentelemetry.io/otel/attribute"
@@ -18,6 +17,7 @@ import (
1817 "go.opentelemetry.io/otel/sdk/resource"
1918 "go.opentelemetry.io/otel/sdk/trace"
2019 semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
20+ ver "sigs.k8s.io/cluster-api-provider-gcp/version"
2121)
2222
2323func RegisterTracing (ctx context.Context , samplingRate float64 , log logr.Logger ) error {
@@ -44,10 +44,13 @@ func RegisterTracing(ctx context.Context, samplingRate float64, log logr.Logger)
4444
4545func newExporter (ctx context.Context ) (* otlptrace.Exporter , error ) {
4646
47+ ctx , cancel := context .WithTimeout (ctx , time .Second )
48+ defer cancel ()
49+
4750 conn , err := grpc .DialContext (ctx , "opentelemetry-collector:4317" ,
4851 // Using non-TLS connection for dev environment
4952 grpc .WithTransportCredentials (insecure .NewCredentials ()),
50- grpc .WithBlock (),
53+ grpc .WithBlock (), // blocking code
5154 )
5255
5356 if err != nil {
@@ -73,12 +76,11 @@ func SetUpTracing(ctx context.Context, samplingRate float64) (*trace.TracerProvi
7376 }
7477
7578 // labels/tags/res common to all traces
76- // TODO: consider to add more fields
7779 resource , err := resource .New (ctx ,
7880 resource .WithAttributes (
7981 semconv .ServiceNameKey .String ("capg" ),
8082 attribute .String ("exporter" , "otlpgrpc" ),
81- attribute .String ("version" , version .Get ().String ()),
83+ attribute .String ("version" , ver .Get ().String ()),
8284 ),
8385 )
8486
0 commit comments