Merge branch 'main' into script/update-license-headers

.mockery.yaml

@@ -42,7 +42,7 @@ packages:
   github.com/jaegertracing/jaeger/plugin/sampling/leaderelection:
     config:
       all: true
-  github.com/jaegertracing/jaeger/plugin/storage/grpc:
+  github.com/jaegertracing/jaeger/plugin/storage/grpc/shared:
     interfaces:
       PluginCapabilities:
   github.com/jaegertracing/jaeger/plugin/storage/kafka:

RELEASE.md

@@ -5,7 +5,8 @@
     * A curated list of notable changes and links to PRs. Do not simply dump git log, select the changes that affect the users.
       To obtain the list of all changes run `make changelog` or use `scripts/release-notes.py`.
     * The section can be split into sub-section if necessary, e.g. UI Changes, Backend Changes, Bug Fixes, etc.
-    * If the jaeger-ui submodule has changes cut a new release and also upgrade the submodule versions then commit, for example:
+    * If the jaeger-ui submodule has changes cut a new release
+    * Then upgrade the submodule versions and finally commit. For example:
         ```
         git submodule init
         git submodule update

cmd/tracegen/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '2'
-
 services:
     jaeger:
       image: jaegertracing/all-in-one:latest

crossdock/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '2'
-
 services:
     crossdock:
         image: crossdock/crossdock

crossdock/jaeger-docker-compose.yml

@@ -1,5 +1,3 @@
-version: '2'
-
 services:
     jaeger-remote-storage:
       image: jaegertracing/jaeger-remote-storage

docker-compose/cassandra/v3/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   cassandra:
     image: cassandra:3.11

docker-compose/cassandra/v4/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   cassandra:
     image: cassandra:4.1

docker-compose/elasticsearch/v6/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.23

docker-compose/elasticsearch/v7/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.17.22

docker-compose/elasticsearch/v8/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.14.1

docker-compose/jaeger-docker-compose.yml

@@ -1,5 +1,3 @@
-version: '2'
-
 services:
     hotrod:
       image: jaegertracing/example-hotrod:latest

docker-compose/kafka-integration-test/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   kafka:
     image: bitnami/kafka:3.7.0

docker-compose/kafka/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "2.1"
-
 services:
   zookeeper:
     image: bitnami/zookeeper

docker-compose/monitor/docker-compose-v2.yml

@@ -1,4 +1,3 @@
-version: "3.5"
 services:
   jaeger:
     networks:

docker-compose/monitor/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.5"
 services:
   jaeger:
     networks:

docker-compose/opensearch/v1/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   opensearch:
     image: opensearchproject/opensearch:1.3.17

docker-compose/opensearch/v2/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   opensearch:
     image: opensearchproject/opensearch:2.15.0

docker/debug/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22.5-alpine AS build
+FROM golang:1.22.6-alpine AS build
 ARG TARGETARCH
 ENV GOPATH /go
 RUN apk add --update --no-cache ca-certificates make git build-base mailcap
@@ -10,7 +10,7 @@ RUN if [[ "$TARGETARCH" == "s390x" ||  "$TARGETARCH" == "ppc64le" ]] ; then \
         go install github.com/go-delve/delve/cmd/dlv@latest; \
     fi
 
-FROM golang:1.22.5-alpine
+FROM golang:1.22.6-alpine
 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

examples/grafana-integration/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: '2'
-
 services:
   grafana:
     image: grafana/grafana:10.2.2

examples/hotrod/docker-compose-v2.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 # To run a specific version of Jaeger, use environment variable, e.g.:
 #     JAEGER_VERSION=1.52 docker compose up
 

examples/hotrod/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 # To run a specific version of Jaeger, use environment variable, e.g.:
 #     JAEGER_VERSION=1.52 docker compose up
 

examples/reverse-proxy/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   jaeger:
     image: jaegertracing/all-in-one:latest