@@ -31,11 +31,12 @@ import (
3131 "github.com/mitchellh/go-homedir"
3232 "github.com/rakyll/statik/fs"
3333 "github.com/sirupsen/logrus"
34- "go.opentelemetry.io/otel/api/global "
35- "go.opentelemetry.io/otel/api/metric "
34+ "go.opentelemetry.io/otel"
35+ "go.opentelemetry.io/otel/attribute "
3636 "go.opentelemetry.io/otel/exporters/stdout"
37- "go.opentelemetry.io/otel/label"
38- "go.opentelemetry.io/otel/sdk/metric/controller/push"
37+ "go.opentelemetry.io/otel/metric"
38+ "go.opentelemetry.io/otel/metric/global"
39+ "go.opentelemetry.io/otel/sdk/metric/controller/basic"
3940 "google.golang.org/api/option"
4041
4142 "github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd/statik"
@@ -90,11 +91,11 @@ func exportMetrics(ctx context.Context, filename string, meter skaffoldMeter) er
9091 }
9192
9293 start := time .Now ()
93- p .Start ()
94+ p .Start (ctx )
9495 for _ , m := range meters {
9596 createMetrics (ctx , m )
9697 }
97- p .Stop ()
98+ p .Stop (ctx )
9899 logrus .Debugf ("metrics uploading complete in %s" , time .Since (start ).String ())
99100
100101 if fileExists {
@@ -103,7 +104,7 @@ func exportMetrics(ctx context.Context, filename string, meter skaffoldMeter) er
103104 return nil
104105}
105106
106- func initCloudMonitoringExporterMetrics () (* push .Controller , error ) {
107+ func initCloudMonitoringExporterMetrics () (* basic .Controller , error ) {
107108 statikFS , err := statik .FS ()
108109 if err != nil {
109110 return nil , err
@@ -127,7 +128,7 @@ func initCloudMonitoringExporterMetrics() (*push.Controller, error) {
127128 return fmt .Sprintf ("custom.googleapis.com/skaffold/%s" , desc .Name ())
128129 }
129130
130- global .SetErrorHandler (errHandler {})
131+ otel .SetErrorHandler (errHandler {})
131132 return mexporter .InstallNewPipeline (
132133 []mexporter.Option {
133134 mexporter .WithProjectID (c .ProjectID ),
@@ -140,14 +141,14 @@ func initCloudMonitoringExporterMetrics() (*push.Controller, error) {
140141 )
141142}
142143
143- func devStdOutExporter () (* push .Controller , error ) {
144+ func devStdOutExporter () (* basic .Controller , error ) {
144145 // export metrics to std out if local env is set.
145146 if _ , ok := os .LookupEnv ("SKAFFOLD_EXPORT_TO_STDOUT" ); ok {
146- return stdout .InstallNewPipeline ([]stdout.Option {
147- stdout .WithQuantiles ([]float64 {0.5 }),
147+ _ , controller , err := stdout .InstallNewPipeline ([]stdout.Option {
148148 stdout .WithPrettyPrint (),
149149 stdout .WithWriter (os .Stdout ),
150150 }, nil )
151+ return controller , err
151152 }
152153 return nil , nil
153154}
@@ -157,25 +158,25 @@ func createMetrics(ctx context.Context, meter skaffoldMeter) {
157158 // A metric is uniquely identified by the metric name and the labels and corresponding values
158159 // This random number is used as a label to differentiate the metrics per user so if two users
159160 // run `skaffold build` at the same time they will both have their metrics recorded
160- randLabel := label .String ("randomizer" , strconv .Itoa (rand .Intn (75000 )))
161+ randLabel := attribute .String ("randomizer" , strconv .Itoa (rand .Intn (75000 )))
161162
162163 m := global .Meter ("skaffold" )
163164
164165 // cloud monitoring only supports string type labels
165- labels := []label .KeyValue {
166- label .String ("version" , meter .Version ),
167- label .String ("os" , meter .OS ),
168- label .String ("arch" , meter .Arch ),
169- label .String ("command" , meter .Command ),
170- label .String ("error" , meter .ErrorCode .String ()),
171- label .String ("platform_type" , meter .PlatformType ),
172- label .String ("config_count" , strconv .Itoa (meter .ConfigCount )),
166+ labels := []attribute .KeyValue {
167+ attribute .String ("version" , meter .Version ),
168+ attribute .String ("os" , meter .OS ),
169+ attribute .String ("arch" , meter .Arch ),
170+ attribute .String ("command" , meter .Command ),
171+ attribute .String ("error" , meter .ErrorCode .String ()),
172+ attribute .String ("platform_type" , meter .PlatformType ),
173+ attribute .String ("config_count" , strconv .Itoa (meter .ConfigCount )),
173174 }
174- sharedLabels := []label .KeyValue {
175+ sharedLabels := []attribute .KeyValue {
175176 randLabel ,
176177 }
177178 if _ , ok := allowedUsers [meter .User ]; ok {
178- sharedLabels = append (sharedLabels , label .String ("user" , meter .User ))
179+ sharedLabels = append (sharedLabels , attribute .String ("user" , meter .User ))
179180 }
180181 labels = append (labels , sharedLabels ... )
181182
@@ -201,24 +202,24 @@ func createMetrics(ctx context.Context, meter skaffoldMeter) {
201202 }
202203}
203204
204- func flagMetrics (ctx context.Context , meter skaffoldMeter , m metric.Meter , randLabel label .KeyValue ) {
205+ func flagMetrics (ctx context.Context , meter skaffoldMeter , m metric.Meter , randLabel attribute .KeyValue ) {
205206 flagCounter := metric .Must (m ).NewInt64ValueRecorder ("flags" , metric .WithDescription ("Tracks usage of enum flags" ))
206207 for k , v := range meter .EnumFlags {
207- labels := []label .KeyValue {
208- label .String ("flag_name" , k ),
209- label .String ("flag_value" , v ),
210- label .String ("command" , meter .Command ),
211- label .String ("error" , meter .ErrorCode .String ()),
208+ labels := []attribute .KeyValue {
209+ attribute .String ("flag_name" , k ),
210+ attribute .String ("flag_value" , v ),
211+ attribute .String ("command" , meter .Command ),
212+ attribute .String ("error" , meter .ErrorCode .String ()),
212213 randLabel ,
213214 }
214215 flagCounter .Record (ctx , 1 , labels ... )
215216 }
216217}
217218
218- func commandMetrics (ctx context.Context , meter skaffoldMeter , m metric.Meter , labels ... label .KeyValue ) {
219+ func commandMetrics (ctx context.Context , meter skaffoldMeter , m metric.Meter , labels ... attribute .KeyValue ) {
219220 commandCounter := metric .Must (m ).NewInt64ValueRecorder (meter .Command ,
220221 metric .WithDescription (fmt .Sprintf ("Number of times %s is used" , meter .Command )))
221- labels = append (labels , label .String ("error" , meter .ErrorCode .String ()))
222+ labels = append (labels , attribute .String ("error" , meter .ErrorCode .String ()))
222223 commandCounter .Record (ctx , 1 , labels ... )
223224
224225 if meter .Command == "dev" || meter .Command == "debug" {
@@ -238,42 +239,42 @@ func commandMetrics(ctx context.Context, meter skaffoldMeter, m metric.Meter, la
238239 for errorCode , count := range errorCounts {
239240 iterationCounter .Record (ctx , int64 (count ),
240241 append (labels ,
241- label .String ("intent" , intention ),
242- label .String ("error" , errorCode .String ()),
242+ attribute .String ("intent" , intention ),
243+ attribute .String ("error" , errorCode .String ()),
243244 )... )
244245 }
245246 }
246247 }
247248}
248249
249- func deployerMetrics (ctx context.Context , meter skaffoldMeter , m metric.Meter , labels ... label .KeyValue ) {
250+ func deployerMetrics (ctx context.Context , meter skaffoldMeter , m metric.Meter , labels ... attribute .KeyValue ) {
250251 deployerCounter := metric .Must (m ).NewInt64ValueRecorder ("deployer" , metric .WithDescription ("Deployers used" ))
251252 for _ , deployer := range meter .Deployers {
252- deployerCounter .Record (ctx , 1 , append (labels , label .String ("deployer" , deployer ))... )
253+ deployerCounter .Record (ctx , 1 , append (labels , attribute .String ("deployer" , deployer ))... )
253254 }
254255 if meter .HelmReleasesCount > 0 {
255256 multiReleasesCounter := metric .Must (m ).NewInt64ValueRecorder ("helmReleases" , metric .WithDescription ("Multiple helm releases used" ))
256- multiReleasesCounter .Record (ctx , 1 , append (labels , label .Int ("count" , meter .HelmReleasesCount ))... )
257+ multiReleasesCounter .Record (ctx , 1 , append (labels , attribute .Int ("count" , meter .HelmReleasesCount ))... )
257258 }
258259}
259260
260- func builderMetrics (ctx context.Context , meter skaffoldMeter , m metric.Meter , labels ... label .KeyValue ) {
261+ func builderMetrics (ctx context.Context , meter skaffoldMeter , m metric.Meter , labels ... attribute .KeyValue ) {
261262 builderCounter := metric .Must (m ).NewInt64ValueRecorder ("builders" , metric .WithDescription ("Builders used" ))
262263 artifactCounter := metric .Must (m ).NewInt64ValueRecorder ("artifacts" , metric .WithDescription ("Number of artifacts used" ))
263264 dependenciesCounter := metric .Must (m ).NewInt64ValueRecorder ("artifact-dependencies" , metric .WithDescription ("Number of artifacts with dependencies" ))
264265 for builder , count := range meter .Builders {
265- bLabel := label .String ("builder" , builder )
266+ bLabel := attribute .String ("builder" , builder )
266267 builderCounter .Record (ctx , 1 , append (labels , bLabel )... )
267268 artifactCounter .Record (ctx , int64 (count ), append (labels , bLabel )... )
268269 dependenciesCounter .Record (ctx , int64 (meter .BuildDependencies [builder ]), append (labels , bLabel )... )
269270 }
270271}
271272
272- func errorMetrics (ctx context.Context , meter skaffoldMeter , m metric.Meter , labels ... label .KeyValue ) {
273+ func errorMetrics (ctx context.Context , meter skaffoldMeter , m metric.Meter , labels ... attribute .KeyValue ) {
273274 errCounter := metric .Must (m ).NewInt64ValueRecorder ("errors" , metric .WithDescription ("Skaffold errors" ))
274- errCounter .Record (ctx , 1 , append (labels , label .String ("error" , meter .ErrorCode .String ()))... )
275+ errCounter .Record (ctx , 1 , append (labels , attribute .String ("error" , meter .ErrorCode .String ()))... )
275276
276- labels = append (labels , label .String ("command" , meter .Command ))
277+ labels = append (labels , attribute .String ("command" , meter .Command ))
277278
278279 switch meter .ErrorCode {
279280 case proto .StatusCode_UNKNOWN_ERROR :
0 commit comments