From ecbae67ea32f189df1ddb4ec2da46d5fcd328b03 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Wed, 3 Apr 2024 15:57:40 -0400 Subject: [PATCH] Prepare release 1.56.0 (#5321) * coincidentally GitHub runners removed `docker-compose` (v1) command on Apr-1, so I added a commit that changes everything to use `docker compose` (v2) * the all-in-one integration tests were failing because jaeger logo file in ui static assets got a different hash for some reason. I changed the test to read the actual file name from index.html and then try to load it. --------- Signed-off-by: Yuri Shkuro --- CHANGELOG.md | 35 ++++++++++++++++++++++++++ RELEASE.md | 4 +-- cmd/all-in-one/all_in_one_test.go | 30 ++++++++++++++-------- crossdock/rules.mk | 11 ++++---- docker-compose/kafka/README.md | 2 +- examples/grafana-integration/README.md | 6 ++--- examples/hotrod/README.md | 6 ++--- jaeger-ui | 2 +- 8 files changed, 69 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3043bdcaf05..6136e01b040 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,41 @@ run `make changelog` to generate content +1.56.0 (2024-04-02) +------------------- + +### Backend Changes + +#### ⛔ Breaking Changes + +* Fix hotrod instructions ([@yurishkuro](https://github.com/yurishkuro) in [#5273](https://github.com/jaegertracing/jaeger/pull/5273)) + +#### 🐞 Bug fixes, Minor Improvements + +* Refactor healthcheck signalling between server and service ([@WillSewell](https://github.com/WillSewell) in [#5308](https://github.com/jaegertracing/jaeger/pull/5308)) +* Docs: badger file permission as non-root service ([@tico88612](https://github.com/tico88612) in [#5282](https://github.com/jaegertracing/jaeger/pull/5282)) +* [kafka-consumer] add support for setting fetch message max bytes ([@sappusaketh](https://github.com/sappusaketh) in [#5283](https://github.com/jaegertracing/jaeger/pull/5283)) +* [chore] remove repetitive words ([@tgolang](https://github.com/tgolang) in [#5265](https://github.com/jaegertracing/jaeger/pull/5265)) +* Fix zipkin spanformat ([@fyuan1316](https://github.com/fyuan1316) in [#5261](https://github.com/jaegertracing/jaeger/pull/5261)) +* [kafka-producer] support setting max message size ([@sappusaketh](https://github.com/sappusaketh) in [#5263](https://github.com/jaegertracing/jaeger/pull/5263)) + +#### 🚧 Experimental Features + +* [jaeger-v2] add support for opensearch ([@akagami-harsh](https://github.com/akagami-harsh) in [#5257](https://github.com/jaegertracing/jaeger/pull/5257)) +* [jaeger-v2] add support for cassandra ([@Pushkarm029](https://github.com/Pushkarm029) in [#5253](https://github.com/jaegertracing/jaeger/pull/5253)) + +#### 👷 CI Improvements + +* Allow go-leak linter to fail ci ([@yurishkuro](https://github.com/yurishkuro) in [#5316](https://github.com/jaegertracing/jaeger/pull/5316)) +* [jaeger-v2] add grpc storage backend integration test ([@james-ryans](https://github.com/james-ryans) in [#5259](https://github.com/jaegertracing/jaeger/pull/5259)) +* Github actions added to block prs from fork/main branch ([@varshith257](https://github.com/varshith257) in [#5272](https://github.com/jaegertracing/jaeger/pull/5272)) + + +### 📊 UI Changes + +* UI pinned to version [1.40.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v1400-2024-04-02). + + 1.55.0 (2024-03-04) ------------------- ### Backend Changes diff --git a/RELEASE.md b/RELEASE.md index 4c5f9643c89..84ca3d25d47 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -60,8 +60,8 @@ Here are the release managers for future versions with the tentative release dat | Version | Release Manager | Tentative release date | |---------|-----------------|------------------------| -| 1.56.0 | @yurishkuro | 3 April 2024 | | 1.57.0 | @albertteoh | 1 May 2024 | | 1.58.0 | @pavolloffay | 5 June 2024 | | 1.59.0 | @joe-elliott | 3 July 2024 | -| 1.55.0 | @jkowall | 7 August 2024 | +| 1.60.0 | @jkowall | 7 August 2024 | +| 1.61.0 | @yurishkuro | 3 Sep 2024 | diff --git a/cmd/all-in-one/all_in_one_test.go b/cmd/all-in-one/all_in_one_test.go index b557dfcff22..f5186001976 100644 --- a/cmd/all-in-one/all_in_one_test.go +++ b/cmd/all-in-one/all_in_one_test.go @@ -21,6 +21,7 @@ import ( "io" "net/http" "os" + "regexp" "strings" "testing" "time" @@ -85,22 +86,29 @@ func healthCheck(t *testing.T) { } func checkWebUI(t *testing.T) { - t.Run("logo", func(t *testing.T) { - resp, err := http.Get(queryAddr + "/static/jaeger-logo-jWbKFHZJ.svg") + resp, err := http.Get(queryAddr + "/") + require.NoError(t, err) + require.NotNil(t, resp) + defer resp.Body.Close() + assert.Equal(t, http.StatusOK, resp.StatusCode) + bodyBytes, err := io.ReadAll(resp.Body) + require.NoError(t, err) + body := string(bodyBytes) + t.Run("Static_files", func(t *testing.T) { + pattern := regexp.MustCompile(``) + t.Run("React_app", func(t *testing.T) { + assert.Contains(t, body, `
`) }) } diff --git a/crossdock/rules.mk b/crossdock/rules.mk index 92d3652c8a8..8d4ca66fb3d 100644 --- a/crossdock/rules.mk +++ b/crossdock/rules.mk @@ -5,16 +5,15 @@ JAEGER_COLLECTOR_HC_PORT ?= 14269 .PHONY: crossdock crossdock: - docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) kill - docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) rm -f test_driver - JAEGER_COLLECTOR_HC_PORT=${JAEGER_COLLECTOR_HC_PORT} docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) run crossdock 2>&1 | tee run-crossdock.log + docker compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) kill + docker compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) rm -f test_driver + JAEGER_COLLECTOR_HC_PORT=${JAEGER_COLLECTOR_HC_PORT} docker compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) run crossdock 2>&1 | tee run-crossdock.log grep 'Tests passed!' run-crossdock.log .PHONE: crossdock-logs crossdock-logs: - docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) logs + docker compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) logs .PHONE: crossdock-clean crossdock-clean: - docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) down - + docker compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) down diff --git a/docker-compose/kafka/README.md b/docker-compose/kafka/README.md index 0f18aad2e11..286b9f96a1d 100644 --- a/docker-compose/kafka/README.md +++ b/docker-compose/kafka/README.md @@ -1,6 +1,6 @@ # Sample configuration with Kafka -This `docker-compose` environment provides a sample configuration of Jaeger depoyment utilizing collector-Kafka-injester pipeline. Storage is provided by the `jageer-remote-storage` service running memstore. +This `docker compose` environment provides a sample configuration of Jaeger depoyment utilizing collector-Kafka-injester pipeline. Storage is provided by the `jageer-remote-storage` service running memstore. Jaeger UI can be accessed at http://localhost:16686/, as usual, and refreshing the screen should produce internal traces. diff --git a/examples/grafana-integration/README.md b/examples/grafana-integration/README.md index 24b18f571e8..eef83392fff 100644 --- a/examples/grafana-integration/README.md +++ b/examples/grafana-integration/README.md @@ -2,7 +2,7 @@ This example combines the Hot R.O.D. demo application ([examples/hotrod/](../hotrod/)) with Grafana, Loki and Prometheus integration, to demonstrate logs, metrics and traces correlation. -## Running via `docker-compose` +## Running via `docker compose` ### Prerequisites @@ -20,7 +20,7 @@ grafana/loki-docker-driver:latest \ ### Run the services -`docker-compose up` +`docker compose up` ### Access the services * HotROD application at http://localhost:8080 @@ -52,4 +52,4 @@ Additionally, there are graphs for each service, visualizing the rate of the req ### Clean up -`docker-compose down` +`docker compose down` diff --git a/examples/hotrod/README.md b/examples/hotrod/README.md index 190dd3dbd86..f69fb49099b 100644 --- a/examples/hotrod/README.md +++ b/examples/hotrod/README.md @@ -19,14 +19,14 @@ As of Jaeger v1.42.0 this application was upgraded to use the OpenTelemetry SDK ## Running -### Run everything via `docker-compose` +### Run everything via `docker compose` * Download `docker-compose.yml` from https://github.com/jaegertracing/jaeger/blob/main/examples/hotrod/docker-compose.yml * Optional: find the latest Jaeger version (see https://www.jaegertracing.io/download/) and pass it via environment variable `JAEGER_VERSION`. Otherwise `docker compose` will use the `latest` tag, which is fine for the first time you download the images, but once they are in your local registry the `latest` tag is never updated and you may be running stale (and possibly incompatible) verions of Jaeger and the HotROD app. * Run Jaeger backend and HotROD demo, e.g.: - * `JAEGER_VERSION=1.52 docker-compose -f path-to-yml-file up` + * `JAEGER_VERSION=1.52 docker compose -f path-to-yml-file up` * Access Jaeger UI at http://localhost:16686 and HotROD app at http://localhost:8080 -* Shutdown / cleanup with `docker-compose -f path-to-yml-file down` +* Shutdown / cleanup with `docker compose -f path-to-yml-file down` Alternatively, you can run each component separately as described below. diff --git a/jaeger-ui b/jaeger-ui index f704b56fbc8..f8a4ece2c01 160000 --- a/jaeger-ui +++ b/jaeger-ui @@ -1 +1 @@ -Subproject commit f704b56fbc8dedf3b7f1e23884db8108157598db +Subproject commit f8a4ece2c01769ac1126019fdca489f73ff4a1e8