Merge branch 'main' into V2/Healthcheck_Extension

Makefile

@@ -42,6 +42,14 @@ ALL_SRC = $(shell find . -name '*.go' \
 				   -type f | \
 				sort)
 
+# All .sh or .py or Makefile or .mk files that should be auto-formatted and linted.
+SCRIPTS_SRC = $(shell find . \( -name '*.sh' -o -name '*.py' -o -name '*.mk' -o -name 'Makefile*' -o -name 'Dockerfile*' \) \
+						-not -path './.git/*' \
+						-not -path './idl/*' \
+						-not -path './jaeger-ui/*' \
+						-type f | \
+					sort)
+
 # ALL_PKGS is used with 'nocover' and 'goleak'
 ALL_PKGS = $(shell echo $(dir $(ALL_SRC)) | tr ' ' '\n' | sort -u)
 
@@ -185,11 +193,11 @@ fmt: $(GOFUMPT)
 	@echo Running gofumpt on ALL_SRC ...
 	@$(GOFUMPT) -e -l -w $(ALL_SRC)
 	@echo Running updateLicense.py on ALL_SRC ...
-	@./scripts/updateLicense.py $(ALL_SRC)
+	@./scripts/updateLicense.py $(ALL_SRC) $(SCRIPTS_SRC)
 
 .PHONY: lint
 lint: $(LINT) goleak
-	@./scripts/updateLicense.py $(ALL_SRC) > $(FMT_LOG)
+	@./scripts/updateLicense.py $(ALL_SRC) $(SCRIPTS_SRC) > $(FMT_LOG)
 	@./scripts/import-order-cleanup.py -o stdout -t $(ALL_SRC) > $(IMPORT_LOG)
 	@[ ! -s "$(FMT_LOG)" -a ! -s "$(IMPORT_LOG)" ] || (echo "License check or import ordering failures, run 'make fmt'" | cat - $(FMT_LOG) $(IMPORT_LOG) && false)
 	./scripts/check-semconv-version.sh

cmd/agent/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 ARG base_image
 ARG debug_image
 

cmd/all-in-one/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 ARG base_image
 ARG debug_image
 

cmd/anonymizer/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 FROM scratch
 ARG TARGETARCH
 ARG USER_UID=10001

cmd/collector/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 ARG base_image
 ARG debug_image
 

cmd/es-index-cleaner/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 ARG base_image
 
 FROM $base_image AS release

cmd/es-rollover/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 ARG base_image
 
 FROM $base_image AS release

cmd/ingester/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 ARG base_image
 ARG debug_image
 

cmd/jaeger/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 ARG base_image
 ARG debug_image
 

cmd/query/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 ARG base_image
 ARG debug_image
 

cmd/remote-storage/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 ARG base_image
 ARG debug_image
 

cmd/tracegen/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 FROM scratch
 ARG TARGETARCH
 ARG USER_UID=10001

crossdock/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 FROM scratch
 ARG TARGETARCH
 

crossdock/rules.mk

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 XDOCK_YAML=crossdock/docker-compose.yml
 
 JAEGER_COMPOSE_YAML ?= crossdock/jaeger-docker-compose.yml

docker-compose/monitor/Makefile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 BINARY ?= all-in-one # Default value uses v1 binary
 
 .PHONY: build

docker/Makefile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 VERSION := 1.0.0
 
 DOCKER_REGISTRY ?= localhost:5000

docker/base/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 FROM alpine:3.20.2 AS cert
 RUN apk add --update --no-cache ca-certificates mailcap
 

docker/debug/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 FROM golang:1.22.6-alpine AS build
 ARG TARGETARCH
 ENV GOPATH /go

examples/hotrod/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 FROM scratch
 ARG TARGETARCH
 EXPOSE 8080 8081 8082 8083

pkg/config/tlscfg/testdata/gen-certs.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 # The following commands were used to create the CA, server and client's certificates and keys in this directory used by unit tests.
 # These certificates use the Subject Alternative Name extension rather than the Common Name, which will be unsupported in Go 1.15.
 

plugin/storage/cassandra/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 FROM cassandra:5.0
 
 COPY schema/* /cassandra-schema/

plugin/storage/cassandra/schema/create.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 function usage {
     >&2 echo "Error: $1"
     >&2 echo ""

plugin/storage/cassandra/schema/docker.sh

@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
 #
 # This script is used in the Docker image jaegertracing/jaeger-cassandra-schema
 # that allows installing Jaeger keyspace and schema without installing cqlsh.

plugin/storage/cassandra/schema/migration/V002toV003.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 # Create a new operation_names_v2 table and copy all data from operation_names table
 # Sample usage: KEYSPACE=jaeger_v1 CQL_CMD='cqlsh host 9042 -u test_user -p test_password --request-timeout=3000' bash
 # ./v002tov003.sh

plugin/storage/cassandra/schema/migration/v001tov002part1.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -euo pipefail
 
 function usage {

plugin/storage/cassandra/schema/migration/v001tov002part2.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -euo pipefail
 
 function usage {

scripts/adaptive-sampling-integration-test.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -euf -o pipefail
 
 # This script is currently a placeholder.

scripts/build-all-in-one-image.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -euf -o pipefail
 
 print_help() {

scripts/build-crossdock.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -euxf -o pipefail
 
 BRANCH=${BRANCH:?'missing BRANCH env var'}

scripts/build-upload-a-docker-image.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -euf -o pipefail
 
 base_debug_img_arg=""

scripts/build-upload-docker-images.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -euf -o pipefail
 
 print_help() {

scripts/cassandra-integration-test.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -uxf -o pipefail
 
 usage() {

scripts/check-go-version.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 version_regex='[0-9]\.[0-9][0-9]'
 update=false
 verbose=false

scripts/check-goleak-files.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -euo pipefail
 
 bad_pkgs=0

scripts/check-semconv-version.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -euf -o pipefail
 
 package_name="go.opentelemetry.io/otel/semconv"

scripts/compare_metrics.py

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 import json
 
 v1_metrics_path = "./V1_Metrics.json"

scripts/compute-tags.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 # Compute major/minor/etc image tags based on the current branch
 
 set -ef -o pipefail

scripts/compute-tags.test.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 # This script uses https://github.com/kward/shunit2 to run unit tests.
 # The path to this repo must be provided via SHUNIT2 env var.
 

scripts/dco_check.py

@@ -1,3 +1,6 @@
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 # Script copied from https://github.com/christophebedard/dco-check/blob/master/dco_check/dco_check.py
 #
 # Copyright 2020 Christophe Bedard

scripts/docker-login.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -exu
 
 DOCKERHUB_USERNAME=${DOCKERHUB_USERNAME:-"jaegertracingbot"}

scripts/draft-release.py

@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 import argparse
 import re
 import subprocess

scripts/es-integration-test.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 PS4='T$(date "+%H:%M:%S") '
 set -euf -o pipefail
 

scripts/generate-help-output.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 # This script runs the `help` command on all Jaeger binaries (using go run) with variations of SPAN_STORAGE_TYPE.
 # It can be used to compare the CLI API changes between releases.
 

scripts/hotrod-integration-test.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -euxf -o pipefail
 
 print_help() {

scripts/import-order-cleanup.py

@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 import argparse
 
 def cleanup_imports_and_return(imports):

scripts/kafka-integration-test.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
 set -euf -o pipefail
 
 compose_file="docker-compose/kafka-integration-test/docker-compose.yml"

scripts/package-deploy.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+
+# Copyright (c) 2024 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
 set -euxf -o pipefail
 
 TARCMD=${TARCMD:-tar}