8
8
"github.com/pkg/errors"
9
9
"google.golang.org/grpc"
10
10
"google.golang.org/grpc/credentials/insecure"
11
- "k8s.io/client-go/pkg/version"
12
11
13
12
"go.opentelemetry.io/otel"
14
13
"go.opentelemetry.io/otel/attribute"
@@ -18,6 +17,7 @@ import (
18
17
"go.opentelemetry.io/otel/sdk/resource"
19
18
"go.opentelemetry.io/otel/sdk/trace"
20
19
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
20
+ ver "sigs.k8s.io/cluster-api-provider-gcp/version"
21
21
)
22
22
23
23
func RegisterTracing (ctx context.Context , samplingRate float64 , log logr.Logger ) error {
@@ -44,10 +44,13 @@ func RegisterTracing(ctx context.Context, samplingRate float64, log logr.Logger)
44
44
45
45
func newExporter (ctx context.Context ) (* otlptrace.Exporter , error ) {
46
46
47
+ ctx , cancel := context .WithTimeout (ctx , time .Second )
48
+ defer cancel ()
49
+
47
50
conn , err := grpc .DialContext (ctx , "opentelemetry-collector:4317" ,
48
51
// Using non-TLS connection for dev environment
49
52
grpc .WithTransportCredentials (insecure .NewCredentials ()),
50
- grpc .WithBlock (),
53
+ grpc .WithBlock (), // blocking code
51
54
)
52
55
53
56
if err != nil {
@@ -73,12 +76,11 @@ func SetUpTracing(ctx context.Context, samplingRate float64) (*trace.TracerProvi
73
76
}
74
77
75
78
// labels/tags/res common to all traces
76
- // TODO: consider to add more fields
77
79
resource , err := resource .New (ctx ,
78
80
resource .WithAttributes (
79
81
semconv .ServiceNameKey .String ("capg" ),
80
82
attribute .String ("exporter" , "otlpgrpc" ),
81
- attribute .String ("version" , version .Get ().String ()),
83
+ attribute .String ("version" , ver .Get ().String ()),
82
84
),
83
85
)
84
86
0 commit comments