Merge branch 'main' into grpc-plugin-health-check

README.md

@@ -188,10 +188,9 @@ We are grateful to our former maintainers for their contributions to the Jaeger
 * [@tiffon](https://github.com/tiffon)
 * [@vprithvi](https://github.com/vprithvi)
 
-## Project Status Bi-Weekly Meeting
+## Project Status Meetings
 
-The Jaeger contributors meet bi-weekly, and everyone is welcome to join.
-[Agenda and meeting details here](https://docs.google.com/document/d/1ZuBAwTJvQN7xkWVvEFXj5WU9_JmS5TPiNbxCJSvPqX0/).
+The Jaeger maintainers and contributors meet regularly on a video call. Everyone is welcome to join, including end users. For meeting details, see https://www.jaegertracing.io/get-in-touch/.
 
 ## Roadmap
 

cmd/all-in-one/all_in_one_test.go

@@ -62,6 +62,10 @@ func TestAllInOne(t *testing.T) {
 	if err := healthCheck(); err != nil {
 		t.Fatal(err)
 	}
+	// Check if the favicon icon is available
+	if err := faviconCheck(); err != nil {
+		t.Fatal(err)
+	}
 	createTrace(t)
 	getAPITrace(t)
 	getSamplingStrategy(t)
@@ -138,6 +142,18 @@ func healthCheck() error {
 	return fmt.Errorf("query service is not ready")
 }
 
+func faviconCheck() error {
+	println("Checking favicon...")
+	resp, err := http.Get(queryURL + "/favicon.ico")
+	if err == nil && resp.StatusCode == http.StatusOK {
+		println("Favicon check successful")
+		return nil
+	} else {
+		println("Favicon check failed")
+		return fmt.Errorf("all-in-one failed to serve favicon icon")
+	}
+}
+
 func getServicesAPIV3(t *testing.T) {
 	req, err := http.NewRequest("GET", getServicesAPIV3URL, nil)
 	require.NoError(t, err)

docker/base/Dockerfile

@@ -2,7 +2,8 @@ ARG cert_image
 ARG root_image
 
 FROM $cert_image AS cert
-RUN apk add --update --no-cache ca-certificates
+RUN apk add --update --no-cache ca-certificates mailcap
 
 FROM $root_image
 COPY --from=cert /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+COPY --from=cert /etc/mime.types /etc/mime.types

docker/debug/Dockerfile

@@ -3,7 +3,7 @@ ARG golang_image
 FROM $golang_image AS build
 ARG TARGETARCH
 ENV GOPATH /go
-RUN apk add --update --no-cache ca-certificates make git build-base
+RUN apk add --update --no-cache ca-certificates make git build-base mailcap
 #Once go-delve adds support for s390x (see PR #2948), remove this entire conditional.
 #Once go-delve adds support for ppc64le (see PR go-delve/delve#1564), remove this entire conditional.
 RUN if [[ "$TARGETARCH" == "s390x"  ||  "$TARGETARCH" == "ppc64le" ]] ; then \
@@ -15,3 +15,4 @@ RUN if [[ "$TARGETARCH" == "s390x"  ||  "$TARGETARCH" == "ppc64le" ]] ; then \
 FROM $golang_image
 COPY --from=build /go/bin/dlv /go/bin/dlv
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+COPY --from=build /etc/mime.types /etc/mime.types

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/go-openapi/errors v0.20.2
 	github.com/go-openapi/loads v0.21.1
-	github.com/go-openapi/runtime v0.23.1
+	github.com/go-openapi/runtime v0.23.3
 	github.com/go-openapi/spec v0.20.4
 	github.com/go-openapi/strfmt v0.21.2
 	github.com/go-openapi/swag v0.21.1
@@ -26,32 +26,32 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645
-	github.com/hashicorp/go-hclog v1.1.0
+	github.com/hashicorp/go-hclog v1.2.0
 	github.com/hashicorp/go-plugin v1.4.3
 	github.com/kr/pretty v0.3.0
 	github.com/olivere/elastic v6.2.37+incompatible
 	github.com/opentracing-contrib/go-grpc v0.0.0-20191001143057-db30781987df
 	github.com/opentracing-contrib/go-stdlib v1.0.0
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/prometheus/client_golang v1.12.1
-	github.com/prometheus/common v0.32.1
+	github.com/prometheus/common v0.33.0
 	github.com/rs/cors v1.8.2
 	github.com/soheilhy/cmux v0.1.5
-	github.com/spf13/cobra v1.3.0
+	github.com/spf13/cobra v1.4.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.10.1
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.7.1
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
 	github.com/uber/jaeger-lib v2.4.1+incompatible
 	github.com/xdg-go/scram v1.1.1
-	go.opentelemetry.io/collector/model v0.46.0
+	go.opentelemetry.io/collector/model v0.47.0
 	go.uber.org/atomic v1.9.0
 	go.uber.org/automaxprocs v1.4.0
 	go.uber.org/zap v1.21.0
-	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f
 	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
-	google.golang.org/grpc v1.44.0
-	google.golang.org/protobuf v1.27.1
+	google.golang.org/grpc v1.45.0
+	google.golang.org/protobuf v1.28.0
 	gopkg.in/yaml.v2 v2.4.0
 )