Skip to content

Commit

Permalink
deps: update opentelemetry-go monorepo to v0.34.0 (minor) (#498)
Browse files Browse the repository at this point in the history
Signed-off-by: Renovate Bot <bot@renovateapp.com>
Signed-off-by: Florian Bacher <florian.bacher@dynatrace.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Bacher <florian.bacher@dynatrace.com>
  • Loading branch information
renovate[bot] and bacherfl committed Dec 19, 2022
1 parent 627b9e1 commit e7db4d0
Show file tree
Hide file tree
Showing 13 changed files with 56 additions and 57 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ data:
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "keptn_app_count{keptn_deployment_app_status=\"Succeeded\", keptn_deployment_app_name=\"$Application\"}",
"expr": "keptn_app_count_total{keptn_deployment_app_status=\"Succeeded\", keptn_deployment_app_name=\"$Application\"}",
"format": "table",
"legendFormat": "__auto",
"range": true,
Expand Down Expand Up @@ -236,7 +236,7 @@ data:
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "keptn_app_count{keptn_deployment_app_status=\"Failed\", keptn_deployment_app_name=\"$Application\"}",
"expr": "keptn_app_count_total{keptn_deployment_app_status=\"Failed\", keptn_deployment_app_name=\"$Application\"}",
"format": "table",
"legendFormat": "__auto",
"range": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ data:
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "sum by(job) (keptn_evaluation_count{job=\"otel-collector\"})",
"expr": "sum by(job) (keptn_evaluation_count_total{job=\"otel-collector\"})",
"legendFormat": "__auto",
"range": true,
"refId": "A"
Expand Down
4 changes: 2 additions & 2 deletions dashboards/grafana/grafana_dashboard_applications.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "keptn_app_count{keptn_deployment_app_status=\"Succeeded\", keptn_deployment_app_name=\"$Application\"}",
"expr": "keptn_app_count_total{keptn_deployment_app_status=\"Succeeded\", keptn_deployment_app_name=\"$Application\"}",
"format": "table",
"legendFormat": "__auto",
"range": true,
Expand Down Expand Up @@ -233,7 +233,7 @@
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "keptn_app_count{keptn_deployment_app_status=\"Failed\", keptn_deployment_app_name=\"$Application\"}",
"expr": "keptn_app_count_total{keptn_deployment_app_status=\"Failed\", keptn_deployment_app_name=\"$Application\"}",
"format": "table",
"legendFormat": "__auto",
"range": true,
Expand Down
2 changes: 1 addition & 1 deletion dashboards/grafana/grafana_dashboard_overview.json
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "sum by(job) (keptn_evaluation_count{job=\"otel-collector\"})",
"expr": "sum by(job) (keptn_evaluation_count_total{job=\"otel-collector\"})",
"legendFormat": "__auto",
"range": true,
"refId": "A"
Expand Down
4 changes: 2 additions & 2 deletions dashboards/grafana/import/grafana_dashboard_applications.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "keptn_app_count{keptn_deployment_app_status=\"Succeeded\", keptn_deployment_app_name=\"$Application\"}",
"expr": "keptn_app_count_total{keptn_deployment_app_status=\"Succeeded\", keptn_deployment_app_name=\"$Application\"}",
"format": "table",
"legendFormat": "__auto",
"range": true,
Expand Down Expand Up @@ -234,7 +234,7 @@
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "keptn_app_count{keptn_deployment_app_status=\"Failed\", keptn_deployment_app_name=\"$Application\"}",
"expr": "keptn_app_count_total{keptn_deployment_app_status=\"Failed\", keptn_deployment_app_name=\"$Application\"}",
"format": "table",
"legendFormat": "__auto",
"range": true,
Expand Down
2 changes: 1 addition & 1 deletion dashboards/grafana/import/grafana_dashboard_overview.json
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "sum by(job) (keptn_evaluation_count{job=\"otel-collector\"})",
"expr": "sum by(job) (keptn_evaluation_count_total{job=\"otel-collector\"})",
"legendFormat": "__auto",
"range": true,
"refId": "A"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "sum by(job) (keptn_evaluation_count{job=\"otel-collector\"})",
"expr": "sum by(job) (keptn_evaluation_count_total{job=\"otel-collector\"})",
"legendFormat": "__auto",
"range": true,
"refId": "A"
Expand Down
2 changes: 1 addition & 1 deletion examples/observability/assets/grafana_dashboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "sum by(job) (keptn_evaluation_count{job=\"otel-collector\"})",
"expr": "sum by(job) (keptn_evaluation_count_total{job=\"otel-collector\"})",
"legendFormat": "__auto",
"range": true,
"refId": "A"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ data:
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "keptn_app_count{keptn_deployment_app_status=\"Succeeded\", keptn_deployment_app_name=\"$Application\"}",
"expr": "keptn_app_count_total{keptn_deployment_app_status=\"Succeeded\", keptn_deployment_app_name=\"$Application\"}",
"format": "table",
"legendFormat": "__auto",
"range": true,
Expand Down Expand Up @@ -236,7 +236,7 @@ data:
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "keptn_app_count{keptn_deployment_app_status=\"Failed\", keptn_deployment_app_name=\"$Application\"}",
"expr": "keptn_app_count_total{keptn_deployment_app_status=\"Failed\", keptn_deployment_app_name=\"$Application\"}",
"format": "table",
"legendFormat": "__auto",
"range": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ data:
"uid": "P1809F7CD0C75ACF3"
},
"editorMode": "builder",
"expr": "sum by(job) (keptn_evaluation_count{job=\"otel-collector\"})",
"expr": "sum by(job) (keptn_evaluation_count_total{job=\"otel-collector\"})",
"legendFormat": "__auto",
"range": true,
"refId": "A"
Expand Down
22 changes: 11 additions & 11 deletions operator/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ require (
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/common v0.37.0
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/otel v1.11.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.0
go.opentelemetry.io/otel/exporters/prometheus v0.32.3
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.0
go.opentelemetry.io/otel/metric v0.32.3
go.opentelemetry.io/otel/sdk v1.11.0
go.opentelemetry.io/otel/sdk/metric v0.32.3
go.opentelemetry.io/otel/trace v1.11.0
go.opentelemetry.io/otel v1.11.2
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.2
go.opentelemetry.io/otel/exporters/prometheus v0.34.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2
go.opentelemetry.io/otel/metric v0.34.0
go.opentelemetry.io/otel/sdk v1.11.2
go.opentelemetry.io/otel/sdk/metric v0.34.0
go.opentelemetry.io/otel/trace v1.11.2
google.golang.org/grpc v1.51.0
k8s.io/api v0.25.5
k8s.io/apimachinery v0.25.5
Expand All @@ -43,7 +43,7 @@ require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
Expand Down Expand Up @@ -76,8 +76,8 @@ require (
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.2 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
Expand Down
34 changes: 22 additions & 12 deletions operator/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4=
github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
Expand Down Expand Up @@ -376,26 +378,34 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/otel v1.11.0 h1:kfToEGMDq6TrVrJ9Vht84Y8y9enykSZzDDZglV0kIEk=
go.opentelemetry.io/otel v1.11.0/go.mod h1:H2KtuEphyMvlhZ+F7tg9GRhAOe60moNx61Ex+WmiKkk=
go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0=
go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.0 h1:0dly5et1i/6Th3WHn0M6kYiJfFNzhhxanrJ0bOfnjEo=
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.0/go.mod h1:+Lq4/WkdCkjbGcBMVHHg2apTbv8oMBf29QCnyCCJjNQ=
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 h1:htgM8vZIF8oPSCxa341e3IZ4yr/sKxgu8KZYllByiVY=
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2/go.mod h1:rqbht/LlhVBgn5+k3M5QK96K5Xb0DvXpMJ5SFQpY6uw=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.0 h1:eyJ6njZmH16h9dOKCi7lMswAnGsSOwgTqWzfxqcuNr8=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.0/go.mod h1:FnDp7XemjN3oZ3xGunnfOUTVwd2XcvLbtRAuOSU3oc8=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.2 h1:fqR1kli93643au1RKo0Uma3d2aPQKT+WBKfTSBaKbOc=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.2/go.mod h1:5Qn6qvgkMsLDX+sYK64rHb1FPhpn0UtxF+ouX1uhyJE=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.0 h1:j2RFV0Qdt38XQ2Jvi4WIsQ56w8T7eSirYbMw19VXRDg=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.0/go.mod h1:pILgiTEtrqvZpoiuGdblDgS5dbIaTgDrkIuKfEFkt+A=
go.opentelemetry.io/otel/exporters/prometheus v0.32.3 h1:17C3zlnAFjmoyWueoQrESV/FvogMq2EmtJWpk7acX4Y=
go.opentelemetry.io/otel/exporters/prometheus v0.32.3/go.mod h1:7T6oLYJY+ydl+dEteIw+xCDJ7vaTRVWZ4CxEhpCUHFA=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.2 h1:ERwKPn9Aer7Gxsc0+ZlutlH1bEEAUXAUhqm3Y45ABbk=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.2/go.mod h1:jWZUM2MWhWCJ9J9xVbRx7tzK1mXKpAlze4CeulycwVY=
go.opentelemetry.io/otel/exporters/prometheus v0.34.0 h1:L5D+HxdaC/ORB47ribbTBbkXRZs9JzPjq0EoIOMWncM=
go.opentelemetry.io/otel/exporters/prometheus v0.34.0/go.mod h1:6gUoJyfhoWqF0tOLaY0ZmKgkQRcvEQx6p5rVlKHp3s4=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.0 h1:rzpQkvma82S+jQvJHqJaAGQdeRBtH6HASrgrZa45rx4=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.0/go.mod h1:nMt8nBu01qC+8LfJu4puk/OYHovohkISNuy/MMG8yRk=
go.opentelemetry.io/otel/metric v0.32.3 h1:dMpnJYk2KULXr0j8ph6N7+IcuiIQXlPXD4kix9t7L9c=
go.opentelemetry.io/otel/metric v0.32.3/go.mod h1:pgiGmKohxHyTPHGOff+vrtIH39/R9fiO/WoenUQ3kcc=
go.opentelemetry.io/otel/sdk v1.11.0 h1:ZnKIL9V9Ztaq+ME43IUi/eo22mNsb6a7tGfzaOWB5fo=
go.opentelemetry.io/otel/sdk v1.11.0/go.mod h1:REusa8RsyKaq0OlyangWXaw97t2VogoO4SSEeKkSTAk=
go.opentelemetry.io/otel/sdk/metric v0.32.3 h1:lY46wXBbo8IuPDlh1fpVPVy/bCT4wwo3RBYve6UaHOA=
go.opentelemetry.io/otel/sdk/metric v0.32.3/go.mod h1:nqJPheSpNDSGXhg22BQRgTQedRalfei6tZkmqTavDSk=
go.opentelemetry.io/otel/trace v1.11.0 h1:20U/Vj42SX+mASlXLmSGBg6jpI1jQtv682lZtTAOVFI=
go.opentelemetry.io/otel/trace v1.11.0/go.mod h1:nyYjis9jy0gytE9LXGU+/m1sHTKbRY0fX0hulNNDP1U=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2 h1:BhEVgvuE1NWLLuMLvC6sif791F45KFHi5GhOs1KunZU=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2/go.mod h1:bx//lU66dPzNT+Y0hHA12ciKoMOH9iixEwCqC1OeQWQ=
go.opentelemetry.io/otel/metric v0.34.0 h1:MCPoQxcg/26EuuJwpYN1mZTeCYAUGx8ABxfW07YkjP8=
go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8=
go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU=
go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU=
go.opentelemetry.io/otel/sdk/metric v0.34.0 h1:7ElxfQpXCFZlRTvVRTkcUvK8Gt5DC8QzmzsLsO2gdzo=
go.opentelemetry.io/otel/sdk/metric v0.34.0/go.mod h1:l4r16BIqiqPy5rd14kkxllPy/fOI4tWo1jkpD9Z3ffQ=
go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0=
go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw=
go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
Expand Down
29 changes: 9 additions & 20 deletions operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import (
"github.com/keptn/lifecycle-toolkit/operator/controllers/keptnworkload"
"github.com/keptn/lifecycle-toolkit/operator/controllers/keptnworkloadinstance"
"github.com/keptn/lifecycle-toolkit/operator/webhooks"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
Expand Down Expand Up @@ -102,12 +101,10 @@ func main() {
// implements prometheus.Collector, allowing it to be used as
// both a Reader and Collector.

exporter := otelprom.New()
// TODO uncomment after bumping OTel version to 1.11.2 or higher
// exporter, err := otelprom.New()
// if err != nil {
// setupLog.Error(err, "unable to start OTel")
// }
exporter, err := otelprom.New()
if err != nil {
setupLog.Error(err, "unable to start OTel")
}
provider := metric.NewMeterProvider(metric.WithReader(exporter))
meter := provider.Meter("keptn/task")
deploymentCount, err := meter.SyncInt64().Counter("keptn.deployment.count", instrument.WithDescription("a simple counter for Keptn Deployments"))
Expand Down Expand Up @@ -190,9 +187,7 @@ func main() {
}

// Start the prometheus HTTP server and pass the exporter Collector to it
// TODO uncomment after bumping OTel version to 1.11.2 or higher
//go serveMetrics()
go serveMetrics(exporter.Collector)
go serveMetrics()

// As recommended by the kubebuilder docs, webhook registration should be disabled if running locally. See https://book.kubebuilder.io/cronjob-tutorial/running.html#running-webhooks-locally for reference
flag.BoolVar(&disableWebhook, "disable-webhook", false, "Disable the registration of webhooks.")
Expand Down Expand Up @@ -511,17 +506,11 @@ func newResource() *resource.Resource {
return r
}

func serveMetrics(collector prometheus.Collector) {
registry := prometheus.NewRegistry()
err := registry.Register(collector)
if err != nil {
fmt.Printf("error registering collector: %v", err)
return
}

func serveMetrics() {
log.Printf("serving metrics at localhost:2222/metrics")
http.Handle("/metrics", promhttp.HandlerFor(registry, promhttp.HandlerOpts{}))
err = http.ListenAndServe(":2222", nil)

http.Handle("/metrics", promhttp.Handler())
err := http.ListenAndServe(":2222", nil)
if err != nil {
fmt.Printf("error serving http: %v", err)
return
Expand Down

0 comments on commit e7db4d0

Please sign in to comment.