Merge branch 'main' into migrate-to-google-protobuf

.github/workflows/ci-all-in-one-build.yml

@@ -51,9 +51,20 @@ jobs:
       if: github.ref_name != 'main'
       run: bash scripts/build-all-in-one-image.sh pr-only
 
+    - name: Build and test jaeger (v2) as all-in-one
+      if: github.ref_name != 'main'
+      run: BINARY=jaeger bash scripts/build-all-in-one-image.sh pr-only
+
     - name: Build, test, and publish all-in-one image
       if: github.ref_name == 'main'
       run: bash scripts/build-all-in-one-image.sh
       env:
         DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
+
+    - name: Build, test, and publish jaeger (v2) image
+      if: github.ref_name == 'main'
+      run: BINARY=jaeger bash scripts/build-all-in-one-image.sh
+      env:
+        DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+        QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}

CHANGELOG.md

@@ -1,23 +1,81 @@
-Changes by Version
-==================
-
 ### A message to people of Russia 🇷🇺
 
 If you currently live in Russia, please read [this message](./_To_People_of_Russia.md).
 
+Changes by Version
+==================
+
+<details>
+<summary>next release template</summary>
+
 next release (yyyy-mm-dd)
 -------------------
 
 ### Backend Changes
 
-#### ⛔ Breaking Changes
+run `make changelog` to generate content
 
-#### New Features
+### UI Changes
 
-#### Bug fixes, Minor Improvements
+...
+
+</details>
+
+1.51.0 (2023-11-04)
+-------------------
+
+### Backend Changes
+
+#### ✨ New Features:
+
+* Feat: add sampling store support to badger ([@slayer321](https://github.com/slayer321) in [#4834](https://github.com/jaegertracing/jaeger/pull/4834))
+* Feat: add span adjuster that moves some otel resource attributes to span.process ([@james-ryans](https://github.com/james-ryans) in [#4844](https://github.com/jaegertracing/jaeger/pull/4844))
+* Add product/file version in windows executables ([@ResamVi](https://github.com/ResamVi) in [#4811](https://github.com/jaegertracing/jaeger/pull/4811))
+
+#### 🐞 Bug fixes, Minor Improvements:
+
+* Fix dependency policy and add to security-insights.yml ([@jkowall](https://github.com/jkowall) in [#4907](https://github.com/jaegertracing/jaeger/pull/4907))
+* Add reload interval to otel server certificates ([@james-ryans](https://github.com/james-ryans) in [#4898](https://github.com/jaegertracing/jaeger/pull/4898))
+* Feat: add blackhole storage, for benchmarking ([@yurishkuro](https://github.com/yurishkuro) in [#4896](https://github.com/jaegertracing/jaeger/pull/4896))
+* Add otel resource detector to jaeger components ([@james-ryans](https://github.com/james-ryans) in [#4864](https://github.com/jaegertracing/jaeger/pull/4864))
+* Fix batchprocessor to set correct span format flags ([@k0zl](https://github.com/k0zl) in [#4796](https://github.com/jaegertracing/jaeger/pull/4796))
+* Expose collector ports in docker images ([@arunvelsriram](https://github.com/arunvelsriram) in [#4810](https://github.com/jaegertracing/jaeger/pull/4810))
+
+#### 🚧 Experimental Features:
+
+* Exp(jaeger-v2): simplify all-in-one configuration ([@yurishkuro](https://github.com/yurishkuro) in [#4875](https://github.com/jaegertracing/jaeger/pull/4875))
+* Exp: support primary and archive storage ([@yurishkuro](https://github.com/yurishkuro) in [#4873](https://github.com/jaegertracing/jaeger/pull/4873))
+* Feat(jaeger-v2): create default config for all-in-one ([@yurishkuro](https://github.com/yurishkuro) in [#4842](https://github.com/jaegertracing/jaeger/pull/4842))
+
+#### 👷 CI Improvements:
+
+* Ci: split the install-tools into test/build groups ([@MeenuyD](https://github.com/MeenuyD) in [#4878](https://github.com/jaegertracing/jaeger/pull/4878))
+* Simplify binary building in makefile ([@yurishkuro](https://github.com/yurishkuro) in [#4885](https://github.com/jaegertracing/jaeger/pull/4885))
+* Ci: pass variable instead of calling make build-xxx-debug ([@yurishkuro](https://github.com/yurishkuro) in [#4883](https://github.com/jaegertracing/jaeger/pull/4883))
+* Simplify makefile ([@yurishkuro](https://github.com/yurishkuro) in [#4882](https://github.com/jaegertracing/jaeger/pull/4882))
+* Test: add more linters ([@yurishkuro](https://github.com/yurishkuro) in [#4881](https://github.com/jaegertracing/jaeger/pull/4881))
+* Ci: enable linting of code in examples/ ([@yurishkuro](https://github.com/yurishkuro) in [#4880](https://github.com/jaegertracing/jaeger/pull/4880))
+* Ci: keep the ui asset's .gz file timestamps the same as the original file ([@yurishkuro](https://github.com/yurishkuro) in [#4879](https://github.com/jaegertracing/jaeger/pull/4879))
+* Add first pass at the security-insights.yml ([@jkowall](https://github.com/jkowall) in [#4872](https://github.com/jaegertracing/jaeger/pull/4872))
+* Create scorecard.yml for ossf implementation ([@jkowall](https://github.com/jkowall) in [#4870](https://github.com/jaegertracing/jaeger/pull/4870))
+* Add ci validation of shell scripts using shellcheck ([@akagami-harsh](https://github.com/akagami-harsh) in [#4826](https://github.com/jaegertracing/jaeger/pull/4826))
+* Chore: add dynamic loading bar functionality to release-notes.py ([@anshgoyalevil](https://github.com/anshgoyalevil) in [#4857](https://github.com/jaegertracing/jaeger/pull/4857))
+* Ci: add the label-check workflow to verify changelog labels on each pr ([@anshgoyalevil](https://github.com/anshgoyalevil) in [#4847](https://github.com/jaegertracing/jaeger/pull/4847))
+* Ci(hotrod): print hotrod container logs in case of test failure ([@yurishkuro](https://github.com/yurishkuro) in [#4845](https://github.com/jaegertracing/jaeger/pull/4845))
+* Ci: drop -v from ci unit tests to make failures easier to see ([@yurishkuro](https://github.com/yurishkuro) in [#4839](https://github.com/jaegertracing/jaeger/pull/4839))
+* Use commit hash as image label when building & integration-testing ([@yurishkuro](https://github.com/yurishkuro) in [#4824](https://github.com/jaegertracing/jaeger/pull/4824))
+* Clean-up some linter warnings in build scripts ([@yurishkuro](https://github.com/yurishkuro) in [#4823](https://github.com/jaegertracing/jaeger/pull/4823))
+* Fix build-all-in-one-image script ([@albertteoh](https://github.com/albertteoh) in [#4819](https://github.com/jaegertracing/jaeger/pull/4819))
+* [ci-release] improve release workflow for manual runs ([@yurishkuro](https://github.com/yurishkuro) in [#4818](https://github.com/jaegertracing/jaeger/pull/4818))
+* Add --force to docker commands ([@albertteoh](https://github.com/albertteoh) in [#4820](https://github.com/jaegertracing/jaeger/pull/4820))
+* Use setup-node.js for publish release ([@albertteoh](https://github.com/albertteoh) in [#4816](https://github.com/jaegertracing/jaeger/pull/4816))
+* Clean up ci scripts and prune docker images between builds ([@yurishkuro](https://github.com/yurishkuro) in [#4815](https://github.com/jaegertracing/jaeger/pull/4815))
+* Clean-up & fortify ci-release ([@yurishkuro](https://github.com/yurishkuro) in [#4813](https://github.com/jaegertracing/jaeger/pull/4813))
 
 ### UI Changes
 
+* UI pinned to version [1.35.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v1350-2023-11-02).
+
 1.50.0 (2023-10-06)
 -------------------
 

Makefile

@@ -263,10 +263,10 @@ BIN_PATH = ./cmd/$(BIN_NAME)
 _build-a-binary-%:
 	$(GOBUILD) $(DISABLE_OPTIMIZATIONS) $(GO_TAGS) -o $(BIN_PATH)/$(BIN_NAME)$(SUFFIX)-$(GOOS)-$(GOARCH) $(BUILD_INFO) $(BIN_PATH)
 
-.PHONY: build-jaeger-v2
-build-jaeger-v2: BIN_NAME = jaeger-v2
-build-jaeger-v2: GO_TAGS = -tags ui
-build-jaeger-v2: build-ui _build-a-binary-jaeger-v2$(SUFFIX)-$(GOOS)-$(GOARCH)
+.PHONY: build-jaeger
+build-jaeger: BIN_NAME = jaeger
+build-jaeger: GO_TAGS = -tags ui
+build-jaeger: build-ui _build-a-binary-jaeger$(SUFFIX)-$(GOOS)-$(GOARCH)
 
 .PHONY: build-all-in-one
 build-all-in-one: BIN_NAME = all-in-one
@@ -346,7 +346,7 @@ _prepare-winres:
 	$(MAKE) _prepare-winres-helper NAME="Jaeger Ingester"         PKGPATH="cmd/ingester"
 	$(MAKE) _prepare-winres-helper NAME="Jaeger Remote Storage"   PKGPATH="cmd/remote-storage"
 	$(MAKE) _prepare-winres-helper NAME="Jaeger All-In-One"       PKGPATH="cmd/all-in-one"
-	$(MAKE) _prepare-winres-helper NAME="Jaeger V2"               PKGPATH="cmd/jaeger-v2"
+	$(MAKE) _prepare-winres-helper NAME="Jaeger V2"               PKGPATH="cmd/jaeger"
 	$(MAKE) _prepare-winres-helper NAME="Jaeger Tracegen"         PKGPATH="cmd/tracegen"
 	$(MAKE) _prepare-winres-helper NAME="Jaeger Anonymizer"       PKGPATH="cmd/anonymizer"
 	$(MAKE) _prepare-winres-helper NAME="Jaeger ES-Index-Cleaner" PKGPATH="cmd/es-index-cleaner"
@@ -392,7 +392,7 @@ _build-platform-binaries: build-agent \
 		build-collector \
 		build-query \
 		build-ingester \
-		build-jaeger-v2 \
+		build-jaeger \
 		build-remote-storage \
 		build-examples \
 		build-tracegen \
@@ -500,7 +500,7 @@ changelog:
 draft-release:
 	./scripts/draft-release.py
 
-.PHONY: install-test-tools 
+.PHONY: install-test-tools
 install-test-tools:
 	$(GO) install github.com/golangci/golangci-lint/cmd/[email protected]
 	$(GO) install mvdan.cc/gofumpt@latest

RELEASE.md

@@ -54,8 +54,8 @@ Here are the release managers for future versions with the tentative release dat
 
 | Version | Release Manager | Tentative release date |
 |---------|-----------------|------------------------|
-| 1.51.0  | @yurishkuro     | 5 November 2023        |
 | 1.52.0  | @jkowall        | 5 December 2023        |
-| 1.53.0  | @pavolloffay    | 3 January 2023         |
-| 1.53.0  | @joe-elliott    | 7 February 2023        |
-| 1.54.0  | @albertteoh     | 6 March 2023           |
+| 1.53.0  | @pavolloffay    | 3 January 2024         |
+| 1.54.0  | @joe-elliott    | 7 February 2024        |
+| 1.55.0  | @albertteoh     | 6 March 2024           |
+| 1.56.0  | @yurishkuro     | 3 April 2024           |

SECURITY-INSIGHTS.yml

@@ -62,3 +62,5 @@ dependencies:
     sbom-url: https://github.com/anchore/sbom-action 
   dependencies-lifecycle:
     policy-url: https://github.com/jaegertracing/jaeger/blob/main/SECURITY.md#security-patch-policy
+  env-dependencies-policy:
+    policy-url: https://github.com/jaegertracing/jaeger/blob/main/SECURITY.md#dependency-policy

SECURITY.md

@@ -10,7 +10,7 @@ Security fixes are given priority and might be enough to cause a new version to
 
 CVEs in Jaeger code will be patched in the newest Jaeger releases. 
 
-### Dependencies Lifecycle Policy
+### Dependency Policy
 
 Dependencies are evaluated before being introduced to ensure they:
 

SELF-ASSESMENT.md

@@ -1,9 +1,9 @@
-# Jaeger Self-Assessment
-​
-This is a placeholder document for the Jaeger project self-assessment. More details of what this will turn into can be found in the [TAG-Security documented standards.](https://github.com/cncf/tag-security/blob/main/assessments/guide/self-assessment.md) ​
+# Self-assessment
+
+# Self-assessment outline
+
+## Table of contents
 
-## Table of Contents
-​
 * [Metadata](#metadata)
   * [Security links](#security-links)
 * [Overview](#overview)
@@ -17,4 +17,30 @@ This is a placeholder document for the Jaeger project self-assessment. More deta
 * [Project compliance](#project-compliance)
 * [Secure development practices](#secure-development-practices)
 * [Security issue resolution](#security-issue-resolution)
-* [Appendix](#appendix)## Table of Contents
+* [Appendix](#appendix)
+
+## Metadata
+
+|   |  |
+| -- | -- |
+| Software | https://github.com/jaegertracing/jaeger/  |
+| Security Provider | No  |
+| Languages | Go |
+| SBOM | [Software bill of materials](https://github.com/jaegertracing/jaeger/releases/latest/download/jaeger-SBOM.spdx.json) |
+| | |
+
+### Security links
+
+Provide the list of links to existing security documentation for the project. You may
+use the table below as an example:
+| Doc | url |
+| -- | -- |
+| Security file | https://github.com/jaegertracing/jaeger/blob/main/SECURITY.md |
+
+## Overview
+
+See [README](https://github.com/jaegertracing/jaeger/#jaeger---a-distributed-tracing-system)
+
+### Background
+
+See [README](https://github.com/jaegertracing/jaeger/#jaeger---a-distributed-tracing-system)

cmd/jaeger/.gitignore

@@ -0,0 +1,2 @@
+jaeger-*-*
+jaeger

cmd/jaeger/Dockerfile

@@ -0,0 +1,93 @@
+ARG base_image
+ARG debug_image
+
+FROM $base_image AS release
+ARG TARGETARCH
+ARG USER_UID=10001
+
+# Agent zipkin.thrift compact
+EXPOSE 5775/udp
+
+# Agent jaeger.thrift compact
+EXPOSE 6831/udp
+
+# Agent jaeger.thrift binary
+EXPOSE 6832/udp
+
+# Agent config HTTP
+EXPOSE 5778
+
+# Collector OTLP gRPC
+EXPOSE 4317
+
+# Collector OTLP HTTP
+EXPOSE 4318
+
+# Collector HTTP
+EXPOSE 14268
+
+# Collector gRPC
+EXPOSE 14250
+
+# Collector Zipkin
+EXPOSE 9411
+
+# Web HTTP
+EXPOSE 16686
+
+# Default configuration file for setting sampling strategies
+# ENV SAMPLING_STRATEGIES_FILE=/etc/jaeger/sampling_strategies.json
+# COPY sampling_strategies.json /etc/jaeger/
+
+COPY jaeger-linux-$TARGETARCH /go/bin/jaeger-linux
+
+VOLUME ["/tmp"]
+ENTRYPOINT ["/go/bin/jaeger-linux"]
+USER ${USER_UID}
+
+FROM $debug_image AS debug
+ARG TARGETARCH=amd64
+ARG USER_UID=10001
+
+# Agent zipkin.thrift compact
+EXPOSE 5775/udp
+
+# Agent jaeger.thrift compact
+EXPOSE 6831/udp
+
+# Agent jaeger.thrift binary
+EXPOSE 6832/udp
+
+# Agent config HTTP
+EXPOSE 5778
+
+# Collector OTLP gRPC
+EXPOSE 4317
+
+# Collector OTLP HTTP
+EXPOSE 4318
+
+# Collector HTTP
+EXPOSE 14268
+
+# Collector gRPC
+EXPOSE 14250
+
+# Collector Zipkin
+EXPOSE 9411
+
+# Web HTTP
+EXPOSE 16686
+
+# Delve
+EXPOSE 12345
+
+# Default configuration file for setting sampling strategies
+# ENV SAMPLING_STRATEGIES_FILE=/etc/jaeger/sampling_strategies.json
+# COPY sampling_strategies.json /etc/jaeger/
+
+COPY jaeger-debug-linux-$TARGETARCH /go/bin/jaeger-linux
+
+VOLUME ["/tmp"]
+ENTRYPOINT ["/go/bin/dlv", "exec", "/go/bin/jaeger-linux", "--headless", "--listen=:12345", "--api-version=2", "--accept-multiclient", "--log", "--"]
+USER ${USER_UID}

cmd/jaeger/README.md

@@ -0,0 +1,4 @@
+# jaeger
+
+This is experimental Jaeger V2 based on OpenTelemetry collector.
+See https://github.com/jaegertracing/jaeger/issues/4843.

cmd/jaeger-v2/config.yaml → cmd/jaeger/config.yaml

@@ -16,7 +16,7 @@ extensions:
   jaeger_query:
     trace_storage: memstore
     trace_storage_archive: memstore_archive
-    ui_config: ./cmd/jaeger-v2/config-ui.json
+    ui_config: ./cmd/jaeger/config-ui.json
 
   jaeger_storage:
     memory:

cmd/jaeger-v2/internal/all-in-one/config.go → cmd/jaeger/internal/all-in-one/config.go

@@ -17,9 +17,9 @@ import (
 	"go.opentelemetry.io/collector/service/telemetry"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/jaegertracing/jaeger/cmd/jaeger-v2/internal/exporters/storageexporter"
-	"github.com/jaegertracing/jaeger/cmd/jaeger-v2/internal/extension/jaegerquery"
-	"github.com/jaegertracing/jaeger/cmd/jaeger-v2/internal/extension/jaegerstorage"
+	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/exporters/storageexporter"
+	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerquery"
+	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
 )
 
 type configProvider struct {

cmd/jaeger-v2/internal/command.go → cmd/jaeger/internal/command.go

@@ -27,7 +27,7 @@ func Command() *cobra.Command {
 	}
 
 	info := component.BuildInfo{
-		Command:     "jaeger-v2",
+		Command:     "jaeger",
 		Description: description,
 		Version:     version.Get().String(),
 	}

cmd/jaeger-v2/internal/components.go → cmd/jaeger/internal/components.go

@@ -25,9 +25,9 @@ import (
 	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
 
-	"github.com/jaegertracing/jaeger/cmd/jaeger-v2/internal/exporters/storageexporter"
-	"github.com/jaegertracing/jaeger/cmd/jaeger-v2/internal/extension/jaegerquery"
-	"github.com/jaegertracing/jaeger/cmd/jaeger-v2/internal/extension/jaegerstorage"
+	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/exporters/storageexporter"
+	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerquery"
+	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
 )
 
 func components() (otelcol.Factories, error) {

cmd/jaeger-v2/internal/exporters/storageexporter/exporter.go → cmd/jaeger/internal/exporters/storageexporter/exporter.go

@@ -13,7 +13,7 @@ import (
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.uber.org/zap"
 
-	"github.com/jaegertracing/jaeger/cmd/jaeger-v2/internal/extension/jaegerstorage"
+	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )