diff --git a/examples/go.mod b/examples/go.mod index 4ca2285a9..6d384fcc1 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -8,9 +8,9 @@ require ( github.com/google/uuid v1.4.0 github.com/ogen-go/ogen v0.0.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/otel v1.19.0 - go.opentelemetry.io/otel/metric v1.19.0 - go.opentelemetry.io/otel/trace v1.19.0 + go.opentelemetry.io/otel v1.20.0 + go.opentelemetry.io/otel/metric v1.20.0 + go.opentelemetry.io/otel/trace v1.20.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 @@ -23,7 +23,7 @@ require ( github.com/fatih/color v1.16.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/go-faster/yaml v0.4.6 // indirect - github.com/go-logr/logr v1.2.4 // indirect + github.com/go-logr/logr v1.3.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect diff --git a/examples/go.sum b/examples/go.sum index 42ac139cf..9534af2b7 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -13,11 +13,11 @@ github.com/go-faster/jx v1.1.0/go.mod h1:vKDNikrKoyUmpzaJ0OkIkRQClNHFX/nF3dnTJZb 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-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.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/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/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -34,12 +34,12 @@ github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= 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/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= -go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= -go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= -go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= -go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= -go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= +go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= +go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs= +go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA= +go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM= +go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ= +go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= diff --git a/go.mod b/go.mod index 9d36c5244..71381a484 100644 --- a/go.mod +++ b/go.mod @@ -14,9 +14,9 @@ require ( github.com/mattn/go-isatty v0.0.20 github.com/stretchr/testify v1.8.4 github.com/valyala/fasthttp v1.50.0 - go.opentelemetry.io/otel v1.19.0 - go.opentelemetry.io/otel/metric v1.19.0 - go.opentelemetry.io/otel/trace v1.19.0 + go.opentelemetry.io/otel v1.20.0 + go.opentelemetry.io/otel/metric v1.20.0 + go.opentelemetry.io/otel/trace v1.20.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 @@ -28,7 +28,7 @@ require ( require ( github.com/andybalholm/brotli v1.0.5 // indirect - github.com/go-logr/logr v1.2.4 // indirect + github.com/go-logr/logr v1.3.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/klauspost/compress v1.16.3 // indirect github.com/kr/pretty v0.3.1 // indirect diff --git a/go.sum b/go.sum index 22adc2e71..d44a4eb1e 100644 --- a/go.sum +++ b/go.sum @@ -16,11 +16,11 @@ github.com/go-faster/jx v1.1.0/go.mod h1:vKDNikrKoyUmpzaJ0OkIkRQClNHFX/nF3dnTJZb 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-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.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/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/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= @@ -51,12 +51,12 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M= github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= -go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= -go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= -go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= -go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= -go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= -go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= +go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= +go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs= +go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA= +go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM= +go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ= +go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/internal/integration/bench_test.go b/internal/integration/bench_test.go index 145b81d71..ba3a5e65f 100644 --- a/internal/integration/bench_test.go +++ b/internal/integration/bench_test.go @@ -18,7 +18,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" "github.com/valyala/fasthttp" - "go.opentelemetry.io/otel/trace" + "go.opentelemetry.io/otel/trace/noop" "github.com/ogen-go/ogen/conv" ht "github.com/ogen-go/ogen/http" @@ -246,7 +246,7 @@ func BenchmarkIntegration(b *testing.B) { httpClient := benchClient() client, err := techempower.NewClient(s.URL, techempower.WithClient(httpClient), - techempower.WithTracerProvider(trace.NewNoopTracerProvider()), + techempower.WithTracerProvider(noop.NewTracerProvider()), ) require.NoError(b, err) ctx := context.Background() diff --git a/internal/integration/cmd/techempower/main.go b/internal/integration/cmd/techempower/main.go index b98d7e4e9..ad84745d1 100644 --- a/internal/integration/cmd/techempower/main.go +++ b/internal/integration/cmd/techempower/main.go @@ -6,7 +6,7 @@ import ( "log" "net/http" - "go.opentelemetry.io/otel/trace" + "go.opentelemetry.io/otel/trace/noop" "github.com/ogen-go/ogen/internal/integration/techempower" ) @@ -23,9 +23,11 @@ func (server) DB(ctx context.Context) (*techempower.WorldObject, error) { panic( func (server) Caching(ctx context.Context, params techempower.CachingParams) (techempower.WorldObjects, error) { panic("implement me") } + func (server) Queries(ctx context.Context, params techempower.QueriesParams) (techempower.WorldObjects, error) { panic("implement me") } + func (server) Updates(ctx context.Context, params techempower.UpdatesParams) (techempower.WorldObjects, error) { panic("implement me") } @@ -37,7 +39,7 @@ func main() { flag.StringVar(&arg.Addr, "addr", ":8080", "http address to listen") flag.Parse() - traceProvider := trace.NewNoopTracerProvider() + traceProvider := noop.NewTracerProvider() s, err := techempower.NewServer(&server{}, techempower.WithTracerProvider(traceProvider)) if err != nil { panic(err) diff --git a/internal/integration/e2e_test.go b/internal/integration/e2e_test.go index fba3db7a3..dac3cf351 100644 --- a/internal/integration/e2e_test.go +++ b/internal/integration/e2e_test.go @@ -17,8 +17,8 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/otel/metric/noop" - "go.opentelemetry.io/otel/trace" + metricnoop "go.opentelemetry.io/otel/metric/noop" + tracenoop "go.opentelemetry.io/otel/trace/noop" "github.com/ogen-go/ogen/conv" api "github.com/ogen-go/ogen/internal/integration/sample_api" @@ -229,8 +229,8 @@ func TestIntegration(t *testing.T) { handler := &sampleAPIServer{} h, err := api.NewServer(handler, handler, - api.WithTracerProvider(trace.NewNoopTracerProvider()), - api.WithMeterProvider(noop.NewMeterProvider()), + api.WithTracerProvider(tracenoop.NewTracerProvider()), + api.WithMeterProvider(metricnoop.NewMeterProvider()), ) require.NoError(t, err) s := httptest.NewServer(h) @@ -239,8 +239,8 @@ func TestIntegration(t *testing.T) { httpClient := s.Client() client, err := api.NewClient(s.URL, handler, api.WithClient(httpClient), - api.WithTracerProvider(trace.NewNoopTracerProvider()), - api.WithMeterProvider(noop.NewMeterProvider()), + api.WithTracerProvider(tracenoop.NewTracerProvider()), + api.WithMeterProvider(metricnoop.NewMeterProvider()), ) require.NoError(t, err) ctx := context.Background() diff --git a/internal/location/error.go b/internal/location/error.go index 0d525e19f..b0c0dc286 100644 --- a/internal/location/error.go +++ b/internal/location/error.go @@ -7,9 +7,10 @@ import ( "github.com/go-faster/errors" "github.com/go-faster/yaml" - "github.com/ogen-go/ogen/internal/xmaps" "go.uber.org/multierr" "golang.org/x/exp/slices" + + "github.com/ogen-go/ogen/internal/xmaps" ) var _ interface { diff --git a/openapi/parser/expand.go b/openapi/parser/expand.go index e41422546..603f3f7ff 100644 --- a/openapi/parser/expand.go +++ b/openapi/parser/expand.go @@ -7,6 +7,7 @@ import ( "strings" "github.com/go-faster/errors" + "github.com/ogen-go/ogen" "github.com/ogen-go/ogen/internal/location" "github.com/ogen-go/ogen/jsonschema" diff --git a/openapi/parser/parse_server_test.go b/openapi/parser/parse_server_test.go index 3d0d0f816..56d5f970a 100644 --- a/openapi/parser/parse_server_test.go +++ b/openapi/parser/parse_server_test.go @@ -3,9 +3,10 @@ package parser_test import ( "testing" + "github.com/stretchr/testify/require" + "github.com/ogen-go/ogen" "github.com/ogen-go/ogen/openapi/parser" - "github.com/stretchr/testify/require" ) func TestServerURL(t *testing.T) {