From bbc7292840742d408b8096b28dbdabd1ef81d2c9 Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 13:33:59 +0300 Subject: [PATCH 01/15] ok --- go.mod | 44 ++++++++++++------------- go.sum | 102 +++++++++++++++++++++++++++------------------------------ 2 files changed, 69 insertions(+), 77 deletions(-) diff --git a/go.mod b/go.mod index d78220f..ad943b9 100644 --- a/go.mod +++ b/go.mod @@ -3,36 +3,34 @@ module github.com/komuw/otero go 1.21 require ( - github.com/rs/zerolog v1.30.0 + github.com/rs/zerolog v1.31.0 github.com/sirupsen/logrus v1.9.3 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0 - go.opentelemetry.io/otel v1.17.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 - go.opentelemetry.io/otel/metric v1.17.0 - go.opentelemetry.io/otel/sdk v1.17.0 - go.opentelemetry.io/otel/sdk/metric v0.40.0 - go.opentelemetry.io/otel/trace v1.17.0 - google.golang.org/grpc v1.58.0 - + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 + go.opentelemetry.io/otel v1.21.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 + go.opentelemetry.io/otel/metric v1.21.0 + go.opentelemetry.io/otel/sdk v1.21.0 + go.opentelemetry.io/otel/sdk/metric v1.21.0 + go.opentelemetry.io/otel/trace v1.21.0 + google.golang.org/grpc v1.60.1 ) require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect - github.com/felixge/httpsnoop v1.0.3 // indirect - github.com/go-logr/logr v1.2.4 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect - golang.org/x/net v0.15.0 // indirect - golang.org/x/sys v0.12.0 // indirect - golang.org/x/text v0.13.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/protobuf v1.31.0 // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/text v0.14.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect + google.golang.org/protobuf v1.32.0 // indirect ) diff --git a/go.sum b/go.sum index 8173a8a..7738d66 100644 --- a/go.sum +++ b/go.sum @@ -4,91 +4,85 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= -github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1 h1:LSsiG61v9IzzxMkqEr6nrix4miJI62xlRjwT7BYD2SM= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1/go.mod h1:Hbb13e3/WtqQ8U5hLGkek9gJvBLasHuPFI0UEGfnQ10= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c= -github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w= +github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= +github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0 h1:HKORGpiOY0R0nAPtKx/ub8/7XoHhRooP8yNRkuPfelI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0/go.mod h1:e+y1M74SYXo/FcIx3UATwth2+5dDkM8dBi7eXg1tbw8= -go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= -go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 h1:MZbjiZeMmn5wFMORhozpouGKDxj9POHTuU5UA8msBQk= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0/go.mod h1:C7tOYVCJmrDTCwxNny0MuUtnDIR3032vFHYke0F2ZrU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 h1:q3FNPi8FLQVjLlmV+WWHQfH9ZCCtQIS0O/+dn1+4cJ4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0/go.mod h1:rmx4n0uSIAkKBeQYkygcv9dENAlL2/tv3OSq68h1JAo= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 h1:U5GYackKpVKlPrd/5gKMlrTlP2dCESAAFU682VCpieY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0/go.mod h1:aFsJfCEnLzEu9vRRAcUiB/cpRTbVsNdF3OHSPpdjxZQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 h1:iGeIsSYwpYSvh5UGzWrJfTDJvPjrXtxl3GUppj6IXQU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0/go.mod h1:1j3H3G1SBYpZFti6OI4P0uRQCW20MXkG5v4UWXppLLE= -go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= -go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= -go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= -go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= -go.opentelemetry.io/otel/sdk/metric v0.40.0 h1:qOM29YaGcxipWjL5FzpyZDpCYrDREvX0mVlmXdOjCHU= -go.opentelemetry.io/otel/sdk/metric v0.40.0/go.mod h1:dWxHtdzdJvg+ciJUKLTKwrMe5P6Dv3FyDbh8UkfgkVs= -go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= -go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= +go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= +go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 h1:jd0+5t/YynESZqsSyPz+7PAFdEop0dlN0+PkyHYo8oI= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0/go.mod h1:U707O40ee1FpQGyhvqnzmCJm1Wh6OX6GGBVn0E6Uyyk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqheXEFWAZ7O8A7m+J0aPTmpJN3YQ7qetUAdkkkKpk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0= +go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= +go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= +go.opentelemetry.io/otel/sdk/metric v1.21.0 h1:smhI5oD714d6jHE6Tie36fPx4WDFIg+Y6RfAY4ICcR0= +go.opentelemetry.io/otel/sdk/metric v1.21.0/go.mod h1:FJ8RAsoPGv/wYMgBdUJXOm+6pzFY3YdljnXtv1SBE8Q= +go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= +go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= -go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= -go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= -golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o= -google.golang.org/grpc v1.58.0/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 h1:nz5NESFLZbJGPFxDT/HCn+V1mZ8JGNoY4nUpmW/Y2eg= +google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917/go.mod h1:pZqR+glSb11aJ+JQcczCvgf47+duRuzNSKqE8YAQnV0= +google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1 h1:OPXtXn7fNMaXwO3JvOmF1QyTc00jsSFFz1vXXBOdCDo= +google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1/go.mod h1:B5xPO//w8qmBDjGReYLpR6UJPnkldGkCSMoH/2vxJeg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 h1:gphdwh0npgs8elJ4T6J+DQJHPVF7RsuJHCfwztUb4J4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA= +google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= +google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= From 1742264f831e6a5227f2fc1fa3d48cb5d8673ba1 Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 13:38:22 +0300 Subject: [PATCH 02/15] ok --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 533f31d..24757ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -91,9 +91,9 @@ services: image: otel/opentelemetry-collector-contrib:0.84.0 command: --config=/etc/otel-collector-config.yaml volumes: + - ./confs/tls:/etc/tls - ./confs/otel-collector-config.yaml:/etc/otel-collector-config.yaml - ./confs/otel_file_exporter.json:/etc/otel_file_exporter.json - - ./confs/tls:/etc/tls # The official opentelemetry-collector-contrib container does not have a writable filesystem(its built from scratch docker image) # Hence, we need to add this file and make it writabe; `chmod 777 confs/file_exporter.json` # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/fileexporter From c0345dff6bc91bb25ab7da9be97a25cf5440de2a Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 13:42:07 +0300 Subject: [PATCH 03/15] ok --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 24757ec..049687f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,7 +41,7 @@ services: # ******************** # Jaeger jaeger: - image: jaegertracing/all-in-one:1.48.0 + image: jaegertracing/all-in-one:1.53.0 command: - "--memory.max-traces" - "10000" @@ -69,7 +69,7 @@ services: # Prometheus prometheus: - image: prom/prometheus:v2.47.0 + image: prom/prometheus:v2.48.1 container_name: prometheus command: - --web.console.templates=/etc/prometheus/consoles @@ -88,7 +88,7 @@ services: # OpenTelemetry Collector otel_collector: - image: otel/opentelemetry-collector-contrib:0.84.0 + image: otel/opentelemetry-collector-contrib:0.91.0 command: --config=/etc/otel-collector-config.yaml volumes: - ./confs/tls:/etc/tls From 0007ba04d2cedefdabef816fcd1fbae532e4ad12 Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 15:00:07 +0300 Subject: [PATCH 04/15] ok --- confs/otel-collector-config.yaml | 4 ++++ docker-compose.yml | 30 ++++++++++++++++++------------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/confs/otel-collector-config.yaml b/confs/otel-collector-config.yaml index c1a36fe..b8edbdc 100644 --- a/confs/otel-collector-config.yaml +++ b/confs/otel-collector-config.yaml @@ -52,6 +52,8 @@ processors: # (c) Exporters # An exporter, which can be push or pull based, is how you send data to one or more destinations. +# The list of all exporters(that can be used in collector config) is found; +# https://opentelemetry.io/ecosystem/registry/?s=exporter&language=collector exporters: # Data sources: traces, metrics, logs @@ -74,6 +76,8 @@ exporters: # header1: "header-value1" # Data sources: traces, metrics + # jaeger is deprecated and removed as an exporter. + # see: https://github.com/open-telemetry/opentelemetry-specification/pull/2858 jaeger: endpoint: jaeger:14250 tls: diff --git a/docker-compose.yml b/docker-compose.yml index 049687f..b8a2bad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,18 +48,24 @@ services: - "--query.base-path" - "/jaeger/ui" ports: - # Agent zipkin.thrift compact - - "5775:5775" - # Agent jaeger.thrift compact - - "6831:6831" - # Agent jaeger.thrift binary - - "6832:6832" - # Agent config HTTP - - "5778:5778" - # Collector HTTP - - "14268:14268" - # Collector gRPC - - "14250:14250" + # TODO: remove ports. + # # Agent zipkin.thrift compact + # - "5775:5775" + # # Agent jaeger.thrift compact + # - "6831:6831" + # # Agent jaeger.thrift binary + # - "6832:6832" + # # Agent config HTTP + # - "5778:5778" + # # Collector HTTP + # - "14268:14268" + # # Collector gRPC + # - "14250:14250" + # + # OTLP over gRPC receiver + - "14317:4317" + # OTLP over HTTP receiver + - "14318:4318" # Web HTTP - "16686:16686" environment: From 8a8e8b1796fcb8a14bff9cae0ff3078214b8a041 Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 15:01:12 +0300 Subject: [PATCH 05/15] ok --- confs/otel-collector-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/confs/otel-collector-config.yaml b/confs/otel-collector-config.yaml index b8edbdc..414c5d0 100644 --- a/confs/otel-collector-config.yaml +++ b/confs/otel-collector-config.yaml @@ -54,6 +54,7 @@ processors: # An exporter, which can be push or pull based, is how you send data to one or more destinations. # The list of all exporters(that can be used in collector config) is found; # https://opentelemetry.io/ecosystem/registry/?s=exporter&language=collector +# https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter exporters: # Data sources: traces, metrics, logs From bd0d33285e3f9bd09a8f667fc99b629987bbc53d Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 15:39:38 +0300 Subject: [PATCH 06/15] ok --- confs/otel-collector-config.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/confs/otel-collector-config.yaml b/confs/otel-collector-config.yaml index 414c5d0..10abc6f 100644 --- a/confs/otel-collector-config.yaml +++ b/confs/otel-collector-config.yaml @@ -71,11 +71,17 @@ exporters: # loglevel: debug # Data sources: traces, metrics, logs - # otlp: + # otlp/name1: # endpoint: otel_collector:4317 # headers: # header1: "header-value1" + # Data sources: traces, metrics, logs + # otlp/datadog: + # endpoint: https://example.com:4317 + # headers: + # API_KEY: "some-value" + # Data sources: traces, metrics # jaeger is deprecated and removed as an exporter. # see: https://github.com/open-telemetry/opentelemetry-specification/pull/2858 From b8ffc12cb31f314896058f5b5495957072c0e77a Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 15:40:12 +0300 Subject: [PATCH 07/15] ok --- confs/otel-collector-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confs/otel-collector-config.yaml b/confs/otel-collector-config.yaml index 10abc6f..6dcd78b 100644 --- a/confs/otel-collector-config.yaml +++ b/confs/otel-collector-config.yaml @@ -78,7 +78,7 @@ exporters: # Data sources: traces, metrics, logs # otlp/datadog: - # endpoint: https://example.com:4317 + # endpoint: api.example.com:4317 # headers: # API_KEY: "some-value" From 982221b5fb428ae7f5fb377d80e17b63aaa43eb6 Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 15:52:17 +0300 Subject: [PATCH 08/15] ok --- confs/otel-collector-config.yaml | 20 ++++++++------------ docker-compose.yml | 14 -------------- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/confs/otel-collector-config.yaml b/confs/otel-collector-config.yaml index 6dcd78b..d47fa23 100644 --- a/confs/otel-collector-config.yaml +++ b/confs/otel-collector-config.yaml @@ -71,24 +71,20 @@ exporters: # loglevel: debug # Data sources: traces, metrics, logs - # otlp/name1: + # otlp/some-custom-name: # endpoint: otel_collector:4317 # headers: # header1: "header-value1" - # Data sources: traces, metrics, logs - # otlp/datadog: - # endpoint: api.example.com:4317 - # headers: - # API_KEY: "some-value" - # Data sources: traces, metrics # jaeger is deprecated and removed as an exporter. # see: https://github.com/open-telemetry/opentelemetry-specification/pull/2858 - jaeger: - endpoint: jaeger:14250 - tls: - insecure: true + # Instead, it can now speak native otlp protocol. See next section. + # jaeger: + + # Data sources: traces, metrics, logs + otlp/jaeger: + endpoint: "jaeger:4317" # Data sources: metrics prometheus: # configure OpenTelemetry Collector to export data to Prometheus @@ -118,7 +114,7 @@ service: traces: receivers: [otlp] processors: [memory_limiter, batch] - exporters: [file/mine, jaeger] + exporters: [file/mine, otlp/jaeger] metrics: receivers: [otlp] processors: [memory_limiter, batch] diff --git a/docker-compose.yml b/docker-compose.yml index b8a2bad..860bc63 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,20 +48,6 @@ services: - "--query.base-path" - "/jaeger/ui" ports: - # TODO: remove ports. - # # Agent zipkin.thrift compact - # - "5775:5775" - # # Agent jaeger.thrift compact - # - "6831:6831" - # # Agent jaeger.thrift binary - # - "6832:6832" - # # Agent config HTTP - # - "5778:5778" - # # Collector HTTP - # - "14268:14268" - # # Collector gRPC - # - "14250:14250" - # # OTLP over gRPC receiver - "14317:4317" # OTLP over HTTP receiver From bf5aea759e158fa9cea879d4a795b5d6f1e395a9 Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 16:15:43 +0300 Subject: [PATCH 09/15] ok --- confs/jaeger-config.yaml | 12 ++++++++++++ confs/otel-collector-config.yaml | 5 +++++ docker-compose.yml | 9 +++++---- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 confs/jaeger-config.yaml diff --git a/confs/jaeger-config.yaml b/confs/jaeger-config.yaml new file mode 100644 index 0000000..c231335 --- /dev/null +++ b/confs/jaeger-config.yaml @@ -0,0 +1,12 @@ +# Docs: https://www.jaegertracing.io/docs/1.53/cli/#jaeger-all-in-one +memory.max-traces: "10000" +query.base-path: "/jaeger/ui" +log-level: "info" +collector: + grpc: + tls: + enabled: true + cert: /etc/tls/server.crt + key: /etc/tls/server.key + client-ca: /etc/tls/rootCA.crt # Path to the TLS cert to use by the server to verify a client certificate. + diff --git a/confs/otel-collector-config.yaml b/confs/otel-collector-config.yaml index d47fa23..b4a5bbb 100644 --- a/confs/otel-collector-config.yaml +++ b/confs/otel-collector-config.yaml @@ -85,6 +85,11 @@ exporters: # Data sources: traces, metrics, logs otlp/jaeger: endpoint: "jaeger:4317" + tls: + # insecure: false + cert_file: /etc/tls/server.crt + key_file: /etc/tls/server.key + ca_file: /etc/tls/rootCA.crt # For a client this verifies the server certificate. For a server this verifies client certificates. If empty uses system root CA. # Data sources: metrics prometheus: # configure OpenTelemetry Collector to export data to Prometheus diff --git a/docker-compose.yml b/docker-compose.yml index 860bc63..22870b4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,10 +43,11 @@ services: jaeger: image: jaegertracing/all-in-one:1.53.0 command: - - "--memory.max-traces" - - "10000" - - "--query.base-path" - - "/jaeger/ui" + - "--config-file" + - "/etc/jaeger-config.yaml" + volumes: + - ./confs/tls:/etc/tls + - ./confs/jaeger-config.yaml:/etc/jaeger-config.yaml ports: # OTLP over gRPC receiver - "14317:4317" From 526925c9770a6eccfef7f2f13174161a3718201d Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 16:31:52 +0300 Subject: [PATCH 10/15] ok --- confs/jaeger-config.yaml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/confs/jaeger-config.yaml b/confs/jaeger-config.yaml index c231335..ed7120f 100644 --- a/confs/jaeger-config.yaml +++ b/confs/jaeger-config.yaml @@ -3,10 +3,15 @@ memory.max-traces: "10000" query.base-path: "/jaeger/ui" log-level: "info" collector: - grpc: - tls: - enabled: true - cert: /etc/tls/server.crt - key: /etc/tls/server.key - client-ca: /etc/tls/rootCA.crt # Path to the TLS cert to use by the server to verify a client certificate. - + otlp: + enabled: true # Enables OpenTelemetry OTLP receiver on dedicated HTTP and gRPC ports + grpc: + host-port: "127.0.0.1:4317" + tls: + enabled: true + cert: /etc/tls/server.crt + key: /etc/tls/server.key + client-ca: /etc/tls/rootCA.crt + # http: + # host-port: "127.0.0.1:4318" + # etc \ No newline at end of file From 1cc083df1f0d57af34f5094fe1507de6c590ce45 Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 17:01:53 +0300 Subject: [PATCH 11/15] ok --- confs/otel-collector-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confs/otel-collector-config.yaml b/confs/otel-collector-config.yaml index b4a5bbb..37c60e7 100644 --- a/confs/otel-collector-config.yaml +++ b/confs/otel-collector-config.yaml @@ -61,7 +61,7 @@ exporters: file/mine: # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/fileexporter path: /etc/otel_file_exporter.json rotation: - max_megabytes: 1 # max size in megabytes b4 rotation. + max_megabytes: 100 # max size in megabytes b4 rotation. max_backups: 2 localtime: true format: json From 8e9541e520dee2a85e29fd451c8f7c55888a5011 Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 17:05:49 +0300 Subject: [PATCH 12/15] ok --- confs/otel-collector-config.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/confs/otel-collector-config.yaml b/confs/otel-collector-config.yaml index 37c60e7..824b1a6 100644 --- a/confs/otel-collector-config.yaml +++ b/confs/otel-collector-config.yaml @@ -96,14 +96,18 @@ exporters: endpoint: "otel_collector:9464" -# (d) Extensions +# (d) Connectors +# Connectors join two pipelines, acting as both exporter and receiver. +# A connector consumes data as an exporter at the end of one pipeline and emits data as a receiver at the beginning of another pipeline. + +# (e) Extensions # Extensions are available primarily for tasks that do not involve processing telemetry data # They are optional extensions: zpages: # Enables an HTTP endpoint with data for debugging different components that were properly instrumented for such. -# (e) Service +# (f) Service # The service section is used to configure what components are enabled in the Collector based on the configuration found in the receivers, processors, exporters, and extensions sections. # If a component is configured, but not defined within the service section then it is not enabled. # The service section consists of three sub-sections: From dbd59f13abd313427bb4a790729cbead6b92abac Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 17:07:40 +0300 Subject: [PATCH 13/15] ok --- confs/otel-collector-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/confs/otel-collector-config.yaml b/confs/otel-collector-config.yaml index 824b1a6..ef220b8 100644 --- a/confs/otel-collector-config.yaml +++ b/confs/otel-collector-config.yaml @@ -67,8 +67,8 @@ exporters: format: json # Data sources: traces, metrics, logs - # logging: - # loglevel: debug + # debug: # Prior to v0.86.0 use `logging` instead of `debug` + # verbosity: detailed # Data sources: traces, metrics, logs # otlp/some-custom-name: From 6feaeef23ef658ad38dca605a9bed6cd798ecf88 Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 17:10:24 +0300 Subject: [PATCH 14/15] ok --- confs/jaeger-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confs/jaeger-config.yaml b/confs/jaeger-config.yaml index ed7120f..1d2e46d 100644 --- a/confs/jaeger-config.yaml +++ b/confs/jaeger-config.yaml @@ -6,7 +6,7 @@ collector: otlp: enabled: true # Enables OpenTelemetry OTLP receiver on dedicated HTTP and gRPC ports grpc: - host-port: "127.0.0.1:4317" + host-port: "0.0.0.0:4317" tls: enabled: true cert: /etc/tls/server.crt From 0f59a1eddee616cc1daae6aa5dafb499ef38a522 Mon Sep 17 00:00:00 2001 From: $MY_NAME Date: Wed, 10 Jan 2024 17:15:00 +0300 Subject: [PATCH 15/15] add almost all docker services as DNS subject alternate names. This resolves a tls failure when opentelemetry collector tries to send traces to jaeger --- certs.sh | 4 ++-- confs/otel-collector-config.yaml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/certs.sh b/certs.sh index b1e4270..121faf5 100755 --- a/certs.sh +++ b/certs.sh @@ -26,7 +26,7 @@ setup_certs(){ -nodes \ -x509 \ -subj "/C=US/ST=CA/O=MyOrg/CN=myOrgCA" \ - -addext "subjectAltName=DNS:example.com,DNS:example.net,DNS:otel_collector" \ + -addext "subjectAltName=DNS:example.com,DNS:example.net,DNS:otel_collector,DNS:jaeger,DNS:prometheus" \ -CA confs/tls/rootCA.crt \ -CAkey confs/tls/rootCA.key \ -keyout confs/tls/server.key \ @@ -42,7 +42,7 @@ setup_certs(){ -nodes \ -x509 \ -subj "/C=US/ST=CA/O=MyOrg/CN=myOrgCA" \ - -addext "subjectAltName=DNS:example.com,DNS:example.net,DNS:otel_collector" \ + -addext "subjectAltName=DNS:example.com,DNS:example.net,DNS:otel_collector,DNS:jaeger,DNS:prometheus" \ -CA confs/tls/rootCA.crt \ -CAkey confs/tls/rootCA.key \ -keyout confs/tls/client.key \ diff --git a/confs/otel-collector-config.yaml b/confs/otel-collector-config.yaml index ef220b8..499bf62 100644 --- a/confs/otel-collector-config.yaml +++ b/confs/otel-collector-config.yaml @@ -83,6 +83,7 @@ exporters: # jaeger: # Data sources: traces, metrics, logs + # jaeger has native otlp protocol support. So otel collector can just send/export to it. otlp/jaeger: endpoint: "jaeger:4317" tls: