diff --git a/Dockerfile b/Dockerfile index 51e6c6a..63f7222 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16-alpine as builder +FROM golang:1.17-alpine as builder ARG REVISION diff --git a/Dockerfile.base b/Dockerfile.base index 56a7212..bb83fec 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -1,4 +1,4 @@ -FROM golang:1.16 +FROM golang:1.17 WORKDIR /workspace diff --git a/go.mod b/go.mod index c306891..116867a 100644 --- a/go.mod +++ b/go.mod @@ -18,19 +18,18 @@ require ( github.com/spf13/viper v1.8.1 github.com/swaggo/http-swagger v1.0.0 github.com/swaggo/swag v1.7.0 - go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.26.1 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.26.1 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.26.1 // indirect - go.opentelemetry.io/contrib/propagators/aws v1.1.1 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.1.1 // indirect - go.opentelemetry.io/contrib/propagators/jaeger v1.1.1 // indirect - go.opentelemetry.io/contrib/propagators/ot v1.1.1 // indirect - go.opentelemetry.io/otel v1.1.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.1.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.1.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.1.0 // indirect - go.opentelemetry.io/otel/sdk v1.1.0 // indirect - go.opentelemetry.io/otel/trace v1.1.0 // indirect + go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.26.1 + go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.26.1 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.26.1 + go.opentelemetry.io/contrib/propagators/aws v1.1.1 + go.opentelemetry.io/contrib/propagators/b3 v1.1.1 + go.opentelemetry.io/contrib/propagators/jaeger v1.1.1 + go.opentelemetry.io/contrib/propagators/ot v1.1.1 + go.opentelemetry.io/otel v1.1.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.1.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.1.0 + go.opentelemetry.io/otel/sdk v1.1.0 + go.opentelemetry.io/otel/trace v1.1.0 go.uber.org/zap v1.19.1 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 google.golang.org/grpc v1.41.0 diff --git a/go.sum b/go.sum index 8df3ff4..08ab7ec 100644 --- a/go.sum +++ b/go.sum @@ -177,7 +177,6 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -400,8 +399,6 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.1.0 h1:PxBRMkrJnY4HRgToPzoL go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.1.0/go.mod h1:/E4iniSqAEvqbq6KM5qThKZR2sd42kDvD+SrYt00vRw= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.1.0 h1:P2pspBBVl/va7GTS2yWxbcH2kdPrBOuk/iNI6ltOkDo= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.1.0/go.mod h1:5rmeolGP6nXsWbNg8z3pz9s8N5O+j04K5EJ79rZfXzY= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.1.0 h1:n9UCiD5XeG/a67Qvzsg9eRXB7DkysXtO7n8vSVnq2vI= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.1.0/go.mod h1:lISWK4NRLxKH/IrroKBpMd7k/pBuUUaEU6bCykFb9hQ= go.opentelemetry.io/otel/internal/metric v0.24.0 h1:O5lFy6kAl0LMWBjzy3k//M8VjEaTDWL9DPJuqZmWIAA= go.opentelemetry.io/otel/internal/metric v0.24.0/go.mod h1:PSkQG+KuApZjBpC6ea6082ZrWUUy/w132tJ/LOU3TXk= go.opentelemetry.io/otel/metric v0.24.0 h1:Rg4UYHS6JKR1Sw1TxnI13z7q/0p/XAbgIqUTagvLJuU= @@ -748,7 +745,6 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E= google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= @@ -763,7 +759,6 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= diff --git a/pkg/api/mock.go b/pkg/api/mock.go index ae04725..79752fa 100644 --- a/pkg/api/mock.go +++ b/pkg/api/mock.go @@ -1,32 +1,34 @@ package api import ( - "time" + "go.opentelemetry.io/otel/trace" + "time" - "github.com/gorilla/mux" - "go.uber.org/zap" + "github.com/gorilla/mux" + "go.uber.org/zap" ) func NewMockServer() *Server { - config := &Config{ - Port: "9898", - HttpServerShutdownTimeout: 5 * time.Second, - HttpServerTimeout: 30 * time.Second, - BackendURL: []string{}, - ConfigPath: "/config", - DataPath: "/data", - HttpClientTimeout: 30 * time.Second, - UIColor: "blue", - UIPath: ".ui", - UIMessage: "Greetings", - Hostname: "localhost", - } + config := &Config{ + Port: "9898", + HttpServerShutdownTimeout: 5 * time.Second, + HttpServerTimeout: 30 * time.Second, + BackendURL: []string{}, + ConfigPath: "/config", + DataPath: "/data", + HttpClientTimeout: 30 * time.Second, + UIColor: "blue", + UIPath: ".ui", + UIMessage: "Greetings", + Hostname: "localhost", + } - logger, _ := zap.NewDevelopment() + logger, _ := zap.NewDevelopment() - return &Server{ - router: mux.NewRouter(), - logger: logger, - config: config, - } + return &Server{ + router: mux.NewRouter(), + logger: logger, + config: config, + tracer: trace.NewNoopTracerProvider().Tracer("mock"), + } }