diff --git a/Makefile b/Makefile index 0e6ffa284..91ead91b4 100644 --- a/Makefile +++ b/Makefile @@ -156,7 +156,7 @@ go-mod-tidy/%: DIR=$* go-mod-tidy/%: | crosslink @echo "$(GO) mod tidy in $(DIR)" \ && cd $(DIR) \ - && $(GO) mod tidy -compat=1.18 + && $(GO) mod tidy -compat=1.19 .PHONY: lint-modules lint-modules: go-mod-tidy diff --git a/bridge/opencensus/go.mod b/bridge/opencensus/go.mod index d76fd2f29..23afed871 100644 --- a/bridge/opencensus/go.mod +++ b/bridge/opencensus/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/bridge/opencensus -go 1.18 +go 1.19 require ( github.com/stretchr/testify v1.8.2 diff --git a/bridge/opencensus/metric.go b/bridge/opencensus/metric.go index 040dbdfeb..91bd539c9 100644 --- a/bridge/opencensus/metric.go +++ b/bridge/opencensus/metric.go @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build go1.18 -// +build go1.18 - package opencensus // import "go.opentelemetry.io/otel/bridge/opencensus" import ( diff --git a/bridge/opencensus/test/go.mod b/bridge/opencensus/test/go.mod index fa08d2ac5..3c1f5cece 100644 --- a/bridge/opencensus/test/go.mod +++ b/bridge/opencensus/test/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/bridge/opencensus/test -go 1.18 +go 1.19 require ( go.opencensus.io v0.24.0 diff --git a/bridge/opentracing/go.mod b/bridge/opentracing/go.mod index 0c7dcf533..3aae6a5fd 100644 --- a/bridge/opentracing/go.mod +++ b/bridge/opentracing/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/bridge/opentracing -go 1.18 +go 1.19 replace go.opentelemetry.io/otel => ../.. diff --git a/bridge/opentracing/test/go.mod b/bridge/opentracing/test/go.mod index 807f748d8..ccd92d85c 100644 --- a/bridge/opentracing/test/go.mod +++ b/bridge/opentracing/test/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/bridge/opentracing/test -go 1.18 +go 1.19 replace go.opentelemetry.io/otel => ../../.. diff --git a/example/fib/go.mod b/example/fib/go.mod index f85936833..ebcd41898 100644 --- a/example/fib/go.mod +++ b/example/fib/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/example/fib -go 1.18 +go 1.19 require ( go.opentelemetry.io/otel v1.15.0-rc.1 diff --git a/example/jaeger/go.mod b/example/jaeger/go.mod index 199ad3b64..e1ce75713 100644 --- a/example/jaeger/go.mod +++ b/example/jaeger/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/example/jaeger -go 1.18 +go 1.19 replace ( go.opentelemetry.io/otel => ../.. diff --git a/example/namedtracer/go.mod b/example/namedtracer/go.mod index 637b0fdd2..70c717aac 100644 --- a/example/namedtracer/go.mod +++ b/example/namedtracer/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/example/namedtracer -go 1.18 +go 1.19 replace ( go.opentelemetry.io/otel => ../.. diff --git a/example/opencensus/go.mod b/example/opencensus/go.mod index a4caac474..15bef4a21 100644 --- a/example/opencensus/go.mod +++ b/example/opencensus/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/example/opencensus -go 1.18 +go 1.19 replace ( go.opentelemetry.io/otel => ../.. diff --git a/example/otel-collector/go.mod b/example/otel-collector/go.mod index 3abfd2aec..e6c9e0d5a 100644 --- a/example/otel-collector/go.mod +++ b/example/otel-collector/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/example/otel-collector -go 1.18 +go 1.19 replace ( go.opentelemetry.io/otel => ../.. diff --git a/example/passthrough/go.mod b/example/passthrough/go.mod index 4ef682f2b..b79d09fe4 100644 --- a/example/passthrough/go.mod +++ b/example/passthrough/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/example/passthrough -go 1.18 +go 1.19 require ( go.opentelemetry.io/otel v1.15.0-rc.1 diff --git a/example/prometheus/go.mod b/example/prometheus/go.mod index 15f8fb8c5..9f5708477 100644 --- a/example/prometheus/go.mod +++ b/example/prometheus/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/example/prometheus -go 1.18 +go 1.19 require ( github.com/prometheus/client_golang v1.14.0 diff --git a/example/view/go.mod b/example/view/go.mod index 213ea657f..4dd01b52e 100644 --- a/example/view/go.mod +++ b/example/view/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/example/view -go 1.18 +go 1.19 require ( github.com/prometheus/client_golang v1.14.0 diff --git a/example/zipkin/go.mod b/example/zipkin/go.mod index 2cedff454..740752896 100644 --- a/example/zipkin/go.mod +++ b/example/zipkin/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/example/zipkin -go 1.18 +go 1.19 replace ( go.opentelemetry.io/otel => ../.. diff --git a/exporters/jaeger/go.mod b/exporters/jaeger/go.mod index f5778fbc2..bb80b66c4 100644 --- a/exporters/jaeger/go.mod +++ b/exporters/jaeger/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/exporters/jaeger -go 1.18 +go 1.19 require ( github.com/go-logr/logr v1.2.3 diff --git a/exporters/otlp/internal/retry/go.mod b/exporters/otlp/internal/retry/go.mod index 4a32afad8..c456132d4 100644 --- a/exporters/otlp/internal/retry/go.mod +++ b/exporters/otlp/internal/retry/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/exporters/otlp/internal/retry -go 1.18 +go 1.19 require ( github.com/cenkalti/backoff/v4 v4.2.0 diff --git a/exporters/otlp/otlpmetric/go.mod b/exporters/otlp/otlpmetric/go.mod index 936a626e4..45c1f3599 100644 --- a/exporters/otlp/otlpmetric/go.mod +++ b/exporters/otlp/otlpmetric/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/exporters/otlp/otlpmetric -go 1.18 +go 1.19 require ( github.com/google/go-cmp v0.5.9 diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod index 54e046601..603037789 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc -go 1.18 +go 1.19 retract v0.32.2 // Contains unresolvable dependencies. diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod index b4cdc04e2..945303563 100644 --- a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod +++ b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp -go 1.18 +go 1.19 retract v0.32.2 // Contains unresolvable dependencies. diff --git a/exporters/otlp/otlptrace/go.mod b/exporters/otlp/otlptrace/go.mod index 79f90bc6f..d8dec5d84 100644 --- a/exporters/otlp/otlptrace/go.mod +++ b/exporters/otlp/otlptrace/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/exporters/otlp/otlptrace -go 1.18 +go 1.19 require ( github.com/google/go-cmp v0.5.9 diff --git a/exporters/otlp/otlptrace/otlptracegrpc/go.mod b/exporters/otlp/otlptrace/otlptracegrpc/go.mod index 253bd545e..0ea05d315 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/go.mod +++ b/exporters/otlp/otlptrace/otlptracegrpc/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc -go 1.18 +go 1.19 require ( github.com/stretchr/testify v1.8.2 diff --git a/exporters/otlp/otlptrace/otlptracehttp/go.mod b/exporters/otlp/otlptrace/otlptracehttp/go.mod index 922d764e8..2155dd986 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/go.mod +++ b/exporters/otlp/otlptrace/otlptracehttp/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp -go 1.18 +go 1.19 require ( github.com/stretchr/testify v1.8.2 diff --git a/exporters/prometheus/go.mod b/exporters/prometheus/go.mod index 8d183b81b..ec6b2ef33 100644 --- a/exporters/prometheus/go.mod +++ b/exporters/prometheus/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/exporters/prometheus -go 1.18 +go 1.19 require ( github.com/prometheus/client_golang v1.14.0 diff --git a/exporters/stdout/stdoutmetric/go.mod b/exporters/stdout/stdoutmetric/go.mod index 9c6081c1a..195f5126c 100644 --- a/exporters/stdout/stdoutmetric/go.mod +++ b/exporters/stdout/stdoutmetric/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/exporters/stdout/stdoutmetric -go 1.18 +go 1.19 require ( github.com/stretchr/testify v1.8.2 diff --git a/exporters/stdout/stdouttrace/go.mod b/exporters/stdout/stdouttrace/go.mod index 59a37f1c7..741945fba 100644 --- a/exporters/stdout/stdouttrace/go.mod +++ b/exporters/stdout/stdouttrace/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/exporters/stdout/stdouttrace -go 1.18 +go 1.19 replace ( go.opentelemetry.io/otel => ../../.. diff --git a/exporters/zipkin/go.mod b/exporters/zipkin/go.mod index 82098ea9a..929c4c7a6 100644 --- a/exporters/zipkin/go.mod +++ b/exporters/zipkin/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/exporters/zipkin -go 1.18 +go 1.19 require ( github.com/go-logr/logr v1.2.3 diff --git a/go.mod b/go.mod index 9d20c7fc6..c04fd406a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel -go 1.18 +go 1.19 require ( github.com/go-logr/logr v1.2.3 diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 3c08c77b5..eb6792c0b 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/internal/tools -go 1.18 +go 1.19 require ( github.com/client9/misspell v0.3.4 diff --git a/metric/go.mod b/metric/go.mod index 0f674a3d6..5fa0c6042 100644 --- a/metric/go.mod +++ b/metric/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/metric -go 1.18 +go 1.19 require ( github.com/stretchr/testify v1.8.2 diff --git a/schema/go.mod b/schema/go.mod index 6f057a53e..7ef428122 100644 --- a/schema/go.mod +++ b/schema/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/schema -go 1.18 +go 1.19 require ( github.com/Masterminds/semver/v3 v3.2.0 diff --git a/sdk/go.mod b/sdk/go.mod index ca0e82b8d..770e426aa 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/sdk -go 1.18 +go 1.19 replace go.opentelemetry.io/otel => ../ diff --git a/sdk/metric/go.mod b/sdk/metric/go.mod index 15491e08b..079bd3b1d 100644 --- a/sdk/metric/go.mod +++ b/sdk/metric/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/sdk/metric -go 1.18 +go 1.19 require ( github.com/go-logr/logr v1.2.3 diff --git a/trace/go.mod b/trace/go.mod index e7b52c0a3..8caad2f14 100644 --- a/trace/go.mod +++ b/trace/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/otel/trace -go 1.18 +go 1.19 replace go.opentelemetry.io/otel => ../