From 119b9deb761e2ed9acc5cd0d9a18fcd0874bf633 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 09:12:07 +0000 Subject: [PATCH 1/2] chore(deps): bump github.com/go-faster/sdk from 0.15.2 to 0.18.0 Bumps [github.com/go-faster/sdk](https://github.com/go-faster/sdk) from 0.15.2 to 0.18.0. - [Release notes](https://github.com/go-faster/sdk/releases) - [Commits](https://github.com/go-faster/sdk/compare/v0.15.2...v0.18.0) --- updated-dependencies: - dependency-name: github.com/go-faster/sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 37 +++++++++++++++-------------- go.sum | 74 ++++++++++++++++++++++++++++++---------------------------- 2 files changed, 57 insertions(+), 54 deletions(-) diff --git a/go.mod b/go.mod index 1894bc2e..ad737db0 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/fatih/color v1.18.0 github.com/go-faster/errors v0.7.1 github.com/go-faster/jx v1.1.0 - github.com/go-faster/sdk v0.15.2 + github.com/go-faster/sdk v0.18.0 github.com/go-faster/yaml v0.4.6 github.com/go-logfmt/logfmt v0.6.0 github.com/gogo/protobuf v1.3.2 @@ -240,24 +240,25 @@ require ( go.opentelemetry.io/collector/receiver/xreceiver v0.116.0 // indirect go.opentelemetry.io/collector/semconv v0.116.0 // indirect go.opentelemetry.io/collector/service v0.116.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect + go.opentelemetry.io/contrib/bridges/otelzap v0.8.0 // indirect go.opentelemetry.io/contrib/config v0.10.0 // indirect - go.opentelemetry.io/contrib/instrumentation/runtime v0.57.0 // indirect - go.opentelemetry.io/contrib/propagators/autoprop v0.57.0 // indirect - go.opentelemetry.io/contrib/propagators/aws v1.32.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.32.0 // indirect - go.opentelemetry.io/contrib/propagators/jaeger v1.32.0 // indirect - go.opentelemetry.io/contrib/propagators/ot v1.32.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect - go.opentelemetry.io/otel/log v0.8.0 // indirect - go.opentelemetry.io/otel/sdk/log v0.7.0 // indirect + go.opentelemetry.io/contrib/instrumentation/runtime v0.58.0 // indirect + go.opentelemetry.io/contrib/propagators/autoprop v0.58.0 // indirect + go.opentelemetry.io/contrib/propagators/aws v1.33.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.33.0 // indirect + go.opentelemetry.io/contrib/propagators/jaeger v1.33.0 // indirect + go.opentelemetry.io/contrib/propagators/ot v1.33.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.9.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.9.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.33.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.55.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.9.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0 // indirect + go.opentelemetry.io/otel/log v0.9.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.9.0 // indirect go.opentelemetry.io/proto/otlp v1.4.0 // indirect go.uber.org/automaxprocs v1.6.0 // indirect golang.org/x/crypto v0.32.0 // indirect diff --git a/go.sum b/go.sum index 35ef0732..9318b357 100644 --- a/go.sum +++ b/go.sum @@ -211,8 +211,8 @@ github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AY github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo= github.com/go-faster/jx v1.1.0 h1:ZsW3wD+snOdmTDy9eIVgQdjUpXRRV4rqW8NS3t+20bg= github.com/go-faster/jx v1.1.0/go.mod h1:vKDNikrKoyUmpzaJ0OkIkRQClNHFX/nF3dnTJZb3skg= -github.com/go-faster/sdk v0.15.2 h1:6bQPc0WSiFHjGQwiBySFMRMI5kFLtKvZ6KCzeBIgq3Q= -github.com/go-faster/sdk v0.15.2/go.mod h1:F70c3BZyzdrWncSHkD9Vi7eriVd1qUBvmP58qgOo0Ug= +github.com/go-faster/sdk v0.18.0 h1:zHwbVfjRO1lkovWxubl75XJdT7hW1mQMrjRtuSgQ0m8= +github.com/go-faster/sdk v0.18.0/go.mod h1:IWvsQ1GvPtmylD6hzo5myM7kpBEQu43gyC3tcbXC3Q8= github.com/go-faster/yaml v0.4.6 h1:lOK/EhI04gCpPgPhgt0bChS6bvw7G3WwI8xxVe0sw9I= github.com/go-faster/yaml v0.4.6/go.mod h1:390dRIvV4zbnO7qC9FGo6YYutc+wyyUSHBgbXL52eXk= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -812,58 +812,60 @@ go.opentelemetry.io/collector/semconv v0.116.0 h1:63xCZomsKJAWmKGWD3lnORiE3WKW6A go.opentelemetry.io/collector/semconv v0.116.0/go.mod h1:N6XE8Q0JKgBN2fAhkUQtqK9LT7rEGR6+Wu/Rtbal1iI= go.opentelemetry.io/collector/service v0.116.0 h1:1rFmax3ILOlQq4bW//0VKRcG/HmN2rxrgfTybn6bisU= go.opentelemetry.io/collector/service v0.116.0/go.mod h1:CzQzj72mWr5arag+q8uUWGRuUkenNo5Gw9oA97SFZ78= -go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 h1:j8icMXyyqNf6HGuwlYhniPnVsbJIq7n+WirDu3VAJdQ= -go.opentelemetry.io/contrib/bridges/otelzap v0.6.0/go.mod h1:evIOZpl+kAlU5IsaYX2Siw+IbpacAZvXemVsgt70uvw= +go.opentelemetry.io/contrib/bridges/otelzap v0.8.0 h1:4jqXEd0FGULFBy1bF1ledBePc0Ssu8YVddTgr8BXDTc= +go.opentelemetry.io/contrib/bridges/otelzap v0.8.0/go.mod h1:nrDogEQCtEOQ4jAiN4uHIE0BqicDF9bMyepgK1pIbP4= go.opentelemetry.io/contrib/config v0.10.0 h1:2JknAzMaYjxrHkTnZh3eOme/Y2P5eHE2SWfhfV6Xd6c= go.opentelemetry.io/contrib/config v0.10.0/go.mod h1:aND2M6/KfNkntI5cyvHriR/zvZgPf8j9yETdSmvpfmc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 h1:PS8wXpbyaDJQ2VDHHncMe9Vct0Zn1fEjpsjrLxGJoSc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0/go.mod h1:HDBUsEjOuRC0EzKZ1bSaRGZWUBAzo+MhAcUUORSr4D0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q= -go.opentelemetry.io/contrib/instrumentation/runtime v0.57.0 h1:kJB5wMVorwre8QzEodzTAbzm9FOOah0zvG+V4abNlEE= -go.opentelemetry.io/contrib/instrumentation/runtime v0.57.0/go.mod h1:Nup4TgnOyEJWmVq9sf/ASH3ZJiAXwWHd5xZCHG7Sg9M= -go.opentelemetry.io/contrib/propagators/autoprop v0.57.0 h1:bNPJOdT5154XxzeFmrh8R+PXnV4t3TZEczy8gHEpcpg= -go.opentelemetry.io/contrib/propagators/autoprop v0.57.0/go.mod h1:Tb0j0mK+QatKdCxCKPN7CSzc7kx/q34/KaohJx/N96s= -go.opentelemetry.io/contrib/propagators/aws v1.32.0 h1:NELzr8bW7a7aHVZj5gaep1PfkvoSCGx+1qNGZx/uhhU= -go.opentelemetry.io/contrib/propagators/aws v1.32.0/go.mod h1:XKMrzHNka3eOA+nGEcNKYVL9s77TAhkwQEynYuaRFnQ= -go.opentelemetry.io/contrib/propagators/b3 v1.32.0 h1:MazJBz2Zf6HTN/nK/s3Ru1qme+VhWU5hm83QxEP+dvw= -go.opentelemetry.io/contrib/propagators/b3 v1.32.0/go.mod h1:B0s70QHYPrJwPOwD1o3V/R8vETNOG9N3qZf4LDYvA30= -go.opentelemetry.io/contrib/propagators/jaeger v1.32.0 h1:K/fOyTMD6GELKTIJBaJ9k3ppF2Njt8MeUGBOwfaWXXA= -go.opentelemetry.io/contrib/propagators/jaeger v1.32.0/go.mod h1:ISE6hda//MTWvtngG7p4et3OCngsrTVfl7c6DjN17f8= -go.opentelemetry.io/contrib/propagators/ot v1.32.0 h1:Poy02A4wOZubHyd2hpHPDgZW+rn6EIq0vCwTZJ6Lmu8= -go.opentelemetry.io/contrib/propagators/ot v1.32.0/go.mod h1:cbhaURV+VR3NIMarzDYZU1RDEkXG1fNd1WMP1XCcGkY= +go.opentelemetry.io/contrib/instrumentation/runtime v0.58.0 h1:GrcF8ABgnBHQFgp4zu5/jTSqLkoJ9uiDz2e7eKkjq+w= +go.opentelemetry.io/contrib/instrumentation/runtime v0.58.0/go.mod h1:+kxR5prZLoFAJVXJWZKWO2e4PY2dYyXIRNklBuOyzpM= +go.opentelemetry.io/contrib/propagators/autoprop v0.58.0 h1:pL1MMoBcG/ol6fVsjE1bbOO9A8GMQiN+T73hnmaXDoU= +go.opentelemetry.io/contrib/propagators/autoprop v0.58.0/go.mod h1:EU5uMoCqafsagp4hzFqzu1Eyg/8L23JS5Y1hChoHf7s= +go.opentelemetry.io/contrib/propagators/aws v1.33.0 h1:MefPfPIut0IxEiQRK1qVv5AFADBOwizl189+m7QhpFg= +go.opentelemetry.io/contrib/propagators/aws v1.33.0/go.mod h1:VB6xPo12uW/PezOqtA/cY2/DiAGYshnhID606wC9NEY= +go.opentelemetry.io/contrib/propagators/b3 v1.33.0 h1:ig/IsHyyoQ1F1d6FUDIIW5oYpsuTVtN16AyGOgdjAHQ= +go.opentelemetry.io/contrib/propagators/b3 v1.33.0/go.mod h1:EsVYoNy+Eol5znb6wwN3XQTILyjl040gUpEnUSNZfsk= +go.opentelemetry.io/contrib/propagators/jaeger v1.33.0 h1:Jok/dG8kfp+yod29XKYV/blWgYPlMuRUoRHljrXMF5E= +go.opentelemetry.io/contrib/propagators/jaeger v1.33.0/go.mod h1:ku/EpGk44S5lyVMbtJRK2KFOnXEehxf6SDnhu1eZmjA= +go.opentelemetry.io/contrib/propagators/ot v1.33.0 h1:xj/pQFKo4ROsx0v129KpLgFwaYMgFTu3dAMEEih97cY= +go.opentelemetry.io/contrib/propagators/ot v1.33.0/go.mod h1:/xxHCLhTmaypEFwMViRGROj2qgrGiFrkxIlATt0rddc= go.opentelemetry.io/contrib/zpages v0.58.0 h1:3+lAb4TYwT/N1XTCOzi8T/RQjs7PvWtBnja9xg/KySM= go.opentelemetry.io/contrib/zpages v0.58.0/go.mod h1:FSf+HaLUivqGnyFZ1suuLi31t1FVWeS120MA1sqmJYI= go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw= go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0 h1:mMOmtYie9Fx6TSVzw4W+NTpvoaS1JWWga37oI1a/4qQ= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0/go.mod h1:yy7nDsMMBUkD+jeekJ36ur5f3jJIrmCwUrY67VFhNpA= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 h1:j7ZSD+5yn+lo3sGV69nW04rRR0jhYnBwjuX3r0HvnK0= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0/go.mod h1:WXbYJTUaZXAbYd8lbgGuvih0yuCfOFC5RJoYnoLcGz8= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 h1:t/Qur3vKSkUCcDVaSumWF2PKHt85pc7fRvFuoVT8qFU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0/go.mod h1:Rl61tySSdcOJWoEgYZVtmnKdA0GeKrSqkHC1t+91CH8= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.9.0 h1:gA2gh+3B3NDvRFP30Ufh7CC3TtJRbUSf2TTD0LbCagw= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.9.0/go.mod h1:smRTR+02OtrVGjvWE1sQxhuazozKc/BXvvqqnmOxy+s= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.9.0 h1:Za0Z/j9Gf3Z9DKQ1choU9xI2noCxlkcyFFP2Ob3miEQ= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.9.0/go.mod h1:jMRB8N75meTNjDFQyJBA/2Z9en21CsxwMctn08NHY6c= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0 h1:7F29RDmnlqk6B5d+sUqemt8TBfDqxryYW5gX6L74RFA= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0/go.mod h1:ZiGDq7xwDMKmWDrN1XsXAj0iC7hns+2DhxBFSncNHSE= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.33.0 h1:bSjzTvsXZbLSWU8hnZXcKmEVaJjjnandxD0PxThhVU8= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.33.0/go.mod h1:aj2rilHL8WjXY1I5V+ra+z8FELtk681deydgYT8ikxU= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0/go.mod h1:cpgtDBaqD/6ok/UG0jT15/uKjAY8mRA53diogHBg3UI= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 h1:5pojmb1U1AogINhN3SurB+zm/nIcusopeBNp42f45QM= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0/go.mod h1:57gTHJSE5S1tqg+EKsLPlTWhpHMsWlVmer+LA926XiA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 h1:cMyu9O88joYEaI47CnQkxO1XZdpoTF9fEnW2duIddhw= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0/go.mod h1:6Am3rn7P9TVVeXYG+wtcGE7IE1tsQ+bP3AuWcKt/gOI= -go.opentelemetry.io/otel/exporters/prometheus v0.54.0 h1:rFwzp68QMgtzu9PgP3jm9XaMICI6TsofWWPcBDKwlsU= -go.opentelemetry.io/otel/exporters/prometheus v0.54.0/go.mod h1:QyjcV9qDP6VeK5qPyKETvNjmaaEc7+gqjh4SS0ZYzDU= -go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0 h1:TwmL3O3fRR80m8EshBrd8YydEZMcUCsZXzOUlnFohwM= -go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0/go.mod h1:tH98dDv5KPmPThswbXA0fr0Lwfs+OhK8HgaCo7PjRrk= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 h1:SZmDnHcgp3zwlPBS2JX2urGYe/jBKEIT6ZedHRUyCz8= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0/go.mod h1:fdWW0HtZJ7+jNpTKUR0GpMEDP69nR8YBJQxNiVCE3jk= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 h1:cC2yDI3IQd0Udsux7Qmq8ToKAx1XCilTQECZ0KDZyTw= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0/go.mod h1:2PD5Ex6z8CFzDbTdOlwyNIUywRr1DN0ospafJM1wJ+s= -go.opentelemetry.io/otel/log v0.8.0 h1:egZ8vV5atrUWUbnSsHn6vB8R21G2wrKqNiDt3iWertk= -go.opentelemetry.io/otel/log v0.8.0/go.mod h1:M9qvDdUTRCopJcGRKg57+JSQ9LgLBrwwfC32epk5NX8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 h1:wpMfgF8E1rkrT1Z6meFh1NDtownE9Ii3n3X2GJYjsaU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0/go.mod h1:wAy0T/dUbs468uOlkT31xjvqQgEVXv58BRFWEgn5v/0= +go.opentelemetry.io/otel/exporters/prometheus v0.55.0 h1:sSPw658Lk2NWAv74lkD3B/RSDb+xRFx46GjkrL3VUZo= +go.opentelemetry.io/otel/exporters/prometheus v0.55.0/go.mod h1:nC00vyCmQixoeaxF6KNyP42II/RHa9UdruK02qBmHvI= +go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.9.0 h1:iI15wfQb5ZtAVTdS5WROxpYmw6Kjez3hT9SuzXhrgGQ= +go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.9.0/go.mod h1:yepwlNzVVxHWR5ugHIrll+euPQPq4pvysHTDr/daV9o= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0 h1:FiOTYABOX4tdzi8A0+mtzcsTmi6WBOxk66u0f1Mj9Gs= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0/go.mod h1:xyo5rS8DgzV0Jtsht+LCEMwyiDbjpsxBpWETwFRF0/4= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0 h1:W5AWUn/IVe8RFb5pZx1Uh9Laf/4+Qmm4kJL5zPuvR+0= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0/go.mod h1:mzKxJywMNBdEX8TSJais3NnsVZUaJ+bAy6UxPTng2vk= +go.opentelemetry.io/otel/log v0.9.0 h1:0OiWRefqJ2QszpCiqwGO0u9ajMPe17q6IscQvvp3czY= +go.opentelemetry.io/otel/log v0.9.0/go.mod h1:WPP4OJ+RBkQ416jrFCQFuFKtXKD6mOoYCQm6ykK8VaU= go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ= go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M= go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM= go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM= -go.opentelemetry.io/otel/sdk/log v0.7.0 h1:dXkeI2S0MLc5g0/AwxTZv6EUEjctiH8aG14Am56NTmQ= -go.opentelemetry.io/otel/sdk/log v0.7.0/go.mod h1:oIRXpW+WD6M8BuGj5rtS0aRu/86cbDV/dAfNaZBIjYM= +go.opentelemetry.io/otel/sdk/log v0.9.0 h1:YPCi6W1Eg0vwT/XJWsv2/PaQ2nyAJYuF7UUjQSBe3bc= +go.opentelemetry.io/otel/sdk/log v0.9.0/go.mod h1:y0HdrOz7OkXQBuc2yjiqnEHc+CRKeVhRE3hx4RwTmV4= go.opentelemetry.io/otel/sdk/metric v1.33.0 h1:Gs5VK9/WUJhNXZgn8MR6ITatvAmKeIuCtNbsP3JkNqU= go.opentelemetry.io/otel/sdk/metric v1.33.0/go.mod h1:dL5ykHZmm1B1nVRk9dDjChwDmt81MjVp3gLkQRwKf/Q= go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s= From fb801bf2276c38f2775f3c48a9050a0799d03297 Mon Sep 17 00:00:00 2001 From: tdakkota Date: Tue, 7 Jan 2025 13:46:50 +0300 Subject: [PATCH 2/2] chore: do not use deprecated APIs --- cmd/chotel/main.go | 6 +++--- cmd/otelbot/app.go | 4 ++-- cmd/otelbot/main.go | 2 +- cmd/oteldb/app.go | 4 ++-- cmd/oteldb/oteldb.go | 2 +- cmd/oteldb/storage.go | 2 +- cmd/oteldemo/client.go | 2 +- cmd/oteldemo/server.go | 2 +- cmd/otelproxy/main.go | 16 ++++++++-------- internal/otelbench/handler.go | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cmd/chotel/main.go b/cmd/chotel/main.go index 2f983c65..0d9b0afb 100644 --- a/cmd/chotel/main.go +++ b/cmd/chotel/main.go @@ -35,7 +35,7 @@ import ( ) func main() { - app.Run(func(ctx context.Context, lg *zap.Logger, m *app.Metrics) (err error) { + app.Run(func(ctx context.Context, lg *zap.Logger, m *app.Telemetry) (err error) { a, err := NewApp(lg, m) if err != nil { return errors.Wrap(err, "init") @@ -47,7 +47,7 @@ func main() { // App is the trace exporter application. type App struct { log *zap.Logger - metrics *app.Metrics + metrics *app.Telemetry clickHouseAddr string clickHousePassword string @@ -75,7 +75,7 @@ const DDL = `CREATE TABLE IF NOT EXISTS opentelemetry_span_export ` // NewApp initializes the trace exporter application. -func NewApp(lg *zap.Logger, metrics *app.Metrics) (*App, error) { +func NewApp(lg *zap.Logger, metrics *app.Telemetry) (*App, error) { a := &App{ log: lg, metrics: metrics, diff --git a/cmd/otelbot/app.go b/cmd/otelbot/app.go index 871b1bca..8e58994c 100644 --- a/cmd/otelbot/app.go +++ b/cmd/otelbot/app.go @@ -8,7 +8,7 @@ import ( "golang.org/x/sync/errgroup" ) -func newApp(cfg Config, m *app.Metrics) (*App, error) { +func newApp(cfg Config, m *app.Telemetry) (*App, error) { cfg.setDefaults() a := &App{ cfg: cfg, @@ -24,7 +24,7 @@ func newApp(cfg Config, m *app.Metrics) (*App, error) { type App struct { cfg Config - metrics *app.Metrics + metrics *app.Telemetry services map[string]func(context.Context) error } diff --git a/cmd/otelbot/main.go b/cmd/otelbot/main.go index 76fb0de8..ac031486 100644 --- a/cmd/otelbot/main.go +++ b/cmd/otelbot/main.go @@ -13,7 +13,7 @@ import ( ) func main() { - app.Run(func(ctx context.Context, lg *zap.Logger, m *app.Metrics) error { + app.Run(func(ctx context.Context, lg *zap.Logger, m *app.Telemetry) error { shutdown, err := autozpages.Setup(m.TracerProvider()) if err != nil { return errors.Wrap(err, "setup zPages") diff --git a/cmd/oteldb/app.go b/cmd/oteldb/app.go index 3914b053..5ef6e30b 100644 --- a/cmd/oteldb/app.go +++ b/cmd/oteldb/app.go @@ -43,10 +43,10 @@ type App struct { otelStorage lg *zap.Logger - metrics *sdkapp.Metrics + metrics *sdkapp.Telemetry } -func newApp(ctx context.Context, cfg Config, m *sdkapp.Metrics) (_ *App, err error) { +func newApp(ctx context.Context, cfg Config, m *sdkapp.Telemetry) (_ *App, err error) { cfg.setDefaults() app := &App{ diff --git a/cmd/oteldb/oteldb.go b/cmd/oteldb/oteldb.go index 62c5fb0a..f60bb579 100644 --- a/cmd/oteldb/oteldb.go +++ b/cmd/oteldb/oteldb.go @@ -14,7 +14,7 @@ import ( ) func main() { - app.Run(func(ctx context.Context, lg *zap.Logger, m *app.Metrics) error { + app.Run(func(ctx context.Context, lg *zap.Logger, m *app.Telemetry) error { shutdown, err := autozpages.Setup(m.TracerProvider()) if err != nil { return errors.Wrap(err, "setup zPages") diff --git a/cmd/oteldb/storage.go b/cmd/oteldb/storage.go index 7d3596fb..4f2102db 100644 --- a/cmd/oteldb/storage.go +++ b/cmd/oteldb/storage.go @@ -42,7 +42,7 @@ func setupCH( dsn string, ttl time.Duration, lg *zap.Logger, - m *app.Metrics, + m *app.Telemetry, ) (store otelStorage, _ error) { c, err := chstorage.Dial(ctx, dsn, chstorage.DialOptions{ MeterProvider: m.MeterProvider(), diff --git a/cmd/oteldemo/client.go b/cmd/oteldemo/client.go index 81e70553..1c22a531 100644 --- a/cmd/oteldemo/client.go +++ b/cmd/oteldemo/client.go @@ -12,7 +12,7 @@ import ( "go.uber.org/zap" ) -func client(ctx context.Context, lg *zap.Logger, m *app.Metrics) error { +func client(ctx context.Context, lg *zap.Logger, m *app.Telemetry) error { httpTransport := otelhttp.NewTransport(http.DefaultTransport, otelhttp.WithTracerProvider(m.TracerProvider()), otelhttp.WithMeterProvider(m.MeterProvider()), diff --git a/cmd/oteldemo/server.go b/cmd/oteldemo/server.go index 036123b4..53118373 100644 --- a/cmd/oteldemo/server.go +++ b/cmd/oteldemo/server.go @@ -18,7 +18,7 @@ import ( "golang.org/x/sync/errgroup" ) -func server(ctx context.Context, lg *zap.Logger, m *app.Metrics) error { +func server(ctx context.Context, lg *zap.Logger, m *app.Telemetry) error { g, ctx := errgroup.WithContext(ctx) mux := http.NewServeMux() diff --git a/cmd/otelproxy/main.go b/cmd/otelproxy/main.go index d0136fbc..3869d360 100644 --- a/cmd/otelproxy/main.go +++ b/cmd/otelproxy/main.go @@ -33,7 +33,7 @@ type service struct { cleanup func() error } -func (s service) Run(ctx context.Context, lg *zap.Logger, m *app.Metrics) error { +func (s service) Run(ctx context.Context, lg *zap.Logger, m *app.Telemetry) error { if s.cleanup != nil { defer func() { if err := s.cleanup(); err != nil { @@ -74,7 +74,7 @@ func (s service) Run(ctx context.Context, lg *zap.Logger, m *app.Metrics) error } // ServiceMiddleware is a generic middleware for any service. -func ServiceMiddleware(s service, lg *zap.Logger, m *app.Metrics) http.Handler { +func ServiceMiddleware(s service, lg *zap.Logger, m *app.Telemetry) http.Handler { return httpmiddleware.Wrap(s.handler, httpmiddleware.InjectLogger(lg), httpmiddleware.Instrument(s.name, s.findRoute, m), @@ -98,7 +98,7 @@ func (s *services) addService(addr string, srv service) error { return nil } -func (s *services) Prometheus(m *app.Metrics) error { +func (s *services) Prometheus(m *app.Telemetry) error { const ( prefix = "PROMETHEUS" defaultPort = ":9090" @@ -156,7 +156,7 @@ func (s *services) Prometheus(m *app.Metrics) error { }) } -func (s *services) Loki(m *app.Metrics) error { +func (s *services) Loki(m *app.Telemetry) error { const ( prefix = "LOKI" defaultPort = ":3100" @@ -196,7 +196,7 @@ func (s *services) Loki(m *app.Metrics) error { }) } -func (s *services) Pyroscope(m *app.Metrics) error { +func (s *services) Pyroscope(m *app.Telemetry) error { const ( prefix = "PYROSCOPE" defaultPort = ":4040" @@ -236,7 +236,7 @@ func (s *services) Pyroscope(m *app.Metrics) error { }) } -func (s *services) Tempo(m *app.Metrics) error { +func (s *services) Tempo(m *app.Telemetry) error { const ( prefix = "TEMPO" defaultPort = ":3200" @@ -276,7 +276,7 @@ func (s *services) Tempo(m *app.Metrics) error { }) } -func (s *services) httpClient(wrap TransportMiddleware, m *app.Metrics) *http.Client { +func (s *services) httpClient(wrap TransportMiddleware, m *app.Telemetry) *http.Client { transport := http.DefaultTransport if wrap != nil { transport = wrap(transport) @@ -290,7 +290,7 @@ func (s *services) httpClient(wrap TransportMiddleware, m *app.Metrics) *http.Cl } func main() { - app.Run(func(ctx context.Context, lg *zap.Logger, m *app.Metrics) error { + app.Run(func(ctx context.Context, lg *zap.Logger, m *app.Telemetry) error { s := services{} if err := s.Prometheus(m); err != nil { return errors.Wrapf(err, "setup Prometheus proxy") diff --git a/internal/otelbench/handler.go b/internal/otelbench/handler.go index 2a9d1a52..88b8648a 100644 --- a/internal/otelbench/handler.go +++ b/internal/otelbench/handler.go @@ -20,7 +20,7 @@ import ( ) // NewHandler initializes and returns a new Handler. -func NewHandler(db *ent.Client, m *app.Metrics) *Handler { +func NewHandler(db *ent.Client, m *app.Telemetry) *Handler { httpClient := &http.Client{ Transport: otelhttp.NewTransport(http.DefaultTransport, otelhttp.WithTracerProvider(m.TracerProvider()),