From ecbae67ea32f189df1ddb4ec2da46d5fcd328b03 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Wed, 3 Apr 2024 15:57:40 -0400 Subject: [PATCH 1/4] 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 From fc42919d2ece6020ecc71f69d86c6060a7bb7e87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 01:36:55 -0400 Subject: [PATCH 2/4] build(deps): bump golang.org/x/sys from 0.18.0 to 0.19.0 (#5328) Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.18.0 to 0.19.0.
Commits
  • cabba82 windows: use uint32 for serial comm flags for consistency
  • 1a50d97 windows: add serial comm functions
  • 95f07ec x/sys/windows: add func windows.DisconnectNamedPipe(handle Handle) (err error)
  • 4be02d3 unix: expose mmap calls on z/OS
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/sys&package-manager=go_modules&previous-version=0.18.0&new-version=0.19.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e11daae6da1..720e235f9c4 100644 --- a/go.mod +++ b/go.mod @@ -77,7 +77,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 golang.org/x/net v0.22.0 - golang.org/x/sys v0.18.0 + golang.org/x/sys v0.19.0 google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 920b0a24d3f..db7c052d540 100644 --- a/go.sum +++ b/go.sum @@ -732,8 +732,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= From 063c036907cbe51d2fcb38a0990c62a24f575dee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 08:50:46 -0400 Subject: [PATCH 3/4] build(deps): bump github.com/prometheus/common from 0.51.1 to 0.52.2 (#5325) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 720e235f9c4..83fd4406bfc 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.97.0 github.com/prometheus/client_golang v1.19.0 github.com/prometheus/client_model v0.6.0 - github.com/prometheus/common v0.51.1 + github.com/prometheus/common v0.52.2 github.com/soheilhy/cmux v0.1.5 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index db7c052d540..55e19623cde 100644 --- a/go.sum +++ b/go.sum @@ -392,8 +392,8 @@ github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdU github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.51.1 h1:eIjN50Bwglz6a/c3hAgSMcofL3nD+nFQkV6Dd4DsQCw= -github.com/prometheus/common v0.51.1/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q= +github.com/prometheus/common v0.52.2 h1:LW8Vk7BccEdONfrJBDffQGRtpSzi5CQaRZGtboOO2ck= +github.com/prometheus/common v0.52.2/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= From 7fcbca863e475e7680fb4f9804afbea21d87dd80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 09:41:25 -0400 Subject: [PATCH 4/4] build(deps): bump golang.org/x/net from 0.22.0 to 0.24.0 (#5329) --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 83fd4406bfc..a8435de45db 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( go.uber.org/automaxprocs v1.5.3 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - golang.org/x/net v0.22.0 + golang.org/x/net v0.24.0 golang.org/x/sys v0.19.0 google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 @@ -233,7 +233,7 @@ require ( go.opentelemetry.io/proto/otlp v1.1.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.21.0 // indirect + golang.org/x/crypto v0.22.0 // indirect golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect golang.org/x/text v0.14.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect diff --git a/go.sum b/go.sum index 55e19623cde..8362b3740c2 100644 --- a/go.sum +++ b/go.sum @@ -641,8 +641,8 @@ golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -682,8 +682,8 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=