Merge branch 'main' into storage-integration-v2

Signed-off-by: James Ryans <[email protected]>

CHANGELOG.md

@@ -1,4 +1,4 @@
-### A message to people of Russia 🇷🇺
+### 🇷🇺 A message to people of Russia
 
 If you currently live in Russia, please read [this message](./_To_People_of_Russia.md).
 
@@ -15,12 +15,37 @@ next release (yyyy-mm-dd)
 
 run `make changelog` to generate content
 
-### UI Changes
+### 📊 UI Changes
 
 ...
 
 </details>
 
+1.55.0 (2024-03-04)
+-------------------
+### Backend Changes
+
+#### ✨ New Features:
+
+* Support uploading traces to UI in OpenTelemetry format (OTLP/JSON) ([@NavinShrinivas](https://github.com/NavinShrinivas) in [#5155](https://github.com/jaegertracing/jaeger/pull/5155))
+* Add Elasticsearch storage support for adaptive sampling ([@Pushkarm029](https://github.com/Pushkarm029) in [#5158](https://github.com/jaegertracing/jaeger/pull/5158))
+
+#### 🐞 Bug fixes, Minor Improvements:
+
+* Add the `print-config` subcommand ([@gmafrac](https://github.com/gmafrac) in [#5200](https://github.com/jaegertracing/jaeger/pull/5200))
+* Return more detailed errors from ES storage ([@yurishkuro](https://github.com/yurishkuro) in [#5209](https://github.com/jaegertracing/jaeger/pull/5209))
+* Bump go version ([@yurishkuro](https://github.com/yurishkuro) in [#5180](https://github.com/jaegertracing/jaeger/pull/5180))
+
+#### 🚧 Experimental Features:
+
+* [jaeger-v2] Add support for gRPC storarge ([@james-ryans](https://github.com/james-ryans) in [#5228](https://github.com/jaegertracing/jaeger/pull/5228))
+* [jaeger-v2] Add support for Elasticsearch ([@akagami-harsh](https://github.com/akagami-harsh) in [#5152](https://github.com/jaegertracing/jaeger/pull/5152))
+
+### 📊 UI Changes
+
+* UI pinned to version [1.39.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v1390-2024-03-04).
+
+
 1.54.0 (2024-02-06)
 -------------------
 

RELEASE.md

@@ -7,9 +7,11 @@
     * 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:
         ```
+        git submodule init
+        git submodule update
         cd jaeger-ui
-        git ls-remote --tags origin
-        git fetch
+        git checkout main
+        git pull
         git checkout {new_version} //e.g. v1.5.0
         ```
       * If there are no changes, indicate this with "No changes" ([example](https://github.com/jaegertracing/jaeger/pull/4131/files)).
@@ -21,6 +23,11 @@
        * Title "Release X.Y.Z"
        * Tag `vX.Y.Z` (note the `v` prefix) and choose appropriate branch
        * Copy the new CHANGELOG.md section into the release notes
+       * Extra: GitHub has a button "generate release notes". Those are not formatted as we want,
+         but it has a nice feature of explicitly listing first-time contributors.
+         Before doing the previous step, you can click that button and then remove everything
+         except the New Contributors section. Change the header to `### 👏 New Contributors`,
+         then copy the main changelog above it. [Example](https://github.com/jaegertracing/jaeger/releases/tag/v1.55.0).
 3. The release tag will trigger a build of the docker images. Since forks don't have jaegertracingbot dockerhub token, they can never publish images to jaegertracing organisation.
    1. Check the images are available on [Docker Hub](https://hub.docker.com/r/jaegertracing/).
    2. For monitoring and troubleshooting, refer to the [jaegertracing/jaeger GithubActions tab](https://github.com/jaegertracing/jaeger/actions).
@@ -53,8 +60,8 @@ Here are the release managers for future versions with the tentative release dat
 
 | Version | Release Manager | Tentative release date |
 |---------|-----------------|------------------------|
-| 1.55.0  | @jkowall        | 6 March 2024           |
 | 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          |

cmd/collector/app/handler/otlp_receiver.go

@@ -106,7 +106,7 @@ func startOTLPReceiver(
 	return otlpReceiver, nil
 }
 
-func applyGRPCSettings(cfg *configgrpc.GRPCServerSettings, opts *flags.GRPCOptions) {
+func applyGRPCSettings(cfg *configgrpc.ServerConfig, opts *flags.GRPCOptions) {
 	if opts.HostPort != "" {
 		cfg.NetAddr.Endpoint = opts.HostPort
 	}
@@ -126,15 +126,15 @@ func applyGRPCSettings(cfg *configgrpc.GRPCServerSettings, opts *flags.GRPCOptio
 	}
 }
 
-func applyHTTPSettings(cfg *confighttp.HTTPServerSettings, opts *flags.HTTPOptions) {
+func applyHTTPSettings(cfg *confighttp.ServerConfig, opts *flags.HTTPOptions) {
 	if opts.HostPort != "" {
 		cfg.Endpoint = opts.HostPort
 	}
 	if opts.TLS.Enabled {
 		cfg.TLSSetting = applyTLSSettings(&opts.TLS)
 	}
 
-	cfg.CORS = &confighttp.CORSSettings{
+	cfg.CORS = &confighttp.CORSConfig{
 		AllowedOrigins: opts.CORS.AllowedOrigins,
 		AllowedHeaders: opts.CORS.AllowedHeaders,
 	}

cmd/jaeger/internal/extension/jaegerquery/config.go

@@ -18,10 +18,10 @@ var _ component.ConfigValidator = (*Config)(nil)
 type Config struct {
 	queryApp.QueryOptionsBase `mapstructure:",squash"`
 
-	TraceStoragePrimary           string `valid:"required" mapstructure:"trace_storage"`
-	TraceStorageArchive           string `valid:"optional" mapstructure:"trace_storage_archive"`
-	confighttp.HTTPServerSettings `mapstructure:",squash"`
-	Tenancy                       tenancy.Options `mapstructure:"multi_tenancy"`
+	TraceStoragePrimary     string `valid:"required" mapstructure:"trace_storage"`
+	TraceStorageArchive     string `valid:"optional" mapstructure:"trace_storage_archive"`
+	confighttp.ServerConfig `mapstructure:",squash"`
+	Tenancy                 tenancy.Options `mapstructure:"multi_tenancy"`
 }
 
 func (cfg *Config) Validate() error {

cmd/jaeger/internal/extension/jaegerquery/factory.go

@@ -25,7 +25,7 @@ func NewFactory() extension.Factory {
 
 func createDefaultConfig() component.Config {
 	return &Config{
-		HTTPServerSettings: confighttp.HTTPServerSettings{
+		ServerConfig: confighttp.ServerConfig{
 			Endpoint: ports.PortToHostPort(ports.QueryHTTP),
 		},
 	}

cmd/query/app/server.go

@@ -329,10 +329,7 @@ func (s *Server) Close() error {
 	errs = append(errs, s.queryOptions.TLSHTTP.Close())
 	s.grpcServer.Stop()
 	errs = append(errs, s.httpServer.Close())
-	if s.separatePorts {
-		errs = append(errs, s.httpConn.Close())
-		errs = append(errs, s.grpcConn.Close())
-	} else {
+	if !s.separatePorts {
 		s.cmuxServer.Close()
 		errs = append(errs, s.conn.Close())
 	}