From 65cff3c30823ea20d3dc48bae39d5685ae307da5 Mon Sep 17 00:00:00 2001
From: Joe Elliott <number101010@gmail.com>
Date: Fri, 6 Dec 2024 16:17:15 -0500
Subject: [PATCH 01/59] Prepare release 1.64.0 / 2.1.0 (#6318)

Prepares release 1.64.0 / 2.1.0

---------

Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
---
 CHANGELOG.md | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 RELEASE.md   |  2 +-
 jaeger-ui    |  2 +-
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4788ad3e6d..d1bd80a71e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,70 @@ copy from UI changelog
 
 </details>
 
+v1.64.0 / v2.1.0 (2024-12-06)
+-------------------------------
+
+### Backend Changes
+
+#### ⛔ Breaking Changes
+
+* [metrics][storage] move metrics reader decorator to metrics storage factory ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#6287](https://github.com/jaegertracing/jaeger/pull/6287))
+* [v2][storage] move span reader decorator to storage factories ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#6280](https://github.com/jaegertracing/jaeger/pull/6280))
+
+#### ✨ New Features
+
+* [v2][storage] implement read path for v2 storage interface ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#6170](https://github.com/jaegertracing/jaeger/pull/6170))
+* Create cassandra db schema on session initialization ([@akstron](https://github.com/akstron) in [#5922](https://github.com/jaegertracing/jaeger/pull/5922))
+
+#### 🐞 Bug fixes, Minor Improvements
+
+* Fix password in integration test ([@akstron](https://github.com/akstron) in [#6284](https://github.com/jaegertracing/jaeger/pull/6284))
+* [cassandra] change compaction window default to 2hrs ([@yurishkuro](https://github.com/yurishkuro) in [#6282](https://github.com/jaegertracing/jaeger/pull/6282))
+* Improve telemetry.settings ([@yurishkuro](https://github.com/yurishkuro) in [#6275](https://github.com/jaegertracing/jaeger/pull/6275))
+* [kafka] otel helper instead of tlscfg package ([@chahatsagarmain](https://github.com/chahatsagarmain) in [#6270](https://github.com/jaegertracing/jaeger/pull/6270))
+* [refactor] fix package misspelling: telemetery->telemetry ([@yurishkuro](https://github.com/yurishkuro) in [#6269](https://github.com/jaegertracing/jaeger/pull/6269))
+* [prometheus] use otel helper instead of tlscfg package ([@chahatsagarmain](https://github.com/chahatsagarmain) in [#6266](https://github.com/jaegertracing/jaeger/pull/6266))
+* [fix] use metrics decorator around metricstorage ([@yurishkuro](https://github.com/yurishkuro) in [#6262](https://github.com/jaegertracing/jaeger/pull/6262))
+* Use real metrics factory instead of nullfactory ([@yurishkuro](https://github.com/yurishkuro) in [#6261](https://github.com/jaegertracing/jaeger/pull/6261))
+* [v2] use only version number for buildinfo ([@yurishkuro](https://github.com/yurishkuro) in [#6260](https://github.com/jaegertracing/jaeger/pull/6260))
+* [refactor] move spm v2 config to cmd/jaeger/ with all other configs ([@yurishkuro](https://github.com/yurishkuro) in [#6256](https://github.com/jaegertracing/jaeger/pull/6256))
+* [es-index-cleaner] use otel helper instead of tlscfg ([@chahatsagarmain](https://github.com/chahatsagarmain) in [#6259](https://github.com/jaegertracing/jaeger/pull/6259))
+* [api_v2] change time fields in archivetracerequest to non-nullable ([@rim99](https://github.com/rim99) in [#6251](https://github.com/jaegertracing/jaeger/pull/6251))
+* [es-rollover] use otel helpers for tls config instead of tlscfg ([@chahatsagarmain](https://github.com/chahatsagarmain) in [#6238](https://github.com/jaegertracing/jaeger/pull/6238))
+* Enable usestdlibvars linter ([@mmorel-35](https://github.com/mmorel-35) in [#6249](https://github.com/jaegertracing/jaeger/pull/6249))
+* [storage_v1] add time window to gettracerequest ([@rim99](https://github.com/rim99) in [#6244](https://github.com/jaegertracing/jaeger/pull/6244))
+* [fix][query] fix misconfiguration in tls settings from using otel http helper ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#6239](https://github.com/jaegertracing/jaeger/pull/6239))
+* Auto-generate gogo annotations for api_v3 ([@yurishkuro](https://github.com/yurishkuro) in [#6233](https://github.com/jaegertracing/jaeger/pull/6233))
+* Use confighttp in expvar extension ([@yurishkuro](https://github.com/yurishkuro) in [#6227](https://github.com/jaegertracing/jaeger/pull/6227))
+* Parameterize listen host and override when in container ([@yurishkuro](https://github.com/yurishkuro) in [#6231](https://github.com/jaegertracing/jaeger/pull/6231))
+* Remove 0.0.0.0 overrides in hotrod ci ([@yurishkuro](https://github.com/yurishkuro) in [#6226](https://github.com/jaegertracing/jaeger/pull/6226))
+* [storage][v2] add reader adapter that just exposes the underlying v1 reader ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#6221](https://github.com/jaegertracing/jaeger/pull/6221))
+* Change start/end time in gettrace request to not be pointers ([@yurishkuro](https://github.com/yurishkuro) in [#6218](https://github.com/jaegertracing/jaeger/pull/6218))
+* Pass real meterprovider to components ([@chahatsagarmain](https://github.com/chahatsagarmain) in [#6173](https://github.com/jaegertracing/jaeger/pull/6173))
+* [v2] update versions in readme ([@yurishkuro](https://github.com/yurishkuro) in [#6206](https://github.com/jaegertracing/jaeger/pull/6206))
+* Fix: testcreatecollectorproxy unit test failing on go-tip ([@Saumya40-codes](https://github.com/Saumya40-codes) in [#6204](https://github.com/jaegertracing/jaeger/pull/6204))
+* Respect environment variables when creating internal tracer ([@akstron](https://github.com/akstron) in [#6179](https://github.com/jaegertracing/jaeger/pull/6179))
+
+#### 🚧 Experimental Features
+
+* [v2]add script for metrics markdown table ([@vvs-personalstash](https://github.com/vvs-personalstash) in [#5941](https://github.com/jaegertracing/jaeger/pull/5941))
+
+#### 👷 CI Improvements
+
+* Allow using different container runtime ([@rim99](https://github.com/rim99) in [#6247](https://github.com/jaegertracing/jaeger/pull/6247))
+* K8s integration test for hotrod ([@chahatsagarmain](https://github.com/chahatsagarmain) in [#6155](https://github.com/jaegertracing/jaeger/pull/6155))
+* Pass username/password to cassandra docker-compose health check ([@akstron](https://github.com/akstron) in [#6214](https://github.com/jaegertracing/jaeger/pull/6214))
+* [fix][ci] change the prometheus healthcheck endpoint ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#6217](https://github.com/jaegertracing/jaeger/pull/6217))
+
+### 📊 UI Changes
+
+#### 🐞 Bug fixes, Minor Improvements
+
+* Add new formatting function "add" ([@drewcorlin1](https://github.com/drewcorlin1) in [#2507](https://github.com/jaegertracing/jaeger-ui/pull/2507))
+* Add pad_start link formatting function #2505 ([@drewcorlin1](https://github.com/drewcorlin1) in [#2504](https://github.com/jaegertracing/jaeger-ui/pull/2504))
+* Allow formatting link parameter values as iso date #2487 ([@drewcorlin1](https://github.com/drewcorlin1) in [#2501](https://github.com/jaegertracing/jaeger-ui/pull/2501))
+
+
 v1.63.0 / v2.0.0 (2024-11-10)
 -------------------------------
 
diff --git a/RELEASE.md b/RELEASE.md
index f8f67923446..97d62474833 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -78,8 +78,8 @@ Here are the release managers for future versions with the tentative release dat
 
 | Version | Release Manager | Tentative release date |
 |---------|-----------------|------------------------|
-| 1.64.0  | @joe-elliott    | 4 December 2024        |
 | 1.65.0  | @jkowall        | 8 January 2025         |
 | 1.66.0  | @yurishkuro     | 3 February 2025        |
 | 1.67.0  | @albertteoh     | 5 March 2025           |
 | 1.68.0  | @pavolloffay    | 5 April 2025           |
+| 1.69.0  | @joe-elliott    | 7 May   2025           |
\ No newline at end of file
diff --git a/jaeger-ui b/jaeger-ui
index a0458053c53..c5cd17bf979 160000
--- a/jaeger-ui
+++ b/jaeger-ui
@@ -1 +1 @@
-Subproject commit a0458053c53bb18ba36a42867c06b0803d8fafaf
+Subproject commit c5cd17bf979ba454da761f660fde08a1f309aee9

From 56c09d361e68ed3082913fb167be90d991fb3c60 Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Date: Sat, 7 Dec 2024 14:52:48 -0400
Subject: [PATCH 02/59] Pring EOL notice from v1 binaries (#6322)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Which problem is this PR solving?
- Part of #6321

## Description of the changes
- Print EOL notice from core v1 binaries

## How was this change tested?
```
$ go run ./cmd/all-in-one
2024/12/07 13:02:54 maxprocs: Leaving GOMAXPROCS=12: CPU quota undefined

*******************************************************************************

🛑  WARNING: End-of-life Notice for Jaeger v1

You are currently running a v1 version of Jaeger, which is deprecated and will
reach end-of-life on December 31st, 2025. This means there will be no further
development, bug fixes, or security patches for v1 after this date.

We strongly recommend migrating to Jaeger v2 for continued support and access
to new features.

For detailed migration instructions, please refer to the official Jaeger
documentation:  https://www.jaegertracing.io/docs/latest/migration/

Tracking issue: https://github.com/jaegertracing/jaeger/issues/6321

🛑  WARNING: End-of-life Notice for Jaeger v1

*******************************************************************************

2024/12/07 13:02:54 application version: git-commit=, git-version=, build-date=
{"level":"info","ts":1733594574.315758,"caller":"flags/service.go:123","msg":"Mounting metrics handler on admin server","route":"/metrics"}
```

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
---
 cmd/all-in-one/main.go        |  1 +
 cmd/collector/main.go         |  1 +
 cmd/ingester/main.go          |  1 +
 cmd/internal/flags/service.go | 24 ++++++++++++++++++++++++
 cmd/query/main.go             |  1 +
 5 files changed, 28 insertions(+)

diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go
index 9b7b89dfba1..c9382ac80a7 100644
--- a/cmd/all-in-one/main.go
+++ b/cmd/all-in-one/main.go
@@ -45,6 +45,7 @@ import (
 
 // all-in-one/main is a standalone full-stack jaeger backend, backed by a memory store
 func main() {
+	flags.PrintV1EOL()
 	setupcontext.SetAllInOne()
 
 	svc := flags.NewService(ports.CollectorAdminHTTP)
diff --git a/cmd/collector/main.go b/cmd/collector/main.go
index 86f26d1cb84..52528ada6fb 100644
--- a/cmd/collector/main.go
+++ b/cmd/collector/main.go
@@ -35,6 +35,7 @@ import (
 const serviceName = "jaeger-collector"
 
 func main() {
+	cmdFlags.PrintV1EOL()
 	svc := cmdFlags.NewService(ports.CollectorAdminHTTP)
 
 	storageFactory, err := storage.NewFactory(storage.FactoryConfigFromEnvAndCLI(os.Args, os.Stderr))
diff --git a/cmd/ingester/main.go b/cmd/ingester/main.go
index efc08cea61f..4500b997311 100644
--- a/cmd/ingester/main.go
+++ b/cmd/ingester/main.go
@@ -30,6 +30,7 @@ import (
 )
 
 func main() {
+	flags.PrintV1EOL()
 	svc := flags.NewService(ports.IngesterAdminHTTP)
 
 	storageFactory, err := storage.NewFactory(storage.FactoryConfigFromEnvAndCLI(os.Args, os.Stderr))
diff --git a/cmd/internal/flags/service.go b/cmd/internal/flags/service.go
index 7a276d59d18..a076cebc19b 100644
--- a/cmd/internal/flags/service.go
+++ b/cmd/internal/flags/service.go
@@ -42,6 +42,30 @@ type Service struct {
 	signalsChannel chan os.Signal
 }
 
+func PrintV1EOL() {
+	println(`
+*******************************************************************************
+
+🛑  WARNING: End-of-life Notice for Jaeger v1
+
+You are currently running a v1 version of Jaeger, which is deprecated and will
+reach end-of-life on December 31st, 2025. This means there will be no further
+development, bug fixes, or security patches for v1 after this date.
+
+We strongly recommend migrating to Jaeger v2 for continued support and access
+to new features.
+
+For detailed migration instructions, please refer to the official Jaeger
+documentation:  https://www.jaegertracing.io/docs/latest/migration/
+
+Tracking issue: https://github.com/jaegertracing/jaeger/issues/6321
+
+🛑  WARNING: End-of-life Notice for Jaeger v1
+
+*******************************************************************************
+`)
+}
+
 // NewService creates a new Service.
 func NewService(adminPort int) *Service {
 	signalsChannel := make(chan os.Signal, 1)
diff --git a/cmd/query/main.go b/cmd/query/main.go
index 5d32b5db10f..4868cb28428 100644
--- a/cmd/query/main.go
+++ b/cmd/query/main.go
@@ -36,6 +36,7 @@ import (
 )
 
 func main() {
+	flags.PrintV1EOL()
 	svc := flags.NewService(ports.QueryAdminHTTP)
 
 	storageFactory, err := storage.NewFactory(storage.FactoryConfigFromEnvAndCLI(os.Args, os.Stderr))

From 526d36cb01ecca6de257587d12f44f3263a35b07 Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Date: Sat, 7 Dec 2024 15:03:12 -0400
Subject: [PATCH 03/59] Add mahadzaryab1 to maintainers (#6323)

## Which problem is this PR solving?
- Resolves #6264

## Description of the changes
- Add new maintainer
- Clean-up README

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
---
 GOVERNANCE.md  |   6 +--
 MAINTAINERS.md |  11 +++++
 README.md      | 129 ++++++-------------------------------------------
 RELEASE.md     |  11 +++--
 4 files changed, 33 insertions(+), 124 deletions(-)

diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index 8573b0aedd0..69e54775fb7 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -57,13 +57,11 @@ Former maintainers can be reinstated to full maintainer status through the same
 
 ## Emeritus Maintainers
 
-Former maintainers are recognized with an honorary _Emeritus Maintainer_ status, and have their names permanently
-listed in the README as a form of gratitude for their contributions.
+Former maintainers are recognized with an honorary _Emeritus Maintainer_ status, and have their names permanently listed in the [MAINTAINERS](./MAINTAINERS.md#emeritus-maintainers) file as a form of gratitude for their contributions.
 
 ## GitHub Project Administration
 
-Maintainers will be added to the GitHub @jaegertracing/jaeger-maintainers team, and made a GitHub maintainer of that team.
-They will be given write permission to the Jaeger GitHub repository https://github.com/jaegertracing/jaeger.
+Maintainers will be added to the GitHub @jaegertracing/jaeger-maintainers team, and made a GitHub maintainer of that team. They will be given write permission to the Jaeger GitHub repository https://github.com/jaegertracing/jaeger.
 
 ## Changes in Governance
 
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index fcc48358467..40afdccf85e 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -5,9 +5,20 @@ The current Maintainers Group for the Jaeger Project consists of:
 | [@albertteoh](https://github.com/albertteoh) | PackSmith | ALL | 
 | [@jkowall](https://github.com/jkowall) | Aiven | ALL |
 | [@joe-elliott](https://github.com/joe-elliott) | Grafana Labs | ALL |
+| [@mahadzaryab1](https://github.com/mahadzaryab1) | Bloomberg | ALL |
 | [@pavolloffay](https://github.com/pavolloffay) | RedHat | ALL |
 | [@yurishkuro](https://github.com/yurishkuro) | Meta | ALL |
 
 This list must be kept in sync with the [CNCF Project Maintainers list](https://github.com/cncf/foundation/blob/master/project-maintainers.csv).
 
 See [the project Governance](./GOVERNANCE.md) for how maintainers are selected and replaced.
+
+### Emeritus Maintainers
+
+We are grateful to our former maintainers for their contributions to the Jaeger project.
+
+* [@black-adder](https://github.com/black-adder)
+* [@jpkrohling](https://github.com/jpkrohling)
+* [@objectiser](https://github.com/objectiser)
+* [@tiffon](https://github.com/tiffon)
+* [@vprithvi](https://github.com/vprithvi)
diff --git a/README.md b/README.md
index 80a33394621..783edaeb599 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 
 # Jaeger - a Distributed Tracing System
 
-💥💥💥 Jaeger v2 is coming! Read the [blog post](https://medium.com/jaegertracing/towards-jaeger-v2-moar-opentelemetry-2f8239bee48e) and [try it out](./cmd/jaeger).
+💥💥💥 Jaeger v2 is out! Read the [blog post](https://medium.com/jaegertracing/jaeger-v2-released-09a6033d1b10) and [try it out](https://www.jaegertracing.io/docs/latest/getting-started/).
 
 ```mermaid
 graph TD
@@ -35,93 +35,16 @@ graph TD
     end
 ```
 
-Jaeger, inspired by [Dapper][dapper] and [OpenZipkin](https://zipkin.io),
-is a distributed tracing platform created by [Uber Technologies][ubeross]
-and donated to [Cloud Native Computing Foundation](https://cncf.io).
-It can be used for monitoring microservices-based distributed systems:
+Jaeger is a distributed tracing platform created by [Uber Technologies](https://eng.uber.com/distributed-tracing/) and donated to [Cloud Native Computing Foundation](https://cncf.io).
 
-  * Distributed context propagation
-  * Distributed transaction monitoring
-  * Root cause analysis
-  * Service dependency analysis
-  * Performance / latency optimization
+See Jaeger [documentation][doc] for getting started, operational details, and other information.
 
-See also:
-
-  * Jaeger [documentation][doc] for getting started, operational details, and other information.
-  * Blog post [Evolving Distributed Tracing at Uber](https://eng.uber.com/distributed-tracing/).
-  * Tutorial / walkthrough [Take Jaeger for a HotROD ride][hotrod-tutorial].
-
-Jaeger is hosted by the [Cloud Native Computing Foundation](https://cncf.io) (CNCF) as the 7th top-level project (graduated in October 2019). If you are a company that wants to help shape the evolution of technologies that are container-packaged, dynamically-scheduled and microservices-oriented, consider joining the CNCF. For details about who's involved and how Jaeger plays a role, read the CNCF [Jaeger incubation announcement](https://www.cncf.io/blog/2017/09/13/cncf-hosts-jaeger/) and [Jaeger graduation announcement](https://www.cncf.io/announcement/2019/10/31/cloud-native-computing-foundation-announces-jaeger-graduation/).
+Jaeger is hosted by the [Cloud Native Computing Foundation](https://cncf.io) (CNCF) as the 7th top-level project, graduated in October 2019. See the CNCF [Jaeger incubation announcement](https://www.cncf.io/blog/2017/09/13/cncf-hosts-jaeger/) and [Jaeger graduation announcement](https://www.cncf.io/announcement/2019/10/31/cloud-native-computing-foundation-announces-jaeger-graduation/).
 
 ## Get Involved
 
 Jaeger is an open source project with open governance. We welcome contributions from the community, and we would love your help to improve and extend the project. Here are [some ideas](https://www.jaegertracing.io/get-involved/) for how to get involved. Many of them do not even require any coding.
 
-## Features
-
-### High Scalability
-
-Jaeger backend is designed to have no single points of failure and to scale with the business needs.
-For example, any given Jaeger installation at Uber is typically processing several billions of spans per day.
-
-### Relationship with OpenTelemetry
-
-The Jaeger and [OpenTelemetry](https://opentelemetry.io) projects have different goals. OpenTelemetry aims to provide APIs and SDKs in multiple languages to allow applications to export various telemetry data out of the process, to any number of metrics and tracing backends. The Jaeger project is primarily the tracing backend that receives tracing telemetry data and provides processing, aggregation, data mining, and visualizations of that data. For more information please refer to a blog post [Jaeger and OpenTelemetry](https://medium.com/jaegertracing/jaeger-and-opentelemetry-1846f701d9f2).
-
-Jaeger was originally designed to support the [OpenTracing standard](https://opentracing.io/specification/). The terminology is still used in Jaeger UI, but the concepts have direct mapping to the OpenTelemetry data model of traces.
-
-| Capability    | OpenTracing concept | OpenTelemetry concept |
-| ------------- | ------------------- | --------------------- |
-| Represent traces as directed acyclic graphs (not just trees)  | [span references](https://github.com/opentracing/specification/blob/master/specification.md#references-between-spans) | [span links](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/api.md#span) |
-| Strongly typed span attributes  | span tags | span attributes |
-| Strongly typed events/logs  | span logs | span events |
-
-Jaeger project recommends OpenTelemetry SDKs for instrumentation, instead of [now-deprecated Jaeger SDKs](https://www.jaegertracing.io/docs/latest/client-libraries/#deprecating-jaeger-clients).
-
-### Multiple storage backends
-
-Jaeger can be used with a growing a number of storage backends:
-* It natively supports two popular open source NoSQL databases as trace storage backends: Cassandra and Elasticsearch.
-* It integrates via a gRPC API with other well known databases that have been certified to be Jaeger compliant: [TimescaleDB via Promscale](https://github.com/timescale/promscale), [ClickHouse](https://github.com/jaegertracing/jaeger-clickhouse).
-* There is embedded database support using [Badger](https://github.com/dgraph-io/badger) and simple in-memory storage for testing setups.
-* ScyllaDB [can be used](https://github.com/jaegertracing/jaeger/blob/main/plugin/storage/scylladb/README.md) as a drop-in replacement for Cassandra since it uses the same data model and query language.
-* There are ongoing community experiments using other databases, such as InfluxDB, Amazon DynamoDB, YugabyteDB(YCQL).
-
-### Modern Web UI
-
-Jaeger Web UI is implemented in Javascript using popular open source frameworks like React. Several performance
-improvements have been released in v1.0 to allow the UI to efficiently deal with large volumes of data and to display
-traces with tens of thousands of spans (e.g. we tried a trace with 80,000 spans).
-
-### Cloud Native Deployment
-
-Jaeger backend is distributed as a collection of Docker images. The binaries support various configuration methods,
-including command line options, environment variables, and configuration files in multiple formats (yaml, toml, etc.).
-
-The recommended way to deploy Jaeger in a production Kubernetes cluster is via the [Jaeger Operator](https://github.com/jaegertracing/jaeger-operator).
-
-The Jaeger Operator provides a [CLI to generate](https://github.com/jaegertracing/jaeger-operator#experimental-generate-kubernetes-manifest-file) Kubernetes manifests from the Jaeger CR.
-This can be considered as an alternative source over plain Kubernetes manifest files.
-
-The Jaeger ecosystem also provides a [Helm chart](https://github.com/jaegertracing/helm-charts) as an alternative way to deploy Jaeger.
-
-### Observability
-
-All Jaeger backend components expose [Prometheus](https://prometheus.io/) metrics by default (other metrics backends are
-also supported). Logs are written to standard out using the structured logging library [zap](https://github.com/uber-go/zap).
-
-### Security
-
-Third-party security audits of Jaeger are available in https://github.com/jaegertracing/security-audits. Please see [Issue #1718](https://github.com/jaegertracing/jaeger/issues/1718) for the summary of available security mechanisms in Jaeger.
-
-### Backwards compatibility with Zipkin
-
-Although we recommend instrumenting applications with OpenTelemetry, if your organization has already invested in the instrumentation
-using Zipkin libraries, you do not have to rewrite all that code. Jaeger provides backwards compatibility with Zipkin
-by accepting spans in Zipkin formats (Thrift or JSON v1/v2) over HTTP. Switching from Zipkin backend is just a matter
-of routing the traffic from Zipkin libraries to the Jaeger backend.
-
 ## Version Compatibility Guarantees
 
 Occasionally, CLI flags can be deprecated due to, for example, usability improvements or new functionality.
@@ -151,24 +74,16 @@ Starting with the release of Go 1.21, support for Go versions will be updated as
 
 ## Related Repositories
 
-### Documentation
-
-  * Published: https://www.jaegertracing.io/docs/
-  * Source: https://github.com/jaegertracing/documentation
-
-### Instrumentation Libraries
-
-Jaeger project recommends OpenTelemetry SDKs for instrumentation, instead of Jaeger's native SDKs [that are now deprecated](https://www.jaegertracing.io/docs/latest/client-libraries/#deprecating-jaeger-clients).
-
-### Deployment
-
-  * [Jaeger Operator for Kubernetes](https://github.com/jaegertracing/jaeger-operator#getting-started)
-
 ### Components
 
  * [UI](https://github.com/jaegertracing/jaeger-ui)
  * [Data model](https://github.com/jaegertracing/jaeger-idl)
 
+### Documentation
+
+  * Published: https://www.jaegertracing.io/docs/
+  * Source: https://github.com/jaegertracing/documentation
+
 ## Building From Source
 
 See [CONTRIBUTING](./CONTRIBUTING.md).
@@ -186,27 +101,11 @@ Thanks to all the people who already contributed!
 ### Maintainers
 
 Rules for becoming a maintainer are defined in the [GOVERNANCE](./GOVERNANCE.md) document.
-Below are the official maintainers of the Jaeger project.
+The official maintainers of the Jaeger project are listed in the [MAINTAINERS](./MAINTAINERS.md) file.
 Please use `@jaegertracing/jaeger-maintainers` to tag them on issues / PRs.
 
-* [@albertteoh](https://github.com/albertteoh)
-* [@jkowall](https://github.com/jkowall)
-* [@joe-elliott](https://github.com/joe-elliott)
-* [@pavolloffay](https://github.com/pavolloffay)
-* [@yurishkuro](https://github.com/yurishkuro)
-
 Some repositories under [jaegertracing](https://github.com/jaegertracing) org have additional maintainers.
 
-### Emeritus Maintainers
-
-We are grateful to our former maintainers for their contributions to the Jaeger project.
-
-* [@black-adder](https://github.com/black-adder)
-* [@jpkrohling](https://github.com/jpkrohling)
-* [@objectiser](https://github.com/objectiser)
-* [@tiffon](https://github.com/tiffon)
-* [@vprithvi](https://github.com/vprithvi)
-
 ## Project Status Meetings
 
 The Jaeger maintainers and contributors meet regularly on a video call. Everyone is welcome to join, including end users. For meeting details, see https://www.jaegertracing.io/get-in-touch/.
@@ -223,6 +122,10 @@ Have questions, suggestions, bug reports? Reach the project community via these
  * [`jaeger-tracing` mail group](https://groups.google.com/forum/#!forum/jaeger-tracing)
  * GitHub [issues](https://github.com/jaegertracing/jaeger/issues) and [discussions](https://github.com/jaegertracing/jaeger/discussions)
 
+## Security
+
+Third-party security audits of Jaeger are available in https://github.com/jaegertracing/security-audits. Please see [Issue #1718](https://github.com/jaegertracing/jaeger/issues/1718) for the summary of available security mechanisms in Jaeger.
+
 ## Adopters
 
 Jaeger as a product consists of multiple components. We want to support different types of users,
@@ -238,8 +141,6 @@ If you would like to add your organization to the list, please comment on our
 Copyright (c) The Jaeger Authors. [Apache 2.0 License](./LICENSE).
 
 [doc]: https://jaegertracing.io/docs/
-[godoc-img]: https://godoc.org/github.com/jaegertracing/jaeger?status.svg
-[godoc]: https://godoc.org/github.com/jaegertracing/jaeger
 [ci-img]: https://github.com/jaegertracing/jaeger/actions/workflows/ci-unit-tests.yml/badge.svg?branch=main
 [ci]: https://github.com/jaegertracing/jaeger/actions/workflows/ci-unit-tests.yml?query=branch%3Amain
 [cov-img]: https://codecov.io/gh/jaegertracing/jaeger/branch/main/graph/badge.svg
@@ -256,8 +157,6 @@ Copyright (c) The Jaeger Authors. [Apache 2.0 License](./LICENSE).
 [artifacthub]: https://artifacthub.io/packages/search?repo=jaegertracing
 
 
-[dapper]: https://research.google.com/pubs/pub36356.html
-[ubeross]: https://uber.github.io
 [community-badge]: https://img.shields.io/badge/Project+Community-stats-blue.svg
 [community-stats]: https://all.devstats.cncf.io/d/54/project-health?orgId=1&var-repogroup_name=Jaeger
 [hotrod-tutorial]: https://medium.com/jaegertracing/take-jaeger-for-a-hotrod-ride-233cf43e46c2
diff --git a/RELEASE.md b/RELEASE.md
index 97d62474833..9075e84481c 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -78,8 +78,9 @@ Here are the release managers for future versions with the tentative release dat
 
 | Version | Release Manager | Tentative release date |
 |---------|-----------------|------------------------|
-| 1.65.0  | @jkowall        | 8 January 2025         |
-| 1.66.0  | @yurishkuro     | 3 February 2025        |
-| 1.67.0  | @albertteoh     | 5 March 2025           |
-| 1.68.0  | @pavolloffay    | 5 April 2025           |
-| 1.69.0  | @joe-elliott    | 7 May   2025           |
\ No newline at end of file
+| 1.65.0  | @mahadzaryab1   | 8 January 2025         |
+| 1.66.0  | @jkowall        | 3 February 2025        |
+| 1.67.0  | @yurishkuro     | 5 March 2025           |
+| 1.68.0  | @albertteoh     | 5 April 2025           |
+| 1.69.0  | @pavolloffay    | 7 May   2025           |
+| 1.70.0  | @joe-elliott    | 5 June   2025          |

From 593315b9915379d0699a553b06b114ebd06a6a93 Mon Sep 17 00:00:00 2001
From: Vaidik <vaidikbhardwaj00@gmail.com>
Date: Sun, 8 Dec 2024 02:17:25 +0530
Subject: [PATCH 04/59] Run e2e jobs as a single workflow (#6310)

Signed-off-by: vaidikcode <vaidikbhardwaj00@gmail.com>

## Which problem is this PR solving?
- Task one of #6278

## Description of the changes
- Integrated all e2e workflows jobs into a single workflow

## How was this change tested?
- CI

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Co-authored-by: Yuri Shkuro <github@ysh.us>
---
 .github/workflows/ci-e2e-all.yml           | 42 ++++++++++++++++++++++
 .github/workflows/ci-e2e-badger.yaml       |  8 ++---
 .github/workflows/ci-e2e-cassandra.yml     |  8 ++---
 .github/workflows/ci-e2e-elasticsearch.yml |  8 ++---
 .github/workflows/ci-e2e-grpc.yml          |  8 ++---
 .github/workflows/ci-e2e-kafka.yml         | 10 ++----
 .github/workflows/ci-e2e-memory.yaml       |  8 ++---
 .github/workflows/ci-e2e-opensearch.yml    |  8 ++---
 8 files changed, 57 insertions(+), 43 deletions(-)
 create mode 100644 .github/workflows/ci-e2e-all.yml

diff --git a/.github/workflows/ci-e2e-all.yml b/.github/workflows/ci-e2e-all.yml
new file mode 100644
index 00000000000..fb41a17b5c5
--- /dev/null
+++ b/.github/workflows/ci-e2e-all.yml
@@ -0,0 +1,42 @@
+name: E2E Tests
+
+on:
+  push:
+    branches: [main]
+
+  pull_request:
+    branches: [main]
+
+concurrency:
+  group: combined-cit-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  badger:
+    uses: ./.github/workflows/ci-e2e-badger.yaml
+
+  cassandra:
+    uses: ./.github/workflows/ci-e2e-cassandra.yml
+
+  elasticsearch:
+    uses: ./.github/workflows/ci-e2e-elasticsearch.yml
+
+  grpc:
+    uses: ./.github/workflows/ci-e2e-grpc.yml
+
+  kafka:
+    uses: ./.github/workflows/ci-e2e-kafka.yml
+
+  memory:
+    uses: ./.github/workflows/ci-e2e-memory.yaml
+
+  opensearch:
+    uses: ./.github/workflows/ci-e2e-opensearch.yml
+
+
+
+
+
diff --git a/.github/workflows/ci-e2e-badger.yaml b/.github/workflows/ci-e2e-badger.yaml
index e4ec18ad83a..5b87cd4e448 100644
--- a/.github/workflows/ci-e2e-badger.yaml
+++ b/.github/workflows/ci-e2e-badger.yaml
@@ -1,14 +1,10 @@
 name: CIT Badger
 
 on:
-  push:
-    branches: [main]
-
-  pull_request:
-    branches: [main]
+  workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
+  group: cit-badger-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
   cancel-in-progress: true
 
 # See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
diff --git a/.github/workflows/ci-e2e-cassandra.yml b/.github/workflows/ci-e2e-cassandra.yml
index 3ca6709e012..2e5cb4b561c 100644
--- a/.github/workflows/ci-e2e-cassandra.yml
+++ b/.github/workflows/ci-e2e-cassandra.yml
@@ -1,14 +1,10 @@
 name: CIT Cassandra
 
 on:
-  push:
-    branches: [main]
-
-  pull_request:
-    branches: [main]
+  workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
+  group: cit-cassandra-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
   cancel-in-progress: true
 
 # See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
diff --git a/.github/workflows/ci-e2e-elasticsearch.yml b/.github/workflows/ci-e2e-elasticsearch.yml
index e10491e736e..548775f9e97 100644
--- a/.github/workflows/ci-e2e-elasticsearch.yml
+++ b/.github/workflows/ci-e2e-elasticsearch.yml
@@ -1,14 +1,10 @@
 name: CIT Elasticsearch
 
 on:
-  push:
-    branches: [main]
-
-  pull_request:
-    branches: [main]
+  workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
+  group: cit-elasticsearch-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
   cancel-in-progress: true
 
 # See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
diff --git a/.github/workflows/ci-e2e-grpc.yml b/.github/workflows/ci-e2e-grpc.yml
index bc2af82f7f1..3d2eb1806d3 100644
--- a/.github/workflows/ci-e2e-grpc.yml
+++ b/.github/workflows/ci-e2e-grpc.yml
@@ -1,14 +1,10 @@
 name: CIT gRPC
 
 on:
-  push:
-    branches: [main]
-
-  pull_request:
-    branches: [main]
+  workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
+  group: cit-grpc-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
   cancel-in-progress: true
 
 # See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
diff --git a/.github/workflows/ci-e2e-kafka.yml b/.github/workflows/ci-e2e-kafka.yml
index 162a077470e..d56d0046803 100644
--- a/.github/workflows/ci-e2e-kafka.yml
+++ b/.github/workflows/ci-e2e-kafka.yml
@@ -1,14 +1,10 @@
 name: CIT Kafka
 
 on:
-  push:
-    branches: [main]
-
-  pull_request:
-    branches: [main]
+  workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
+  group: cit-kafka-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
   cancel-in-progress: true
 
 # See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
@@ -22,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         jaeger-version: [v1, v2]  # Adjust if there are specific versions of Jaeger
-    name: Kafka Integration Tests ${{ matrix.jaeger-version }}
+    name: kafka ${{ matrix.jaeger-version }}
     steps:
     - name: Harden Runner
       uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
diff --git a/.github/workflows/ci-e2e-memory.yaml b/.github/workflows/ci-e2e-memory.yaml
index cdb17650e08..3408d459852 100644
--- a/.github/workflows/ci-e2e-memory.yaml
+++ b/.github/workflows/ci-e2e-memory.yaml
@@ -1,14 +1,10 @@
 name: CIT Memory
 
 on:
-  push:
-    branches: [main]
-
-  pull_request:
-    branches: [main]
+  workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
+  group: cit-memory-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
   cancel-in-progress: true
 
 # See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
diff --git a/.github/workflows/ci-e2e-opensearch.yml b/.github/workflows/ci-e2e-opensearch.yml
index 63fd77947f2..de98e61e095 100644
--- a/.github/workflows/ci-e2e-opensearch.yml
+++ b/.github/workflows/ci-e2e-opensearch.yml
@@ -1,14 +1,10 @@
 name: CIT OpenSearch
 
 on:
-  push:
-    branches: [main]
-
-  pull_request:
-    branches: [main]
+  workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
+  group: cit-opensearch-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
   cancel-in-progress: true
 
 # See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

From 723202bb62a768cdb37f660b5685d8b4d4ab6354 Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Sat, 7 Dec 2024 16:18:35 -0500
Subject: [PATCH 05/59] [fix] Fix call to `GetDependencies` in grpc handler
 (#6324)

## Description of the changes
- This PR fixes a bug in the query GRPC handler which currently passes
`startTime` to `GetDependencies` instead of `endTime`

## How was this change tested?
- Fixed unit test expectations

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/query/app/grpc_handler.go      | 2 +-
 cmd/query/app/grpc_handler_test.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/query/app/grpc_handler.go b/cmd/query/app/grpc_handler.go
index 64669ed3e4e..7cbeab083cb 100644
--- a/cmd/query/app/grpc_handler.go
+++ b/cmd/query/app/grpc_handler.go
@@ -223,7 +223,7 @@ func (g *GRPCHandler) GetDependencies(ctx context.Context, r *api_v2.GetDependen
 		return nil, status.Errorf(codes.InvalidArgument, "StartTime and EndTime must be initialized.")
 	}
 
-	dependencies, err := g.queryService.GetDependencies(ctx, startTime, endTime.Sub(startTime))
+	dependencies, err := g.queryService.GetDependencies(ctx, endTime, endTime.Sub(startTime))
 	if err != nil {
 		g.logger.Error("failed to fetch dependencies", zap.Error(err))
 		return nil, status.Errorf(codes.Internal, "failed to fetch dependencies: %v", err)
diff --git a/cmd/query/app/grpc_handler_test.go b/cmd/query/app/grpc_handler_test.go
index 55dcf2affa7..273f2a2f712 100644
--- a/cmd/query/app/grpc_handler_test.go
+++ b/cmd/query/app/grpc_handler_test.go
@@ -513,7 +513,7 @@ func TestGetDependenciesSuccessGRPC(t *testing.T) {
 		endTs := time.Now().UTC()
 		server.depReader.On("GetDependencies",
 			mock.Anything, // context.Context
-			endTs.Add(time.Duration(-1)*defaultDependencyLookbackDuration),
+			endTs,
 			defaultDependencyLookbackDuration,
 		).Return(expectedDependencies, nil).Times(1)
 
@@ -532,7 +532,7 @@ func TestGetDependenciesFailureGRPC(t *testing.T) {
 		server.depReader.On(
 			"GetDependencies",
 			mock.Anything, // context.Context
-			endTs.Add(time.Duration(-1)*defaultDependencyLookbackDuration),
+			endTs,
 			defaultDependencyLookbackDuration).Return(nil, errStorageGRPC).Times(1)
 
 		_, err := client.GetDependencies(context.Background(), &api_v2.GetDependenciesRequest{

From b264d2c357ecbeb94c999cf24df4ee11dbce2aec Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Sat, 7 Dec 2024 18:13:01 -0500
Subject: [PATCH 06/59] [v2][storage] Add dependency store to v2 storage
 interface  (#6297)

## Which problem is this PR solving?
- Towards #5079

## Description of the changes
- This PR creates a new factory in the `depstore` package for the
DependencyReader and exposes a `CreateDependencyReader` function in the
`factoryadapter`
- This PR also changes some interface return types to structs because
some structs implement multiple interfaces.
- The new factory was integrated into the query service and the
callsites were changed to use the v2 factory instead of the v1 factory
to initialize the dependency reader.

## How was this change tested?
- CI / Unit Tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
Signed-off-by: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
---
 .mockery.yaml                                 |  3 +
 cmd/all-in-one/main.go                        |  6 +-
 cmd/anonymizer/app/query/query_test.go        |  2 +-
 .../exporters/storageexporter/exporter.go     |  2 +-
 .../internal/extension/jaegerquery/server.go  | 20 +++---
 .../extension/jaegerquery/server_test.go      |  2 +-
 .../extension/jaegerstorage/extension.go      |  2 +-
 .../extension/jaegerstorage/extension_test.go |  4 +-
 cmd/query/app/apiv3/grpc_handler_test.go      |  2 +-
 cmd/query/app/apiv3/http_gateway_test.go      |  2 +-
 cmd/query/app/grpc_handler_test.go            | 19 ++++--
 cmd/query/app/handler_deps_test.go            | 14 ++--
 cmd/query/app/http_handler_test.go            |  2 +-
 cmd/query/app/querysvc/query_service.go       | 11 ++--
 cmd/query/app/querysvc/query_service_test.go  |  9 ++-
 cmd/query/app/server_test.go                  |  2 +-
 cmd/query/main.go                             |  2 +-
 storage_v2/depstore/factory.go                |  8 +++
 storage_v2/depstore/mocks/Factory.go          | 62 +++++++++++++++++
 storage_v2/depstore/mocks/Reader.go           | 66 +++++++++++++++++++
 storage_v2/depstore/package_test.go           | 14 ++++
 storage_v2/depstore/reader.go                 | 22 +++++++
 storage_v2/factory.go                         | 21 ------
 storage_v2/factoryadapter/factory.go          | 12 +++-
 storage_v2/factoryadapter/factory_test.go     | 22 +++++++
 storage_v2/factoryadapter/reader.go           | 20 ++++++
 storage_v2/factoryadapter/reader_test.go      | 21 ++++++
 storage_v2/tracestore/factory.go              |  6 --
 storage_v2/tracestore/mocks/Factory.go        | 38 -----------
 29 files changed, 307 insertions(+), 109 deletions(-)
 create mode 100644 storage_v2/depstore/factory.go
 create mode 100644 storage_v2/depstore/mocks/Factory.go
 create mode 100644 storage_v2/depstore/mocks/Reader.go
 create mode 100644 storage_v2/depstore/package_test.go
 create mode 100644 storage_v2/depstore/reader.go
 delete mode 100644 storage_v2/factory.go

diff --git a/.mockery.yaml b/.mockery.yaml
index a0f879a5a35..513908625a9 100644
--- a/.mockery.yaml
+++ b/.mockery.yaml
@@ -76,3 +76,6 @@ packages:
   github.com/jaegertracing/jaeger/storage_v2/tracestore:
     config:
       all: true
+  github.com/jaegertracing/jaeger/storage_v2/depstore:
+    config:
+      all: true
diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go
index c9382ac80a7..a34a95d0ea2 100644
--- a/cmd/all-in-one/main.go
+++ b/cmd/all-in-one/main.go
@@ -38,7 +38,7 @@ import (
 	ss "github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider"
 	"github.com/jaegertracing/jaeger/plugin/storage"
 	"github.com/jaegertracing/jaeger/ports"
-	"github.com/jaegertracing/jaeger/storage/dependencystore"
+	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
 )
@@ -115,7 +115,7 @@ by default uses only in-memory database.`,
 			if err != nil {
 				logger.Fatal("Failed to create span writer", zap.Error(err))
 			}
-			dependencyReader, err := storageFactory.CreateDependencyReader()
+			dependencyReader, err := v2Factory.CreateDependencyReader()
 			if err != nil {
 				logger.Fatal("Failed to create dependency reader", zap.Error(err))
 			}
@@ -219,7 +219,7 @@ func startQuery(
 	qOpts *queryApp.QueryOptions,
 	queryOpts *querysvc.QueryServiceOptions,
 	traceReader tracestore.Reader,
-	depReader dependencystore.Reader,
+	depReader depstore.Reader,
 	metricsQueryService querysvc.MetricsQueryService,
 	tm *tenancy.Manager,
 	telset telemetry.Settings,
diff --git a/cmd/anonymizer/app/query/query_test.go b/cmd/anonymizer/app/query/query_test.go
index 24352622e54..768dbc3c1fb 100644
--- a/cmd/anonymizer/app/query/query_test.go
+++ b/cmd/anonymizer/app/query/query_test.go
@@ -18,9 +18,9 @@ import (
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
-	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
+	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 )
 
diff --git a/cmd/jaeger/internal/exporters/storageexporter/exporter.go b/cmd/jaeger/internal/exporters/storageexporter/exporter.go
index 3fbeab79b43..4b2dee9e0fc 100644
--- a/cmd/jaeger/internal/exporters/storageexporter/exporter.go
+++ b/cmd/jaeger/internal/exporters/storageexporter/exporter.go
@@ -34,7 +34,7 @@ func newExporter(config *Config, otel component.TelemetrySettings) *storageExpor
 }
 
 func (exp *storageExporter) start(_ context.Context, host component.Host) error {
-	f, err := jaegerstorage.GetStorageFactoryV2(exp.config.TraceStorage, host)
+	f, err := jaegerstorage.GetTraceStoreFactory(exp.config.TraceStorage, host)
 	if err != nil {
 		return fmt.Errorf("cannot find storage factory: %w", err)
 	}
diff --git a/cmd/jaeger/internal/extension/jaegerquery/server.go b/cmd/jaeger/internal/extension/jaegerquery/server.go
index 29f836e9c89..5f578c3f2de 100644
--- a/cmd/jaeger/internal/extension/jaegerquery/server.go
+++ b/cmd/jaeger/internal/extension/jaegerquery/server.go
@@ -21,6 +21,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/storage/metricstore"
+	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 )
 
 var (
@@ -71,23 +72,20 @@ func (s *server) Start(ctx context.Context, host component.Host) error {
 	telset.Metrics = telset.Metrics.
 		Namespace(metrics.NSOptions{Name: "jaeger"}).
 		Namespace(metrics.NSOptions{Name: "query"})
-
-	// TODO currently v1 is still needed because of dependency storage
-	v1Factory, err := jaegerstorage.GetStorageFactory(s.config.Storage.TracesPrimary, host)
+	tf, err := jaegerstorage.GetTraceStoreFactory(s.config.Storage.TracesPrimary, host)
 	if err != nil {
-		return fmt.Errorf("cannot find v1 factory for primary storage %s: %w", s.config.Storage.TracesPrimary, err)
+		return fmt.Errorf("cannot find factory for trace storage %s: %w", s.config.Storage.TracesPrimary, err)
 	}
-	f, err := jaegerstorage.GetStorageFactoryV2(s.config.Storage.TracesPrimary, host)
-	if err != nil {
-		return fmt.Errorf("cannot find v2 factory for primary storage %s: %w", s.config.Storage.TracesPrimary, err)
-	}
-
-	traceReader, err := f.CreateTraceReader()
+	traceReader, err := tf.CreateTraceReader()
 	if err != nil {
 		return fmt.Errorf("cannot create trace reader: %w", err)
 	}
 
-	depReader, err := v1Factory.CreateDependencyReader()
+	df, ok := tf.(depstore.Factory)
+	if !ok {
+		return fmt.Errorf("cannot find factory for dependency storage %s: %w", s.config.Storage.TracesPrimary, err)
+	}
+	depReader, err := df.CreateDependencyReader()
 	if err != nil {
 		return fmt.Errorf("cannot create dependencies reader: %w", err)
 	}
diff --git a/cmd/jaeger/internal/extension/jaegerquery/server_test.go b/cmd/jaeger/internal/extension/jaegerquery/server_test.go
index 70e60d78768..696b691c938 100644
--- a/cmd/jaeger/internal/extension/jaegerquery/server_test.go
+++ b/cmd/jaeger/internal/extension/jaegerquery/server_test.go
@@ -150,7 +150,7 @@ func TestServerStart(t *testing.T) {
 					TracesPrimary: "need-factory-error",
 				},
 			},
-			expectedErr: "cannot find v1 factory for primary storage",
+			expectedErr: "cannot find factory for trace storage",
 		},
 		{
 			name: "span reader error",
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension.go b/cmd/jaeger/internal/extension/jaegerstorage/extension.go
index 7ac99e15a29..c1dd68b01b7 100644
--- a/cmd/jaeger/internal/extension/jaegerstorage/extension.go
+++ b/cmd/jaeger/internal/extension/jaegerstorage/extension.go
@@ -74,7 +74,7 @@ func GetMetricStorageFactory(name string, host component.Host) (storage.MetricSt
 	return mf, nil
 }
 
-func GetStorageFactoryV2(name string, host component.Host) (tracestore.Factory, error) {
+func GetTraceStoreFactory(name string, host component.Host) (tracestore.Factory, error) {
 	f, err := GetStorageFactory(name, host)
 	if err != nil {
 		return nil, err
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go b/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go
index 6213c912765..8623703ad83 100644
--- a/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go
+++ b/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go
@@ -100,7 +100,7 @@ func TestStorageFactoryBadShutdownError(t *testing.T) {
 
 func TestGetFactoryV2Error(t *testing.T) {
 	host := componenttest.NewNopHost()
-	_, err := GetStorageFactoryV2("something", host)
+	_, err := GetTraceStoreFactory("something", host)
 	require.ErrorContains(t, err, "cannot find extension")
 }
 
@@ -112,7 +112,7 @@ func TestGetFactory(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, f)
 
-	f2, err := GetStorageFactoryV2(name, host)
+	f2, err := GetTraceStoreFactory(name, host)
 	require.NoError(t, err)
 	require.NotNil(t, f2)
 
diff --git a/cmd/query/app/apiv3/grpc_handler_test.go b/cmd/query/app/apiv3/grpc_handler_test.go
index b14f1c01abf..6534df23fe6 100644
--- a/cmd/query/app/apiv3/grpc_handler_test.go
+++ b/cmd/query/app/apiv3/grpc_handler_test.go
@@ -20,9 +20,9 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
 	"github.com/jaegertracing/jaeger/model"
 	_ "github.com/jaegertracing/jaeger/pkg/gogocodec" // force gogo codec registration
-	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
+	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 )
 
diff --git a/cmd/query/app/apiv3/http_gateway_test.go b/cmd/query/app/apiv3/http_gateway_test.go
index 5f742a0522f..f0abbeb3307 100644
--- a/cmd/query/app/apiv3/http_gateway_test.go
+++ b/cmd/query/app/apiv3/http_gateway_test.go
@@ -22,9 +22,9 @@ import (
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
-	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
+	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 )
 
diff --git a/cmd/query/app/grpc_handler_test.go b/cmd/query/app/grpc_handler_test.go
index 273f2a2f712..a5c59638031 100644
--- a/cmd/query/app/grpc_handler_test.go
+++ b/cmd/query/app/grpc_handler_test.go
@@ -28,11 +28,12 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
 	"github.com/jaegertracing/jaeger/storage/metricstore"
 	metricsmocks "github.com/jaegertracing/jaeger/storage/metricstore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
+	"github.com/jaegertracing/jaeger/storage_v2/depstore"
+	depsmocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 )
 
@@ -513,8 +514,10 @@ func TestGetDependenciesSuccessGRPC(t *testing.T) {
 		endTs := time.Now().UTC()
 		server.depReader.On("GetDependencies",
 			mock.Anything, // context.Context
-			endTs,
-			defaultDependencyLookbackDuration,
+			depstore.QueryParameters{
+				StartTime: endTs.Add(-defaultDependencyLookbackDuration),
+				EndTime:   endTs,
+			},
 		).Return(expectedDependencies, nil).Times(1)
 
 		res, err := client.GetDependencies(context.Background(), &api_v2.GetDependenciesRequest{
@@ -529,11 +532,13 @@ func TestGetDependenciesSuccessGRPC(t *testing.T) {
 func TestGetDependenciesFailureGRPC(t *testing.T) {
 	withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
 		endTs := time.Now().UTC()
-		server.depReader.On(
-			"GetDependencies",
+		server.depReader.On("GetDependencies",
 			mock.Anything, // context.Context
-			endTs,
-			defaultDependencyLookbackDuration).Return(nil, errStorageGRPC).Times(1)
+			depstore.QueryParameters{
+				StartTime: endTs.Add(-defaultDependencyLookbackDuration),
+				EndTime:   endTs,
+			},
+		).Return(nil, errStorageGRPC).Times(1)
 
 		_, err := client.GetDependencies(context.Background(), &api_v2.GetDependenciesRequest{
 			StartTime: endTs.Add(time.Duration(-1) * defaultDependencyLookbackDuration),
diff --git a/cmd/query/app/handler_deps_test.go b/cmd/query/app/handler_deps_test.go
index ff71efe62cf..e24799c00ce 100644
--- a/cmd/query/app/handler_deps_test.go
+++ b/cmd/query/app/handler_deps_test.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/jaegertracing/jaeger/model"
 	ui "github.com/jaegertracing/jaeger/model/json"
+	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 )
 
 func TestDeduplicateDependencies(t *testing.T) {
@@ -304,8 +305,10 @@ func TestGetDependenciesSuccess(t *testing.T) {
 	endTs := time.Unix(0, 1476374248550*millisToNanosMultiplier)
 	ts.dependencyReader.On("GetDependencies",
 		mock.Anything, // context
-		endTs,
-		defaultDependencyLookbackDuration,
+		depstore.QueryParameters{
+			StartTime: endTs.Add(-defaultDependencyLookbackDuration),
+			EndTime:   endTs,
+		},
 	).Return(expectedDependencies, nil).Times(1)
 
 	var response structuredResponse
@@ -324,8 +327,11 @@ func TestGetDependenciesCassandraFailure(t *testing.T) {
 	endTs := time.Unix(0, 1476374248550*millisToNanosMultiplier)
 	ts.dependencyReader.On("GetDependencies",
 		mock.Anything, // context
-		endTs,
-		defaultDependencyLookbackDuration).Return(nil, errStorage).Times(1)
+		depstore.QueryParameters{
+			StartTime: endTs.Add(-defaultDependencyLookbackDuration),
+			EndTime:   endTs,
+		},
+	).Return(nil, errStorage).Times(1)
 
 	var response structuredResponse
 	err := getJSON(ts.server.URL+"/api/dependencies?endTs=1476374248550&service=testing", &response)
diff --git a/cmd/query/app/http_handler_test.go b/cmd/query/app/http_handler_test.go
index dfa54f6701a..511495193c3 100644
--- a/cmd/query/app/http_handler_test.go
+++ b/cmd/query/app/http_handler_test.go
@@ -38,10 +38,10 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
 	metricsmocks "github.com/jaegertracing/jaeger/storage/metricstore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
+	depsmocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 )
 
diff --git a/cmd/query/app/querysvc/query_service.go b/cmd/query/app/querysvc/query_service.go
index f627c3c8344..1a34cd1e408 100644
--- a/cmd/query/app/querysvc/query_service.go
+++ b/cmd/query/app/querysvc/query_service.go
@@ -13,8 +13,8 @@ import (
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/model/adjuster"
 	"github.com/jaegertracing/jaeger/storage"
-	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
+	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
 )
@@ -43,12 +43,12 @@ type StorageCapabilities struct {
 // QueryService contains span utils required by the query-service.
 type QueryService struct {
 	traceReader      tracestore.Reader
-	dependencyReader dependencystore.Reader
+	dependencyReader depstore.Reader
 	options          QueryServiceOptions
 }
 
 // NewQueryService returns a new QueryService.
-func NewQueryService(traceReader tracestore.Reader, dependencyReader dependencystore.Reader, options QueryServiceOptions) *QueryService {
+func NewQueryService(traceReader tracestore.Reader, dependencyReader depstore.Reader, options QueryServiceOptions) *QueryService {
 	qsvc := &QueryService{
 		traceReader:      traceReader,
 		dependencyReader: dependencyReader,
@@ -134,7 +134,10 @@ func (qs QueryService) Adjust(trace *model.Trace) (*model.Trace, error) {
 
 // GetDependencies implements dependencystore.Reader.GetDependencies
 func (qs QueryService) GetDependencies(ctx context.Context, endTs time.Time, lookback time.Duration) ([]model.DependencyLink, error) {
-	return qs.dependencyReader.GetDependencies(ctx, endTs, lookback)
+	return qs.dependencyReader.GetDependencies(ctx, depstore.QueryParameters{
+		StartTime: endTs.Add(-lookback),
+		EndTime:   endTs,
+	})
 }
 
 // GetCapabilities returns the features supported by the query service.
diff --git a/cmd/query/app/querysvc/query_service_test.go b/cmd/query/app/querysvc/query_service_test.go
index 3a9f906d2b5..9cfd8ec6212 100644
--- a/cmd/query/app/querysvc/query_service_test.go
+++ b/cmd/query/app/querysvc/query_service_test.go
@@ -22,9 +22,10 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/storage"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
-	depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
+	"github.com/jaegertracing/jaeger/storage_v2/depstore"
+	depsmocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
 )
@@ -345,8 +346,10 @@ func TestGetDependencies(t *testing.T) {
 	tqs.depsReader.On(
 		"GetDependencies",
 		mock.Anything, // context.Context
-		endTs,
-		defaultDependencyLookbackDuration).Return(expectedDependencies, nil).Times(1)
+		depstore.QueryParameters{
+			StartTime: endTs.Add(-defaultDependencyLookbackDuration),
+			EndTime:   endTs,
+		}).Return(expectedDependencies, nil).Times(1)
 
 	actualDependencies, err := tqs.queryService.GetDependencies(context.Background(), time.Unix(0, 1476374248550*millisToNanosMultiplier), defaultDependencyLookbackDuration)
 	require.NoError(t, err)
diff --git a/cmd/query/app/server_test.go b/cmd/query/app/server_test.go
index 51db8aeb239..fc2c0d298f0 100644
--- a/cmd/query/app/server_test.go
+++ b/cmd/query/app/server_test.go
@@ -39,8 +39,8 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/ports"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
-	depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
+	depsmocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 )
 
diff --git a/cmd/query/main.go b/cmd/query/main.go
index 4868cb28428..1b8b353a7ae 100644
--- a/cmd/query/main.go
+++ b/cmd/query/main.go
@@ -97,7 +97,7 @@ func main() {
 			if err != nil {
 				logger.Fatal("Failed to create trace reader", zap.Error(err))
 			}
-			dependencyReader, err := storageFactory.CreateDependencyReader()
+			dependencyReader, err := v2Factory.CreateDependencyReader()
 			if err != nil {
 				logger.Fatal("Failed to create dependency reader", zap.Error(err))
 			}
diff --git a/storage_v2/depstore/factory.go b/storage_v2/depstore/factory.go
new file mode 100644
index 00000000000..b6818a0adfb
--- /dev/null
+++ b/storage_v2/depstore/factory.go
@@ -0,0 +1,8 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package depstore
+
+type Factory interface {
+	CreateDependencyReader() (Reader, error)
+}
diff --git a/storage_v2/depstore/mocks/Factory.go b/storage_v2/depstore/mocks/Factory.go
new file mode 100644
index 00000000000..7fed1659c69
--- /dev/null
+++ b/storage_v2/depstore/mocks/Factory.go
@@ -0,0 +1,62 @@
+// Copyright (c) The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+//
+// Run 'make generate-mocks' to regenerate.
+
+// Code generated by mockery. DO NOT EDIT.
+
+package mocks
+
+import (
+	depstore "github.com/jaegertracing/jaeger/storage_v2/depstore"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// Factory is an autogenerated mock type for the Factory type
+type Factory struct {
+	mock.Mock
+}
+
+// CreateDependencyReader provides a mock function with no fields
+func (_m *Factory) CreateDependencyReader() (depstore.Reader, error) {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for CreateDependencyReader")
+	}
+
+	var r0 depstore.Reader
+	var r1 error
+	if rf, ok := ret.Get(0).(func() (depstore.Reader, error)); ok {
+		return rf()
+	}
+	if rf, ok := ret.Get(0).(func() depstore.Reader); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(depstore.Reader)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func() error); ok {
+		r1 = rf()
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewFactory creates a new instance of Factory. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewFactory(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *Factory {
+	mock := &Factory{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/storage_v2/depstore/mocks/Reader.go b/storage_v2/depstore/mocks/Reader.go
new file mode 100644
index 00000000000..b997a3d3036
--- /dev/null
+++ b/storage_v2/depstore/mocks/Reader.go
@@ -0,0 +1,66 @@
+// Copyright (c) The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+//
+// Run 'make generate-mocks' to regenerate.
+
+// Code generated by mockery. DO NOT EDIT.
+
+package mocks
+
+import (
+	context "context"
+
+	depstore "github.com/jaegertracing/jaeger/storage_v2/depstore"
+	mock "github.com/stretchr/testify/mock"
+
+	model "github.com/jaegertracing/jaeger/model"
+)
+
+// Reader is an autogenerated mock type for the Reader type
+type Reader struct {
+	mock.Mock
+}
+
+// GetDependencies provides a mock function with given fields: ctx, query
+func (_m *Reader) GetDependencies(ctx context.Context, query depstore.QueryParameters) ([]model.DependencyLink, error) {
+	ret := _m.Called(ctx, query)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetDependencies")
+	}
+
+	var r0 []model.DependencyLink
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, depstore.QueryParameters) ([]model.DependencyLink, error)); ok {
+		return rf(ctx, query)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, depstore.QueryParameters) []model.DependencyLink); ok {
+		r0 = rf(ctx, query)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]model.DependencyLink)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, depstore.QueryParameters) error); ok {
+		r1 = rf(ctx, query)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewReader creates a new instance of Reader. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewReader(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *Reader {
+	mock := &Reader{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/storage_v2/depstore/package_test.go b/storage_v2/depstore/package_test.go
new file mode 100644
index 00000000000..bb0d70c2b01
--- /dev/null
+++ b/storage_v2/depstore/package_test.go
@@ -0,0 +1,14 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package depstore
+
+import (
+	"testing"
+
+	"github.com/jaegertracing/jaeger/pkg/testutils"
+)
+
+func TestMain(m *testing.M) {
+	testutils.VerifyGoLeaks(m)
+}
diff --git a/storage_v2/depstore/reader.go b/storage_v2/depstore/reader.go
new file mode 100644
index 00000000000..436dfb62187
--- /dev/null
+++ b/storage_v2/depstore/reader.go
@@ -0,0 +1,22 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package depstore
+
+import (
+	"context"
+	"time"
+
+	"github.com/jaegertracing/jaeger/model"
+)
+
+// QueryParameters contains the parameters that can be used to query dependencies.
+type QueryParameters struct {
+	StartTime time.Time
+	EndTime   time.Time
+}
+
+// Reader can load service dependencies from storage.
+type Reader interface {
+	GetDependencies(ctx context.Context, query QueryParameters) ([]model.DependencyLink, error)
+}
diff --git a/storage_v2/factory.go b/storage_v2/factory.go
deleted file mode 100644
index e7515549e05..00000000000
--- a/storage_v2/factory.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2024 The Jaeger Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package storage_v2
-
-import (
-	"context"
-)
-
-// Factory is a general factory interface to be reused across different storage factories.
-// It lives within the OTEL collector extension component's lifecycle.
-// The Initialize and Close functions supposed to be called from the
-// OTEL component's Start and Shutdown functions.
-type FactoryBase interface {
-	// Initialize performs internal initialization of the factory,
-	// such as opening connections to the backend store.
-	Initialize(ctx context.Context) error
-
-	// Close closes the resources held by the factory
-	Close(ctx context.Context) error
-}
diff --git a/storage_v2/factoryadapter/factory.go b/storage_v2/factoryadapter/factory.go
index 56356a70262..1eaaea146ed 100644
--- a/storage_v2/factoryadapter/factory.go
+++ b/storage_v2/factoryadapter/factory.go
@@ -8,6 +8,7 @@ import (
 	"io"
 
 	storage_v1 "github.com/jaegertracing/jaeger/storage"
+	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
 )
 
@@ -15,7 +16,7 @@ type Factory struct {
 	ss storage_v1.Factory
 }
 
-func NewFactory(ss storage_v1.Factory) tracestore.Factory {
+func NewFactory(ss storage_v1.Factory) *Factory {
 	return &Factory{
 		ss: ss,
 	}
@@ -51,3 +52,12 @@ func (f *Factory) CreateTraceWriter() (tracestore.Writer, error) {
 	}
 	return NewTraceWriter(spanWriter), nil
 }
+
+// CreateDependencyReader implements depstore.Factory.
+func (f *Factory) CreateDependencyReader() (depstore.Reader, error) {
+	dr, err := f.ss.CreateDependencyReader()
+	if err != nil {
+		return nil, err
+	}
+	return NewDependencyReader(dr), nil
+}
diff --git a/storage_v2/factoryadapter/factory_test.go b/storage_v2/factoryadapter/factory_test.go
index a8e2819ce0f..d8794adf327 100644
--- a/storage_v2/factoryadapter/factory_test.go
+++ b/storage_v2/factoryadapter/factory_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
+	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
 	factoryMocks "github.com/jaegertracing/jaeger/storage/mocks"
 	spanstoreMocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 )
@@ -71,3 +72,24 @@ func TestAdapterCreateTraceWriter(t *testing.T) {
 	_, err := f.CreateTraceWriter()
 	require.NoError(t, err)
 }
+
+func TestAdapterCreateDependencyReader(t *testing.T) {
+	f1 := new(factoryMocks.Factory)
+	f1.On("CreateDependencyReader").Return(new(dependencyStoreMocks.Reader), nil)
+
+	f := NewFactory(f1)
+	r, err := f.CreateDependencyReader()
+	require.NoError(t, err)
+	require.NotNil(t, r)
+}
+
+func TestAdapterCreateDependencyReaderError(t *testing.T) {
+	f1 := new(factoryMocks.Factory)
+	testErr := errors.New("test error")
+	f1.On("CreateDependencyReader").Return(nil, testErr)
+
+	f := NewFactory(f1)
+	r, err := f.CreateDependencyReader()
+	require.ErrorIs(t, err, testErr)
+	require.Nil(t, r)
+}
diff --git a/storage_v2/factoryadapter/reader.go b/storage_v2/factoryadapter/reader.go
index 2bc5e0b5936..021870f03a6 100644
--- a/storage_v2/factoryadapter/reader.go
+++ b/storage_v2/factoryadapter/reader.go
@@ -10,7 +10,10 @@ import (
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
+	"github.com/jaegertracing/jaeger/model"
+	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
+	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
 )
 
@@ -52,3 +55,20 @@ func (*TraceReader) FindTraces(_ context.Context, _ tracestore.TraceQueryParamet
 func (*TraceReader) FindTraceIDs(_ context.Context, _ tracestore.TraceQueryParameters) ([]pcommon.TraceID, error) {
 	panic("not implemented")
 }
+
+type DependencyReader struct {
+	reader dependencystore.Reader
+}
+
+func NewDependencyReader(reader dependencystore.Reader) *DependencyReader {
+	return &DependencyReader{
+		reader: reader,
+	}
+}
+
+func (dr *DependencyReader) GetDependencies(
+	ctx context.Context,
+	query depstore.QueryParameters,
+) ([]model.DependencyLink, error) {
+	return dr.reader.GetDependencies(ctx, query.EndTime, query.EndTime.Sub(query.StartTime))
+}
diff --git a/storage_v2/factoryadapter/reader_test.go b/storage_v2/factoryadapter/reader_test.go
index 85c245f7a70..7148edf40d7 100644
--- a/storage_v2/factoryadapter/reader_test.go
+++ b/storage_v2/factoryadapter/reader_test.go
@@ -6,12 +6,17 @@ package factoryadapter
 import (
 	"context"
 	"testing"
+	"time"
 
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
+	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
+	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
+	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
 )
 
@@ -101,3 +106,19 @@ func TestTraceReader_FindTraceIDsPanics(t *testing.T) {
 		func() { traceReader.FindTraceIDs(context.Background(), tracestore.TraceQueryParameters{}) },
 	)
 }
+
+func TestDependencyReader_GetDependencies(t *testing.T) {
+	end := time.Now()
+	start := end.Add(-1 * time.Minute)
+	query := depstore.QueryParameters{
+		StartTime: start,
+		EndTime:   end,
+	}
+	expectedDeps := []model.DependencyLink{{Parent: "parent", Child: "child", CallCount: 12}}
+	mr := new(dependencyStoreMocks.Reader)
+	mr.On("GetDependencies", mock.Anything, end, time.Minute).Return(expectedDeps, nil)
+	dr := NewDependencyReader(mr)
+	deps, err := dr.GetDependencies(context.Background(), query)
+	require.NoError(t, err)
+	require.Equal(t, expectedDeps, deps)
+}
diff --git a/storage_v2/tracestore/factory.go b/storage_v2/tracestore/factory.go
index 0f670946562..bf081f0fb45 100644
--- a/storage_v2/tracestore/factory.go
+++ b/storage_v2/tracestore/factory.go
@@ -3,15 +3,9 @@
 
 package tracestore
 
-import (
-	"github.com/jaegertracing/jaeger/storage_v2"
-)
-
 // Factory defines an interface for a factory that can create implementations of
 // different span storage components.
 type Factory interface {
-	storage_v2.FactoryBase
-
 	// CreateTraceReader creates a spanstore.Reader.
 	CreateTraceReader() (Reader, error)
 
diff --git a/storage_v2/tracestore/mocks/Factory.go b/storage_v2/tracestore/mocks/Factory.go
index 922d57ae2c4..095cac10d0f 100644
--- a/storage_v2/tracestore/mocks/Factory.go
+++ b/storage_v2/tracestore/mocks/Factory.go
@@ -8,8 +8,6 @@
 package mocks
 
 import (
-	context "context"
-
 	tracestore "github.com/jaegertracing/jaeger/storage_v2/tracestore"
 	mock "github.com/stretchr/testify/mock"
 )
@@ -19,24 +17,6 @@ type Factory struct {
 	mock.Mock
 }
 
-// Close provides a mock function with given fields: ctx
-func (_m *Factory) Close(ctx context.Context) error {
-	ret := _m.Called(ctx)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Close")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
-		r0 = rf(ctx)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
 // CreateTraceReader provides a mock function with no fields
 func (_m *Factory) CreateTraceReader() (tracestore.Reader, error) {
 	ret := _m.Called()
@@ -97,24 +77,6 @@ func (_m *Factory) CreateTraceWriter() (tracestore.Writer, error) {
 	return r0, r1
 }
 
-// Initialize provides a mock function with given fields: ctx
-func (_m *Factory) Initialize(ctx context.Context) error {
-	ret := _m.Called(ctx)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Initialize")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
-		r0 = rf(ctx)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
 // NewFactory creates a new instance of Factory. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
 func NewFactory(t interface {

From f0769e674cb80f6020edac4c496ac65e393101d4 Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Sat, 7 Dec 2024 21:07:45 -0500
Subject: [PATCH 07/59] [v2][storage] Implement `GetServices` and
 `GetOperations` in v2 factory adapter (#6325)

## Which problem is this PR solving?
- Towards #5079

## Description of the changes
- This PR implements `GetServices` and `GetOperations` in the v2
`factoryadapter`

## How was this change tested?
- Added unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 storage_v2/factoryadapter/reader.go      | 19 ++++--
 storage_v2/factoryadapter/reader_test.go | 87 ++++++++++++++++++++----
 2 files changed, 90 insertions(+), 16 deletions(-)

diff --git a/storage_v2/factoryadapter/reader.go b/storage_v2/factoryadapter/reader.go
index 021870f03a6..4831b92538d 100644
--- a/storage_v2/factoryadapter/reader.go
+++ b/storage_v2/factoryadapter/reader.go
@@ -40,12 +40,23 @@ func (*TraceReader) GetTrace(_ context.Context, _ pcommon.TraceID) (ptrace.Trace
 	panic("not implemented")
 }
 
-func (*TraceReader) GetServices(_ context.Context) ([]string, error) {
-	panic("not implemented")
+func (tr *TraceReader) GetServices(ctx context.Context) ([]string, error) {
+	return tr.spanReader.GetServices(ctx)
 }
 
-func (*TraceReader) GetOperations(_ context.Context, _ tracestore.OperationQueryParameters) ([]tracestore.Operation, error) {
-	panic("not implemented")
+func (tr *TraceReader) GetOperations(ctx context.Context, query tracestore.OperationQueryParameters) ([]tracestore.Operation, error) {
+	o, err := tr.spanReader.GetOperations(ctx, spanstore.OperationQueryParameters{
+		ServiceName: query.ServiceName,
+		SpanKind:    query.SpanKind,
+	})
+	var operations []tracestore.Operation
+	for _, operation := range o {
+		operations = append(operations, tracestore.Operation{
+			Name:     operation.Name,
+			SpanKind: operation.SpanKind,
+		})
+	}
+	return operations, err
 }
 
 func (*TraceReader) FindTraces(_ context.Context, _ tracestore.TraceQueryParameters) ([]ptrace.Traces, error) {
diff --git a/storage_v2/factoryadapter/reader_test.go b/storage_v2/factoryadapter/reader_test.go
index 7148edf40d7..20df60fa768 100644
--- a/storage_v2/factoryadapter/reader_test.go
+++ b/storage_v2/factoryadapter/reader_test.go
@@ -5,6 +5,7 @@ package factoryadapter
 
 import (
 	"context"
+	"errors"
 	"testing"
 	"time"
 
@@ -16,6 +17,8 @@ import (
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
+	"github.com/jaegertracing/jaeger/storage/spanstore"
+	spanStoreMocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
 )
@@ -66,23 +69,83 @@ func TestTraceReader_GetTracePanics(t *testing.T) {
 	require.Panics(t, func() { traceReader.GetTrace(context.Background(), pcommon.NewTraceIDEmpty()) })
 }
 
-func TestTraceReader_GetServicesPanics(t *testing.T) {
-	memstore := memory.NewStore()
+func TestTraceReader_GetServicesDelegatesToSpanReader(t *testing.T) {
+	sr := new(spanStoreMocks.Reader)
+	expectedServices := []string{"service-a", "service-b"}
+	sr.On("GetServices", mock.Anything).Return(expectedServices, nil)
 	traceReader := &TraceReader{
-		spanReader: memstore,
+		spanReader: sr,
 	}
-	require.Panics(t, func() { traceReader.GetServices(context.Background()) })
+	services, err := traceReader.GetServices(context.Background())
+	require.NoError(t, err)
+	require.Equal(t, expectedServices, services)
 }
 
-func TestTraceReader_GetOperationsPanics(t *testing.T) {
-	memstore := memory.NewStore()
-	traceReader := &TraceReader{
-		spanReader: memstore,
+func TestTraceReader_GetOperationsDelegatesResponse(t *testing.T) {
+	tests := []struct {
+		name               string
+		operations         []spanstore.Operation
+		expectedOperations []tracestore.Operation
+		err                error
+	}{
+		{
+			name: "successful response",
+			operations: []spanstore.Operation{
+				{
+					Name:     "operation-a",
+					SpanKind: "server",
+				},
+				{
+					Name:     "operation-b",
+					SpanKind: "server",
+				},
+			},
+			expectedOperations: []tracestore.Operation{
+				{
+					Name:     "operation-a",
+					SpanKind: "server",
+				},
+				{
+					Name:     "operation-b",
+					SpanKind: "server",
+				},
+			},
+		},
+		{
+			name:               "nil response",
+			operations:         nil,
+			expectedOperations: nil,
+		},
+		{
+			name:               "error response",
+			operations:         nil,
+			expectedOperations: nil,
+			err:                errors.New("test error"),
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			sr := new(spanStoreMocks.Reader)
+			sr.On("GetOperations",
+				mock.Anything,
+				spanstore.OperationQueryParameters{
+					ServiceName: "service-a",
+					SpanKind:    "server",
+				}).Return(test.operations, test.err)
+			traceReader := &TraceReader{
+				spanReader: sr,
+			}
+			operations, err := traceReader.GetOperations(
+				context.Background(),
+				tracestore.OperationQueryParameters{
+					ServiceName: "service-a",
+					SpanKind:    "server",
+				})
+			require.ErrorIs(t, err, test.err)
+			require.Equal(t, test.expectedOperations, operations)
+		})
 	}
-	require.Panics(
-		t,
-		func() { traceReader.GetOperations(context.Background(), tracestore.OperationQueryParameters{}) },
-	)
 }
 
 func TestTraceReader_FindTracesPanics(t *testing.T) {

From 1788f0320e6def0691f3f07c7d5cff6cd374fa83 Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Sun, 8 Dec 2024 09:14:48 -0500
Subject: [PATCH 08/59] [storage][v2] Implement `FindTraceIDs` in v2 factory
 adapter (#6326)

## Which problem is this PR solving?
- Towards #5079

## Description of the changes
- This PR implements `FindTraceIDs` in the v2 factory adapter

## How was this change tested?
- Added unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 model/ids.go                             | 11 ++++
 model/ids_test.go                        | 11 ++++
 storage_v2/factoryadapter/reader.go      | 28 +++++++--
 storage_v2/factoryadapter/reader_test.go | 80 +++++++++++++++++++++---
 4 files changed, 118 insertions(+), 12 deletions(-)

diff --git a/model/ids.go b/model/ids.go
index 27c7d3846b0..f911a7beb0e 100644
--- a/model/ids.go
+++ b/model/ids.go
@@ -12,6 +12,7 @@ import (
 	"strconv"
 
 	"github.com/gogo/protobuf/jsonpb"
+	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
 const (
@@ -145,6 +146,16 @@ func (t *TraceID) UnmarshalJSON(data []byte) error {
 	return t.Unmarshal(b)
 }
 
+// ToOTELTraceID converts the TraceID to OTEL's representation of a trace identitfier.
+// This was taken from
+// https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/internal/coreinternal/idutils/big_endian_converter.go.
+func (t *TraceID) ToOTELTraceID() pcommon.TraceID {
+	traceID := [16]byte{}
+	binary.BigEndian.PutUint64(traceID[:8], t.High)
+	binary.BigEndian.PutUint64(traceID[8:], t.Low)
+	return traceID
+}
+
 // ------- SpanID -------
 
 // NewSpanID creates a new SpanID from a 64bit unsigned int.
diff --git a/model/ids_test.go b/model/ids_test.go
index ba490236bb6..6bab7614b96 100644
--- a/model/ids_test.go
+++ b/model/ids_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/pdata/pcommon"
 
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/model/prototest"
@@ -117,3 +118,13 @@ func TestTraceIDFromBytes(t *testing.T) {
 		assert.Equal(t, test.expected, traceID)
 	}
 }
+
+func TestToOTELTraceID(t *testing.T) {
+	modelTraceID := model.TraceID{
+		Low:  3,
+		High: 2,
+	}
+	otelTraceID := modelTraceID.ToOTELTraceID()
+	expected := []byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}
+	require.Equal(t, pcommon.TraceID(expected), otelTraceID)
+}
diff --git a/storage_v2/factoryadapter/reader.go b/storage_v2/factoryadapter/reader.go
index 4831b92538d..7345e84fe60 100644
--- a/storage_v2/factoryadapter/reader.go
+++ b/storage_v2/factoryadapter/reader.go
@@ -49,22 +49,42 @@ func (tr *TraceReader) GetOperations(ctx context.Context, query tracestore.Opera
 		ServiceName: query.ServiceName,
 		SpanKind:    query.SpanKind,
 	})
-	var operations []tracestore.Operation
+	if err != nil || o == nil {
+		return nil, err
+	}
+	operations := []tracestore.Operation{}
 	for _, operation := range o {
 		operations = append(operations, tracestore.Operation{
 			Name:     operation.Name,
 			SpanKind: operation.SpanKind,
 		})
 	}
-	return operations, err
+	return operations, nil
 }
 
 func (*TraceReader) FindTraces(_ context.Context, _ tracestore.TraceQueryParameters) ([]ptrace.Traces, error) {
 	panic("not implemented")
 }
 
-func (*TraceReader) FindTraceIDs(_ context.Context, _ tracestore.TraceQueryParameters) ([]pcommon.TraceID, error) {
-	panic("not implemented")
+func (tr *TraceReader) FindTraceIDs(ctx context.Context, query tracestore.TraceQueryParameters) ([]pcommon.TraceID, error) {
+	t, err := tr.spanReader.FindTraceIDs(ctx, &spanstore.TraceQueryParameters{
+		ServiceName:   query.ServiceName,
+		OperationName: query.OperationName,
+		Tags:          query.Tags,
+		StartTimeMin:  query.StartTimeMin,
+		StartTimeMax:  query.StartTimeMax,
+		DurationMin:   query.DurationMin,
+		DurationMax:   query.DurationMax,
+		NumTraces:     query.NumTraces,
+	})
+	if err != nil || t == nil {
+		return nil, err
+	}
+	traceIDs := []pcommon.TraceID{}
+	for _, traceID := range t {
+		traceIDs = append(traceIDs, traceID.ToOTELTraceID())
+	}
+	return traceIDs, nil
 }
 
 type DependencyReader struct {
diff --git a/storage_v2/factoryadapter/reader_test.go b/storage_v2/factoryadapter/reader_test.go
index 20df60fa768..9d1891a547b 100644
--- a/storage_v2/factoryadapter/reader_test.go
+++ b/storage_v2/factoryadapter/reader_test.go
@@ -159,15 +159,79 @@ func TestTraceReader_FindTracesPanics(t *testing.T) {
 	)
 }
 
-func TestTraceReader_FindTraceIDsPanics(t *testing.T) {
-	memstore := memory.NewStore()
-	traceReader := &TraceReader{
-		spanReader: memstore,
+func TestTraceReader_FindTraceIDsDelegatesResponse(t *testing.T) {
+	tests := []struct {
+		name             string
+		modelTraceIDs    []model.TraceID
+		expectedTraceIDs []pcommon.TraceID
+		err              error
+	}{
+		{
+			name: "successful response",
+			modelTraceIDs: []model.TraceID{
+				{Low: 3, High: 2},
+				{Low: 4, High: 3},
+			},
+			expectedTraceIDs: []pcommon.TraceID{
+				pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}),
+				pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4}),
+			},
+		},
+		{
+			name:             "empty response",
+			modelTraceIDs:    []model.TraceID{},
+			expectedTraceIDs: []pcommon.TraceID{},
+		},
+		{
+			name:             "nil response",
+			modelTraceIDs:    nil,
+			expectedTraceIDs: nil,
+		},
+		{
+			name:             "error response",
+			modelTraceIDs:    nil,
+			expectedTraceIDs: nil,
+			err:              errors.New("test error"),
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			sr := new(spanStoreMocks.Reader)
+			now := time.Now()
+			sr.On(
+				"FindTraceIDs",
+				mock.Anything,
+				&spanstore.TraceQueryParameters{
+					ServiceName:   "service",
+					OperationName: "operation",
+					Tags:          map[string]string{"tag-a": "val-a"},
+					StartTimeMin:  now,
+					StartTimeMax:  now.Add(time.Minute),
+					DurationMin:   time.Minute,
+					DurationMax:   time.Hour,
+					NumTraces:     10,
+				},
+			).Return(test.modelTraceIDs, test.err)
+			traceReader := &TraceReader{
+				spanReader: sr,
+			}
+			traceIDs, err := traceReader.FindTraceIDs(
+				context.Background(),
+				tracestore.TraceQueryParameters{
+					ServiceName:   "service",
+					OperationName: "operation",
+					Tags:          map[string]string{"tag-a": "val-a"},
+					StartTimeMin:  now,
+					StartTimeMax:  now.Add(time.Minute),
+					DurationMin:   time.Minute,
+					DurationMax:   time.Hour,
+					NumTraces:     10,
+				},
+			)
+			require.ErrorIs(t, err, test.err)
+			require.Equal(t, test.expectedTraceIDs, traceIDs)
+		})
 	}
-	require.Panics(
-		t,
-		func() { traceReader.FindTraceIDs(context.Background(), tracestore.TraceQueryParameters{}) },
-	)
 }
 
 func TestDependencyReader_GetDependencies(t *testing.T) {

From 737b9be61ae319291b8d8e19b19f03c478f8ea53 Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Sun, 8 Dec 2024 17:45:32 -0500
Subject: [PATCH 09/59] [storage][v2] Implement `FindTraces` in v2 factory
 adapter (#6328)

## Which problem is this PR solving?
- Towards #5079

## Description of the changes
- This PR implements `FindTraces` in the v2 factory adapter

## How was this change tested?
- Added unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 storage_v2/factoryadapter/reader.go      |  29 +++---
 storage_v2/factoryadapter/reader_test.go | 124 +++++++++++++++++++++--
 storage_v2/tracestore/reader.go          |  13 +++
 storage_v2/tracestore/reader_test.go     |  38 +++++++
 4 files changed, 186 insertions(+), 18 deletions(-)
 create mode 100644 storage_v2/tracestore/reader_test.go

diff --git a/storage_v2/factoryadapter/reader.go b/storage_v2/factoryadapter/reader.go
index 7345e84fe60..ce6db086daf 100644
--- a/storage_v2/factoryadapter/reader.go
+++ b/storage_v2/factoryadapter/reader.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"errors"
 
+	model2otel "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
@@ -62,21 +63,25 @@ func (tr *TraceReader) GetOperations(ctx context.Context, query tracestore.Opera
 	return operations, nil
 }
 
-func (*TraceReader) FindTraces(_ context.Context, _ tracestore.TraceQueryParameters) ([]ptrace.Traces, error) {
-	panic("not implemented")
+func (tr *TraceReader) FindTraces(
+	ctx context.Context,
+	query tracestore.TraceQueryParameters,
+) ([]ptrace.Traces, error) {
+	t, err := tr.spanReader.FindTraces(ctx, query.ToSpanStoreQueryParameters())
+	if err != nil || t == nil {
+		return nil, err
+	}
+	otelTraces := []ptrace.Traces{}
+	for _, trace := range t {
+		batch := &model.Batch{Spans: trace.GetSpans()}
+		otelTrace, _ := model2otel.ProtoToTraces([]*model.Batch{batch})
+		otelTraces = append(otelTraces, otelTrace)
+	}
+	return otelTraces, nil
 }
 
 func (tr *TraceReader) FindTraceIDs(ctx context.Context, query tracestore.TraceQueryParameters) ([]pcommon.TraceID, error) {
-	t, err := tr.spanReader.FindTraceIDs(ctx, &spanstore.TraceQueryParameters{
-		ServiceName:   query.ServiceName,
-		OperationName: query.OperationName,
-		Tags:          query.Tags,
-		StartTimeMin:  query.StartTimeMin,
-		StartTimeMax:  query.StartTimeMax,
-		DurationMin:   query.DurationMin,
-		DurationMax:   query.DurationMax,
-		NumTraces:     query.NumTraces,
-	})
+	t, err := tr.spanReader.FindTraceIDs(ctx, query.ToSpanStoreQueryParameters())
 	if err != nil || t == nil {
 		return nil, err
 	}
diff --git a/storage_v2/factoryadapter/reader_test.go b/storage_v2/factoryadapter/reader_test.go
index 9d1891a547b..288f16ccbf2 100644
--- a/storage_v2/factoryadapter/reader_test.go
+++ b/storage_v2/factoryadapter/reader_test.go
@@ -116,6 +116,11 @@ func TestTraceReader_GetOperationsDelegatesResponse(t *testing.T) {
 			operations:         nil,
 			expectedOperations: nil,
 		},
+		{
+			name:               "empty response",
+			operations:         []spanstore.Operation{},
+			expectedOperations: []tracestore.Operation{},
+		},
 		{
 			name:               "error response",
 			operations:         nil,
@@ -148,15 +153,122 @@ func TestTraceReader_GetOperationsDelegatesResponse(t *testing.T) {
 	}
 }
 
-func TestTraceReader_FindTracesPanics(t *testing.T) {
-	memstore := memory.NewStore()
+func TestTraceReader_FindTracesDelegatesSuccessResponse(t *testing.T) {
+	modelTraces := []*model.Trace{
+		{
+			Spans: []*model.Span{
+				{
+					TraceID:       model.NewTraceID(2, 3),
+					SpanID:        model.SpanID(1),
+					OperationName: "operation-a",
+				},
+				{
+					TraceID:       model.NewTraceID(4, 5),
+					SpanID:        model.SpanID(2),
+					OperationName: "operation-b",
+				},
+			},
+		},
+		{
+			Spans: []*model.Span{
+				{
+					TraceID:       model.NewTraceID(6, 7),
+					SpanID:        model.SpanID(3),
+					OperationName: "operation-c",
+				},
+			},
+		},
+	}
+	sr := new(spanStoreMocks.Reader)
+	now := time.Now()
+	sr.On(
+		"FindTraces",
+		mock.Anything,
+		&spanstore.TraceQueryParameters{
+			ServiceName:   "service",
+			OperationName: "operation",
+			Tags:          map[string]string{"tag-a": "val-a"},
+			StartTimeMin:  now,
+			StartTimeMax:  now.Add(time.Minute),
+			DurationMin:   time.Minute,
+			DurationMax:   time.Hour,
+			NumTraces:     10,
+		},
+	).Return(modelTraces, nil)
 	traceReader := &TraceReader{
-		spanReader: memstore,
+		spanReader: sr,
 	}
-	require.Panics(
-		t,
-		func() { traceReader.FindTraces(context.Background(), tracestore.TraceQueryParameters{}) },
+	traces, err := traceReader.FindTraces(
+		context.Background(),
+		tracestore.TraceQueryParameters{
+			ServiceName:   "service",
+			OperationName: "operation",
+			Tags:          map[string]string{"tag-a": "val-a"},
+			StartTimeMin:  now,
+			StartTimeMax:  now.Add(time.Minute),
+			DurationMin:   time.Minute,
+			DurationMax:   time.Hour,
+			NumTraces:     10,
+		},
 	)
+	require.NoError(t, err)
+	require.Len(t, traces, len(modelTraces))
+	traceASpans := traces[0].ResourceSpans().At(0).ScopeSpans().At(0).Spans()
+	traceBSpans := traces[1].ResourceSpans().At(0).ScopeSpans().At(0).Spans()
+	require.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}, traceASpans.At(0).TraceID())
+	require.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 1}, traceASpans.At(0).SpanID())
+	require.Equal(t, "operation-a", traceASpans.At(0).Name())
+	require.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 5}, traceASpans.At(1).TraceID())
+	require.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 2}, traceASpans.At(1).SpanID())
+	require.Equal(t, "operation-b", traceASpans.At(1).Name())
+	require.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 7}, traceBSpans.At(0).TraceID())
+	require.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 3}, traceBSpans.At(0).SpanID())
+	require.Equal(t, "operation-c", traceBSpans.At(0).Name())
+}
+
+func TestTraceReader_FindTracesEdgeCases(t *testing.T) {
+	tests := []struct {
+		name           string
+		modelTraces    []*model.Trace
+		expectedTraces []ptrace.Traces
+		err            error
+	}{
+		{
+			name:           "nil response",
+			modelTraces:    nil,
+			expectedTraces: nil,
+		},
+		{
+			name:           "empty response",
+			modelTraces:    []*model.Trace{},
+			expectedTraces: []ptrace.Traces{},
+		},
+		{
+			name:           "error response",
+			modelTraces:    nil,
+			expectedTraces: nil,
+			err:            errors.New("test error"),
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			sr := new(spanStoreMocks.Reader)
+			sr.On(
+				"FindTraces",
+				mock.Anything,
+				mock.Anything,
+			).Return(test.modelTraces, test.err)
+			traceReader := &TraceReader{
+				spanReader: sr,
+			}
+			traces, err := traceReader.FindTraces(
+				context.Background(),
+				tracestore.TraceQueryParameters{},
+			)
+			require.ErrorIs(t, err, test.err)
+			require.Equal(t, test.expectedTraces, traces)
+		})
+	}
 }
 
 func TestTraceReader_FindTraceIDsDelegatesResponse(t *testing.T) {
diff --git a/storage_v2/tracestore/reader.go b/storage_v2/tracestore/reader.go
index 9a60a7bc77b..487758700c8 100644
--- a/storage_v2/tracestore/reader.go
+++ b/storage_v2/tracestore/reader.go
@@ -58,6 +58,19 @@ type TraceQueryParameters struct {
 	NumTraces     int
 }
 
+func (t *TraceQueryParameters) ToSpanStoreQueryParameters() *spanstore.TraceQueryParameters {
+	return &spanstore.TraceQueryParameters{
+		ServiceName:   t.ServiceName,
+		OperationName: t.OperationName,
+		Tags:          t.Tags,
+		StartTimeMin:  t.StartTimeMin,
+		StartTimeMax:  t.StartTimeMax,
+		DurationMin:   t.DurationMin,
+		DurationMax:   t.DurationMax,
+		NumTraces:     t.NumTraces,
+	}
+}
+
 // OperationQueryParameters contains parameters of query operations, empty spanKind means get operations for all kinds of span.
 type OperationQueryParameters struct {
 	ServiceName string
diff --git a/storage_v2/tracestore/reader_test.go b/storage_v2/tracestore/reader_test.go
new file mode 100644
index 00000000000..16f558c9877
--- /dev/null
+++ b/storage_v2/tracestore/reader_test.go
@@ -0,0 +1,38 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package tracestore
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/jaegertracing/jaeger/storage/spanstore"
+)
+
+func TestToSpanStoreQueryParameters(t *testing.T) {
+	now := time.Now()
+	query := &TraceQueryParameters{
+		ServiceName:   "service",
+		OperationName: "operation",
+		Tags:          map[string]string{"tag-a": "val-a"},
+		StartTimeMin:  now,
+		StartTimeMax:  now.Add(time.Minute),
+		DurationMin:   time.Minute,
+		DurationMax:   time.Hour,
+		NumTraces:     10,
+	}
+	expected := &spanstore.TraceQueryParameters{
+		ServiceName:   "service",
+		OperationName: "operation",
+		Tags:          map[string]string{"tag-a": "val-a"},
+		StartTimeMin:  now,
+		StartTimeMax:  now.Add(time.Minute),
+		DurationMin:   time.Minute,
+		DurationMax:   time.Hour,
+		NumTraces:     10,
+	}
+	require.Equal(t, expected, query.ToSpanStoreQueryParameters())
+}

From 5bef8fd662f4a666889164bfd72ddb2118bc13ac Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Mon, 9 Dec 2024 09:39:50 -0500
Subject: [PATCH 10/59] [storage][v2] Implement `GetTrace` in v2 factory
 adapter (#6329)

## Which problem is this PR solving?
- Towards #5079

## Description of the changes
- This PR implements `GetTrace` in the v2 factory adapter

## How was this change tested?
- Added unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 model/ids.go                             |  7 ++++
 model/ids_test.go                        |  9 +++++
 storage_v2/factoryadapter/reader.go      |  9 ++++-
 storage_v2/factoryadapter/reader_test.go | 49 ++++++++++++++++++++++--
 4 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/model/ids.go b/model/ids.go
index f911a7beb0e..5bf93dc43be 100644
--- a/model/ids.go
+++ b/model/ids.go
@@ -156,6 +156,13 @@ func (t *TraceID) ToOTELTraceID() pcommon.TraceID {
 	return traceID
 }
 
+func TraceIDFromOTEL(traceID pcommon.TraceID) TraceID {
+	return TraceID{
+		High: binary.BigEndian.Uint64(traceID[:traceIDShortBytesLen]),
+		Low:  binary.BigEndian.Uint64(traceID[traceIDShortBytesLen:]),
+	}
+}
+
 // ------- SpanID -------
 
 // NewSpanID creates a new SpanID from a 64bit unsigned int.
diff --git a/model/ids_test.go b/model/ids_test.go
index 6bab7614b96..40c6f801a5c 100644
--- a/model/ids_test.go
+++ b/model/ids_test.go
@@ -128,3 +128,12 @@ func TestToOTELTraceID(t *testing.T) {
 	expected := []byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}
 	require.Equal(t, pcommon.TraceID(expected), otelTraceID)
 }
+
+func TestTraceIDFromOTEL(t *testing.T) {
+	otelTraceID := pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3})
+	expected := model.TraceID{
+		Low:  3,
+		High: 2,
+	}
+	require.Equal(t, expected, model.TraceIDFromOTEL(otelTraceID))
+}
diff --git a/storage_v2/factoryadapter/reader.go b/storage_v2/factoryadapter/reader.go
index ce6db086daf..85ebddab7e9 100644
--- a/storage_v2/factoryadapter/reader.go
+++ b/storage_v2/factoryadapter/reader.go
@@ -37,8 +37,13 @@ func NewTraceReader(spanReader spanstore.Reader) *TraceReader {
 	}
 }
 
-func (*TraceReader) GetTrace(_ context.Context, _ pcommon.TraceID) (ptrace.Traces, error) {
-	panic("not implemented")
+func (tr *TraceReader) GetTrace(ctx context.Context, traceID pcommon.TraceID) (ptrace.Traces, error) {
+	t, err := tr.spanReader.GetTrace(ctx, model.TraceIDFromOTEL(traceID))
+	if err != nil {
+		return ptrace.NewTraces(), err
+	}
+	batch := &model.Batch{Spans: t.GetSpans()}
+	return model2otel.ProtoToTraces([]*model.Batch{batch})
 }
 
 func (tr *TraceReader) GetServices(ctx context.Context) ([]string, error) {
diff --git a/storage_v2/factoryadapter/reader_test.go b/storage_v2/factoryadapter/reader_test.go
index 288f16ccbf2..0559f7e5d94 100644
--- a/storage_v2/factoryadapter/reader_test.go
+++ b/storage_v2/factoryadapter/reader_test.go
@@ -61,12 +61,53 @@ func TestGetV1Reader_Error(t *testing.T) {
 	require.ErrorIs(t, err, errV1ReaderNotAvailable)
 }
 
-func TestTraceReader_GetTracePanics(t *testing.T) {
-	memstore := memory.NewStore()
+func TestTraceReader_GetTraceDelegatesSuccessResponse(t *testing.T) {
+	sr := new(spanStoreMocks.Reader)
+	modelTrace := &model.Trace{
+		Spans: []*model.Span{
+			{
+				TraceID:       model.NewTraceID(2, 3),
+				SpanID:        model.SpanID(1),
+				OperationName: "operation-a",
+			},
+			{
+				TraceID:       model.NewTraceID(2, 3),
+				SpanID:        model.SpanID(2),
+				OperationName: "operation-b",
+			},
+		},
+	}
+	sr.On("GetTrace", mock.Anything, model.NewTraceID(2, 3)).Return(modelTrace, nil)
 	traceReader := &TraceReader{
-		spanReader: memstore,
+		spanReader: sr,
 	}
-	require.Panics(t, func() { traceReader.GetTrace(context.Background(), pcommon.NewTraceIDEmpty()) })
+	trace, err := traceReader.GetTrace(
+		context.Background(),
+		pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}),
+	)
+	require.NoError(t, err)
+	traceSpans := trace.ResourceSpans().At(0).ScopeSpans().At(0).Spans()
+	require.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}, traceSpans.At(0).TraceID())
+	require.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 1}, traceSpans.At(0).SpanID())
+	require.Equal(t, "operation-a", traceSpans.At(0).Name())
+	require.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}, traceSpans.At(1).TraceID())
+	require.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 2}, traceSpans.At(1).SpanID())
+	require.Equal(t, "operation-b", traceSpans.At(1).Name())
+}
+
+func TestTraceReader_GetTraceErrorResponse(t *testing.T) {
+	sr := new(spanStoreMocks.Reader)
+	testErr := errors.New("test error")
+	sr.On("GetTrace", mock.Anything, mock.Anything).Return(nil, testErr)
+	traceReader := &TraceReader{
+		spanReader: sr,
+	}
+	trace, err := traceReader.GetTrace(
+		context.Background(),
+		pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}),
+	)
+	require.ErrorIs(t, err, testErr)
+	require.Equal(t, ptrace.NewTraces(), trace)
 }
 
 func TestTraceReader_GetServicesDelegatesToSpanReader(t *testing.T) {

From 78f5a4178db8b8022c3c3ab92a31dd8571e75e2f Mon Sep 17 00:00:00 2001
From: Alok Kumar Singh <62210712+akstron@users.noreply.github.com>
Date: Mon, 9 Dec 2024 23:40:58 +0530
Subject: [PATCH 11/59] Add Comments for CompactionWindow Config Advice (#6331)

## Which problem is this PR solving?
- Resolves #3466

## Description of the changes
- Added advice for CompactionWindow config

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com>
---
 pkg/cassandra/config/config.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/cassandra/config/config.go b/pkg/cassandra/config/config.go
index d5e499a2523..9cec5128c4f 100644
--- a/pkg/cassandra/config/config.go
+++ b/pkg/cassandra/config/config.go
@@ -68,6 +68,8 @@ type Schema struct {
 	ReplicationFactor int `mapstructure:"replication_factor" valid:"optional"`
 	// CompactionWindow is the size of the window for TimeWindowCompactionStrategy.
 	// All SSTables within that window are grouped together into one SSTable.
+	// Ideally, operators should select a compaction window size that produces approximately less than 50 windows.
+	// For example, if writing with a 90 day TTL, a 3 day window would be a reasonable choice.
 	CompactionWindow time.Duration `mapstructure:"compaction_window" valid:"optional"`
 }
 

From 8f612a876dc501e0db9786a054ff52fee314afb3 Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Date: Tue, 10 Dec 2024 16:03:33 -0400
Subject: [PATCH 12/59] [fix] Fallback to system CA certs pool (#6335)

## Which problem is this PR solving?
- Resolves #6334

## Description of the changes
- Restore pre-OTEL behavior of using system cert pool if no CAFile is
specified.

## How was this change tested?
- unit tests

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
---
 cmd/ingester/app/flags_test.go       | 19 +++++++++++++------
 pkg/config/tlscfg/options.go         |  4 ++++
 pkg/kafka/auth/config_test.go        | 16 +++++++++-------
 plugin/storage/kafka/options_test.go | 27 +++++++++++++++++++++++----
 4 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/cmd/ingester/app/flags_test.go b/cmd/ingester/app/flags_test.go
index d390b57481f..65ce83a6b7b 100644
--- a/cmd/ingester/app/flags_test.go
+++ b/cmd/ingester/app/flags_test.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/config/configtls"
 
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/kafka/auth"
@@ -66,12 +67,18 @@ func TestTLSFlags(t *testing.T) {
 			expected: auth.AuthenticationConfig{Authentication: "kerberos", Kerberos: kerb, PlainText: plain},
 		},
 		{
-			flags:    []string{"--kafka.consumer.authentication=tls"},
-			expected: auth.AuthenticationConfig{Authentication: "tls", Kerberos: kerb, PlainText: plain},
-		},
-		{
-			flags:    []string{"--kafka.consumer.authentication=tls", "--kafka.consumer.tls.enabled=false"},
-			expected: auth.AuthenticationConfig{Authentication: "tls", Kerberos: kerb, PlainText: plain},
+			flags: []string{"--kafka.consumer.authentication=tls"},
+			expected: auth.AuthenticationConfig{
+				Authentication: "tls",
+				Kerberos:       kerb,
+				// TODO this test is unclear - if tls.enabled != true, why is it not tls.Insecure=true?
+				TLS: configtls.ClientConfig{
+					Config: configtls.Config{
+						IncludeSystemCACertsPool: true,
+					},
+				},
+				PlainText: plain,
+			},
 		},
 	}
 
diff --git a/pkg/config/tlscfg/options.go b/pkg/config/tlscfg/options.go
index 4604313e157..c67dcb2b2ef 100644
--- a/pkg/config/tlscfg/options.go
+++ b/pkg/config/tlscfg/options.go
@@ -139,6 +139,10 @@ func (o *Options) ToOtelClientConfig() configtls.ClientConfig {
 			MinVersion:     o.MinVersion,
 			MaxVersion:     o.MaxVersion,
 			ReloadInterval: o.ReloadInterval,
+
+			// when no truststore given, use SystemCertPool
+			// https://github.com/jaegertracing/jaeger/issues/6334
+			IncludeSystemCACertsPool: o.Enabled && (len(o.CAPath) == 0),
 		},
 	}
 }
diff --git a/pkg/kafka/auth/config_test.go b/pkg/kafka/auth/config_test.go
index f5354c67d2f..56d248a7e4a 100644
--- a/pkg/kafka/auth/config_test.go
+++ b/pkg/kafka/auth/config_test.go
@@ -37,20 +37,18 @@ func Test_InitFromViper(t *testing.T) {
 		"--kafka.auth.kerberos.keytab-file=/path/to/keytab",
 		"--kafka.auth.kerberos.disable-fast-negotiation=true",
 		"--kafka.auth.tls.enabled=false",
+		"--kafka.auth.tls.ca=/not/allowed/if/tls/is/disabled",
 		"--kafka.auth.plaintext.username=user",
 		"--kafka.auth.plaintext.password=password",
 		"--kafka.auth.plaintext.mechanism=SCRAM-SHA-256",
-		"--kafka.auth.tls.ca=failing",
 	})
 
 	authConfig := &AuthenticationConfig{}
 	err := authConfig.InitFromViper(configPrefix, v)
-	require.EqualError(t, err, "failed to process Kafka TLS options: kafka.auth.tls.* options cannot be used when kafka.auth.tls.enabled is false")
+	require.ErrorContains(t, err, "kafka.auth.tls.* options cannot be used when kafka.auth.tls.enabled is false")
 
-	command.ParseFlags([]string{"--kafka.auth.tls.ca="})
-	v.BindPFlags(command.Flags())
-	err = authConfig.InitFromViper(configPrefix, v)
-	require.NoError(t, err)
+	command.ParseFlags([]string{"--kafka.auth.tls.ca="}) // incrementally update authConfig
+	require.NoError(t, authConfig.InitFromViper(configPrefix, v))
 
 	expectedConfig := &AuthenticationConfig{
 		Authentication: "tls",
@@ -64,7 +62,11 @@ func Test_InitFromViper(t *testing.T) {
 			KeyTabPath:      "/path/to/keytab",
 			DisablePAFXFast: true,
 		},
-		TLS: configtls.ClientConfig{},
+		TLS: configtls.ClientConfig{
+			Config: configtls.Config{
+				IncludeSystemCACertsPool: true,
+			},
+		},
 		PlainText: PlainTextConfig{
 			Username:  "user",
 			Password:  "password",
diff --git a/plugin/storage/kafka/options_test.go b/plugin/storage/kafka/options_test.go
index cb41caac0a3..c02823fc89c 100644
--- a/plugin/storage/kafka/options_test.go
+++ b/plugin/storage/kafka/options_test.go
@@ -184,12 +184,31 @@ func TestTLSFlags(t *testing.T) {
 			expected: auth.AuthenticationConfig{Authentication: "kerberos", Kerberos: kerb, TLS: configtls.ClientConfig{}, PlainText: plain},
 		},
 		{
-			flags:    []string{"--kafka.producer.authentication=tls"},
-			expected: auth.AuthenticationConfig{Authentication: "tls", Kerberos: kerb, TLS: configtls.ClientConfig{}, PlainText: plain},
+			flags: []string{"--kafka.producer.authentication=tls"},
+			expected: auth.AuthenticationConfig{
+				Authentication: "tls",
+				Kerberos:       kerb,
+				TLS: configtls.ClientConfig{
+					Config: configtls.Config{
+						IncludeSystemCACertsPool: true,
+					},
+				},
+				PlainText: plain,
+			},
 		},
 		{
-			flags:    []string{"--kafka.producer.authentication=tls", "--kafka.producer.tls.enabled=false"},
-			expected: auth.AuthenticationConfig{Authentication: "tls", Kerberos: kerb, TLS: configtls.ClientConfig{}, PlainText: plain},
+			flags: []string{"--kafka.producer.authentication=tls", "--kafka.producer.tls.enabled=false"},
+			expected: auth.AuthenticationConfig{
+				Authentication: "tls",
+				Kerberos:       kerb,
+				// TODO this test is unclear - if tls.enabled=false, why is it not tls.Insecure=true?
+				TLS: configtls.ClientConfig{
+					Config: configtls.Config{
+						IncludeSystemCACertsPool: true,
+					},
+				},
+				PlainText: plain,
+			},
 		},
 	}
 

From 53a8053917fa182265d20405f4dd2bd82f06d01f Mon Sep 17 00:00:00 2001
From: Manik Mehta <mehtamanik96@gmail.com>
Date: Wed, 11 Dec 2024 20:34:27 +0530
Subject: [PATCH 13/59] Add go leak check to Cassandra and Kafka e2e tests
 (#6336)

## Which problem is this PR solving?
Fixes a part of #5006
## Description of the changes
1) Cassandra factory is closed in the test manually after the test, not
doing so will fail the leak test probably due to CleanUp function is not
closing factory properly and returning in the test leading to end it
that further fails the leak test.
2) Kafka Producer and Consumer was not closed before leading to failure
of leak test which is fixed in this PR.

## How was this change tested?
- By running integartion tests manually

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
Signed-off-by: Manik Mehta <mehtamanik96@gmail.com>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
---
 pkg/testutils/leakcheck.go                   | 13 ++++++++++++-
 plugin/storage/integration/cassandra_test.go | 11 ++++++++---
 plugin/storage/integration/kafka_test.go     | 13 +++++++++++--
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/pkg/testutils/leakcheck.go b/pkg/testutils/leakcheck.go
index df59dc0cc04..fd03e0f7c21 100644
--- a/pkg/testutils/leakcheck.go
+++ b/pkg/testutils/leakcheck.go
@@ -23,6 +23,17 @@ func IgnoreOpenCensusWorkerLeak() goleak.Option {
 	return goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start")
 }
 
+// IgnoreGoMetricsMeterLeak prevents the leak created by go-metrics which is
+// used by Sarama (Kafka Client) in Jaeger v1. This reason of this leak is
+// not Jaeger but the go-metrics used by Samara.
+// See these issues for the context
+// - https://github.com/IBM/sarama/issues/1321
+// - https://github.com/IBM/sarama/issues/1340
+// - https://github.com/IBM/sarama/issues/2832
+func IgnoreGoMetricsMeterLeak() goleak.Option {
+	return goleak.IgnoreTopFunction("github.com/rcrowley/go-metrics.(*meterArbiter).tick")
+}
+
 // VerifyGoLeaks verifies that unit tests do not leak any goroutines.
 // It should be called in TestMain.
 func VerifyGoLeaks(m *testing.M) {
@@ -36,5 +47,5 @@ func VerifyGoLeaks(m *testing.M) {
 //
 //	defer testutils.VerifyGoLeaksOnce(t)
 func VerifyGoLeaksOnce(t *testing.T) {
-	goleak.VerifyNone(t, IgnoreGlogFlushDaemonLeak(), IgnoreOpenCensusWorkerLeak())
+	goleak.VerifyNone(t, IgnoreGlogFlushDaemonLeak(), IgnoreOpenCensusWorkerLeak(), IgnoreGoMetricsMeterLeak())
 }
diff --git a/plugin/storage/integration/cassandra_test.go b/plugin/storage/integration/cassandra_test.go
index 39b3bf18c34..41d67c94544 100644
--- a/plugin/storage/integration/cassandra_test.go
+++ b/plugin/storage/integration/cassandra_test.go
@@ -9,12 +9,14 @@ import (
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest"
 
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 )
@@ -47,6 +49,9 @@ func (*CassandraStorageIntegration) initializeCassandraFactory(t *testing.T, fla
 	require.NoError(t, command.ParseFlags(flags))
 	f.InitFromViper(v, logger)
 	require.NoError(t, f.Initialize(metrics.NullFactory, logger))
+	t.Cleanup(func() {
+		assert.NoError(t, f.Close())
+	})
 	return f
 }
 
@@ -78,9 +83,6 @@ func (s *CassandraStorageIntegration) initializeCassandra(t *testing.T) {
 	s.SamplingStore, err = f.CreateSamplingStore(0)
 	require.NoError(t, err)
 	s.initializeDependencyReaderAndWriter(t, f)
-	t.Cleanup(func() {
-		require.NoError(t, f.Close())
-	})
 }
 
 func (s *CassandraStorageIntegration) initializeDependencyReaderAndWriter(t *testing.T, f *cassandra.Factory) {
@@ -99,6 +101,9 @@ func (s *CassandraStorageIntegration) initializeDependencyReaderAndWriter(t *tes
 
 func TestCassandraStorage(t *testing.T) {
 	SkipUnlessEnv(t, "cassandra")
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnce(t)
+	})
 	s := newCassandraStorageIntegration()
 	s.initializeCassandra(t)
 	s.RunAll(t)
diff --git a/plugin/storage/integration/kafka_test.go b/plugin/storage/integration/kafka_test.go
index ef3528baf65..987f49057b1 100644
--- a/plugin/storage/integration/kafka_test.go
+++ b/plugin/storage/integration/kafka_test.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/Shopify/sarama"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest"
@@ -20,6 +21,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/kafka/consumer"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/plugin/storage/kafka"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
@@ -53,10 +55,11 @@ func (s *KafkaIntegrationTestSuite) initialize(t *testing.T) {
 	f.InitFromViper(v, logger)
 	err = f.Initialize(metrics.NullFactory, logger)
 	require.NoError(t, err)
-
+	t.Cleanup(func() {
+		assert.NoError(t, f.Close())
+	})
 	spanWriter, err := f.CreateSpanWriter()
 	require.NoError(t, err)
-
 	v, command = config.Viperize(app.AddFlags)
 	err = command.ParseFlags([]string{
 		"--kafka.consumer.topic",
@@ -82,6 +85,9 @@ func (s *KafkaIntegrationTestSuite) initialize(t *testing.T) {
 	traceStore := memory.NewStore()
 	spanConsumer, err := builder.CreateConsumer(logger, metrics.NullFactory, traceStore, options)
 	require.NoError(t, err)
+	t.Cleanup(func() {
+		assert.NoError(t, spanConsumer.Close())
+	})
 	spanConsumer.Start()
 
 	s.SpanWriter = spanWriter
@@ -120,6 +126,9 @@ func (*ingester) FindTraceIDs(context.Context, *spanstore.TraceQueryParameters)
 
 func TestKafkaStorage(t *testing.T) {
 	SkipUnlessEnv(t, "kafka")
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnce(t)
+	})
 	s := &KafkaIntegrationTestSuite{}
 	s.initialize(t)
 	t.Run("GetTrace", s.testGetTrace)

From 0f2d50ad7d66ade6a24ccdcaaee3ae992e40a5bf Mon Sep 17 00:00:00 2001
From: chahat sagar <109112505+chahatsagarmain@users.noreply.github.com>
Date: Thu, 12 Dec 2024 04:36:43 +0530
Subject: [PATCH 14/59] [WIP][collector] Switch to OTEL's http/grpc server 
 (#6277)

## Which problem is this PR solving?
-  Part of #4316
-  Resolves #6279

## Description of the changes
-

## How was this change tested?
-

## Checklist
- [ ] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [ ] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: chahatsagarmain <chahatsagar2003@gmail.com>
Signed-off-by: chahat sagar <109112505+chahatsagarmain@users.noreply.github.com>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
---
 cmd/all-in-one/main.go                        |   2 +-
 cmd/collector/app/collector.go                |  46 ++----
 cmd/collector/app/collector_test.go           |  69 ++++++--
 cmd/collector/app/flags/flags.go              | 144 +++++++---------
 cmd/collector/app/flags/flags_test.go         |  30 ++--
 cmd/collector/app/handler/otlp_receiver.go    |  58 +------
 .../app/handler/otlp_receiver_test.go         | 106 +++---------
 cmd/collector/app/handler/zipkin_receiver.go  |   7 +-
 .../app/handler/zipkin_receiver_test.go       |   4 +-
 .../app/handler/zipkin_receiver_tls_test.go   | 154 +++++++++---------
 cmd/collector/app/server/grpc.go              |  52 ++----
 cmd/collector/app/server/grpc_test.go         |  44 +++--
 cmd/collector/app/server/http.go              |  47 ++----
 cmd/collector/app/server/http_test.go         |  72 ++++----
 cmd/collector/main.go                         |   2 +-
 pkg/config/corscfg/flags.go                   |   7 +-
 pkg/config/corscfg/flags_test.go              |   5 +-
 pkg/config/corscfg/options.go                 |   9 -
 pkg/telemetry/settings.go                     |   8 +
 19 files changed, 370 insertions(+), 496 deletions(-)
 delete mode 100644 pkg/config/corscfg/options.go

diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go
index a34a95d0ea2..7f31b472945 100644
--- a/cmd/all-in-one/main.go
+++ b/cmd/all-in-one/main.go
@@ -149,7 +149,7 @@ by default uses only in-memory database.`,
 				logger.Fatal("Failed to configure query service", zap.Error(err))
 			}
 
-			tm := tenancy.NewManager(&cOpts.GRPC.Tenancy)
+			tm := tenancy.NewManager(&cOpts.Tenancy)
 
 			// collector
 			c := collectorApp.New(&collectorApp.CollectorParams{
diff --git a/cmd/collector/app/collector.go b/cmd/collector/app/collector.go
index 44b1ef47803..c2c5b4a9272 100644
--- a/cmd/collector/app/collector.go
+++ b/cmd/collector/app/collector.go
@@ -6,7 +6,6 @@ package app
 import (
 	"context"
 	"fmt"
-	"io"
 	"net/http"
 	"time"
 
@@ -47,13 +46,10 @@ type Collector struct {
 	tenancyMgr         *tenancy.Manager
 
 	// state, read only
-	hServer                    *http.Server
-	grpcServer                 *grpc.Server
-	otlpReceiver               receiver.Traces
-	zipkinReceiver             receiver.Traces
-	tlsGRPCCertWatcherCloser   io.Closer
-	tlsHTTPCertWatcherCloser   io.Closer
-	tlsZipkinCertWatcherCloser io.Closer
+	hServer        *http.Server
+	grpcServer     *grpc.Server
+	otlpReceiver   receiver.Traces
+	zipkinReceiver receiver.Traces
 }
 
 // CollectorParams to construct a new Jaeger Collector.
@@ -101,26 +97,19 @@ func (c *Collector) Start(options *flags.CollectorOptions) error {
 
 	c.spanProcessor = handlerBuilder.BuildSpanProcessor(additionalProcessors...)
 	c.spanHandlers = handlerBuilder.BuildHandlers(c.spanProcessor)
-
 	grpcServer, err := server.StartGRPCServer(&server.GRPCServerParams{
-		HostPort:                options.GRPC.HostPort,
-		Handler:                 c.spanHandlers.GRPCHandler,
-		TLSConfig:               options.GRPC.TLS,
-		SamplingProvider:        c.samplingProvider,
-		Logger:                  c.logger,
-		MaxReceiveMessageLength: options.GRPC.MaxReceiveMessageLength,
-		MaxConnectionAge:        options.GRPC.MaxConnectionAge,
-		MaxConnectionAgeGrace:   options.GRPC.MaxConnectionAgeGrace,
+		Handler:          c.spanHandlers.GRPCHandler,
+		SamplingProvider: c.samplingProvider,
+		Logger:           c.logger,
+		ServerConfig:     options.GRPC,
 	})
 	if err != nil {
 		return fmt.Errorf("could not start gRPC server: %w", err)
 	}
 	c.grpcServer = grpcServer
-
 	httpServer, err := server.StartHTTPServer(&server.HTTPServerParams{
-		HostPort:         options.HTTP.HostPort,
+		ServerConfig:     options.HTTP,
 		Handler:          c.spanHandlers.JaegerBatchesHandler,
-		TLSConfig:        options.HTTP.TLS,
 		HealthCheck:      c.hCheck,
 		MetricsFactory:   c.metricsFactory,
 		SamplingProvider: c.samplingProvider,
@@ -131,11 +120,7 @@ func (c *Collector) Start(options *flags.CollectorOptions) error {
 	}
 	c.hServer = httpServer
 
-	c.tlsGRPCCertWatcherCloser = &options.GRPC.TLS
-	c.tlsHTTPCertWatcherCloser = &options.HTTP.TLS
-	c.tlsZipkinCertWatcherCloser = &options.Zipkin.TLS
-
-	if options.Zipkin.HTTPHostPort == "" {
+	if options.Zipkin.Endpoint == "" {
 		c.logger.Info("Not listening for Zipkin HTTP traffic, port not configured")
 	} else {
 		zipkinReceiver, err := handler.StartZipkinReceiver(options, c.logger, c.spanProcessor, c.tenancyMgr)
@@ -209,17 +194,6 @@ func (c *Collector) Close() error {
 		}
 	}
 
-	// watchers actually never return errors from Close
-	if c.tlsGRPCCertWatcherCloser != nil {
-		_ = c.tlsGRPCCertWatcherCloser.Close()
-	}
-	if c.tlsHTTPCertWatcherCloser != nil {
-		_ = c.tlsHTTPCertWatcherCloser.Close()
-	}
-	if c.tlsZipkinCertWatcherCloser != nil {
-		_ = c.tlsZipkinCertWatcherCloser.Close()
-	}
-
 	return nil
 }
 
diff --git a/cmd/collector/app/collector_test.go b/cmd/collector/app/collector_test.go
index 35c0576d630..4211f88cbbe 100644
--- a/cmd/collector/app/collector_test.go
+++ b/cmd/collector/app/collector_test.go
@@ -13,6 +13,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/confighttp"
+	"go.opentelemetry.io/collector/config/confignet"
+	"go.opentelemetry.io/collector/config/configtls"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
@@ -27,13 +31,54 @@ import (
 var _ (io.Closer) = (*Collector)(nil)
 
 func optionsForEphemeralPorts() *flags.CollectorOptions {
-	collectorOpts := &flags.CollectorOptions{}
-	collectorOpts.GRPC.HostPort = ":0"
-	collectorOpts.HTTP.HostPort = ":0"
-	collectorOpts.OTLP.Enabled = true
-	collectorOpts.OTLP.GRPC.HostPort = ":0"
-	collectorOpts.OTLP.HTTP.HostPort = ":0"
-	collectorOpts.Zipkin.HTTPHostPort = ":0"
+	collectorOpts := &flags.CollectorOptions{
+		HTTP: confighttp.ServerConfig{
+			Endpoint:   ":0",
+			TLSSetting: &configtls.ServerConfig{},
+		},
+		GRPC: configgrpc.ServerConfig{
+			NetAddr: confignet.AddrConfig{
+				Endpoint:  ":0",
+				Transport: confignet.TransportTypeTCP,
+			},
+			Keepalive: &configgrpc.KeepaliveServerConfig{
+				ServerParameters: &configgrpc.KeepaliveServerParameters{
+					MaxConnectionIdle: 10,
+				},
+			},
+		},
+		OTLP: struct {
+			Enabled bool
+			GRPC    configgrpc.ServerConfig
+			HTTP    confighttp.ServerConfig
+		}{
+			Enabled: true,
+			HTTP: confighttp.ServerConfig{
+				Endpoint:   ":0",
+				TLSSetting: &configtls.ServerConfig{},
+			},
+			GRPC: configgrpc.ServerConfig{
+				NetAddr: confignet.AddrConfig{
+					Endpoint:  ":0",
+					Transport: confignet.TransportTypeTCP,
+				},
+				Keepalive: &configgrpc.KeepaliveServerConfig{
+					ServerParameters: &configgrpc.KeepaliveServerParameters{
+						MaxConnectionIdle: 10,
+					},
+				},
+			},
+		},
+		Zipkin: struct {
+			confighttp.ServerConfig
+			KeepAlive bool
+		}{
+			ServerConfig: confighttp.ServerConfig{
+				Endpoint: ":0",
+			},
+		},
+		Tenancy: tenancy.Options{},
+	}
 	return collectorOpts
 }
 
@@ -112,23 +157,23 @@ func TestCollector_StartErrors(t *testing.T) {
 	var options *flags.CollectorOptions
 
 	options = optionsForEphemeralPorts()
-	options.GRPC.HostPort = ":-1"
+	options.GRPC.NetAddr.Endpoint = ":-1"
 	run("gRPC", options, "could not start gRPC server")
 
 	options = optionsForEphemeralPorts()
-	options.HTTP.HostPort = ":-1"
+	options.HTTP.Endpoint = ":-1"
 	run("HTTP", options, "could not start HTTP server")
 
 	options = optionsForEphemeralPorts()
-	options.Zipkin.HTTPHostPort = ":-1"
+	options.Zipkin.Endpoint = ":-1"
 	run("Zipkin", options, "could not start Zipkin receiver")
 
 	options = optionsForEphemeralPorts()
-	options.OTLP.GRPC.HostPort = ":-1"
+	options.OTLP.GRPC.NetAddr.Endpoint = ":-1"
 	run("OTLP/GRPC", options, "could not start OTLP receiver")
 
 	options = optionsForEphemeralPorts()
-	options.OTLP.HTTP.HostPort = ":-1"
+	options.OTLP.HTTP.Endpoint = ":-1"
 	run("OTLP/HTTP", options, "could not start OTLP receiver")
 }
 
diff --git a/cmd/collector/app/flags/flags.go b/cmd/collector/app/flags/flags.go
index 5c68169c881..2cef1e5f585 100644
--- a/cmd/collector/app/flags/flags.go
+++ b/cmd/collector/app/flags/flags.go
@@ -10,6 +10,8 @@ import (
 	"time"
 
 	"github.com/spf13/viper"
+	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/confighttp"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/internal/flags"
@@ -63,6 +65,9 @@ var httpServerFlagsCfg = serverFlagsConfig{
 	tls: tlscfg.ServerFlagsConfig{
 		Prefix: "collector.http",
 	},
+	corsCfg: corscfg.Flags{
+		Prefix: "collector.otlp.http",
+	},
 }
 
 var otlpServerFlagsCfg = struct {
@@ -82,19 +87,20 @@ var otlpServerFlagsCfg = struct {
 			Prefix:                   "collector.otlp.http",
 			EnableCertReloadInterval: true,
 		},
+		corsCfg: corscfg.Flags{
+			Prefix: "collector.otlp.http",
+		},
 	},
 }
 
-var tlsZipkinFlagsConfig = tlscfg.ServerFlagsConfig{
-	Prefix: "collector.zipkin",
-}
-
-var corsZipkinFlags = corscfg.Flags{
-	Prefix: "collector.zipkin",
-}
-
-var corsOTLPFlags = corscfg.Flags{
-	Prefix: "collector.otlp.http",
+var zipkinServerFlagsCfg = serverFlagsConfig{
+	prefix: "collector.zipkin",
+	tls: tlscfg.ServerFlagsConfig{
+		Prefix: "collector.zipkin",
+	},
+	corsCfg: corscfg.Flags{
+		Prefix: "collector.zipkin",
+	},
 }
 
 // CollectorOptions holds configuration for collector
@@ -106,69 +112,32 @@ type CollectorOptions struct {
 	// NumWorkers is the number of internal workers in a collector
 	NumWorkers int
 	// HTTP section defines options for HTTP server
-	HTTP HTTPOptions
+	HTTP confighttp.ServerConfig
 	// GRPC section defines options for gRPC server
-	GRPC GRPCOptions
+	GRPC configgrpc.ServerConfig
 	// OTLP section defines options for servers accepting OpenTelemetry OTLP format
 	OTLP struct {
 		Enabled bool
-		GRPC    GRPCOptions
-		HTTP    HTTPOptions
+		GRPC    configgrpc.ServerConfig
+		HTTP    confighttp.ServerConfig
 	}
 	// Zipkin section defines options for Zipkin HTTP server
 	Zipkin struct {
-		// HTTPHostPort is the host:port address that the Zipkin collector service listens in on for http requests
-		HTTPHostPort string
-		// TLS configures secure transport for Zipkin endpoint to collect spans
-		TLS tlscfg.Options
-		// CORS allows CORS requests , sets the values for Allowed Headers and Allowed Origins.
-		CORS corscfg.Options
-		// KeepAlive configures allow Keep-Alive for Zipkin HTTP server
+		confighttp.ServerConfig
 		KeepAlive bool
 	}
 	// CollectorTags is the string representing collector tags to append to each and every span
 	CollectorTags map[string]string
 	// SpanSizeMetricsEnabled determines whether to enable metrics based on processed span size
 	SpanSizeMetricsEnabled bool
-}
 
-type serverFlagsConfig struct {
-	prefix string
-	tls    tlscfg.ServerFlagsConfig
-}
-
-// HTTPOptions defines options for an HTTP server
-type HTTPOptions struct {
-	// HostPort is the host:port address that the server listens on
-	HostPort string
-	// TLS configures secure transport for HTTP endpoint
-	TLS tlscfg.Options
-	// ReadTimeout sets the respective parameter of http.Server
-	ReadTimeout time.Duration
-	// ReadHeaderTimeout sets the respective parameter of http.Server
-	ReadHeaderTimeout time.Duration
-	// IdleTimeout sets the respective parameter of http.Server
-	IdleTimeout time.Duration
-	// CORS allows CORS requests , sets the values for Allowed Headers and Allowed Origins.
-	CORS corscfg.Options
+	Tenancy tenancy.Options
 }
 
-// GRPCOptions defines options for a gRPC server
-type GRPCOptions struct {
-	// HostPort is the host:port address that the collector service listens in on for gRPC requests
-	HostPort string
-	// TLS configures secure transport for gRPC endpoint to collect spans
-	TLS tlscfg.Options
-	// MaxReceiveMessageLength is the maximum message size receivable by the gRPC Collector.
-	MaxReceiveMessageLength int
-	// MaxConnectionAge is a duration for the maximum amount of time a connection may exist.
-	// See gRPC's keepalive.ServerParameters#MaxConnectionAge.
-	MaxConnectionAge time.Duration
-	// MaxConnectionAgeGrace is an additive period after MaxConnectionAge after which the connection will be forcibly closed.
-	// See gRPC's keepalive.ServerParameters#MaxConnectionAgeGrace.
-	MaxConnectionAgeGrace time.Duration
-	// Tenancy configures tenancy for endpoints that collect spans
-	Tenancy tenancy.Options
+type serverFlagsConfig struct {
+	prefix  string
+	tls     tlscfg.ServerFlagsConfig
+	corsCfg corscfg.Flags
 }
 
 // AddFlags adds flags for CollectorOptions
@@ -184,13 +153,13 @@ func AddFlags(flagSet *flag.FlagSet) {
 
 	flagSet.Bool(flagCollectorOTLPEnabled, true, "Enables OpenTelemetry OTLP receiver on dedicated HTTP and gRPC ports")
 	addHTTPFlags(flagSet, otlpServerFlagsCfg.HTTP, ":4318")
-	corsOTLPFlags.AddFlags(flagSet)
+	otlpServerFlagsCfg.HTTP.corsCfg.AddFlags(flagSet)
 	addGRPCFlags(flagSet, otlpServerFlagsCfg.GRPC, ":4317")
 
 	flagSet.String(flagZipkinHTTPHostPort, "", "The host:port (e.g. 127.0.0.1:9411 or :9411) of the collector's Zipkin server (disabled by default)")
 	flagSet.Bool(flagZipkinKeepAliveEnabled, true, "KeepAlive configures allow Keep-Alive for Zipkin HTTP server (enabled by default)")
-	tlsZipkinFlagsConfig.AddFlags(flagSet)
-	corsZipkinFlags.AddFlags(flagSet)
+	zipkinServerFlagsCfg.tls.AddFlags(flagSet)
+	zipkinServerFlagsCfg.corsCfg.AddFlags(flagSet)
 
 	tenancy.AddFlags(flagSet)
 }
@@ -223,67 +192,70 @@ func addGRPCFlags(flagSet *flag.FlagSet, cfg serverFlagsConfig, defaultHostPort
 	cfg.tls.AddFlags(flagSet)
 }
 
-func (opts *HTTPOptions) initFromViper(v *viper.Viper, _ *zap.Logger, cfg serverFlagsConfig) error {
-	opts.HostPort = ports.FormatHostPort(v.GetString(cfg.prefix + "." + flagSuffixHostPort))
-	opts.IdleTimeout = v.GetDuration(cfg.prefix + "." + flagSuffixHTTPIdleTimeout)
-	opts.ReadTimeout = v.GetDuration(cfg.prefix + "." + flagSuffixHTTPReadTimeout)
-	opts.ReadHeaderTimeout = v.GetDuration(cfg.prefix + "." + flagSuffixHTTPReadHeaderTimeout)
+func initHTTPFromViper(v *viper.Viper, opts *confighttp.ServerConfig, cfg serverFlagsConfig) error {
 	tlsOpts, err := cfg.tls.InitFromViper(v)
 	if err != nil {
 		return fmt.Errorf("failed to parse HTTP TLS options: %w", err)
 	}
-	opts.TLS = tlsOpts
+	opts.TLSSetting = tlsOpts.ToOtelServerConfig()
+	opts.Endpoint = ports.FormatHostPort(v.GetString(cfg.prefix + "." + flagSuffixHostPort))
+	opts.IdleTimeout = v.GetDuration(cfg.prefix + "." + flagSuffixHTTPIdleTimeout)
+	opts.ReadTimeout = v.GetDuration(cfg.prefix + "." + flagSuffixHTTPReadTimeout)
+	opts.ReadHeaderTimeout = v.GetDuration(cfg.prefix + "." + flagSuffixHTTPReadHeaderTimeout)
+	opts.CORS = cfg.corsCfg.InitFromViper(v)
+
 	return nil
 }
 
-func (opts *GRPCOptions) initFromViper(v *viper.Viper, _ *zap.Logger, cfg serverFlagsConfig) error {
-	opts.HostPort = ports.FormatHostPort(v.GetString(cfg.prefix + "." + flagSuffixHostPort))
-	opts.MaxReceiveMessageLength = v.GetInt(cfg.prefix + "." + flagSuffixGRPCMaxReceiveMessageLength)
-	opts.MaxConnectionAge = v.GetDuration(cfg.prefix + "." + flagSuffixGRPCMaxConnectionAge)
-	opts.MaxConnectionAgeGrace = v.GetDuration(cfg.prefix + "." + flagSuffixGRPCMaxConnectionAgeGrace)
+func initGRPCFromViper(v *viper.Viper, opts *configgrpc.ServerConfig, cfg serverFlagsConfig) error {
 	tlsOpts, err := cfg.tls.InitFromViper(v)
 	if err != nil {
-		return fmt.Errorf("failed to parse gRPC TLS options: %w", err)
+		return fmt.Errorf("failed to parse GRPC TLS options: %w", err)
+	}
+	opts.TLSSetting = tlsOpts.ToOtelServerConfig()
+	opts.NetAddr.Endpoint = ports.FormatHostPort(v.GetString(cfg.prefix + "." + flagSuffixHostPort))
+	opts.MaxRecvMsgSizeMiB = v.GetInt(cfg.prefix+"."+flagSuffixGRPCMaxReceiveMessageLength) / (1024 * 1024)
+	opts.Keepalive = &configgrpc.KeepaliveServerConfig{
+		ServerParameters: &configgrpc.KeepaliveServerParameters{
+			MaxConnectionAge:      v.GetDuration(cfg.prefix + "." + flagSuffixGRPCMaxConnectionAge),
+			MaxConnectionAgeGrace: v.GetDuration(cfg.prefix + "." + flagSuffixGRPCMaxConnectionAgeGrace),
+		},
 	}
-	opts.TLS = tlsOpts
-	opts.Tenancy = tenancy.InitFromViper(v)
 
 	return nil
 }
 
 // InitFromViper initializes CollectorOptions with properties from viper
-func (cOpts *CollectorOptions) InitFromViper(v *viper.Viper, logger *zap.Logger) (*CollectorOptions, error) {
+func (cOpts *CollectorOptions) InitFromViper(v *viper.Viper, _ *zap.Logger) (*CollectorOptions, error) {
 	cOpts.CollectorTags = flags.ParseJaegerTags(v.GetString(flagCollectorTags))
 	cOpts.NumWorkers = v.GetInt(flagNumWorkers)
 	cOpts.QueueSize = v.GetUint(flagQueueSize)
 	cOpts.DynQueueSizeMemory = v.GetUint(flagDynQueueSizeMemory) * 1024 * 1024 // we receive in MiB and store in bytes
 	cOpts.SpanSizeMetricsEnabled = v.GetBool(flagSpanSizeMetricsEnabled)
+	cOpts.Tenancy = tenancy.InitFromViper(v)
 
-	if err := cOpts.HTTP.initFromViper(v, logger, httpServerFlagsCfg); err != nil {
+	if err := initHTTPFromViper(v, &cOpts.HTTP, httpServerFlagsCfg); err != nil {
 		return cOpts, fmt.Errorf("failed to parse HTTP server options: %w", err)
 	}
 
-	if err := cOpts.GRPC.initFromViper(v, logger, grpcServerFlagsCfg); err != nil {
+	if err := initGRPCFromViper(v, &cOpts.GRPC, grpcServerFlagsCfg); err != nil {
 		return cOpts, fmt.Errorf("failed to parse gRPC server options: %w", err)
 	}
 
 	cOpts.OTLP.Enabled = v.GetBool(flagCollectorOTLPEnabled)
-	if err := cOpts.OTLP.HTTP.initFromViper(v, logger, otlpServerFlagsCfg.HTTP); err != nil {
+
+	if err := initHTTPFromViper(v, &cOpts.OTLP.HTTP, otlpServerFlagsCfg.HTTP); err != nil {
 		return cOpts, fmt.Errorf("failed to parse OTLP/HTTP server options: %w", err)
 	}
-	cOpts.OTLP.HTTP.CORS = corsOTLPFlags.InitFromViper(v)
-	if err := cOpts.OTLP.GRPC.initFromViper(v, logger, otlpServerFlagsCfg.GRPC); err != nil {
+	if err := initGRPCFromViper(v, &cOpts.OTLP.GRPC, otlpServerFlagsCfg.GRPC); err != nil {
 		return cOpts, fmt.Errorf("failed to parse OTLP/gRPC server options: %w", err)
 	}
 
 	cOpts.Zipkin.KeepAlive = v.GetBool(flagZipkinKeepAliveEnabled)
-	cOpts.Zipkin.HTTPHostPort = ports.FormatHostPort(v.GetString(flagZipkinHTTPHostPort))
-	tlsZipkin, err := tlsZipkinFlagsConfig.InitFromViper(v)
-	if err != nil {
-		return cOpts, fmt.Errorf("failed to parse Zipkin TLS options: %w", err)
+
+	if err := initHTTPFromViper(v, &cOpts.Zipkin.ServerConfig, zipkinServerFlagsCfg); err != nil {
+		return cOpts, fmt.Errorf("failed to parse Zipkin server options: %w", err)
 	}
-	cOpts.Zipkin.TLS = tlsZipkin
-	cOpts.Zipkin.CORS = corsZipkinFlags.InitFromViper(v)
 
 	return cOpts, nil
 }
diff --git a/cmd/collector/app/flags/flags_test.go b/cmd/collector/app/flags/flags_test.go
index 9d261465c09..39727d1bce8 100644
--- a/cmd/collector/app/flags/flags_test.go
+++ b/cmd/collector/app/flags/flags_test.go
@@ -26,9 +26,9 @@ func TestCollectorOptionsWithFlags_CheckHostPort(t *testing.T) {
 	_, err := c.InitFromViper(v, zap.NewNop())
 	require.NoError(t, err)
 
-	assert.Equal(t, ":5678", c.HTTP.HostPort)
-	assert.Equal(t, ":1234", c.GRPC.HostPort)
-	assert.Equal(t, ":3456", c.Zipkin.HTTPHostPort)
+	assert.Equal(t, ":5678", c.HTTP.Endpoint)
+	assert.Equal(t, ":1234", c.GRPC.NetAddr.Endpoint)
+	assert.Equal(t, ":3456", c.Zipkin.Endpoint)
 }
 
 func TestCollectorOptionsWithFlags_CheckFullHostPort(t *testing.T) {
@@ -42,9 +42,9 @@ func TestCollectorOptionsWithFlags_CheckFullHostPort(t *testing.T) {
 	_, err := c.InitFromViper(v, zap.NewNop())
 	require.NoError(t, err)
 
-	assert.Equal(t, ":5678", c.HTTP.HostPort)
-	assert.Equal(t, "127.0.0.1:1234", c.GRPC.HostPort)
-	assert.Equal(t, "0.0.0.0:3456", c.Zipkin.HTTPHostPort)
+	assert.Equal(t, ":5678", c.HTTP.Endpoint)
+	assert.Equal(t, "127.0.0.1:1234", c.GRPC.NetAddr.Endpoint)
+	assert.Equal(t, "0.0.0.0:3456", c.Zipkin.Endpoint)
 }
 
 func TestCollectorOptionsWithFailedTLSFlags(t *testing.T) {
@@ -107,7 +107,7 @@ func TestCollectorOptionsWithFlags_CheckMaxReceiveMessageLength(t *testing.T) {
 	_, err := c.InitFromViper(v, zap.NewNop())
 	require.NoError(t, err)
 
-	assert.Equal(t, 8388608, c.GRPC.MaxReceiveMessageLength)
+	assert.Equal(t, 8, c.GRPC.MaxRecvMsgSizeMiB)
 }
 
 func TestCollectorOptionsWithFlags_CheckMaxConnectionAge(t *testing.T) {
@@ -123,8 +123,8 @@ func TestCollectorOptionsWithFlags_CheckMaxConnectionAge(t *testing.T) {
 	_, err := c.InitFromViper(v, zap.NewNop())
 	require.NoError(t, err)
 
-	assert.Equal(t, 5*time.Minute, c.GRPC.MaxConnectionAge)
-	assert.Equal(t, time.Minute, c.GRPC.MaxConnectionAgeGrace)
+	assert.Equal(t, 5*time.Minute, c.GRPC.Keepalive.ServerParameters.MaxConnectionAge)
+	assert.Equal(t, time.Minute, c.GRPC.Keepalive.ServerParameters.MaxConnectionAgeGrace)
 	assert.Equal(t, 5*time.Minute, c.HTTP.IdleTimeout)
 	assert.Equal(t, 6*time.Minute, c.HTTP.ReadTimeout)
 	assert.Equal(t, 5*time.Second, c.HTTP.ReadHeaderTimeout)
@@ -136,7 +136,7 @@ func TestCollectorOptionsWithFlags_CheckNoTenancy(t *testing.T) {
 	command.ParseFlags([]string{})
 	c.InitFromViper(v, zap.NewNop())
 
-	assert.False(t, c.GRPC.Tenancy.Enabled)
+	assert.False(t, c.Tenancy.Enabled)
 }
 
 func TestCollectorOptionsWithFlags_CheckSimpleTenancy(t *testing.T) {
@@ -147,8 +147,8 @@ func TestCollectorOptionsWithFlags_CheckSimpleTenancy(t *testing.T) {
 	})
 	c.InitFromViper(v, zap.NewNop())
 
-	assert.True(t, c.GRPC.Tenancy.Enabled)
-	assert.Equal(t, "x-tenant", c.GRPC.Tenancy.Header)
+	assert.True(t, c.Tenancy.Enabled)
+	assert.Equal(t, "x-tenant", c.Tenancy.Header)
 }
 
 func TestCollectorOptionsWithFlags_CheckFullTenancy(t *testing.T) {
@@ -161,9 +161,9 @@ func TestCollectorOptionsWithFlags_CheckFullTenancy(t *testing.T) {
 	})
 	c.InitFromViper(v, zap.NewNop())
 
-	assert.True(t, c.GRPC.Tenancy.Enabled)
-	assert.Equal(t, "custom-tenant-header", c.GRPC.Tenancy.Header)
-	assert.Equal(t, []string{"acme", "hardware-store"}, c.GRPC.Tenancy.Tenants)
+	assert.True(t, c.Tenancy.Enabled)
+	assert.Equal(t, "custom-tenant-header", c.Tenancy.Header)
+	assert.Equal(t, []string{"acme", "hardware-store"}, c.Tenancy.Tenants)
 }
 
 func TestCollectorOptionsWithFlags_CheckZipkinKeepAlive(t *testing.T) {
diff --git a/cmd/collector/app/handler/otlp_receiver.go b/cmd/collector/app/handler/otlp_receiver.go
index fb54d931bf8..1bb2b2a96d9 100644
--- a/cmd/collector/app/handler/otlp_receiver.go
+++ b/cmd/collector/app/handler/otlp_receiver.go
@@ -10,10 +10,8 @@ import (
 	otlp2jaeger "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componentstatus"
-	"go.opentelemetry.io/collector/config/configgrpc"
-	"go.opentelemetry.io/collector/config/confighttp"
+	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/config/configtelemetry"
-	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/extension"
 	"go.opentelemetry.io/collector/pdata/ptrace"
@@ -27,7 +25,6 @@ import (
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
 	"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
-	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 )
 
@@ -62,8 +59,9 @@ func startOTLPReceiver(
 		cfg component.Config, nextConsumer consumer.Traces) (receiver.Traces, error),
 ) (receiver.Traces, error) {
 	otlpReceiverConfig := otlpFactory.CreateDefaultConfig().(*otlpreceiver.Config)
-	applyGRPCSettings(otlpReceiverConfig.GRPC, &options.OTLP.GRPC)
-	applyHTTPSettings(otlpReceiverConfig.HTTP.ServerConfig, &options.OTLP.HTTP)
+	otlpReceiverConfig.GRPC = &options.OTLP.GRPC
+	otlpReceiverConfig.GRPC.NetAddr.Transport = confignet.TransportTypeTCP
+	otlpReceiverConfig.HTTP.ServerConfig = &options.OTLP.HTTP
 	statusReporter := func(ev *componentstatus.Event) {
 		// TODO this could be wired into changing healthcheck.HealthCheck
 		logger.Info("OTLP receiver status change", zap.Stringer("status", ev.Status()))
@@ -101,54 +99,6 @@ func startOTLPReceiver(
 	return otlpReceiver, nil
 }
 
-func applyGRPCSettings(cfg *configgrpc.ServerConfig, opts *flags.GRPCOptions) {
-	if opts.HostPort != "" {
-		cfg.NetAddr.Endpoint = opts.HostPort
-	}
-	if opts.TLS.Enabled {
-		cfg.TLSSetting = applyTLSSettings(&opts.TLS)
-	}
-	if opts.MaxReceiveMessageLength > 0 {
-		cfg.MaxRecvMsgSizeMiB = int(opts.MaxReceiveMessageLength / (1024 * 1024))
-	}
-	if opts.MaxConnectionAge != 0 || opts.MaxConnectionAgeGrace != 0 {
-		cfg.Keepalive = &configgrpc.KeepaliveServerConfig{
-			ServerParameters: &configgrpc.KeepaliveServerParameters{
-				MaxConnectionAge:      opts.MaxConnectionAge,
-				MaxConnectionAgeGrace: opts.MaxConnectionAgeGrace,
-			},
-		}
-	}
-}
-
-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.CORSConfig{
-		AllowedOrigins: opts.CORS.AllowedOrigins,
-		AllowedHeaders: opts.CORS.AllowedHeaders,
-	}
-}
-
-func applyTLSSettings(opts *tlscfg.Options) *configtls.ServerConfig {
-	return &configtls.ServerConfig{
-		Config: configtls.Config{
-			CAFile:         opts.CAPath,
-			CertFile:       opts.CertPath,
-			KeyFile:        opts.KeyPath,
-			MinVersion:     opts.MinVersion,
-			MaxVersion:     opts.MaxVersion,
-			ReloadInterval: opts.ReloadInterval,
-		},
-		ClientCAFile: opts.ClientCAPath,
-	}
-}
-
 func newConsumerDelegate(logger *zap.Logger, spanProcessor processor.SpanProcessor, tm *tenancy.Manager) *consumerDelegate {
 	return &consumerDelegate{
 		batchConsumer: newBatchConsumer(logger,
diff --git a/cmd/collector/app/handler/otlp_receiver_test.go b/cmd/collector/app/handler/otlp_receiver_test.go
index 1f18c3d07bb..c0f80de60f2 100644
--- a/cmd/collector/app/handler/otlp_receiver_test.go
+++ b/cmd/collector/app/handler/otlp_receiver_test.go
@@ -7,11 +7,13 @@ import (
 	"context"
 	"errors"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/confighttp"
+	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.opentelemetry.io/collector/pipeline"
@@ -19,19 +21,28 @@ import (
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
-	"github.com/jaegertracing/jaeger/pkg/config/corscfg"
-	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
 )
 
 func optionsWithPorts(port string) *flags.CollectorOptions {
-	opts := &flags.CollectorOptions{}
-	opts.OTLP.GRPC = flags.GRPCOptions{
-		HostPort: port,
-	}
-	opts.OTLP.HTTP = flags.HTTPOptions{
-		HostPort: port,
+	opts := &flags.CollectorOptions{
+		OTLP: struct {
+			Enabled bool
+			GRPC    configgrpc.ServerConfig
+			HTTP    confighttp.ServerConfig
+		}{
+			Enabled: true,
+			HTTP: confighttp.ServerConfig{
+				Endpoint: port,
+			},
+			GRPC: configgrpc.ServerConfig{
+				NetAddr: confignet.AddrConfig{
+					Endpoint:  port,
+					Transport: confignet.TransportTypeTCP,
+				},
+			},
+		},
 	}
 	return opts
 }
@@ -128,80 +139,3 @@ func TestOtelHost(t *testing.T) {
 	assert.Nil(t, host.GetExtensions())
 	assert.Nil(t, host.GetExporters())
 }
-
-func TestApplyOTLPGRPCServerSettings(t *testing.T) {
-	otlpFactory := otlpreceiver.NewFactory()
-	otlpReceiverConfig := otlpFactory.CreateDefaultConfig().(*otlpreceiver.Config)
-
-	grpcOpts := &flags.GRPCOptions{
-		HostPort:                ":54321",
-		MaxReceiveMessageLength: 42 * 1024 * 1024,
-		MaxConnectionAge:        33 * time.Second,
-		MaxConnectionAgeGrace:   37 * time.Second,
-		TLS: tlscfg.Options{
-			Enabled:        true,
-			CAPath:         "ca",
-			CertPath:       "cert",
-			KeyPath:        "key",
-			ClientCAPath:   "clientca",
-			MinVersion:     "1.1",
-			MaxVersion:     "1.3",
-			ReloadInterval: 24 * time.Hour,
-		},
-	}
-	applyGRPCSettings(otlpReceiverConfig.GRPC, grpcOpts)
-	out := otlpReceiverConfig.GRPC
-	assert.Equal(t, ":54321", out.NetAddr.Endpoint)
-	assert.EqualValues(t, 42, out.MaxRecvMsgSizeMiB)
-	require.NotNil(t, out.Keepalive)
-	require.NotNil(t, out.Keepalive.ServerParameters)
-	assert.Equal(t, 33*time.Second, out.Keepalive.ServerParameters.MaxConnectionAge)
-	assert.Equal(t, 37*time.Second, out.Keepalive.ServerParameters.MaxConnectionAgeGrace)
-	require.NotNil(t, out.TLSSetting)
-	assert.Equal(t, "ca", out.TLSSetting.CAFile)
-	assert.Equal(t, "cert", out.TLSSetting.CertFile)
-	assert.Equal(t, "key", out.TLSSetting.KeyFile)
-	assert.Equal(t, "clientca", out.TLSSetting.ClientCAFile)
-	assert.Equal(t, "1.1", out.TLSSetting.MinVersion)
-	assert.Equal(t, "1.3", out.TLSSetting.MaxVersion)
-	assert.Equal(t, 24*time.Hour, out.TLSSetting.ReloadInterval)
-}
-
-func TestApplyOTLPHTTPServerSettings(t *testing.T) {
-	otlpFactory := otlpreceiver.NewFactory()
-	otlpReceiverConfig := otlpFactory.CreateDefaultConfig().(*otlpreceiver.Config)
-
-	httpOpts := &flags.HTTPOptions{
-		HostPort: ":12345",
-		TLS: tlscfg.Options{
-			Enabled:        true,
-			CAPath:         "ca",
-			CertPath:       "cert",
-			KeyPath:        "key",
-			ClientCAPath:   "clientca",
-			MinVersion:     "1.1",
-			MaxVersion:     "1.3",
-			ReloadInterval: 24 * time.Hour,
-		},
-		CORS: corscfg.Options{
-			AllowedOrigins: []string{"http://example.domain.com", "http://*.domain.com"},
-			AllowedHeaders: []string{"Content-Type", "Accept", "X-Requested-With"},
-		},
-	}
-
-	applyHTTPSettings(otlpReceiverConfig.HTTP.ServerConfig, httpOpts)
-
-	out := otlpReceiverConfig.HTTP
-
-	assert.Equal(t, ":12345", out.Endpoint)
-	require.NotNil(t, out.TLSSetting)
-	assert.Equal(t, "ca", out.TLSSetting.CAFile)
-	assert.Equal(t, "cert", out.TLSSetting.CertFile)
-	assert.Equal(t, "key", out.TLSSetting.KeyFile)
-	assert.Equal(t, "clientca", out.TLSSetting.ClientCAFile)
-	assert.Equal(t, "1.1", out.TLSSetting.MinVersion)
-	assert.Equal(t, "1.3", out.TLSSetting.MaxVersion)
-	assert.Equal(t, 24*time.Hour, out.TLSSetting.ReloadInterval)
-	assert.Equal(t, []string{"Content-Type", "Accept", "X-Requested-With"}, out.CORS.AllowedHeaders)
-	assert.Equal(t, []string{"http://example.domain.com", "http://*.domain.com"}, out.CORS.AllowedOrigins)
-}
diff --git a/cmd/collector/app/handler/zipkin_receiver.go b/cmd/collector/app/handler/zipkin_receiver.go
index 983ee4bd2a5..b7fc18619e3 100644
--- a/cmd/collector/app/handler/zipkin_receiver.go
+++ b/cmd/collector/app/handler/zipkin_receiver.go
@@ -56,12 +56,7 @@ func startZipkinReceiver(
 		cfg component.Config, nextConsumer consumer.Traces) (receiver.Traces, error),
 ) (receiver.Traces, error) {
 	receiverConfig := zipkinFactory.CreateDefaultConfig().(*zipkinreceiver.Config)
-	applyHTTPSettings(&receiverConfig.ServerConfig, &flags.HTTPOptions{
-		HostPort: options.Zipkin.HTTPHostPort,
-		TLS:      options.Zipkin.TLS,
-		CORS:     options.HTTP.CORS,
-		// TODO keepAlive not supported?
-	})
+	receiverConfig.ServerConfig = options.Zipkin.ServerConfig
 	receiverSettings := receiver.Settings{
 		TelemetrySettings: component.TelemetrySettings{
 			Logger:         logger,
diff --git a/cmd/collector/app/handler/zipkin_receiver_test.go b/cmd/collector/app/handler/zipkin_receiver_test.go
index 584dbc56cda..d6ad98c4319 100644
--- a/cmd/collector/app/handler/zipkin_receiver_test.go
+++ b/cmd/collector/app/handler/zipkin_receiver_test.go
@@ -37,7 +37,7 @@ func TestZipkinReceiver(t *testing.T) {
 	tm := &tenancy.Manager{}
 
 	opts := &flags.CollectorOptions{}
-	opts.Zipkin.HTTPHostPort = ":11911"
+	opts.Zipkin.Endpoint = ":11911"
 
 	rec, err := StartZipkinReceiver(opts, logger, spanProcessor, tm)
 	require.NoError(t, err)
@@ -138,7 +138,7 @@ func TestStartZipkinReceiver_Error(t *testing.T) {
 	tm := &tenancy.Manager{}
 
 	opts := &flags.CollectorOptions{}
-	opts.Zipkin.HTTPHostPort = ":-1"
+	opts.Zipkin.Endpoint = ":-1"
 
 	_, err := StartZipkinReceiver(opts, logger, spanProcessor, tm)
 	require.ErrorContains(t, err, "could not start Zipkin receiver")
diff --git a/cmd/collector/app/handler/zipkin_receiver_tls_test.go b/cmd/collector/app/handler/zipkin_receiver_tls_test.go
index 060327360a6..108a1023150 100644
--- a/cmd/collector/app/handler/zipkin_receiver_tls_test.go
+++ b/cmd/collector/app/handler/zipkin_receiver_tls_test.go
@@ -13,10 +13,9 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"go.uber.org/zap"
+	"go.opentelemetry.io/collector/config/configtls"
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
-	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/ports"
@@ -26,21 +25,21 @@ func TestSpanCollectorZipkinTLS(t *testing.T) {
 	const testCertKeyLocation = "../../../../pkg/config/tlscfg/testdata"
 	testCases := []struct {
 		name                  string
-		serverTLS             tlscfg.Options
-		clientTLS             tlscfg.Options
+		serverTLS             configtls.ServerConfig
+		clientTLS             configtls.ClientConfig
 		expectTLSClientErr    bool
 		expectZipkinClientErr bool
 		expectServerFail      bool
 	}{
 		{
 			name: "should fail with TLS client to untrusted TLS server",
-			serverTLS: tlscfg.Options{
-				Enabled:  true,
-				CertPath: testCertKeyLocation + "/example-server-cert.pem",
-				KeyPath:  testCertKeyLocation + "/example-server-key.pem",
+			serverTLS: configtls.ServerConfig{
+				Config: configtls.Config{
+					CertFile: testCertKeyLocation + "/example-server-cert.pem",
+					KeyFile:  testCertKeyLocation + "/example-server-key.pem",
+				},
 			},
-			clientTLS: tlscfg.Options{
-				Enabled:    true,
+			clientTLS: configtls.ClientConfig{
 				ServerName: "example.com",
 			},
 			expectTLSClientErr:    true,
@@ -49,14 +48,16 @@ func TestSpanCollectorZipkinTLS(t *testing.T) {
 		},
 		{
 			name: "should fail with TLS client to trusted TLS server with incorrect hostname",
-			serverTLS: tlscfg.Options{
-				Enabled:  true,
-				CertPath: testCertKeyLocation + "/example-server-cert.pem",
-				KeyPath:  testCertKeyLocation + "/example-server-key.pem",
+			serverTLS: configtls.ServerConfig{
+				Config: configtls.Config{
+					CertFile: testCertKeyLocation + "/example-server-cert.pem",
+					KeyFile:  testCertKeyLocation + "/example-server-key.pem",
+				},
 			},
-			clientTLS: tlscfg.Options{
-				Enabled:    true,
-				CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+			clientTLS: configtls.ClientConfig{
+				Config: configtls.Config{
+					CAFile: testCertKeyLocation + "/example-CA-cert.pem",
+				},
 				ServerName: "nonEmpty",
 			},
 			expectTLSClientErr:    true,
@@ -65,14 +66,16 @@ func TestSpanCollectorZipkinTLS(t *testing.T) {
 		},
 		{
 			name: "should pass with TLS client to trusted TLS server with correct hostname",
-			serverTLS: tlscfg.Options{
-				Enabled:  true,
-				CertPath: testCertKeyLocation + "/example-server-cert.pem",
-				KeyPath:  testCertKeyLocation + "/example-server-key.pem",
+			serverTLS: configtls.ServerConfig{
+				Config: configtls.Config{
+					CertFile: testCertKeyLocation + "/example-server-cert.pem",
+					KeyFile:  testCertKeyLocation + "/example-server-key.pem",
+				},
 			},
-			clientTLS: tlscfg.Options{
-				Enabled:    true,
-				CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+			clientTLS: configtls.ClientConfig{
+				Config: configtls.Config{
+					CAFile: testCertKeyLocation + "/example-CA-cert.pem",
+				},
 				ServerName: "example.com",
 			},
 			expectTLSClientErr:    false,
@@ -81,74 +84,82 @@ func TestSpanCollectorZipkinTLS(t *testing.T) {
 		},
 		{
 			name: "should fail with TLS client without cert to trusted TLS server requiring cert",
-			serverTLS: tlscfg.Options{
-				Enabled:      true,
-				CertPath:     testCertKeyLocation + "/example-server-cert.pem",
-				KeyPath:      testCertKeyLocation + "/example-server-key.pem",
-				ClientCAPath: testCertKeyLocation + "/example-CA-cert.pem",
+			serverTLS: configtls.ServerConfig{
+				ClientCAFile: testCertKeyLocation + "/example-CA-cert.pem",
+				Config: configtls.Config{
+					CertFile: testCertKeyLocation + "/example-server-cert.pem",
+					KeyFile:  testCertKeyLocation + "/example-server-key.pem",
+				},
 			},
-			clientTLS: tlscfg.Options{
-				Enabled:    true,
-				CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+			clientTLS: configtls.ClientConfig{
+				Config: configtls.Config{
+					CAFile: testCertKeyLocation + "/example-CA-cert.pem",
+				},
 				ServerName: "example.com",
 			},
 			expectTLSClientErr:    false,
-			expectServerFail:      false,
 			expectZipkinClientErr: true,
+			expectServerFail:      false,
 		},
 		{
 			name: "should pass with TLS client with cert to trusted TLS server requiring cert",
-			serverTLS: tlscfg.Options{
-				Enabled:      true,
-				CertPath:     testCertKeyLocation + "/example-server-cert.pem",
-				KeyPath:      testCertKeyLocation + "/example-server-key.pem",
-				ClientCAPath: testCertKeyLocation + "/example-CA-cert.pem",
+			serverTLS: configtls.ServerConfig{
+				ClientCAFile: testCertKeyLocation + "/example-CA-cert.pem",
+				Config: configtls.Config{
+					CertFile: testCertKeyLocation + "/example-server-cert.pem",
+					KeyFile:  testCertKeyLocation + "/example-server-key.pem",
+				},
 			},
-			clientTLS: tlscfg.Options{
-				Enabled:    true,
-				CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+			clientTLS: configtls.ClientConfig{
+				Config: configtls.Config{
+					CAFile:   testCertKeyLocation + "/example-CA-cert.pem",
+					CertFile: testCertKeyLocation + "/example-client-cert.pem",
+					KeyFile:  testCertKeyLocation + "/example-client-key.pem",
+				},
 				ServerName: "example.com",
-				CertPath:   testCertKeyLocation + "/example-client-cert.pem",
-				KeyPath:    testCertKeyLocation + "/example-client-key.pem",
 			},
 			expectTLSClientErr:    false,
-			expectServerFail:      false,
 			expectZipkinClientErr: false,
+			expectServerFail:      false,
 		},
 		{
-			name: "should fail with TLS client without cert to trusted TLS server requiring cert from a different CA",
-			serverTLS: tlscfg.Options{
-				Enabled:      true,
-				CertPath:     testCertKeyLocation + "/example-server-cert.pem",
-				KeyPath:      testCertKeyLocation + "/example-server-key.pem",
-				ClientCAPath: testCertKeyLocation + "/wrong-CA-cert.pem", // NB: wrong CA
+			name: "should fail with TLS client without cert to trusted TLS server requiring cert from different CA",
+			serverTLS: configtls.ServerConfig{
+				ClientCAFile: testCertKeyLocation + "/wrong-CA-cert.pem",
+				Config: configtls.Config{
+					CertFile: testCertKeyLocation + "/example-server-cert.pem",
+					KeyFile:  testCertKeyLocation + "/example-server-key.pem",
+				},
 			},
-			clientTLS: tlscfg.Options{
-				Enabled:    true,
-				CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+			clientTLS: configtls.ClientConfig{
+				Config: configtls.Config{
+					CAFile:   testCertKeyLocation + "/example-CA-cert.pem",
+					CertFile: testCertKeyLocation + "/example-client-cert.pem",
+					KeyFile:  testCertKeyLocation + "/example-client-key.pem",
+				},
 				ServerName: "example.com",
-				CertPath:   testCertKeyLocation + "/example-client-cert.pem",
-				KeyPath:    testCertKeyLocation + "/example-client-key.pem",
 			},
 			expectTLSClientErr:    false,
-			expectServerFail:      false,
 			expectZipkinClientErr: true,
+			expectServerFail:      false,
 		},
 		{
 			name: "should fail with TLS client with cert to trusted TLS server with incorrect TLS min",
-			serverTLS: tlscfg.Options{
-				Enabled:      true,
-				CertPath:     testCertKeyLocation + "/example-server-cert.pem",
-				KeyPath:      testCertKeyLocation + "/example-server-key.pem",
-				ClientCAPath: testCertKeyLocation + "/example-CA-cert.pem",
-				MinVersion:   "1.5",
+			serverTLS: configtls.ServerConfig{
+				ClientCAFile: testCertKeyLocation + "/example-CA-cert.pem",
+				Config: configtls.Config{
+					CertFile:   testCertKeyLocation + "/example-server-cert.pem",
+					KeyFile:    testCertKeyLocation + "/example-server-key.pem",
+					MinVersion: "1.5",
+				},
 			},
-			clientTLS: tlscfg.Options{
-				Enabled:    true,
-				CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+			clientTLS: configtls.ClientConfig{
+				Config: configtls.Config{
+					CAFile:   testCertKeyLocation + "/example-CA-cert.pem",
+					CertFile: testCertKeyLocation + "/example-client-cert.pem",
+					KeyFile:  testCertKeyLocation + "/example-client-key.pem",
+				},
 				ServerName: "example.com",
-				CertPath:   testCertKeyLocation + "/example-client-cert.pem",
-				KeyPath:    testCertKeyLocation + "/example-client-key.pem",
 			},
 			expectTLSClientErr:    true,
 			expectServerFail:      true,
@@ -163,9 +174,8 @@ func TestSpanCollectorZipkinTLS(t *testing.T) {
 			tm := &tenancy.Manager{}
 
 			opts := &flags.CollectorOptions{}
-			opts.Zipkin.HTTPHostPort = ports.PortToHostPort(ports.CollectorZipkin)
-			opts.Zipkin.TLS = test.serverTLS
-			defer test.serverTLS.Close()
+			opts.Zipkin.Endpoint = ports.PortToHostPort(ports.CollectorZipkin)
+			opts.Zipkin.TLSSetting = &test.serverTLS
 
 			server, err := StartZipkinReceiver(opts, logger, spanProcessor, tm)
 			if test.expectServerFail {
@@ -177,8 +187,7 @@ func TestSpanCollectorZipkinTLS(t *testing.T) {
 				require.NoError(t, server.Shutdown(context.Background()))
 			}()
 
-			clientTLSCfg, err0 := test.clientTLS.Config(zap.NewNop())
-			defer test.clientTLS.Close()
+			clientTLSCfg, err0 := test.clientTLS.LoadTLSConfig(context.Background())
 			require.NoError(t, err0)
 			dialer := &net.Dialer{Timeout: 2 * time.Second}
 			conn, clientError := tls.DialWithDialer(dialer, "tcp", fmt.Sprintf("localhost:%d", ports.CollectorZipkin), clientTLSCfg)
@@ -197,7 +206,6 @@ func TestSpanCollectorZipkinTLS(t *testing.T) {
 			}
 
 			response, requestError := client.Post(fmt.Sprintf("https://localhost:%d", ports.CollectorZipkin), "", nil)
-
 			if test.expectZipkinClientErr {
 				require.Error(t, requestError)
 			} else {
diff --git a/cmd/collector/app/server/grpc.go b/cmd/collector/app/server/grpc.go
index a740fe5b8fe..dbdedce6f26 100644
--- a/cmd/collector/app/server/grpc.go
+++ b/cmd/collector/app/server/grpc.go
@@ -4,36 +4,32 @@
 package server
 
 import (
+	"context"
 	"fmt"
 	"net"
-	"time"
 
+	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/confignet"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/health"
 	"google.golang.org/grpc/health/grpc_health_v1"
-	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/reflection"
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/handler"
 	"github.com/jaegertracing/jaeger/cmd/collector/app/sampling"
 	"github.com/jaegertracing/jaeger/cmd/collector/app/sampling/samplingstrategy"
-	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
+	"github.com/jaegertracing/jaeger/pkg/telemetry"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 )
 
 // GRPCServerParams to construct a new Jaeger Collector gRPC Server
 type GRPCServerParams struct {
-	TLSConfig               tlscfg.Options
-	HostPort                string
-	Handler                 *handler.GRPCHandler
-	SamplingProvider        samplingstrategy.Provider
-	Logger                  *zap.Logger
-	OnError                 func(error)
-	MaxReceiveMessageLength int
-	MaxConnectionAge        time.Duration
-	MaxConnectionAgeGrace   time.Duration
+	configgrpc.ServerConfig
+	Handler          *handler.GRPCHandler
+	SamplingProvider samplingstrategy.Provider
+	Logger           *zap.Logger
+	OnError          func(error)
 
 	// Set by the server to indicate the actual host:port of the server.
 	HostPortActual string
@@ -42,31 +38,17 @@ type GRPCServerParams struct {
 // StartGRPCServer based on the given parameters
 func StartGRPCServer(params *GRPCServerParams) (*grpc.Server, error) {
 	var server *grpc.Server
-	var grpcOpts []grpc.ServerOption
-
-	if params.MaxReceiveMessageLength > 0 {
-		grpcOpts = append(grpcOpts, grpc.MaxRecvMsgSize(params.MaxReceiveMessageLength))
-	}
-	grpcOpts = append(grpcOpts, grpc.KeepaliveParams(keepalive.ServerParameters{
-		MaxConnectionAge:      params.MaxConnectionAge,
-		MaxConnectionAgeGrace: params.MaxConnectionAgeGrace,
-	}))
-
-	if params.TLSConfig.Enabled {
-		// user requested a server with TLS, setup creds
-		tlsCfg, err := params.TLSConfig.Config(params.Logger)
-		if err != nil {
-			return nil, err
-		}
-
-		creds := credentials.NewTLS(tlsCfg)
-		grpcOpts = append(grpcOpts, grpc.Creds(creds))
+	var grpcOpts []configgrpc.ToServerOption
+	params.NetAddr.Transport = confignet.TransportTypeTCP
+	server, err := params.ToServer(context.Background(), nil,
+		telemetry.NoopSettings().ToOtelComponent(),
+		grpcOpts...)
+	if err != nil {
+		return nil, err
 	}
-
-	server = grpc.NewServer(grpcOpts...)
 	reflection.Register(server)
 
-	listener, err := net.Listen("tcp", params.HostPort)
+	listener, err := params.NetAddr.Listen(context.Background())
 	if err != nil {
 		return nil, fmt.Errorf("failed to listen on gRPC port: %w", err)
 	}
diff --git a/cmd/collector/app/server/grpc_test.go b/cmd/collector/app/server/grpc_test.go
index 19594ebcfa7..3ac6351d628 100644
--- a/cmd/collector/app/server/grpc_test.go
+++ b/cmd/collector/app/server/grpc_test.go
@@ -10,6 +10,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/confignet"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest/observer"
@@ -28,7 +30,12 @@ import (
 func TestFailToListen(t *testing.T) {
 	logger, _ := zap.NewDevelopment()
 	server, err := StartGRPCServer(&GRPCServerParams{
-		HostPort:         ":-1",
+		ServerConfig: configgrpc.ServerConfig{
+			NetAddr: confignet.AddrConfig{
+				Endpoint:  ":-1",
+				Transport: confignet.TransportTypeTCP,
+			},
+		},
 		Handler:          handler.NewGRPCHandler(logger, &mockSpanProcessor{}, &tenancy.Manager{}),
 		SamplingProvider: &mockSamplingProvider{},
 		Logger:           logger,
@@ -63,10 +70,15 @@ func TestFailServe(t *testing.T) {
 func TestSpanCollector(t *testing.T) {
 	logger, _ := zap.NewDevelopment()
 	params := &GRPCServerParams{
-		Handler:                 handler.NewGRPCHandler(logger, &mockSpanProcessor{}, &tenancy.Manager{}),
-		SamplingProvider:        &mockSamplingProvider{},
-		Logger:                  logger,
-		MaxReceiveMessageLength: 1024 * 1024,
+		Handler:          handler.NewGRPCHandler(logger, &mockSpanProcessor{}, &tenancy.Manager{}),
+		SamplingProvider: &mockSamplingProvider{},
+		Logger:           logger,
+		ServerConfig: configgrpc.ServerConfig{
+			MaxRecvMsgSizeMiB: 2,
+			NetAddr: confignet.AddrConfig{
+				Transport: confignet.TransportTypeTCP,
+			},
+		},
 	}
 
 	server, err := StartGRPCServer(params)
@@ -87,21 +99,26 @@ func TestSpanCollector(t *testing.T) {
 
 func TestCollectorStartWithTLS(t *testing.T) {
 	logger, _ := zap.NewDevelopment()
+	opts := tlscfg.Options{
+		Enabled:      true,
+		CertPath:     testCertKeyLocation + "/example-server-cert.pem",
+		KeyPath:      testCertKeyLocation + "/example-server-key.pem",
+		ClientCAPath: testCertKeyLocation + "/example-CA-cert.pem",
+	}
 	params := &GRPCServerParams{
 		Handler:          handler.NewGRPCHandler(logger, &mockSpanProcessor{}, &tenancy.Manager{}),
 		SamplingProvider: &mockSamplingProvider{},
 		Logger:           logger,
-		TLSConfig: tlscfg.Options{
-			Enabled:      true,
-			CertPath:     testCertKeyLocation + "/example-server-cert.pem",
-			KeyPath:      testCertKeyLocation + "/example-server-key.pem",
-			ClientCAPath: testCertKeyLocation + "/example-CA-cert.pem",
+		ServerConfig: configgrpc.ServerConfig{
+			NetAddr: confignet.AddrConfig{
+				Transport: confignet.TransportTypeTCP,
+			},
+			TLSSetting: opts.ToOtelServerConfig(),
 		},
 	}
 	server, err := StartGRPCServer(params)
 	require.NoError(t, err)
 	defer server.Stop()
-	defer params.TLSConfig.Close()
 }
 
 func TestCollectorReflection(t *testing.T) {
@@ -110,6 +127,11 @@ func TestCollectorReflection(t *testing.T) {
 		Handler:          handler.NewGRPCHandler(logger, &mockSpanProcessor{}, &tenancy.Manager{}),
 		SamplingProvider: &mockSamplingProvider{},
 		Logger:           logger,
+		ServerConfig: configgrpc.ServerConfig{
+			NetAddr: confignet.AddrConfig{
+				Transport: confignet.TransportTypeTCP,
+			},
+		},
 	}
 
 	server, err := StartGRPCServer(params)
diff --git a/cmd/collector/app/server/http.go b/cmd/collector/app/server/http.go
index c519e6df495..15385bb9320 100644
--- a/cmd/collector/app/server/http.go
+++ b/cmd/collector/app/server/http.go
@@ -4,63 +4,47 @@
 package server
 
 import (
+	"context"
 	"net"
 	"net/http"
-	"time"
 
 	"github.com/gorilla/mux"
+	"go.opentelemetry.io/collector/config/confighttp"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/handler"
 	"github.com/jaegertracing/jaeger/cmd/collector/app/sampling/samplingstrategy"
 	clientcfgHandler "github.com/jaegertracing/jaeger/pkg/clientcfg/clientcfghttp"
-	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
 	"github.com/jaegertracing/jaeger/pkg/healthcheck"
 	"github.com/jaegertracing/jaeger/pkg/httpmetrics"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/recoveryhandler"
+	"github.com/jaegertracing/jaeger/pkg/telemetry"
 )
 
 // HTTPServerParams to construct a new Jaeger Collector HTTP Server
 type HTTPServerParams struct {
-	TLSConfig        tlscfg.Options
-	HostPort         string
+	confighttp.ServerConfig
 	Handler          handler.JaegerBatchesHandler
 	SamplingProvider samplingstrategy.Provider
 	MetricsFactory   metrics.Factory
 	HealthCheck      *healthcheck.HealthCheck
 	Logger           *zap.Logger
-
-	// ReadTimeout sets the respective parameter of http.Server
-	ReadTimeout time.Duration
-	// ReadHeaderTimeout sets the respective parameter of http.Server
-	ReadHeaderTimeout time.Duration
-	// IdleTimeout sets the respective parameter of http.Server
-	IdleTimeout time.Duration
 }
 
 // StartHTTPServer based on the given parameters
 func StartHTTPServer(params *HTTPServerParams) (*http.Server, error) {
-	params.Logger.Info("Starting jaeger-collector HTTP server", zap.String("http host-port", params.HostPort))
-
-	errorLog, _ := zap.NewStdLogAt(params.Logger, zapcore.ErrorLevel)
-	server := &http.Server{
-		Addr:              params.HostPort,
-		ReadTimeout:       params.ReadTimeout,
-		ReadHeaderTimeout: params.ReadHeaderTimeout,
-		IdleTimeout:       params.IdleTimeout,
-		ErrorLog:          errorLog,
-	}
-	if params.TLSConfig.Enabled {
-		tlsCfg, err := params.TLSConfig.Config(params.Logger) // This checks if the certificates are correctly provided
-		if err != nil {
-			return nil, err
-		}
-		server.TLSConfig = tlsCfg
+	params.Logger.Info("Starting jaeger-collector HTTP server", zap.String("host-port", params.Endpoint))
+	listener, err := params.ToListener(context.Background())
+	if err != nil {
+		return nil, err
 	}
+	errorLog, _ := zap.NewStdLogAt(params.Logger, zapcore.ErrorLevel)
+	server, err := params.ToServer(context.Background(), nil, telemetry.NoopSettings().ToOtelComponent(),
+		nil)
 
-	listener, err := net.Listen("tcp", params.HostPort)
+	server.ErrorLog = errorLog
 	if err != nil {
 		return nil, err
 	}
@@ -89,12 +73,7 @@ func serveHTTP(server *http.Server, listener net.Listener, params *HTTPServerPar
 	recoveryHandler := recoveryhandler.NewRecoveryHandler(params.Logger, true)
 	server.Handler = httpmetrics.Wrap(recoveryHandler(r), params.MetricsFactory, params.Logger)
 	go func() {
-		var err error
-		if params.TLSConfig.Enabled {
-			err = server.ServeTLS(listener, "", "")
-		} else {
-			err = server.Serve(listener)
-		}
+		err := server.Serve(listener)
 		if err != nil {
 			if err != http.ErrServerClosed {
 				params.Logger.Error("Could not start HTTP collector", zap.Error(err))
diff --git a/cmd/collector/app/server/http_test.go b/cmd/collector/app/server/http_test.go
index 46184bd8b89..24c00b94e54 100644
--- a/cmd/collector/app/server/http_test.go
+++ b/cmd/collector/app/server/http_test.go
@@ -4,17 +4,20 @@
 package server
 
 import (
+	"context"
 	"crypto/tls"
 	"fmt"
 	"net"
 	"net/http"
-	"net/http/httptest"
 	"strconv"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/config/confighttp"
+	"go.opentelemetry.io/collector/config/configtls"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/handler"
@@ -30,8 +33,10 @@ var testCertKeyLocation = "../../../../pkg/config/tlscfg/testdata"
 func TestFailToListenHTTP(t *testing.T) {
 	logger, _ := zap.NewDevelopment()
 	server, err := StartHTTPServer(&HTTPServerParams{
-		HostPort: ":-1",
-		Logger:   logger,
+		ServerConfig: confighttp.ServerConfig{
+			Endpoint: ":-1",
+		},
+		Logger: logger,
 	})
 	assert.Nil(t, server)
 	require.EqualError(t, err, "listen tcp: address -1: invalid port")
@@ -39,22 +44,23 @@ func TestFailToListenHTTP(t *testing.T) {
 
 func TestCreateTLSHTTPServerError(t *testing.T) {
 	logger, _ := zap.NewDevelopment()
-	tlsCfg := tlscfg.Options{
-		Enabled:      true,
-		CertPath:     "invalid/path",
-		KeyPath:      "invalid/path",
-		ClientCAPath: "invalid/path",
-	}
 
 	params := &HTTPServerParams{
-		HostPort:    fmt.Sprintf(":%d", ports.CollectorHTTP),
+		ServerConfig: confighttp.ServerConfig{
+			Endpoint: ":0",
+			TLSSetting: &configtls.ServerConfig{
+				Config: configtls.Config{
+					CertFile: "invalid/path",
+					KeyFile:  "invalid/path",
+					CAFile:   "invalid/path",
+				},
+			},
+		},
 		HealthCheck: healthcheck.New(),
 		Logger:      logger,
-		TLSConfig:   tlsCfg,
 	}
 	_, err := StartHTTPServer(params)
 	require.Error(t, err)
-	defer params.TLSConfig.Close()
 }
 
 func TestSpanCollectorHTTP(t *testing.T) {
@@ -69,11 +75,15 @@ func TestSpanCollectorHTTP(t *testing.T) {
 		Logger:           logger,
 	}
 
-	server := httptest.NewServer(nil)
-
-	serveHTTP(server.Config, server.Listener, params)
+	server, _ := params.ToServer(context.Background(), nil, component.TelemetrySettings{}, nil)
+	listener, _ := params.ToListener(context.Background())
 
-	response, err := http.Post(server.URL, "", nil)
+	serveHTTP(server, listener, params)
+	addr := listener.Addr().String()
+	host, port, err := net.SplitHostPort(addr)
+	require.NoError(t, err)
+	url := fmt.Sprintf("http://%s:%s", host, port)
+	response, err := http.Post(url, "", nil)
 	require.NoError(t, err)
 	assert.NotNil(t, response)
 	defer response.Body.Close()
@@ -188,15 +198,16 @@ func TestSpanCollectorHTTPS(t *testing.T) {
 			mFact := metricstest.NewFactory(time.Hour)
 			defer mFact.Backend.Stop()
 			params := &HTTPServerParams{
-				HostPort:         fmt.Sprintf(":%d", ports.CollectorHTTP),
+				ServerConfig: confighttp.ServerConfig{
+					Endpoint:   fmt.Sprintf(":%d", ports.CollectorHTTP),
+					TLSSetting: test.TLS.ToOtelServerConfig(),
+				},
 				Handler:          handler.NewJaegerSpanHandler(logger, &mockSpanProcessor{}),
 				SamplingProvider: &mockSamplingProvider{},
 				MetricsFactory:   mFact,
 				HealthCheck:      healthcheck.New(),
 				Logger:           logger,
-				TLSConfig:        test.TLS,
 			}
-			defer params.TLSConfig.Close()
 
 			server, err := StartHTTPServer(params)
 			require.NoError(t, err)
@@ -204,8 +215,7 @@ func TestSpanCollectorHTTPS(t *testing.T) {
 				require.NoError(t, server.Close())
 			}()
 
-			clientTLSCfg, err0 := test.clientTLS.Config(logger)
-			defer test.clientTLS.Close()
+			clientTLSCfg, err0 := test.clientTLS.ToOtelClientConfig().LoadTLSConfig(context.Background())
 			require.NoError(t, err0)
 			dialer := &net.Dialer{Timeout: 2 * time.Second}
 			conn, clientError := tls.DialWithDialer(dialer, "tcp", "localhost:"+strconv.Itoa(ports.CollectorHTTP), clientTLSCfg)
@@ -250,15 +260,17 @@ func TestStartHTTPServerParams(t *testing.T) {
 	mFact := metricstest.NewFactory(time.Hour)
 	defer mFact.Stop()
 	params := &HTTPServerParams{
-		HostPort:          fmt.Sprintf(":%d", ports.CollectorHTTP),
-		Handler:           handler.NewJaegerSpanHandler(logger, &mockSpanProcessor{}),
-		SamplingProvider:  &mockSamplingProvider{},
-		MetricsFactory:    mFact,
-		HealthCheck:       healthcheck.New(),
-		Logger:            logger,
-		IdleTimeout:       5 * time.Minute,
-		ReadTimeout:       6 * time.Minute,
-		ReadHeaderTimeout: 7 * time.Second,
+		ServerConfig: confighttp.ServerConfig{
+			Endpoint:          fmt.Sprintf(":%d", ports.CollectorHTTP),
+			IdleTimeout:       5 * time.Minute,
+			ReadTimeout:       6 * time.Minute,
+			ReadHeaderTimeout: 7 * time.Second,
+		},
+		Handler:          handler.NewJaegerSpanHandler(logger, &mockSpanProcessor{}),
+		SamplingProvider: &mockSamplingProvider{},
+		MetricsFactory:   mFact,
+		HealthCheck:      healthcheck.New(),
+		Logger:           logger,
 	}
 
 	server, err := StartHTTPServer(params)
diff --git a/cmd/collector/main.go b/cmd/collector/main.go
index 52528ada6fb..29303cecdbb 100644
--- a/cmd/collector/main.go
+++ b/cmd/collector/main.go
@@ -95,7 +95,7 @@ func main() {
 			if err != nil {
 				logger.Fatal("Failed to initialize collector", zap.Error(err))
 			}
-			tm := tenancy.NewManager(&collectorOpts.GRPC.Tenancy)
+			tm := tenancy.NewManager(&collectorOpts.Tenancy)
 
 			collector := app.New(&app.CollectorParams{
 				ServiceName:        serviceName,
diff --git a/pkg/config/corscfg/flags.go b/pkg/config/corscfg/flags.go
index c58b6b44bc4..892e177d7f7 100644
--- a/pkg/config/corscfg/flags.go
+++ b/pkg/config/corscfg/flags.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/spf13/viper"
+	"go.opentelemetry.io/collector/config/confighttp"
 )
 
 const (
@@ -25,8 +26,8 @@ func (c Flags) AddFlags(flags *flag.FlagSet) {
 	flags.String(c.Prefix+corsAllowedOrigins, "", "Comma-separated CORS allowed origins. See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin")
 }
 
-func (c Flags) InitFromViper(v *viper.Viper) Options {
-	var p Options
+func (c Flags) InitFromViper(v *viper.Viper) *confighttp.CORSConfig {
+	var p confighttp.CORSConfig
 
 	allowedHeaders := v.GetString(c.Prefix + corsAllowedHeaders)
 	allowedOrigins := v.GetString(c.Prefix + corsAllowedOrigins)
@@ -34,5 +35,5 @@ func (c Flags) InitFromViper(v *viper.Viper) Options {
 	p.AllowedOrigins = strings.Split(strings.ReplaceAll(allowedOrigins, " ", ""), ",")
 	p.AllowedHeaders = strings.Split(strings.ReplaceAll(allowedHeaders, " ", ""), ",")
 
-	return p
+	return &p
 }
diff --git a/pkg/config/corscfg/flags_test.go b/pkg/config/corscfg/flags_test.go
index 4ddb292e1fe..2ca108b6c2b 100644
--- a/pkg/config/corscfg/flags_test.go
+++ b/pkg/config/corscfg/flags_test.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/config/confighttp"
 
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
@@ -31,10 +32,10 @@ func TestCORSFlags(t *testing.T) {
 		corsOpts := flagCfg.InitFromViper(v)
 		fmt.Println(corsOpts)
 
-		assert.Equal(t, Options{
+		assert.Equal(t, confighttp.CORSConfig{
 			AllowedHeaders: []string{"Content-Type", "Accept", "X-Requested-With"},
 			AllowedOrigins: []string{"http://example.domain.com", "http://*.domain.com"},
-		}, corsOpts)
+		}, *corsOpts)
 	})
 }
 
diff --git a/pkg/config/corscfg/options.go b/pkg/config/corscfg/options.go
deleted file mode 100644
index 9dd1f7ffd5a..00000000000
--- a/pkg/config/corscfg/options.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2023 The Jaeger Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package corscfg
-
-type Options struct {
-	AllowedOrigins []string
-	AllowedHeaders []string
-}
diff --git a/pkg/telemetry/settings.go b/pkg/telemetry/settings.go
index 1f76b38e107..5b58fd7583d 100644
--- a/pkg/telemetry/settings.go
+++ b/pkg/telemetry/settings.go
@@ -70,3 +70,11 @@ func FromOtelComponent(telset component.TelemetrySettings, host component.Host)
 		Host: host,
 	}
 }
+
+func (s Settings) ToOtelComponent() component.TelemetrySettings {
+	return component.TelemetrySettings{
+		Logger:         s.Logger,
+		MeterProvider:  s.MeterProvider,
+		TracerProvider: s.TracerProvider,
+	}
+}

From acc9e027a998ed79b457b77278e62478c642faae Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 12 Dec 2024 00:24:47 +0100
Subject: [PATCH 15/59] fix(deps): update module
 github.com/grpc-ecosystem/go-grpc-middleware/v2 to v2.2.0 (#6340)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/grpc-ecosystem/go-grpc-middleware/v2](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware)
| `v2.1.0` -> `v2.2.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fgrpc-ecosystem%2fgo-grpc-middleware%2fv2/v2.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fgrpc-ecosystem%2fgo-grpc-middleware%2fv2/v2.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fgrpc-ecosystem%2fgo-grpc-middleware%2fv2/v2.1.0/v2.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fgrpc-ecosystem%2fgo-grpc-middleware%2fv2/v2.1.0/v2.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>grpc-ecosystem/go-grpc-middleware
(github.com/grpc-ecosystem/go-grpc-middleware/v2)</summary>

###
[`v2.2.0`](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/releases/tag/v2.2.0)

[Compare
Source](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/compare/v2.1.0...v2.2.0)

#### What's Changed

- Call retry callback on retry by
[@&#8203;fredr](https://redirect.github.com/fredr) in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/700](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/700)
- interceptors: Update logging interceptor Reporter to re-extract fields
from context before logging by
[@&#8203;chancez](https://redirect.github.com/chancez) in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/702](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/702)
- logging: Document correct
WithFieldsFromContext/WithFieldsFromContextAndCallMeta usage by
[@&#8203;chancez](https://redirect.github.com/chancez) in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/703](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/703)
- Include error details in protovalidate responses by
[@&#8203;akshayjshah](https://redirect.github.com/akshayjshah) in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/714](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/714)
- protovalidate: avoid pointer comparisons by
[@&#8203;akshayjshah](https://redirect.github.com/akshayjshah) in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/715](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/715)
- Support for namespace in grpc prometheus counter and histogram metrics
by [@&#8203;hyungi](https://redirect.github.com/hyungi) in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/718](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/718)
- Protovalidate interceptor cleanup, Go version bump by
[@&#8203;ash2k](https://redirect.github.com/ash2k) in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/721](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/721)
- Use ValueFromIncomingContext() to reduce allocations and copying by
[@&#8203;ash2k](https://redirect.github.com/ash2k) in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/723](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/723)
- Update examples to the latest otelgrpc API by
[@&#8203;nmittler](https://redirect.github.com/nmittler) in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/729](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/729)
- Fix grpc middleware interceptor not PostCall-ing when a streaming RPC
with non-streaming server finishes successfully. by
[@&#8203;alexandrupitis1](https://redirect.github.com/alexandrupitis1)
in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/725](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/725)
- x-retry-attempt to StreamClientInterceptor by
[@&#8203;Boklazhenko](https://redirect.github.com/Boklazhenko) in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/733](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/733)
- logging: add WithErrorFields by
[@&#8203;kindermoumoute](https://redirect.github.com/kindermoumoute) in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/734](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/734)
- example: use slog instead of go-kit by
[@&#8203;kindermoumoute](https://redirect.github.com/kindermoumoute) in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/735](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/735)

#### New Contributors

- [@&#8203;fredr](https://redirect.github.com/fredr) made their first
contribution in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/700](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/700)
- [@&#8203;marefr](https://redirect.github.com/marefr) made their first
contribution in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/706](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/706)
- [@&#8203;akshayjshah](https://redirect.github.com/akshayjshah) made
their first contribution in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/714](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/714)
- [@&#8203;hyungi](https://redirect.github.com/hyungi) made their first
contribution in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/718](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/718)
- [@&#8203;nmittler](https://redirect.github.com/nmittler) made their
first contribution in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/729](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/729)
- [@&#8203;alexandrupitis1](https://redirect.github.com/alexandrupitis1)
made their first contribution in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/725](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/725)
- [@&#8203;Boklazhenko](https://redirect.github.com/Boklazhenko) made
their first contribution in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/733](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/733)
- [@&#8203;kindermoumoute](https://redirect.github.com/kindermoumoute)
made their first contribution in
[https://github.com/grpc-ecosystem/go-grpc-middleware/pull/734](https://redirect.github.com/grpc-ecosystem/go-grpc-middleware/pull/734)

**Full Changelog**:
https://github.com/grpc-ecosystem/go-grpc-middleware/compare/v2.1.0...v2.2.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS41OC4xIiwidXBkYXRlZEluVmVyIjoiMzkuNTguMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 003fc057822..34a704d6958 100644
--- a/go.mod
+++ b/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/gorilla/handlers v1.5.2
 	github.com/gorilla/mux v1.8.1
-	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
+	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0
 	github.com/kr/pretty v0.3.1
 	github.com/olivere/elastic v6.2.37+incompatible
 	github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.115.0
diff --git a/go.sum b/go.sum
index 308f93da133..095f08bf482 100644
--- a/go.sum
+++ b/go.sum
@@ -248,8 +248,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
 github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
-github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk=
-github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI=
+github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 h1:kQ0NI7W1B3HwiN5gAYtY+XFItDPbLBwYRxAqbFTyDes=
+github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0/go.mod h1:zrT2dxOAjNFPRGjTUe2Xmb4q4YdUwVvQFV6xiCSf+z0=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0=
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=

From 4162f57571ed4787c7002b5398fbc7efe5abdfec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 18:36:26 -0500
Subject: [PATCH 16/59] chore(deps): bump golang.org/x/crypto from 0.30.0 to
 0.31.0 (#6342)

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from
0.30.0 to 0.31.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/golang/crypto/commit/b4f1988a35dee11ec3e05d6bf3e90b695fbd8909"><code>b4f1988</code></a>
ssh: make the public key cache a 1-entry FIFO cache</li>
<li>See full diff in <a
href="https://github.com/golang/crypto/compare/v0.30.0...v0.31.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/crypto&package-manager=go_modules&previous-version=0.30.0&new-version=0.31.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)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

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 <dependency name> 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)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/jaegertracing/jaeger/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
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 34a704d6958..656614e68cd 100644
--- a/go.mod
+++ b/go.mod
@@ -262,7 +262,7 @@ require (
 	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.30.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gonum.org/v1/gonum v0.15.1 // indirect
diff --git a/go.sum b/go.sum
index 095f08bf482..332af178994 100644
--- a/go.sum
+++ b/go.sum
@@ -786,8 +786,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.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
-golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 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=

From 86965411377114061384234ccd33a4dad1ba8a47 Mon Sep 17 00:00:00 2001
From: chahat sagar <109112505+chahatsagarmain@users.noreply.github.com>
Date: Thu, 12 Dec 2024 09:05:34 +0530
Subject: [PATCH 17/59] [admin] Use OTEL helper instead of tlscfg (#6319)

## Which problem is this PR solving?
- Part of #4316

## Description of the changes
-

## How was this change tested?
-

## Checklist
- [ ] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [ ] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: chahatsagarmain <chahatsagar2003@gmail.com>
Signed-off-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Co-authored-by: Yuri Shkuro <github@ysh.us>
---
 cmd/internal/flags/admin.go        | 103 ++++++++++++++---------------
 cmd/internal/flags/admin_test.go   |   6 +-
 cmd/internal/flags/service_test.go |   2 +-
 3 files changed, 53 insertions(+), 58 deletions(-)

diff --git a/cmd/internal/flags/admin.go b/cmd/internal/flags/admin.go
index e868eff7f3b..6078fb97c3b 100644
--- a/cmd/internal/flags/admin.go
+++ b/cmd/internal/flags/admin.go
@@ -5,23 +5,23 @@ package flags
 
 import (
 	"context"
-	"crypto/tls"
 	"errors"
 	"flag"
 	"fmt"
-	"io"
 	"net"
 	"net/http"
 	"net/http/pprof"
-	"time"
+	"sync"
 
 	"github.com/spf13/viper"
+	"go.opentelemetry.io/collector/config/confighttp"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
 	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
 	"github.com/jaegertracing/jaeger/pkg/healthcheck"
 	"github.com/jaegertracing/jaeger/pkg/recoveryhandler"
+	"github.com/jaegertracing/jaeger/pkg/telemetry"
 	"github.com/jaegertracing/jaeger/pkg/version"
 )
 
@@ -35,22 +35,23 @@ var tlsAdminHTTPFlagsConfig = tlscfg.ServerFlagsConfig{
 
 // AdminServer runs an HTTP server with admin endpoints, such as healthcheck at /, /metrics, etc.
 type AdminServer struct {
-	logger               *zap.Logger
-	adminHostPort        string
-	hc                   *healthcheck.HealthCheck
-	mux                  *http.ServeMux
-	server               *http.Server
-	tlsCfg               *tls.Config
-	tlsCertWatcherCloser io.Closer
+	logger    *zap.Logger
+	hc        *healthcheck.HealthCheck
+	mux       *http.ServeMux
+	server    *http.Server
+	serverCfg confighttp.ServerConfig
+	stopped   sync.WaitGroup
 }
 
 // NewAdminServer creates a new admin server.
 func NewAdminServer(hostPort string) *AdminServer {
 	return &AdminServer{
-		adminHostPort: hostPort,
-		logger:        zap.NewNop(),
-		hc:            healthcheck.New(),
-		mux:           http.NewServeMux(),
+		logger: zap.NewNop(),
+		hc:     healthcheck.New(),
+		mux:    http.NewServeMux(),
+		serverCfg: confighttp.ServerConfig{
+			Endpoint: hostPort,
+		},
 	}
 }
 
@@ -67,7 +68,7 @@ func (s *AdminServer) setLogger(logger *zap.Logger) {
 
 // AddFlags registers CLI flags.
 func (s *AdminServer) AddFlags(flagSet *flag.FlagSet) {
-	flagSet.String(adminHTTPHostPort, s.adminHostPort, fmt.Sprintf("The host:port (e.g. 127.0.0.1%s or %s) for the admin server, including health check, /metrics, etc.", s.adminHostPort, s.adminHostPort))
+	flagSet.String(adminHTTPHostPort, s.serverCfg.Endpoint, fmt.Sprintf("The host:port (e.g. 127.0.0.1%s or %s) for the admin server, including health check, /metrics, etc.", s.serverCfg.Endpoint, s.serverCfg.Endpoint))
 	tlsAdminHTTPFlagsConfig.AddFlags(flagSet)
 }
 
@@ -75,22 +76,13 @@ func (s *AdminServer) AddFlags(flagSet *flag.FlagSet) {
 func (s *AdminServer) initFromViper(v *viper.Viper, logger *zap.Logger) error {
 	s.setLogger(logger)
 
-	s.adminHostPort = v.GetString(adminHTTPHostPort)
-	var tlsAdminHTTP tlscfg.Options
 	tlsAdminHTTP, err := tlsAdminHTTPFlagsConfig.InitFromViper(v)
 	if err != nil {
 		return fmt.Errorf("failed to parse admin server TLS options: %w", err)
 	}
-	if tlsAdminHTTP.Enabled {
-		tlsCfg, err := tlsAdminHTTP.Config(s.logger) // This checks if the certificates are correctly provided
-		if err != nil {
-			return err
-		}
-		s.tlsCfg = tlsCfg
-		s.tlsCertWatcherCloser = &tlsAdminHTTP
-	} else {
-		s.tlsCertWatcherCloser = io.NopCloser(nil)
-	}
+
+	s.serverCfg.Endpoint = v.GetString(adminHTTPHostPort)
+	s.serverCfg.TLSSetting = tlsAdminHTTP.ToOtelServerConfig()
 	return nil
 }
 
@@ -101,48 +93,52 @@ func (s *AdminServer) Handle(path string, handler http.Handler) {
 
 // Serve starts HTTP server.
 func (s *AdminServer) Serve() error {
-	l, err := net.Listen("tcp", s.adminHostPort)
+	l, err := s.serverCfg.ToListener(context.Background())
 	if err != nil {
 		s.logger.Error("Admin server failed to listen", zap.Error(err))
 		return err
 	}
-	s.serveWithListener(l)
 
-	s.logger.Info(
-		"Admin server started",
-		zap.String("http.host-port", l.Addr().String()),
-		zap.Stringer("health-status", s.hc.Get()))
-	return nil
+	return s.serveWithListener(l)
 }
 
-func (s *AdminServer) serveWithListener(l net.Listener) {
+func (s *AdminServer) serveWithListener(l net.Listener) (err error) {
 	s.logger.Info("Mounting health check on admin server", zap.String("route", "/"))
 	s.mux.Handle("/", s.hc.Handler())
 	version.RegisterHandler(s.mux, s.logger)
 	s.registerPprofHandlers()
 	recoveryHandler := recoveryhandler.NewRecoveryHandler(s.logger, true)
-	errorLog, _ := zap.NewStdLogAt(s.logger, zapcore.ErrorLevel)
-	s.server = &http.Server{
-		Handler:           recoveryHandler(s.mux),
-		ErrorLog:          errorLog,
-		ReadHeaderTimeout: 2 * time.Second,
-	}
-	if s.tlsCfg != nil {
-		s.server.TLSConfig = s.tlsCfg
+	s.server, err = s.serverCfg.ToServer(
+		context.Background(),
+		nil, // host
+		telemetry.NoopSettings().ToOtelComponent(),
+		recoveryHandler(s.mux),
+	)
+	if err != nil {
+		return fmt.Errorf("failed to create admin server: %w", err)
 	}
-	s.logger.Info("Starting admin HTTP server", zap.String("http-addr", s.adminHostPort))
+	errorLog, _ := zap.NewStdLogAt(s.logger, zapcore.ErrorLevel)
+	s.server.ErrorLog = errorLog
+
+	s.logger.Info("Starting admin HTTP server")
+	var wg sync.WaitGroup
+	wg.Add(1)
+	s.stopped.Add(1)
 	go func() {
-		var err error
-		if s.tlsCfg != nil {
-			err = s.server.ServeTLS(l, "", "")
-		} else {
-			err = s.server.Serve(l)
-		}
+		wg.Done()
+		defer s.stopped.Done()
+		err := s.server.Serve(l)
 		if err != nil && !errors.Is(err, http.ErrServerClosed) {
 			s.logger.Error("failed to serve", zap.Error(err))
 			s.hc.Set(healthcheck.Broken)
 		}
 	}()
+	wg.Wait() // wait for the server to start listening
+	s.logger.Info(
+		"Admin server started",
+		zap.String("http.host-port", l.Addr().String()),
+		zap.Stringer("health-status", s.hc.Get()))
+	return nil
 }
 
 func (s *AdminServer) registerPprofHandlers() {
@@ -159,8 +155,7 @@ func (s *AdminServer) registerPprofHandlers() {
 
 // Close stops the HTTP server
 func (s *AdminServer) Close() error {
-	return errors.Join(
-		s.tlsCertWatcherCloser.Close(),
-		s.server.Shutdown(context.Background()),
-	)
+	err := s.server.Shutdown(context.Background())
+	s.stopped.Wait()
+	return err
 }
diff --git a/cmd/internal/flags/admin_test.go b/cmd/internal/flags/admin_test.go
index 74eaaf525fe..8d83e46d99c 100644
--- a/cmd/internal/flags/admin_test.go
+++ b/cmd/internal/flags/admin_test.go
@@ -4,6 +4,7 @@
 package flags
 
 import (
+	"context"
 	"crypto/tls"
 	"fmt"
 	"net"
@@ -69,7 +70,7 @@ func TestAdminFailToServe(t *testing.T) {
 	require.NoError(t, adminServer.initFromViper(v, logger))
 
 	adminServer.serveWithListener(l)
-	defer adminServer.Close()
+	t.Cleanup(func() { assert.NoError(t, adminServer.Close()) })
 
 	waitForEqual(t, healthcheck.Broken, func() any { return adminServer.HC().Get() })
 
@@ -133,9 +134,8 @@ func TestAdminServerTLS(t *testing.T) {
 			adminServer.Serve()
 			defer adminServer.Close()
 
-			clientTLSCfg, err0 := test.clientTLS.Config(zap.NewNop())
+			clientTLSCfg, err0 := test.clientTLS.ToOtelClientConfig().LoadTLSConfig(context.Background())
 			require.NoError(t, err0)
-			defer test.clientTLS.Close()
 			dialer := &net.Dialer{Timeout: 2 * time.Second}
 			conn, clientError := tls.DialWithDialer(dialer, "tcp", fmt.Sprintf("localhost:%d", ports.CollectorAdminHTTP), clientTLSCfg)
 			require.NoError(t, clientError)
diff --git a/cmd/internal/flags/service_test.go b/cmd/internal/flags/service_test.go
index f50a2bbe97f..4157b1c7c6c 100644
--- a/cmd/internal/flags/service_test.go
+++ b/cmd/internal/flags/service_test.go
@@ -50,7 +50,7 @@ func TestStartErrors(t *testing.T) {
 		{
 			name:   "bad admin TLS",
 			flags:  []string{"--admin.http.tls.enabled=true", "--admin.http.tls.cert=invalid-cert"},
-			expErr: "cannot initialize admin server",
+			expErr: "cannot start the admin server: failed to load TLS config",
 		},
 		{
 			name:   "bad host:port",

From d69dad5bc07be359baf805e290975895b2370597 Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Wed, 11 Dec 2024 23:51:31 -0500
Subject: [PATCH 18/59] [v2][query] Add interface for adjuster to operate on
 OTLP data format (#6346)

## Which problem is this PR solving?
- Towards #6344

## Description of the changes
- This PR adds an interface for `Adjuster` to operate on the OTLP model
format so that it can be used by the v2 query service. The v1
interface/implementation can be found in `model/adjuster`.
- In the following PRs, we'll implement all the standard adjusters in
`model/adjuster` to implement the new interface.

## How was this change tested?
- Unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/query/app/querysvc/adjuster/adjuster.go   | 60 ++++++++++++++++
 .../app/querysvc/adjuster/adjuster_test.go    | 68 +++++++++++++++++++
 .../app/querysvc/adjuster/package_test.go     | 14 ++++
 3 files changed, 142 insertions(+)
 create mode 100644 cmd/query/app/querysvc/adjuster/adjuster.go
 create mode 100644 cmd/query/app/querysvc/adjuster/adjuster_test.go
 create mode 100644 cmd/query/app/querysvc/adjuster/package_test.go

diff --git a/cmd/query/app/querysvc/adjuster/adjuster.go b/cmd/query/app/querysvc/adjuster/adjuster.go
new file mode 100644
index 00000000000..748eee10b07
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/adjuster.go
@@ -0,0 +1,60 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"errors"
+
+	"go.opentelemetry.io/collector/pdata/ptrace"
+)
+
+// Adjuster defines an interface for modifying a trace object.
+// It returns the adjusted trace object, which is also updated in place.
+// If the adjuster encounters an issue that prevents it from applying
+// modifications, it should return the original trace object along with an error.
+type Adjuster interface {
+	Adjust(ptrace.Traces) (ptrace.Traces, error)
+}
+
+// Func is a type alias that wraps a function and makes an Adjuster from it.
+type Func func(trace ptrace.Traces) (ptrace.Traces, error)
+
+// Adjust implements Adjuster interface for the Func alias.
+func (f Func) Adjust(trace ptrace.Traces) (ptrace.Traces, error) {
+	return f(trace)
+}
+
+// Sequence creates an adjuster that combines a series of adjusters
+// applied in order. Errors from each step are accumulated and returned
+// in the end as a single wrapper error. Errors do not interrupt the
+// sequence of adapters.
+func Sequence(adjusters ...Adjuster) Adjuster {
+	return sequence{adjusters: adjusters}
+}
+
+// FailFastSequence is similar to Sequence() but returns immediately
+// if any adjuster returns an error.
+func FailFastSequence(adjusters ...Adjuster) Adjuster {
+	return sequence{adjusters: adjusters, failFast: true}
+}
+
+type sequence struct {
+	adjusters []Adjuster
+	failFast  bool
+}
+
+func (c sequence) Adjust(trace ptrace.Traces) (ptrace.Traces, error) {
+	var errs []error
+	for _, adjuster := range c.adjusters {
+		var err error
+		trace, err = adjuster.Adjust(trace)
+		if err != nil {
+			if c.failFast {
+				return trace, err
+			}
+			errs = append(errs, err)
+		}
+	}
+	return trace, errors.Join(errs...)
+}
diff --git a/cmd/query/app/querysvc/adjuster/adjuster_test.go b/cmd/query/app/querysvc/adjuster/adjuster_test.go
new file mode 100644
index 00000000000..96cd4336988
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/adjuster_test.go
@@ -0,0 +1,68 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster_test
+
+import (
+	"errors"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc/adjuster"
+)
+
+func TestSequences(t *testing.T) {
+	// mock adjuster that increments last byte of span ID
+	adj := adjuster.Func(func(trace ptrace.Traces) (ptrace.Traces, error) {
+		span := trace.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
+		spanId := span.SpanID()
+		spanId[7]++
+		span.SetSpanID(spanId)
+		return trace, nil
+	})
+
+	adjErr := errors.New("mock adjuster error")
+	failingAdj := adjuster.Func(func(trace ptrace.Traces) (ptrace.Traces, error) {
+		return trace, adjErr
+	})
+
+	tests := []struct {
+		name       string
+		adjuster   adjuster.Adjuster
+		err        string
+		lastSpanID pcommon.SpanID
+	}{
+		{
+			name:       "normal sequence",
+			adjuster:   adjuster.Sequence(adj, failingAdj, adj, failingAdj),
+			err:        fmt.Sprintf("%s\n%s", adjErr, adjErr),
+			lastSpanID: [8]byte{0, 0, 0, 0, 0, 0, 0, 2},
+		},
+		{
+			name:       "fail fast sequence",
+			adjuster:   adjuster.FailFastSequence(adj, failingAdj, adj, failingAdj),
+			err:        adjErr.Error(),
+			lastSpanID: [8]byte{0, 0, 0, 0, 0, 0, 0, 1},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			trace := ptrace.NewTraces()
+			span := trace.ResourceSpans().AppendEmpty().ScopeSpans().AppendEmpty().Spans().AppendEmpty()
+			span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 0})
+
+			adjTrace, err := test.adjuster.Adjust(trace)
+			adjTraceSpan := adjTrace.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
+
+			assert.Equal(t, span, adjTraceSpan)
+			assert.EqualValues(t, test.lastSpanID, span.SpanID())
+			require.EqualError(t, err, test.err)
+		})
+	}
+}
diff --git a/cmd/query/app/querysvc/adjuster/package_test.go b/cmd/query/app/querysvc/adjuster/package_test.go
new file mode 100644
index 00000000000..d5e9585aa5c
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/package_test.go
@@ -0,0 +1,14 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"testing"
+
+	"github.com/jaegertracing/jaeger/pkg/testutils"
+)
+
+func TestMain(m *testing.M) {
+	testutils.VerifyGoLeaks(m)
+}

From 5b5042869e48f6a8976d7aba2ab1c5902647611d Mon Sep 17 00:00:00 2001
From: Manik Mehta <mehtamanik96@gmail.com>
Date: Thu, 12 Dec 2024 19:58:51 +0530
Subject: [PATCH 19/59] Add Go Leak Check for Badgerstore, gRPC and Memstore
 e2e Tests (#6347)

## Which problem is this PR solving?
Fixes a part of #5006

## Description of the changes
- Added go leak check for badgerstore, grpc and Memstore

## How was this change tested?
- Integration Tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
---
 plugin/storage/integration/badgerstore_test.go | 4 ++++
 plugin/storage/integration/grpc_test.go        | 4 ++++
 plugin/storage/integration/memstore_test.go    | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/plugin/storage/integration/badgerstore_test.go b/plugin/storage/integration/badgerstore_test.go
index d7ac474e27f..6bec5b45365 100644
--- a/plugin/storage/integration/badgerstore_test.go
+++ b/plugin/storage/integration/badgerstore_test.go
@@ -12,6 +12,7 @@ import (
 	"go.uber.org/zap/zaptest"
 
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/plugin/storage/badger"
 )
 
@@ -47,6 +48,9 @@ func (s *BadgerIntegrationStorage) cleanUp(t *testing.T) {
 
 func TestBadgerStorage(t *testing.T) {
 	SkipUnlessEnv(t, "badger")
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnce(t)
+	})
 	s := &BadgerIntegrationStorage{
 		StorageIntegration: StorageIntegration{
 			SkipArchiveTest: true,
diff --git a/plugin/storage/integration/grpc_test.go b/plugin/storage/integration/grpc_test.go
index 77e273cf826..8ca6df51ddb 100644
--- a/plugin/storage/integration/grpc_test.go
+++ b/plugin/storage/integration/grpc_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
 )
 
@@ -61,6 +62,9 @@ func (s *GRPCStorageIntegrationTestSuite) cleanUp(t *testing.T) {
 
 func TestGRPCRemoteStorage(t *testing.T) {
 	SkipUnlessEnv(t, "grpc")
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnce(t)
+	})
 	s := &GRPCStorageIntegrationTestSuite{
 		flags: []string{
 			"--grpc-storage.server=localhost:17271",
diff --git a/plugin/storage/integration/memstore_test.go b/plugin/storage/integration/memstore_test.go
index fa5eb65d7c6..35eaede7517 100644
--- a/plugin/storage/integration/memstore_test.go
+++ b/plugin/storage/integration/memstore_test.go
@@ -36,6 +36,9 @@ func (s *MemStorageIntegrationTestSuite) initialize(_ *testing.T) {
 
 func TestMemoryStorage(t *testing.T) {
 	SkipUnlessEnv(t, "memory")
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnce(t)
+	})
 	s := &MemStorageIntegrationTestSuite{}
 	s.initialize(t)
 	s.RunAll(t)

From 62ee67c67553d2c9878d24c1c537fbc3620a1e33 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 12 Dec 2024 18:36:22 +0100
Subject: [PATCH 20/59] chore(deps): update
 docker.elastic.co/elasticsearch/elasticsearch docker tag to v8.17.0 (#6348)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
|
[docker.elastic.co/elasticsearch/elasticsearch](https://www.elastic.co/products/elasticsearch)
([source](https://redirect.github.com/elastic/elasticsearch)) | minor |
`8.16.0` -> `8.17.0` |

---

### Release Notes

<details>
<summary>elastic/elasticsearch
(docker.elastic.co/elasticsearch/elasticsearch)</summary>

###
[`v8.17.0`](https://redirect.github.com/elastic/elasticsearch/compare/v8.16.1...v8.17.0)

[Compare
Source](https://redirect.github.com/elastic/elasticsearch/compare/v8.16.1...v8.17.0)

###
[`v8.16.1`](https://redirect.github.com/elastic/elasticsearch/releases/tag/v8.16.1):
Elasticsearch 8.16.1

[Compare
Source](https://redirect.github.com/elastic/elasticsearch/compare/v8.16.0...v8.16.1)

Downloads: https://elastic.co/downloads/elasticsearch
Release notes:
https://www.elastic.co/guide/en/elasticsearch/reference/8.16/release-notes-8.16.1.html

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS41OC4xIiwidXBkYXRlZEluVmVyIjoiMzkuNTguMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
---
 docker-compose/elasticsearch/v8/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/elasticsearch/v8/docker-compose.yml b/docker-compose/elasticsearch/v8/docker-compose.yml
index b5bc8671b2b..8b8405f181f 100644
--- a/docker-compose/elasticsearch/v8/docker-compose.yml
+++ b/docker-compose/elasticsearch/v8/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.16.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0
     environment:
       - discovery.type=single-node
       - http.host=0.0.0.0

From 1f231502f333800857f567be456a9c34ba9c3732 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 12 Dec 2024 22:11:27 +0100
Subject: [PATCH 21/59] fix(deps): update module go.opentelemetry.io/otel to
 v1.33.0 (#6350)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[go.opentelemetry.io/otel](https://redirect.github.com/open-telemetry/opentelemetry-go)
| `v1.32.0` -> `v1.33.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>open-telemetry/opentelemetry-go
(go.opentelemetry.io/otel)</summary>

###
[`v1.33.0`](https://redirect.github.com/open-telemetry/opentelemetry-go/releases/tag/v1.33.0):
/v0.55.0/v0.9.0/v0.0.12

[Compare
Source](https://redirect.github.com/open-telemetry/opentelemetry-go/compare/v1.32.0...v1.33.0)

##### Overview

##### Added

- Add `Reset` method to `SpanRecorder` in
`go.opentelemetry.io/otel/sdk/trace/tracetest`.
([#&#8203;5994](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5994))
- Add `EnabledInstrument` interface in
`go.opentelemetry.io/otel/sdk/metric/internal/x`. This is an
experimental interface that is implemented by synchronous instruments
provided by `go.opentelemetry.io/otel/sdk/metric`. Users can use it to
avoid performing computationally expensive operations when recording
measurements. It does not fall within the scope of the OpenTelemetry Go
versioning and stability [policy](./VERSIONING.md) and it may be changed
in backwards incompatible ways or removed in feature releases.
([#&#8203;6016](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/6016))

##### Changed

- The default global API now supports full auto-instrumentation from the
`go.opentelemetry.io/auto` package. See that package for more
information.
([#&#8203;5920](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5920))
- Propagate non-retryable error messages to client in
`go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`.
([#&#8203;5929](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5929))
- Propagate non-retryable error messages to client in
`go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp`.
([#&#8203;5929](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5929))
- Propagate non-retryable error messages to client in
`go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp`.
([#&#8203;5929](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5929))
- Performance improvements for attribute value `AsStringSlice`,
`AsFloat64Slice`, `AsInt64Slice`, `AsBoolSlice`.
([#&#8203;6011](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/6011))
- Change `EnabledParameters` to have a `Severity` field instead of a
getter and setter in `go.opentelemetry.io/otel/log`.
([#&#8203;6009](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/6009))

##### Fixed

- Fix inconsistent request body closing in
`go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`.
([#&#8203;5954](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5954))
- Fix inconsistent request body closing in
`go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp`.
([#&#8203;5954](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5954))
- Fix inconsistent request body closing in
`go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp`.
([#&#8203;5954](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5954))
- Fix invalid exemplar keys in
`go.opentelemetry.io/otel/exporters/prometheus`.
([#&#8203;5995](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5995))
- Fix attribute value truncation in
`go.opentelemetry.io/otel/sdk/trace`.
([#&#8203;5997](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5997))
- Fix attribute value truncation in `go.opentelemetry.io/otel/sdk/log`.
([#&#8203;6032](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/6032))

##### What's Changed

- fix(deps): update module google.golang.org/grpc to v1.68.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5955](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5955)
- chore(deps): update golang.org/x by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5962](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5962)
- fix(deps): update golang.org/x/exp digest to
[`2d47ceb`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/2d47ceb)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5963](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5963)
- otlp: Clients to close body uniformly by
[@&#8203;mark-pictor-csec](https://redirect.github.com/mark-pictor-csec)
in
[https://github.com/open-telemetry/opentelemetry-go/pull/5954](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5954)
- Fix lint issues for golangci-lint 1.62.0 by
[@&#8203;dmathieu](https://redirect.github.com/dmathieu) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5967](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5967)
- fix(deps): update module github.com/golangci/golangci-lint to v1.62.0
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5966](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5966)
- chore(deps): update googleapis to
[`e0fbfb7`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/e0fbfb7)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5971](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5971)
- chore(deps): update googleapis to
[`65e8d21`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/65e8d21)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5972](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5972)
- fix(deps): update module google.golang.org/protobuf to v1.35.2 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5975](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5975)
- \[chore]: enable int-conversion rule of perfsprint by
[@&#8203;mmorel-35](https://redirect.github.com/mmorel-35) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5964](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5964)
- chore(deps): update codecov/codecov-action action to v5 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5977](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5977)
- \[chore] Fix codecov action usage by
[@&#8203;pellared](https://redirect.github.com/pellared) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5979](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5979)
- chore(deps): update codecov/codecov-action action to v5.0.2 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5981](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5981)
- \[chore]: enable all rules of perfsprint by
[@&#8203;mmorel-35](https://redirect.github.com/mmorel-35) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5978](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5978)
- Add toolchain check by
[@&#8203;cheese-head](https://redirect.github.com/cheese-head) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5983](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5983)
- \[chore] Fix VERSIONING.md missing parenthesis by
[@&#8203;MrAlias](https://redirect.github.com/MrAlias) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5984](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5984)
- chore(deps): update googleapis to
[`e639e21`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/e639e21)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5985](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5985)
- chore(deps): update codecov/codecov-action action to v5.0.3 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5986](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5986)
- fix(deps): update module github.com/masterminds/semver/v3 to v3.3.1 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5987](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5987)
- Propagate non-retryable error messages to client by
[@&#8203;mark-pictor-csec](https://redirect.github.com/mark-pictor-csec)
in
[https://github.com/open-telemetry/opentelemetry-go/pull/5929](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5929)
- chore(deps): update codecov/codecov-action action to v5.0.5 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5991](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5991)
- chore(deps): update codecov/codecov-action action to v5.0.6 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5992](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5992)
- chore(deps): update codecov/codecov-action action to v5.0.7 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5993](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5993)
- Use auto-instrumentation SDK in global tracing by
[@&#8203;MrAlias](https://redirect.github.com/MrAlias) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5920](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5920)
- Escape exemplar keys to fix invalid key errors by
[@&#8203;dashpole](https://redirect.github.com/dashpole) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5995](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5995)
- chore(deps): update module github.com/grpc-ecosystem/grpc-gateway/v2
to v2.24.0 by [@&#8203;renovate](https://redirect.github.com/renovate)
in
[https://github.com/open-telemetry/opentelemetry-go/pull/5998](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5998)
- fix(deps): update module github.com/stretchr/testify to v1.10.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6000](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6000)
- Corrent comments for the metric data storage location by
[@&#8203;yumosx](https://redirect.github.com/yumosx) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5999](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5999)
- fix(deps): update module github.com/golangci/golangci-lint to v1.62.2
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6003](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6003)
- \[chore]: enable usestdlibvars linter by
[@&#8203;mmorel-35](https://redirect.github.com/mmorel-35) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6001](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6001)
- feat(trace): add concurrent-safe `Reset` method to `SpanRecorder` by
[@&#8203;flc1125](https://redirect.github.com/flc1125) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5994](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5994)
- Fix attribute value truncation by
[@&#8203;MrAlias](https://redirect.github.com/MrAlias) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5997](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5997)
- fix(deps): update github.com/opentracing-contrib/go-grpc/test digest
to
[`8dc4a50`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/8dc4a50)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6005](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6005)
- Fix span option typo in SDK span End, and WithAttributes only being
available on span start by
[@&#8203;dmathieu](https://redirect.github.com/dmathieu) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6006](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6006)
- chore(deps): update github.com/golang/groupcache digest to
[`2c02b82`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/2c02b82)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6010](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6010)
- fix(deps): update module go.opentelemetry.io/proto/otlp to v1.4.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6013](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6013)
- chore(deps): update googleapis to
[`19429a9`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/19429a9)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6014](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6014)
- Performance improvements for attribute value `AsStringSlice`,
`AsFloat64Slice`, `AsInt64Slice`, `AsBoolSlice` by
[@&#8203;boekkooi-impossiblecloud](https://redirect.github.com/boekkooi-impossiblecloud)
in
[https://github.com/open-telemetry/opentelemetry-go/pull/6011](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6011)
- log: Change EnabledParameters to have a field instead of getter and
setter by [@&#8203;pellared](https://redirect.github.com/pellared) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6009](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6009)
- chore: fix a typo in TestMeterCreatesInstruments by
[@&#8203;codeboten](https://redirect.github.com/codeboten) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6015](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6015)
- chore(deps): update module golang.org/x/sys to v0.28.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6019](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6019)
- chore(deps): update module golang.org/x/text to v0.21.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6020](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6020)
- fix(deps): update module google.golang.org/grpc to v1.68.1 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6021](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6021)
- fix(deps): update golang.org/x by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6022](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6022)
- fix(deps): update module github.com/prometheus/common to v0.61.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6023](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6023)
- chore(deps): update codecov/codecov-action action to v5.1.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6024](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6024)
- chore(deps): update module go.opentelemetry.io/auto/sdk to v1.1.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6025](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6025)
- chore(deps): update codecov/codecov-action action to v5.1.1 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6026](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6026)
- chore(deps): update google.golang.org/genproto/googleapis/rpc digest
to
[`a4fef06`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/a4fef06)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6027](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6027)
- sdk/metric: Add experimental Enabled method to synchronous instruments
by [@&#8203;codeboten](https://redirect.github.com/codeboten) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6016](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6016)
- fix(deps): update github.com/opentracing-contrib/go-grpc/test digest
to
[`ca80a95`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/ca80a95)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6029](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6029)
- chore(deps): update googleapis to
[`e6fa225`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/e6fa225)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6028](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6028)
- fix(deps): update golang.org/x/exp digest to
[`1829a12`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/1829a12)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6031](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6031)
- Cache successful requests in lychee by
[@&#8203;dmathieu](https://redirect.github.com/dmathieu) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6030](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6030)
- Fix sdk/log record attr value limit by
[@&#8203;MrAlias](https://redirect.github.com/MrAlias) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6032](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6032)
- Release v1.33.0 by
[@&#8203;MrAlias](https://redirect.github.com/MrAlias) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6035](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6035)

##### New Contributors

-
[@&#8203;mark-pictor-csec](https://redirect.github.com/mark-pictor-csec)
made their first contribution in
[https://github.com/open-telemetry/opentelemetry-go/pull/5954](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5954)
- [@&#8203;cheese-head](https://redirect.github.com/cheese-head) made
their first contribution in
[https://github.com/open-telemetry/opentelemetry-go/pull/5983](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5983)
- [@&#8203;yumosx](https://redirect.github.com/yumosx) made their first
contribution in
[https://github.com/open-telemetry/opentelemetry-go/pull/5999](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5999)
- [@&#8203;flc1125](https://redirect.github.com/flc1125) made their
first contribution in
[https://github.com/open-telemetry/opentelemetry-go/pull/5994](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5994)

**Full Changelog**:
https://github.com/open-telemetry/opentelemetry-go/compare/v1.32.0...v1.33.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS41OC4xIiwidXBkYXRlZEluVmVyIjoiMzkuNTguMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
---
 go.mod |  7 ++++---
 go.sum | 14 ++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/go.mod b/go.mod
index 656614e68cd..58749599f18 100644
--- a/go.mod
+++ b/go.mod
@@ -81,16 +81,16 @@ require (
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
 	go.opentelemetry.io/contrib/samplers/jaegerremote v0.26.0
-	go.opentelemetry.io/otel v1.32.0
+	go.opentelemetry.io/otel v1.33.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0
 	go.opentelemetry.io/otel/exporters/prometheus v0.54.0
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0
-	go.opentelemetry.io/otel/metric v1.32.0
+	go.opentelemetry.io/otel/metric v1.33.0
 	go.opentelemetry.io/otel/sdk v1.32.0
 	go.opentelemetry.io/otel/sdk/metric v1.32.0
-	go.opentelemetry.io/otel/trace v1.32.0
+	go.opentelemetry.io/otel/trace v1.33.0
 	go.uber.org/automaxprocs v1.6.0
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
@@ -108,6 +108,7 @@ require (
 	github.com/ebitengine/purego v0.8.1 // indirect
 	github.com/expr-lang/expr v1.16.9 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.115.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/collector/connector/connectortest v0.115.0 // indirect
 	go.opentelemetry.io/collector/consumer/consumererror v0.115.0 // indirect
 	go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles v0.115.0 // indirect
diff --git a/go.sum b/go.sum
index 332af178994..5d6df0fe44a 100644
--- a/go.sum
+++ b/go.sum
@@ -588,6 +588,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/collector v0.115.0 h1:qUZ0bTeNBudMxNQ7FJKS//TxTjeJ7tfU/z22mcFavWU=
 go.opentelemetry.io/collector v0.115.0/go.mod h1:66qx0xKnVvdwq60e1DEfb4e+zmM9szhPsv2hxZ/Mpj4=
 go.opentelemetry.io/collector/client v1.21.0 h1:3Kes8lOFMYVxoxeAmX+DTEAkuS1iTA3NkSfqzGmygJA=
@@ -732,8 +734,8 @@ go.opentelemetry.io/contrib/samplers/jaegerremote v0.26.0 h1:/SKXyZLAnuj981HVc8G
 go.opentelemetry.io/contrib/samplers/jaegerremote v0.26.0/go.mod h1:cOEzME0M2OKeHB45lJiOKfvUCdg/r75mf7YS5w0tbmE=
 go.opentelemetry.io/contrib/zpages v0.56.0 h1:W7vP6s3juzL5KiHpr41zLNmsJ0QAZudYu8ay0zGAoko=
 go.opentelemetry.io/contrib/zpages v0.56.0/go.mod h1:IxPRP4TYHw9jLeaEOSDIiA9zmyJNZNO6sbW55iMvSXs=
-go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
-go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
+go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
+go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0 h1:mMOmtYie9Fx6TSVzw4W+NTpvoaS1JWWga37oI1a/4qQ=
 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0/go.mod h1:yy7nDsMMBUkD+jeekJ36ur5f3jJIrmCwUrY67VFhNpA=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 h1:j7ZSD+5yn+lo3sGV69nW04rRR0jhYnBwjuX3r0HvnK0=
@@ -756,16 +758,16 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 h1:cC2yDI3IQd0Udsu
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0/go.mod h1:2PD5Ex6z8CFzDbTdOlwyNIUywRr1DN0ospafJM1wJ+s=
 go.opentelemetry.io/otel/log v0.8.0 h1:egZ8vV5atrUWUbnSsHn6vB8R21G2wrKqNiDt3iWertk=
 go.opentelemetry.io/otel/log v0.8.0/go.mod h1:M9qvDdUTRCopJcGRKg57+JSQ9LgLBrwwfC32epk5NX8=
-go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
-go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
+go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
+go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
 go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
 go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
 go.opentelemetry.io/otel/sdk/log v0.7.0 h1:dXkeI2S0MLc5g0/AwxTZv6EUEjctiH8aG14Am56NTmQ=
 go.opentelemetry.io/otel/sdk/log v0.7.0/go.mod h1:oIRXpW+WD6M8BuGj5rtS0aRu/86cbDV/dAfNaZBIjYM=
 go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
 go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
-go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
-go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
+go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
+go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
 go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
 go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=

From 5568df8f6d297b7011bcdee06652b9de9dfc1014 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 12 Dec 2024 22:21:58 +0100
Subject: [PATCH 22/59] fix(deps): update all otel sdk + contrib packages
 (#6349)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[go.opentelemetry.io/otel/exporters/otlp/otlptrace](https://redirect.github.com/open-telemetry/opentelemetry-go)
| `v1.32.0` -> `v1.33.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlptrace/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlptrace/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlptrace/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlptrace/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](https://redirect.github.com/open-telemetry/opentelemetry-go)
| `v1.32.0` -> `v1.33.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlptrace%2fotlptracegrpc/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlptrace%2fotlptracegrpc/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlptrace%2fotlptracegrpc/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlptrace%2fotlptracegrpc/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp](https://redirect.github.com/open-telemetry/opentelemetry-go)
| `v1.32.0` -> `v1.33.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlptrace%2fotlptracehttp/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlptrace%2fotlptracehttp/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlptrace%2fotlptracehttp/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fexporters%2fotlp%2fotlptrace%2fotlptracehttp/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/otel/exporters/prometheus](https://redirect.github.com/open-telemetry/opentelemetry-go)
| `v0.54.0` -> `v0.55.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fexporters%2fprometheus/v0.55.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fexporters%2fprometheus/v0.55.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fexporters%2fprometheus/v0.54.0/v0.55.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fexporters%2fprometheus/v0.54.0/v0.55.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/otel/exporters/stdout/stdouttrace](https://redirect.github.com/open-telemetry/opentelemetry-go)
| `v1.32.0` -> `v1.33.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fexporters%2fstdout%2fstdouttrace/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fexporters%2fstdout%2fstdouttrace/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fexporters%2fstdout%2fstdouttrace/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fexporters%2fstdout%2fstdouttrace/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/otel/metric](https://redirect.github.com/open-telemetry/opentelemetry-go)
| `v1.32.0` -> `v1.33.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fmetric/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fmetric/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fmetric/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fmetric/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/otel/sdk](https://redirect.github.com/open-telemetry/opentelemetry-go)
| `v1.32.0` -> `v1.33.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fsdk/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fsdk/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fsdk/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fsdk/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/otel/sdk/metric](https://redirect.github.com/open-telemetry/opentelemetry-go)
| `v1.32.0` -> `v1.33.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2fsdk%2fmetric/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2fsdk%2fmetric/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2fsdk%2fmetric/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2fsdk%2fmetric/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/otel/trace](https://redirect.github.com/open-telemetry/opentelemetry-go)
| `v1.32.0` -> `v1.33.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fotel%2ftrace/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fotel%2ftrace/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fotel%2ftrace/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fotel%2ftrace/v1.32.0/v1.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>open-telemetry/opentelemetry-go
(go.opentelemetry.io/otel/exporters/otlp/otlptrace)</summary>

###
[`v1.33.0`](https://redirect.github.com/open-telemetry/opentelemetry-go/releases/tag/v1.33.0):
/v0.55.0/v0.9.0/v0.0.12

[Compare
Source](https://redirect.github.com/open-telemetry/opentelemetry-go/compare/v1.32.0...v1.33.0)

##### Overview

##### Added

- Add `Reset` method to `SpanRecorder` in
`go.opentelemetry.io/otel/sdk/trace/tracetest`.
([#&#8203;5994](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5994))
- Add `EnabledInstrument` interface in
`go.opentelemetry.io/otel/sdk/metric/internal/x`. This is an
experimental interface that is implemented by synchronous instruments
provided by `go.opentelemetry.io/otel/sdk/metric`. Users can use it to
avoid performing computationally expensive operations when recording
measurements. It does not fall within the scope of the OpenTelemetry Go
versioning and stability [policy](./VERSIONING.md) and it may be changed
in backwards incompatible ways or removed in feature releases.
([#&#8203;6016](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/6016))

##### Changed

- The default global API now supports full auto-instrumentation from the
`go.opentelemetry.io/auto` package. See that package for more
information.
([#&#8203;5920](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5920))
- Propagate non-retryable error messages to client in
`go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`.
([#&#8203;5929](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5929))
- Propagate non-retryable error messages to client in
`go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp`.
([#&#8203;5929](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5929))
- Propagate non-retryable error messages to client in
`go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp`.
([#&#8203;5929](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5929))
- Performance improvements for attribute value `AsStringSlice`,
`AsFloat64Slice`, `AsInt64Slice`, `AsBoolSlice`.
([#&#8203;6011](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/6011))
- Change `EnabledParameters` to have a `Severity` field instead of a
getter and setter in `go.opentelemetry.io/otel/log`.
([#&#8203;6009](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/6009))

##### Fixed

- Fix inconsistent request body closing in
`go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`.
([#&#8203;5954](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5954))
- Fix inconsistent request body closing in
`go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp`.
([#&#8203;5954](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5954))
- Fix inconsistent request body closing in
`go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp`.
([#&#8203;5954](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5954))
- Fix invalid exemplar keys in
`go.opentelemetry.io/otel/exporters/prometheus`.
([#&#8203;5995](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5995))
- Fix attribute value truncation in
`go.opentelemetry.io/otel/sdk/trace`.
([#&#8203;5997](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/5997))
- Fix attribute value truncation in `go.opentelemetry.io/otel/sdk/log`.
([#&#8203;6032](https://redirect.github.com/open-telemetry/opentelemetry-go/issues/6032))

##### What's Changed

- fix(deps): update module google.golang.org/grpc to v1.68.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5955](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5955)
- chore(deps): update golang.org/x by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5962](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5962)
- fix(deps): update golang.org/x/exp digest to
[`2d47ceb`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/2d47ceb)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5963](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5963)
- otlp: Clients to close body uniformly by
[@&#8203;mark-pictor-csec](https://redirect.github.com/mark-pictor-csec)
in
[https://github.com/open-telemetry/opentelemetry-go/pull/5954](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5954)
- Fix lint issues for golangci-lint 1.62.0 by
[@&#8203;dmathieu](https://redirect.github.com/dmathieu) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5967](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5967)
- fix(deps): update module github.com/golangci/golangci-lint to v1.62.0
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5966](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5966)
- chore(deps): update googleapis to
[`e0fbfb7`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/e0fbfb7)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5971](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5971)
- chore(deps): update googleapis to
[`65e8d21`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/65e8d21)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5972](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5972)
- fix(deps): update module google.golang.org/protobuf to v1.35.2 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5975](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5975)
- \[chore]: enable int-conversion rule of perfsprint by
[@&#8203;mmorel-35](https://redirect.github.com/mmorel-35) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5964](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5964)
- chore(deps): update codecov/codecov-action action to v5 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5977](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5977)
- \[chore] Fix codecov action usage by
[@&#8203;pellared](https://redirect.github.com/pellared) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5979](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5979)
- chore(deps): update codecov/codecov-action action to v5.0.2 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5981](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5981)
- \[chore]: enable all rules of perfsprint by
[@&#8203;mmorel-35](https://redirect.github.com/mmorel-35) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5978](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5978)
- Add toolchain check by
[@&#8203;cheese-head](https://redirect.github.com/cheese-head) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5983](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5983)
- \[chore] Fix VERSIONING.md missing parenthesis by
[@&#8203;MrAlias](https://redirect.github.com/MrAlias) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5984](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5984)
- chore(deps): update googleapis to
[`e639e21`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/e639e21)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5985](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5985)
- chore(deps): update codecov/codecov-action action to v5.0.3 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5986](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5986)
- fix(deps): update module github.com/masterminds/semver/v3 to v3.3.1 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5987](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5987)
- Propagate non-retryable error messages to client by
[@&#8203;mark-pictor-csec](https://redirect.github.com/mark-pictor-csec)
in
[https://github.com/open-telemetry/opentelemetry-go/pull/5929](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5929)
- chore(deps): update codecov/codecov-action action to v5.0.5 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5991](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5991)
- chore(deps): update codecov/codecov-action action to v5.0.6 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5992](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5992)
- chore(deps): update codecov/codecov-action action to v5.0.7 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5993](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5993)
- Use auto-instrumentation SDK in global tracing by
[@&#8203;MrAlias](https://redirect.github.com/MrAlias) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5920](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5920)
- Escape exemplar keys to fix invalid key errors by
[@&#8203;dashpole](https://redirect.github.com/dashpole) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5995](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5995)
- chore(deps): update module github.com/grpc-ecosystem/grpc-gateway/v2
to v2.24.0 by [@&#8203;renovate](https://redirect.github.com/renovate)
in
[https://github.com/open-telemetry/opentelemetry-go/pull/5998](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5998)
- fix(deps): update module github.com/stretchr/testify to v1.10.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6000](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6000)
- Corrent comments for the metric data storage location by
[@&#8203;yumosx](https://redirect.github.com/yumosx) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5999](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5999)
- fix(deps): update module github.com/golangci/golangci-lint to v1.62.2
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6003](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6003)
- \[chore]: enable usestdlibvars linter by
[@&#8203;mmorel-35](https://redirect.github.com/mmorel-35) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6001](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6001)
- feat(trace): add concurrent-safe `Reset` method to `SpanRecorder` by
[@&#8203;flc1125](https://redirect.github.com/flc1125) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5994](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5994)
- Fix attribute value truncation by
[@&#8203;MrAlias](https://redirect.github.com/MrAlias) in
[https://github.com/open-telemetry/opentelemetry-go/pull/5997](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5997)
- fix(deps): update github.com/opentracing-contrib/go-grpc/test digest
to
[`8dc4a50`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/8dc4a50)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6005](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6005)
- Fix span option typo in SDK span End, and WithAttributes only being
available on span start by
[@&#8203;dmathieu](https://redirect.github.com/dmathieu) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6006](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6006)
- chore(deps): update github.com/golang/groupcache digest to
[`2c02b82`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/2c02b82)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6010](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6010)
- fix(deps): update module go.opentelemetry.io/proto/otlp to v1.4.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6013](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6013)
- chore(deps): update googleapis to
[`19429a9`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/19429a9)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6014](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6014)
- Performance improvements for attribute value `AsStringSlice`,
`AsFloat64Slice`, `AsInt64Slice`, `AsBoolSlice` by
[@&#8203;boekkooi-impossiblecloud](https://redirect.github.com/boekkooi-impossiblecloud)
in
[https://github.com/open-telemetry/opentelemetry-go/pull/6011](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6011)
- log: Change EnabledParameters to have a field instead of getter and
setter by [@&#8203;pellared](https://redirect.github.com/pellared) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6009](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6009)
- chore: fix a typo in TestMeterCreatesInstruments by
[@&#8203;codeboten](https://redirect.github.com/codeboten) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6015](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6015)
- chore(deps): update module golang.org/x/sys to v0.28.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6019](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6019)
- chore(deps): update module golang.org/x/text to v0.21.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6020](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6020)
- fix(deps): update module google.golang.org/grpc to v1.68.1 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6021](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6021)
- fix(deps): update golang.org/x by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6022](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6022)
- fix(deps): update module github.com/prometheus/common to v0.61.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6023](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6023)
- chore(deps): update codecov/codecov-action action to v5.1.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6024](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6024)
- chore(deps): update module go.opentelemetry.io/auto/sdk to v1.1.0 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6025](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6025)
- chore(deps): update codecov/codecov-action action to v5.1.1 by
[@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6026](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6026)
- chore(deps): update google.golang.org/genproto/googleapis/rpc digest
to
[`a4fef06`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/a4fef06)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6027](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6027)
- sdk/metric: Add experimental Enabled method to synchronous instruments
by [@&#8203;codeboten](https://redirect.github.com/codeboten) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6016](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6016)
- fix(deps): update github.com/opentracing-contrib/go-grpc/test digest
to
[`ca80a95`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/ca80a95)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6029](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6029)
- chore(deps): update googleapis to
[`e6fa225`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/e6fa225)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6028](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6028)
- fix(deps): update golang.org/x/exp digest to
[`1829a12`](https://redirect.github.com/open-telemetry/opentelemetry-go/commit/1829a12)
by [@&#8203;renovate](https://redirect.github.com/renovate) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6031](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6031)
- Cache successful requests in lychee by
[@&#8203;dmathieu](https://redirect.github.com/dmathieu) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6030](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6030)
- Fix sdk/log record attr value limit by
[@&#8203;MrAlias](https://redirect.github.com/MrAlias) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6032](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6032)
- Release v1.33.0 by
[@&#8203;MrAlias](https://redirect.github.com/MrAlias) in
[https://github.com/open-telemetry/opentelemetry-go/pull/6035](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/6035)

##### New Contributors

-
[@&#8203;mark-pictor-csec](https://redirect.github.com/mark-pictor-csec)
made their first contribution in
[https://github.com/open-telemetry/opentelemetry-go/pull/5954](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5954)
- [@&#8203;cheese-head](https://redirect.github.com/cheese-head) made
their first contribution in
[https://github.com/open-telemetry/opentelemetry-go/pull/5983](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5983)
- [@&#8203;yumosx](https://redirect.github.com/yumosx) made their first
contribution in
[https://github.com/open-telemetry/opentelemetry-go/pull/5999](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5999)
- [@&#8203;flc1125](https://redirect.github.com/flc1125) made their
first contribution in
[https://github.com/open-telemetry/opentelemetry-go/pull/5994](https://redirect.github.com/open-telemetry/opentelemetry-go/pull/5994)

**Full Changelog**:
https://github.com/open-telemetry/opentelemetry-go/compare/v1.32.0...v1.33.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS41OC4xIiwidXBkYXRlZEluVmVyIjoiMzkuNTguMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
Signed-off-by: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Co-authored-by: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
---
 go.mod | 22 +++++++++++-----------
 go.sum | 44 ++++++++++++++++++++++----------------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/go.mod b/go.mod
index 58749599f18..72faacbf54b 100644
--- a/go.mod
+++ b/go.mod
@@ -82,14 +82,14 @@ require (
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
 	go.opentelemetry.io/contrib/samplers/jaegerremote v0.26.0
 	go.opentelemetry.io/otel v1.33.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0
-	go.opentelemetry.io/otel/exporters/prometheus v0.54.0
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0
+	go.opentelemetry.io/otel/exporters/prometheus v0.55.0
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0
 	go.opentelemetry.io/otel/metric v1.33.0
-	go.opentelemetry.io/otel/sdk v1.32.0
-	go.opentelemetry.io/otel/sdk/metric v1.32.0
+	go.opentelemetry.io/otel/sdk v1.33.0
+	go.opentelemetry.io/otel/sdk/metric v1.33.0
 	go.opentelemetry.io/otel/trace v1.33.0
 	go.uber.org/automaxprocs v1.6.0
 	go.uber.org/goleak v1.3.0
@@ -148,7 +148,7 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/flatbuffers v24.3.25+incompatible // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
 	github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -260,15 +260,15 @@ require (
 	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect
 	go.opentelemetry.io/otel/log v0.8.0 // indirect
 	go.opentelemetry.io/otel/sdk/log v0.7.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
+	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gonum.org/v1/gonum v0.15.1 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index 5d6df0fe44a..4d0368b246b 100644
--- a/go.sum
+++ b/go.sum
@@ -250,8 +250,8 @@ github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrR
 github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
 github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 h1:kQ0NI7W1B3HwiN5gAYtY+XFItDPbLBwYRxAqbFTyDes=
 github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0/go.mod h1:zrT2dxOAjNFPRGjTUe2Xmb4q4YdUwVvQFV6xiCSf+z0=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 h1:TmHmbvxPmaegwhDubVz0lICL0J5Ka2vwTzhoePEXsGE=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0/go.mod h1:qztMSjm835F2bXf+5HKAPIS5qsmQDqZna/PgVt4rWtI=
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
 github.com/hashicorp/consul/api v1.29.2 h1:aYyRn8EdE2mSfG14S1+L9Qkjtz8RzmaWh6AcNGRNwPw=
@@ -742,34 +742,34 @@ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 h1:j7Z
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0/go.mod h1:WXbYJTUaZXAbYd8lbgGuvih0yuCfOFC5RJoYnoLcGz8=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 h1:t/Qur3vKSkUCcDVaSumWF2PKHt85pc7fRvFuoVT8qFU=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0/go.mod h1:Rl61tySSdcOJWoEgYZVtmnKdA0GeKrSqkHC1t+91CH8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 h1:IJFEoHiytixx8cMiVAO+GmHR6Frwu+u5Ur8njpFO6Ac=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0/go.mod h1:3rHrKNtLIoS0oZwkY2vxi+oJcwFRWdtUyRII+so45p8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 h1:9kV11HXBHZAvuPUZxmMWrH8hZn/6UnHX4K0mu36vNsU=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0/go.mod h1:JyA0FHXe22E1NeNiHmVp7kFHglnexDQ7uRWDiiJ1hKQ=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 h1:cMyu9O88joYEaI47CnQkxO1XZdpoTF9fEnW2duIddhw=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0/go.mod h1:6Am3rn7P9TVVeXYG+wtcGE7IE1tsQ+bP3AuWcKt/gOI=
-go.opentelemetry.io/otel/exporters/prometheus v0.54.0 h1:rFwzp68QMgtzu9PgP3jm9XaMICI6TsofWWPcBDKwlsU=
-go.opentelemetry.io/otel/exporters/prometheus v0.54.0/go.mod h1:QyjcV9qDP6VeK5qPyKETvNjmaaEc7+gqjh4SS0ZYzDU=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0/go.mod h1:cpgtDBaqD/6ok/UG0jT15/uKjAY8mRA53diogHBg3UI=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 h1:5pojmb1U1AogINhN3SurB+zm/nIcusopeBNp42f45QM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0/go.mod h1:57gTHJSE5S1tqg+EKsLPlTWhpHMsWlVmer+LA926XiA=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 h1:wpMfgF8E1rkrT1Z6meFh1NDtownE9Ii3n3X2GJYjsaU=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0/go.mod h1:wAy0T/dUbs468uOlkT31xjvqQgEVXv58BRFWEgn5v/0=
+go.opentelemetry.io/otel/exporters/prometheus v0.55.0 h1:sSPw658Lk2NWAv74lkD3B/RSDb+xRFx46GjkrL3VUZo=
+go.opentelemetry.io/otel/exporters/prometheus v0.55.0/go.mod h1:nC00vyCmQixoeaxF6KNyP42II/RHa9UdruK02qBmHvI=
 go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0 h1:TwmL3O3fRR80m8EshBrd8YydEZMcUCsZXzOUlnFohwM=
 go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0/go.mod h1:tH98dDv5KPmPThswbXA0fr0Lwfs+OhK8HgaCo7PjRrk=
 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 h1:SZmDnHcgp3zwlPBS2JX2urGYe/jBKEIT6ZedHRUyCz8=
 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0/go.mod h1:fdWW0HtZJ7+jNpTKUR0GpMEDP69nR8YBJQxNiVCE3jk=
-go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 h1:cC2yDI3IQd0Udsux7Qmq8ToKAx1XCilTQECZ0KDZyTw=
-go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0/go.mod h1:2PD5Ex6z8CFzDbTdOlwyNIUywRr1DN0ospafJM1wJ+s=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0 h1:W5AWUn/IVe8RFb5pZx1Uh9Laf/4+Qmm4kJL5zPuvR+0=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0/go.mod h1:mzKxJywMNBdEX8TSJais3NnsVZUaJ+bAy6UxPTng2vk=
 go.opentelemetry.io/otel/log v0.8.0 h1:egZ8vV5atrUWUbnSsHn6vB8R21G2wrKqNiDt3iWertk=
 go.opentelemetry.io/otel/log v0.8.0/go.mod h1:M9qvDdUTRCopJcGRKg57+JSQ9LgLBrwwfC32epk5NX8=
 go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
 go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
-go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
-go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
+go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM=
+go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
 go.opentelemetry.io/otel/sdk/log v0.7.0 h1:dXkeI2S0MLc5g0/AwxTZv6EUEjctiH8aG14Am56NTmQ=
 go.opentelemetry.io/otel/sdk/log v0.7.0/go.mod h1:oIRXpW+WD6M8BuGj5rtS0aRu/86cbDV/dAfNaZBIjYM=
-go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
-go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
+go.opentelemetry.io/otel/sdk/metric v1.33.0 h1:Gs5VK9/WUJhNXZgn8MR6ITatvAmKeIuCtNbsP3JkNqU=
+go.opentelemetry.io/otel/sdk/metric v1.33.0/go.mod h1:dL5ykHZmm1B1nVRk9dDjChwDmt81MjVp3gLkQRwKf/Q=
 go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
 go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
-go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
-go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
+go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg=
+go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
@@ -915,10 +915,10 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g=
-google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
+google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
+google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=

From b57dbc9a140070155f972653c43ccd4f61e27aa7 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 12 Dec 2024 22:39:56 +0100
Subject: [PATCH 23/59] fix(deps): update all otel sdk + contrib packages
 (#6352)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib)
| `v0.57.0` -> `v0.58.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fgoogle.golang.org%2fgrpc%2fotelgrpc/v0.58.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fgoogle.golang.org%2fgrpc%2fotelgrpc/v0.58.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fgoogle.golang.org%2fgrpc%2fotelgrpc/v0.57.0/v0.58.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fgoogle.golang.org%2fgrpc%2fotelgrpc/v0.57.0/v0.58.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib)
| `v0.57.0` -> `v0.58.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fnet%2fhttp%2fotelhttp/v0.58.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fnet%2fhttp%2fotelhttp/v0.58.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fnet%2fhttp%2fotelhttp/v0.57.0/v0.58.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcontrib%2finstrumentation%2fnet%2fhttp%2fotelhttp/v0.57.0/v0.58.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/contrib/samplers/jaegerremote](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib)
| `v0.26.0` -> `v0.27.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcontrib%2fsamplers%2fjaegerremote/v0.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcontrib%2fsamplers%2fjaegerremote/v0.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcontrib%2fsamplers%2fjaegerremote/v0.26.0/v0.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcontrib%2fsamplers%2fjaegerremote/v0.26.0/v0.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS41OC4xIiwidXBkYXRlZEluVmVyIjoiMzkuNTguMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
---
 go.mod |  6 +++---
 go.sum | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/go.mod b/go.mod
index 72faacbf54b..855e0ccaf5f 100644
--- a/go.mod
+++ b/go.mod
@@ -78,9 +78,9 @@ require (
 	go.opentelemetry.io/collector/processor/processortest v0.115.0
 	go.opentelemetry.io/collector/receiver v0.115.0
 	go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
-	go.opentelemetry.io/contrib/samplers/jaegerremote v0.26.0
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0
+	go.opentelemetry.io/contrib/samplers/jaegerremote v0.27.0
 	go.opentelemetry.io/otel v1.33.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0
diff --git a/go.sum b/go.sum
index 4d0368b246b..5e2d3e0dcd3 100644
--- a/go.sum
+++ b/go.sum
@@ -724,14 +724,14 @@ go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 h1:j8icMXyyqNf6HGuwlYhniPnVsb
 go.opentelemetry.io/contrib/bridges/otelzap v0.6.0/go.mod h1:evIOZpl+kAlU5IsaYX2Siw+IbpacAZvXemVsgt70uvw=
 go.opentelemetry.io/contrib/config v0.10.0 h1:2JknAzMaYjxrHkTnZh3eOme/Y2P5eHE2SWfhfV6Xd6c=
 go.opentelemetry.io/contrib/config v0.10.0/go.mod h1:aND2M6/KfNkntI5cyvHriR/zvZgPf8j9yETdSmvpfmc=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0 h1:qtFISDHKolvIxzSs0gIaiPUPR0Cucb0F2coHC7ZLdps=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0/go.mod h1:Y+Pop1Q6hCOnETWTW4NROK/q1hv50hM7yDaUTjG8lp8=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 h1:DheMAlT6POBP+gh8RUH19EOTnQIor5QE0uSRPtzCpSw=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0/go.mod h1:wZcGmeVO9nzP67aYSLDqXNWK87EZWhi7JWj1v7ZXf94=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 h1:PS8wXpbyaDJQ2VDHHncMe9Vct0Zn1fEjpsjrLxGJoSc=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0/go.mod h1:HDBUsEjOuRC0EzKZ1bSaRGZWUBAzo+MhAcUUORSr4D0=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
 go.opentelemetry.io/contrib/propagators/b3 v1.31.0 h1:PQPXYscmwbCp76QDvO4hMngF2j8Bx/OTV86laEl8uqo=
 go.opentelemetry.io/contrib/propagators/b3 v1.31.0/go.mod h1:jbqfV8wDdqSDrAYxVpXQnpM0XFMq2FtDesblJ7blOwQ=
-go.opentelemetry.io/contrib/samplers/jaegerremote v0.26.0 h1:/SKXyZLAnuj981HVc8G5ZylYK3qD2W6AYR6cJx5kIHw=
-go.opentelemetry.io/contrib/samplers/jaegerremote v0.26.0/go.mod h1:cOEzME0M2OKeHB45lJiOKfvUCdg/r75mf7YS5w0tbmE=
+go.opentelemetry.io/contrib/samplers/jaegerremote v0.27.0 h1:Co7WDtZosbvNcG4Nqbs3AEVuHNsN6EMc1/1uGKAvyJk=
+go.opentelemetry.io/contrib/samplers/jaegerremote v0.27.0/go.mod h1:IohbtCIY5Erb6wKnDddXOMNlG7GwyZnkrgcqjPmhpaA=
 go.opentelemetry.io/contrib/zpages v0.56.0 h1:W7vP6s3juzL5KiHpr41zLNmsJ0QAZudYu8ay0zGAoko=
 go.opentelemetry.io/contrib/zpages v0.56.0/go.mod h1:IxPRP4TYHw9jLeaEOSDIiA9zmyJNZNO6sbW55iMvSXs=
 go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=

From 083383957f0010b5ec9b82513a380721f4baf4d8 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 12 Dec 2024 23:03:12 +0100
Subject: [PATCH 24/59] fix(deps): update module google.golang.org/grpc to
 v1.69.0 (#6353)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [google.golang.org/grpc](https://redirect.github.com/grpc/grpc-go) |
`v1.68.1` -> `v1.69.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/google.golang.org%2fgrpc/v1.69.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/google.golang.org%2fgrpc/v1.69.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/google.golang.org%2fgrpc/v1.68.1/v1.69.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/google.golang.org%2fgrpc/v1.68.1/v1.69.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>grpc/grpc-go (google.golang.org/grpc)</summary>

###
[`v1.69.0`](https://redirect.github.com/grpc/grpc-go/releases/tag/v1.69.0):
Release 1.69.0

[Compare
Source](https://redirect.github.com/grpc/grpc-go/compare/v1.68.1...v1.69.0)

### Known Issues

- The recently added `grpc.NewClient` function is incompatible with
forward proxies, because it resolves the target hostname on the client
instead of passing the hostname to the proxy. A fix is expected to be a
part of grpc-go v1.70.
([#&#8203;7556](https://redirect.github.com/grpc/grpc-go/issues/7556))

### New Features

- stats/opentelemetry: Introduce new APIs to enable OpenTelemetry
instrumentation for metrics on servers and clients
([#&#8203;7874](https://redirect.github.com/grpc/grpc-go/issues/7874))
- xdsclient: add support to fallback to lower priority servers when
higher priority ones are down
([#&#8203;7701](https://redirect.github.com/grpc/grpc-go/issues/7701))
- dns: Add support for link local IPv6 addresses
([#&#8203;7889](https://redirect.github.com/grpc/grpc-go/issues/7889))
- The new experimental `pickfirst` LB policy (disabled by default)
supports Happy Eyeballs, interleaving IPv4 and IPv6 address as described
in [RFC-8305 section
4](https://www.rfc-editor.org/rfc/rfc8305#section-4), to attempt
connections to multiple backends concurrently. The experimental
`pickfirst` policy can be enabled by setting the environment variable
`GRPC_EXPERIMENTAL_ENABLE_NEW_PICK_FIRST` to `true`.
([#&#8203;7725](https://redirect.github.com/grpc/grpc-go/issues/7725),
[#&#8203;7742](https://redirect.github.com/grpc/grpc-go/issues/7742))
- balancer/pickfirst: Emit metrics from the `pick_first` load balancing
policy
([#&#8203;7839](https://redirect.github.com/grpc/grpc-go/issues/7839))
- grpc: export `MethodHandler`, which is the type of an already-exported
field in `MethodDesc`
([#&#8203;7796](https://redirect.github.com/grpc/grpc-go/issues/7796))
- Special Thanks:
[@&#8203;mohdjishin](https://redirect.github.com/mohdjishin)

### Bug Fixes

- credentials/google: set scope for application default credentials
([#&#8203;7887](https://redirect.github.com/grpc/grpc-go/issues/7887))
- Special Thanks:
[@&#8203;halvards](https://redirect.github.com/halvards)
- xds: fix edge-case issues where some clients or servers would not
initialize correctly or would not receive errors when resources are
invalid or unavailable if another channel or server with the same target
was already in use .
([#&#8203;7851](https://redirect.github.com/grpc/grpc-go/issues/7851),
[#&#8203;7853](https://redirect.github.com/grpc/grpc-go/issues/7853))
- examples: fix the debugging example, which was broken by a recent
change
([#&#8203;7833](https://redirect.github.com/grpc/grpc-go/issues/7833))

### Behavior Changes

- client: update retry attempt backoff to apply jitter per updates to
[gRFC
A6](https://redirect.github.com/grpc/proposal/blob/master/A6-client-retries.md).
([#&#8203;7869](https://redirect.github.com/grpc/grpc-go/issues/7869))
    -   Special Thanks: [@&#8203;isgj](https://redirect.github.com/isgj)
- balancer/weightedroundrobin: use the `pick_first` LB policy to manage
connections
([#&#8203;7826](https://redirect.github.com/grpc/grpc-go/issues/7826))

### API Changes

- balancer: An internal method is added to the `balancer.SubConn`
interface to force implementors to embed a delegate implementation. This
requirement is present in the interface documentation, but wasn't
enforced earlier.
([#&#8203;7840](https://redirect.github.com/grpc/grpc-go/issues/7840))

### Performance Improvements

- mem: implement a `ReadAll()` method for more efficient `io.Reader`
consumption
([#&#8203;7653](https://redirect.github.com/grpc/grpc-go/issues/7653))
- Special Thanks: [@&#8203;ash2k](https://redirect.github.com/ash2k)
- mem: use slice capacity instead of length to determine whether to pool
buffers or directly allocate them
([#&#8203;7702](https://redirect.github.com/grpc/grpc-go/issues/7702))
- Special Thanks:
[@&#8203;PapaCharlie](https://redirect.github.com/PapaCharlie)

### Documentation

- examples/csm_observability: Add xDS Credentials and switch server to
be xDS enabled
([#&#8203;7875](https://redirect.github.com/grpc/grpc-go/issues/7875))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS41OC4xIiwidXBkYXRlZEluVmVyIjoiMzkuNTguMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
---
 go.mod |  2 +-
 go.sum | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index 855e0ccaf5f..8fcd77df2cc 100644
--- a/go.mod
+++ b/go.mod
@@ -96,7 +96,7 @@ require (
 	go.uber.org/zap v1.27.0
 	golang.org/x/net v0.32.0
 	golang.org/x/sys v0.28.0
-	google.golang.org/grpc v1.68.1
+	google.golang.org/grpc v1.69.0
 	google.golang.org/protobuf v1.35.2
 	gopkg.in/yaml.v3 v3.0.1
 )
diff --git a/go.sum b/go.sum
index 5e2d3e0dcd3..7200135b269 100644
--- a/go.sum
+++ b/go.sum
@@ -5,8 +5,8 @@ cloud.google.com/go/auth v0.7.0/go.mod h1:D+WqdrpcjmiCgWrXmLLxOVq1GACoE36chW6KXo
 cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4=
 cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q=
 cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg=
-cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY=
-cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
+cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo=
+cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 h1:GJHeeA2N7xrG3q30L2UXDyuWRzDM900/65j70wcM4Ww=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0/go.mod h1:l38EPgmsp71HHLq9j7De57JcKOWPyhrsW1Awm1JS6K0=
@@ -125,8 +125,8 @@ github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRr
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.13.0 h1:HzkeUz1Knt+3bK+8LG1bxOO/jzWZmdxpwC51i202les=
-github.com/envoyproxy/go-control-plane v0.13.0/go.mod h1:GRaKG3dwvFoTg4nj7aXdZnvMg4d7nvT/wl9WgVXn3Q8=
+github.com/envoyproxy/go-control-plane v0.13.1 h1:vPfJZCkob6yTMEgS+0TwfTUfbHjfy/6vOJ8hUWX/uXE=
+github.com/envoyproxy/go-control-plane v0.13.1/go.mod h1:X45hY0mufo6Fd0KW3rqsGvQMw58jvjymeCzBU3mWyHw=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM=
 github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4=
@@ -924,8 +924,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
+google.golang.org/grpc v1.69.0 h1:quSiOM1GJPmPH5XtU+BCoVXcDVJJAzNcoyfC2cCjGkI=
+google.golang.org/grpc v1.69.0/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

From 737be78f8f81b5b53c006f677debc60cb8b17b77 Mon Sep 17 00:00:00 2001
From: chahat sagar <109112505+chahatsagarmain@users.noreply.github.com>
Date: Fri, 13 Dec 2024 06:12:48 +0530
Subject: [PATCH 25/59] [remote-storage] Use OTEL helper instead of tlscfg
 (#6351)

## Which problem is this PR solving?
- Part of #4316

## Description of the changes
-

## How was this change tested?
-

## Checklist
- [ ] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [ ] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: chahatsagarmain <chahatsagar2003@gmail.com>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
---
 cmd/remote-storage/app/flags.go               |  13 +-
 cmd/remote-storage/app/flags_test.go          |   7 +-
 cmd/remote-storage/app/server.go              |  54 +++---
 cmd/remote-storage/app/server_test.go         | 171 ++++++++++--------
 cmd/remote-storage/main.go                    |   2 +-
 .../integration/remote_memory_storage.go      |  12 +-
 6 files changed, 141 insertions(+), 118 deletions(-)

diff --git a/cmd/remote-storage/app/flags.go b/cmd/remote-storage/app/flags.go
index 14e3fe42187..fc169f83636 100644
--- a/cmd/remote-storage/app/flags.go
+++ b/cmd/remote-storage/app/flags.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/viper"
-	"go.uber.org/zap"
+	"go.opentelemetry.io/collector/config/configgrpc"
 
 	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
@@ -25,10 +25,7 @@ var tlsGRPCFlagsConfig = tlscfg.ServerFlagsConfig{
 
 // Options holds configuration for remote-storage service.
 type Options struct {
-	// GRPCHostPort is the host:port address for gRPC server
-	GRPCHostPort string
-	// TLSGRPC configures secure transport
-	TLSGRPC tlscfg.Options
+	configgrpc.ServerConfig
 	// Tenancy configuration
 	Tenancy tenancy.Options
 }
@@ -41,13 +38,13 @@ func AddFlags(flagSet *flag.FlagSet) {
 }
 
 // InitFromViper initializes Options with properties from CLI flags.
-func (o *Options) InitFromViper(v *viper.Viper, _ *zap.Logger) (*Options, error) {
-	o.GRPCHostPort = v.GetString(flagGRPCHostPort)
+func (o *Options) InitFromViper(v *viper.Viper) (*Options, error) {
+	o.NetAddr.Endpoint = v.GetString(flagGRPCHostPort)
 	tlsGrpc, err := tlsGRPCFlagsConfig.InitFromViper(v)
 	if err != nil {
 		return o, fmt.Errorf("failed to process gRPC TLS options: %w", err)
 	}
-	o.TLSGRPC = tlsGrpc
+	o.TLSSetting = tlsGrpc.ToOtelServerConfig()
 	o.Tenancy = tenancy.InitFromViper(v)
 	return o, nil
 }
diff --git a/cmd/remote-storage/app/flags_test.go b/cmd/remote-storage/app/flags_test.go
index 206a9f7dfa6..239ebe18c99 100644
--- a/cmd/remote-storage/app/flags_test.go
+++ b/cmd/remote-storage/app/flags_test.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/pkg/config"
 )
@@ -18,9 +17,9 @@ func TestFlags(t *testing.T) {
 	command.ParseFlags([]string{
 		"--grpc.host-port=127.0.0.1:8081",
 	})
-	qOpts, err := new(Options).InitFromViper(v, zap.NewNop())
+	qOpts, err := new(Options).InitFromViper(v)
 	require.NoError(t, err)
-	assert.Equal(t, "127.0.0.1:8081", qOpts.GRPCHostPort)
+	assert.Equal(t, "127.0.0.1:8081", qOpts.NetAddr.Endpoint)
 }
 
 func TestFailedTLSFlags(t *testing.T) {
@@ -30,6 +29,6 @@ func TestFailedTLSFlags(t *testing.T) {
 		"--grpc.tls.cert=blah", // invalid unless tls.enabled
 	})
 	require.NoError(t, err)
-	_, err = new(Options).InitFromViper(v, zap.NewNop())
+	_, err = new(Options).InitFromViper(v)
 	assert.ErrorContains(t, err, "failed to process gRPC TLS options")
 }
diff --git a/cmd/remote-storage/app/server.go b/cmd/remote-storage/app/server.go
index 546d5c0b16c..66529595a88 100644
--- a/cmd/remote-storage/app/server.go
+++ b/cmd/remote-storage/app/server.go
@@ -4,14 +4,16 @@
 package app
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"sync"
 
 	"go.opentelemetry.io/collector/component/componentstatus"
+	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/confignet"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/health"
 	"google.golang.org/grpc/reflection"
 
@@ -27,11 +29,10 @@ import (
 
 // Server runs a gRPC server
 type Server struct {
-	opts *Options
-
+	opts       *Options
 	grpcConn   net.Listener
 	grpcServer *grpc.Server
-	wg         sync.WaitGroup
+	stopped    sync.WaitGroup
 	telset     telemetry.Settings
 }
 
@@ -42,7 +43,7 @@ func NewServer(options *Options, storageFactory storage.BaseFactory, tm *tenancy
 		return nil, err
 	}
 
-	grpcServer, err := createGRPCServer(options, tm, handler, telset.Logger)
+	grpcServer, err := createGRPCServer(options, tm, handler, telset)
 	if err != nil {
 		return nil, err
 	}
@@ -86,18 +87,7 @@ func createGRPCHandler(f storage.BaseFactory, logger *zap.Logger) (*shared.GRPCH
 	return handler, nil
 }
 
-func createGRPCServer(opts *Options, tm *tenancy.Manager, handler *shared.GRPCHandler, logger *zap.Logger) (*grpc.Server, error) {
-	var grpcOpts []grpc.ServerOption
-
-	if opts.TLSGRPC.Enabled {
-		tlsCfg, err := opts.TLSGRPC.Config(logger)
-		if err != nil {
-			return nil, fmt.Errorf("invalid TLS config: %w", err)
-		}
-		creds := credentials.NewTLS(tlsCfg)
-		grpcOpts = append(grpcOpts, grpc.Creds(creds))
-	}
-
+func createGRPCServer(opts *Options, tm *tenancy.Manager, handler *shared.GRPCHandler, telset telemetry.Settings) (*grpc.Server, error) {
 	unaryInterceptors := []grpc.UnaryServerInterceptor{
 		bearertoken.NewUnaryServerInterceptor(),
 	}
@@ -109,12 +99,16 @@ func createGRPCServer(opts *Options, tm *tenancy.Manager, handler *shared.GRPCHa
 		streamInterceptors = append(streamInterceptors, tenancy.NewGuardingStreamInterceptor(tm))
 	}
 
-	grpcOpts = append(grpcOpts,
-		grpc.ChainUnaryInterceptor(unaryInterceptors...),
-		grpc.ChainStreamInterceptor(streamInterceptors...),
+	opts.NetAddr.Transport = confignet.TransportTypeTCP
+	server, err := opts.ToServer(context.Background(),
+		telset.Host,
+		telset.ToOtelComponent(),
+		configgrpc.WithGrpcServerOption(grpc.ChainUnaryInterceptor(unaryInterceptors...)),
+		configgrpc.WithGrpcServerOption(grpc.ChainStreamInterceptor(streamInterceptors...)),
 	)
-
-	server := grpc.NewServer(grpcOpts...)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create gRPC server: %w", err)
+	}
 	healthServer := health.NewServer()
 	reflection.Register(server)
 	handler.Register(server, healthServer)
@@ -124,15 +118,15 @@ func createGRPCServer(opts *Options, tm *tenancy.Manager, handler *shared.GRPCHa
 
 // Start gRPC server concurrently
 func (s *Server) Start() error {
-	listener, err := net.Listen("tcp", s.opts.GRPCHostPort)
+	var err error
+	s.grpcConn, err = s.opts.NetAddr.Listen(context.Background())
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to listen on gRPC port: %w", err)
 	}
-	s.telset.Logger.Info("Starting GRPC server", zap.Stringer("addr", listener.Addr()))
-	s.grpcConn = listener
-	s.wg.Add(1)
+	s.telset.Logger.Info("Starting GRPC server", zap.Stringer("addr", s.grpcConn.Addr()))
+	s.stopped.Add(1)
 	go func() {
-		defer s.wg.Done()
+		defer s.stopped.Done()
 		if err := s.grpcServer.Serve(s.grpcConn); err != nil {
 			s.telset.Logger.Error("GRPC server exited", zap.Error(err))
 			s.telset.ReportStatus(componentstatus.NewFatalErrorEvent(err))
@@ -145,9 +139,7 @@ func (s *Server) Start() error {
 // Close stops http, GRPC servers and closes the port listener.
 func (s *Server) Close() error {
 	s.grpcServer.Stop()
-	s.grpcConn.Close()
-	s.opts.TLSGRPC.Close()
-	s.wg.Wait()
+	s.stopped.Wait()
 	s.telset.ReportStatus(componentstatus.NewEvent(componentstatus.StatusStopped))
 	return nil
 }
diff --git a/cmd/remote-storage/app/server_test.go b/cmd/remote-storage/app/server_test.go
index c9a78d31896..ecfc1f0dd26 100644
--- a/cmd/remote-storage/app/server_test.go
+++ b/cmd/remote-storage/app/server_test.go
@@ -12,6 +12,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/confignet"
+	"go.opentelemetry.io/collector/config/configtls"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest/observer"
 	"google.golang.org/grpc"
@@ -43,7 +46,13 @@ func TestNewServer_CreateStorageErrors(t *testing.T) {
 	factory.On("CreateDependencyReader").Return(nil, nil)
 	f := func() (*Server, error) {
 		return NewServer(
-			&Options{GRPCHostPort: ":0"},
+			&Options{
+				ServerConfig: configgrpc.ServerConfig{
+					NetAddr: confignet.AddrConfig{
+						Endpoint: ":0",
+					},
+				},
+			},
 			factory,
 			tenancy.NewManager(&tenancy.Options{}),
 			telemetry.NoopSettings(),
@@ -60,17 +69,19 @@ func TestNewServer_CreateStorageErrors(t *testing.T) {
 
 	s, err := f()
 	require.NoError(t, err)
-	err = s.Start()
-	require.NoError(t, err)
+	require.NoError(t, s.Start())
 	validateGRPCServer(t, s.grpcConn.Addr().String())
-
-	s.grpcConn.Close() // causes logged error
+	require.NoError(t, s.grpcConn.Close())
 }
 
 func TestServerStart_BadPortErrors(t *testing.T) {
 	srv := &Server{
 		opts: &Options{
-			GRPCHostPort: ":-1",
+			ServerConfig: configgrpc.ServerConfig{
+				NetAddr: confignet.AddrConfig{
+					Endpoint: ":-1",
+				},
+			},
 		},
 	}
 	require.Error(t, srv.Start())
@@ -114,12 +125,19 @@ func TestNewServer_TLSConfigError(t *testing.T) {
 	}
 	storageMocks := newStorageMocks()
 	_, err := NewServer(
-		&Options{GRPCHostPort: ":8081", TLSGRPC: tlsCfg},
+		&Options{
+			ServerConfig: configgrpc.ServerConfig{
+				NetAddr: confignet.AddrConfig{
+					Endpoint: ":8081",
+				},
+				TLSSetting: tlsCfg.ToOtelServerConfig(),
+			},
+		},
 		storageMocks.factory,
 		tenancy.NewManager(&tenancy.Options{}),
 		telset,
 	)
-	assert.ErrorContains(t, err, "invalid TLS config")
+	assert.ErrorContains(t, err, "failed to load TLS config")
 }
 
 func TestCreateGRPCHandler(t *testing.T) {
@@ -152,19 +170,17 @@ func TestCreateGRPCHandler(t *testing.T) {
 
 var testCases = []struct {
 	name              string
-	TLS               tlscfg.Options
-	clientTLS         tlscfg.Options
+	TLS               *configtls.ServerConfig
+	clientTLS         *configtls.ClientConfig
 	expectError       bool
 	expectClientError bool
 	expectServerFail  bool
 }{
 	{
 		name: "should pass with insecure connection",
-		TLS: tlscfg.Options{
-			Enabled: false,
-		},
-		clientTLS: tlscfg.Options{
-			Enabled: false,
+		TLS:  nil,
+		clientTLS: &configtls.ClientConfig{
+			Insecure: true,
 		},
 		expectError:       false,
 		expectClientError: false,
@@ -172,13 +188,13 @@ var testCases = []struct {
 	},
 	{
 		name: "should fail with TLS client to untrusted TLS server",
-		TLS: tlscfg.Options{
-			Enabled:  true,
-			CertPath: testCertKeyLocation + "/example-server-cert.pem",
-			KeyPath:  testCertKeyLocation + "/example-server-key.pem",
+		TLS: &configtls.ServerConfig{
+			Config: configtls.Config{
+				CertFile: testCertKeyLocation + "/example-server-cert.pem",
+				KeyFile:  testCertKeyLocation + "/example-server-key.pem",
+			},
 		},
-		clientTLS: tlscfg.Options{
-			Enabled:    true,
+		clientTLS: &configtls.ClientConfig{
 			ServerName: "example.com",
 		},
 		expectError:       true,
@@ -187,14 +203,16 @@ var testCases = []struct {
 	},
 	{
 		name: "should fail with TLS client to trusted TLS server with incorrect hostname",
-		TLS: tlscfg.Options{
-			Enabled:  true,
-			CertPath: testCertKeyLocation + "/example-server-cert.pem",
-			KeyPath:  testCertKeyLocation + "/example-server-key.pem",
+		TLS: &configtls.ServerConfig{
+			Config: configtls.Config{
+				CertFile: testCertKeyLocation + "/example-server-cert.pem",
+				KeyFile:  testCertKeyLocation + "/example-server-key.pem",
+			},
 		},
-		clientTLS: tlscfg.Options{
-			Enabled:    true,
-			CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+		clientTLS: &configtls.ClientConfig{
+			Config: configtls.Config{
+				CAFile: testCertKeyLocation + "/example-CA-cert.pem",
+			},
 			ServerName: "nonEmpty",
 		},
 		expectError:       true,
@@ -203,14 +221,16 @@ var testCases = []struct {
 	},
 	{
 		name: "should pass with TLS client to trusted TLS server with correct hostname",
-		TLS: tlscfg.Options{
-			Enabled:  true,
-			CertPath: testCertKeyLocation + "/example-server-cert.pem",
-			KeyPath:  testCertKeyLocation + "/example-server-key.pem",
+		TLS: &configtls.ServerConfig{
+			Config: configtls.Config{
+				CertFile: testCertKeyLocation + "/example-server-cert.pem",
+				KeyFile:  testCertKeyLocation + "/example-server-key.pem",
+			},
 		},
-		clientTLS: tlscfg.Options{
-			Enabled:    true,
-			CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+		clientTLS: &configtls.ClientConfig{
+			Config: configtls.Config{
+				CAFile: testCertKeyLocation + "/example-CA-cert.pem",
+			},
 			ServerName: "example.com",
 		},
 		expectError:       false,
@@ -219,15 +239,17 @@ var testCases = []struct {
 	},
 	{
 		name: "should fail with TLS client without cert to trusted TLS server requiring cert",
-		TLS: tlscfg.Options{
-			Enabled:      true,
-			CertPath:     testCertKeyLocation + "/example-server-cert.pem",
-			KeyPath:      testCertKeyLocation + "/example-server-key.pem",
-			ClientCAPath: testCertKeyLocation + "/example-CA-cert.pem",
+		TLS: &configtls.ServerConfig{
+			Config: configtls.Config{
+				CertFile: testCertKeyLocation + "/example-server-cert.pem",
+				KeyFile:  testCertKeyLocation + "/example-server-key.pem",
+			},
+			ClientCAFile: testCertKeyLocation + "/example-CA-cert.pem",
 		},
-		clientTLS: tlscfg.Options{
-			Enabled:    true,
-			CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+		clientTLS: &configtls.ClientConfig{
+			Config: configtls.Config{
+				CAFile: testCertKeyLocation + "/example-CA-cert.pem",
+			},
 			ServerName: "example.com",
 		},
 		expectError:       false,
@@ -236,18 +258,20 @@ var testCases = []struct {
 	},
 	{
 		name: "should pass with TLS client with cert to trusted TLS server requiring cert",
-		TLS: tlscfg.Options{
-			Enabled:      true,
-			CertPath:     testCertKeyLocation + "/example-server-cert.pem",
-			KeyPath:      testCertKeyLocation + "/example-server-key.pem",
-			ClientCAPath: testCertKeyLocation + "/example-CA-cert.pem",
+		TLS: &configtls.ServerConfig{
+			Config: configtls.Config{
+				CertFile: testCertKeyLocation + "/example-server-cert.pem",
+				KeyFile:  testCertKeyLocation + "/example-server-key.pem",
+			},
+			ClientCAFile: testCertKeyLocation + "/example-CA-cert.pem",
 		},
-		clientTLS: tlscfg.Options{
-			Enabled:    true,
-			CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+		clientTLS: &configtls.ClientConfig{
+			Config: configtls.Config{
+				CAFile:   testCertKeyLocation + "/example-CA-cert.pem",
+				CertFile: testCertKeyLocation + "/example-client-cert.pem",
+				KeyFile:  testCertKeyLocation + "/example-client-key.pem",
+			},
 			ServerName: "example.com",
-			CertPath:   testCertKeyLocation + "/example-client-cert.pem",
-			KeyPath:    testCertKeyLocation + "/example-client-key.pem",
 		},
 		expectError:       false,
 		expectServerFail:  false,
@@ -255,18 +279,20 @@ var testCases = []struct {
 	},
 	{
 		name: "should fail with TLS client without cert to trusted TLS server requiring cert from a different CA",
-		TLS: tlscfg.Options{
-			Enabled:      true,
-			CertPath:     testCertKeyLocation + "/example-server-cert.pem",
-			KeyPath:      testCertKeyLocation + "/example-server-key.pem",
-			ClientCAPath: testCertKeyLocation + "/wrong-CA-cert.pem", // NB: wrong CA
+		TLS: &configtls.ServerConfig{
+			Config: configtls.Config{
+				CertFile: testCertKeyLocation + "/example-server-cert.pem",
+				KeyFile:  testCertKeyLocation + "/example-server-key.pem",
+			},
+			ClientCAFile: testCertKeyLocation + "/wrong-CA-cert.pem",
 		},
-		clientTLS: tlscfg.Options{
-			Enabled:    true,
-			CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+		clientTLS: &configtls.ClientConfig{
+			Config: configtls.Config{
+				CAFile:   testCertKeyLocation + "/example-CA-cert.pem",
+				CertFile: testCertKeyLocation + "/example-client-cert.pem",
+				KeyFile:  testCertKeyLocation + "/example-client-key.pem",
+			},
 			ServerName: "example.com",
-			CertPath:   testCertKeyLocation + "/example-client-cert.pem",
-			KeyPath:    testCertKeyLocation + "/example-client-key.pem",
 		},
 		expectError:       false,
 		expectServerFail:  false,
@@ -289,7 +315,6 @@ func newGRPCClient(t *testing.T, addr string, creds credentials.TransportCredent
 	} else {
 		dialOpts = append(dialOpts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
-
 	conn, err := grpc.NewClient(addr, dialOpts...)
 	require.NoError(t, err)
 
@@ -303,11 +328,13 @@ func TestServerGRPCTLS(t *testing.T) {
 	for _, test := range testCases {
 		t.Run(test.name, func(t *testing.T) {
 			serverOptions := &Options{
-				GRPCHostPort: ":0",
-				TLSGRPC:      test.TLS,
+				ServerConfig: configgrpc.ServerConfig{
+					NetAddr: confignet.AddrConfig{
+						Endpoint: ":0",
+					},
+					TLSSetting: test.TLS,
+				},
 			}
-			defer serverOptions.TLSGRPC.Close()
-			defer test.clientTLS.Close()
 			flagsSvc := flags.NewService(ports.QueryAdminHTTP)
 			flagsSvc.Logger = zap.NewNop()
 
@@ -332,8 +359,8 @@ func TestServerGRPCTLS(t *testing.T) {
 			var clientError error
 			var client *grpcClient
 
-			if serverOptions.TLSGRPC.Enabled {
-				clientTLSCfg, err0 := test.clientTLS.Config(zap.NewNop())
+			if serverOptions.TLSSetting != nil {
+				clientTLSCfg, err0 := test.clientTLS.LoadTLSConfig(context.Background())
 				require.NoError(t, err0)
 				creds := credentials.NewTLS(clientTLSCfg)
 				client = newGRPCClient(t, server.grpcConn.Addr().String(), creds, tm)
@@ -370,7 +397,9 @@ func TestServerHandlesPortZero(t *testing.T) {
 		ReportStatus: telemetry.HCAdapter(flagsSvc.HC()),
 	}
 	server, err := NewServer(
-		&Options{GRPCHostPort: ":0"},
+		&Options{ServerConfig: configgrpc.ServerConfig{
+			NetAddr: confignet.AddrConfig{Endpoint: ":0"},
+		}},
 		storageMocks.factory,
 		tenancy.NewManager(&tenancy.Options{}),
 		telset,
diff --git a/cmd/remote-storage/main.go b/cmd/remote-storage/main.go
index 8f1ed50e9a7..da2ec326ce7 100644
--- a/cmd/remote-storage/main.go
+++ b/cmd/remote-storage/main.go
@@ -57,7 +57,7 @@ func main() {
 			metricsFactory := baseFactory.Namespace(metrics.NSOptions{Name: "remote-storage"})
 			version.NewInfoMetrics(metricsFactory)
 
-			opts, err := new(app.Options).InitFromViper(v, logger)
+			opts, err := new(app.Options).InitFromViper(v)
 			if err != nil {
 				logger.Fatal("Failed to parse options", zap.Error(err))
 			}
diff --git a/plugin/storage/integration/remote_memory_storage.go b/plugin/storage/integration/remote_memory_storage.go
index 74f813fa2b9..8e72fadf47c 100644
--- a/plugin/storage/integration/remote_memory_storage.go
+++ b/plugin/storage/integration/remote_memory_storage.go
@@ -10,6 +10,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/confignet"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest"
 	"google.golang.org/grpc"
@@ -34,7 +36,11 @@ type RemoteMemoryStorage struct {
 func StartNewRemoteMemoryStorage(t *testing.T) *RemoteMemoryStorage {
 	logger := zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller()))
 	opts := &app.Options{
-		GRPCHostPort: ports.PortToHostPort(ports.RemoteStorageGRPC),
+		ServerConfig: configgrpc.ServerConfig{
+			NetAddr: confignet.AddrConfig{
+				Endpoint: ports.PortToHostPort(ports.RemoteStorageGRPC),
+			},
+		},
 		Tenancy: tenancy.Options{
 			Enabled: false,
 		},
@@ -47,7 +53,7 @@ func StartNewRemoteMemoryStorage(t *testing.T) *RemoteMemoryStorage {
 	storageFactory.InitFromViper(v, logger)
 	require.NoError(t, storageFactory.Initialize(metrics.NullFactory, logger))
 
-	t.Logf("Starting in-process remote storage server on %s", opts.GRPCHostPort)
+	t.Logf("Starting in-process remote storage server on %s", opts.NetAddr.Endpoint)
 	telset := telemetry.NoopSettings()
 	telset.Logger = logger
 	telset.ReportStatus = telemetry.HCAdapter(healthcheck.New())
@@ -56,7 +62,7 @@ func StartNewRemoteMemoryStorage(t *testing.T) *RemoteMemoryStorage {
 	require.NoError(t, server.Start())
 
 	conn, err := grpc.NewClient(
-		opts.GRPCHostPort,
+		opts.NetAddr.Endpoint,
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 	)
 	require.NoError(t, err)

From e98f7f507f1dc24d3ab12615e20e037f51dfe603 Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Thu, 12 Dec 2024 21:55:16 -0500
Subject: [PATCH 26/59] [jaeger][v2] implement span links adjuster to operate
 on otlp data model (#6354)

## Which problem is this PR solving?
- Towards #6344

## Description of the changes
- This PR implements the `SpanReferences` adjuster to operate on the
OTLP data model. In the OTLP model, references are dubbed as links so
the adjuster was renamed to `SpanLinks`

## How was this change tested?
- Added unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/query/app/querysvc/adjuster/spanlinks.go  | 50 +++++++++++++++++++
 .../app/querysvc/adjuster/spanlinks_test.go   | 39 +++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 cmd/query/app/querysvc/adjuster/spanlinks.go
 create mode 100644 cmd/query/app/querysvc/adjuster/spanlinks_test.go

diff --git a/cmd/query/app/querysvc/adjuster/spanlinks.go b/cmd/query/app/querysvc/adjuster/spanlinks.go
new file mode 100644
index 00000000000..bb93dc1f9c3
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/spanlinks.go
@@ -0,0 +1,50 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"go.opentelemetry.io/collector/pdata/ptrace"
+)
+
+// SpanLinks creates an adjuster that removes span links with empty trace IDs.
+func SpanLinks() Adjuster {
+	return Func(func(traces ptrace.Traces) (ptrace.Traces, error) {
+		adjuster := linksAdjuster{}
+		resourceSpans := traces.ResourceSpans()
+		for i := 0; i < resourceSpans.Len(); i++ {
+			rs := resourceSpans.At(i)
+			scopeSpans := rs.ScopeSpans()
+			for j := 0; j < scopeSpans.Len(); j++ {
+				ss := scopeSpans.At(j)
+				spans := ss.Spans()
+				for k := 0; k < spans.Len(); k++ {
+					span := spans.At(k)
+					adjuster.adjust(span)
+				}
+			}
+		}
+		return traces, nil
+	})
+}
+
+type linksAdjuster struct{}
+
+// adjust removes invalid links from a span.
+func (l linksAdjuster) adjust(span ptrace.Span) {
+	links := span.Links()
+	validLinks := ptrace.NewSpanLinkSlice()
+	for i := 0; i < links.Len(); i++ {
+		link := links.At(i)
+		if l.valid(link) {
+			newLink := validLinks.AppendEmpty()
+			link.CopyTo(newLink)
+		}
+	}
+	validLinks.CopyTo(span.Links())
+}
+
+// valid checks if a span link's TraceID is not empty.
+func (linksAdjuster) valid(link ptrace.SpanLink) bool {
+	return !link.TraceID().IsEmpty()
+}
diff --git a/cmd/query/app/querysvc/adjuster/spanlinks_test.go b/cmd/query/app/querysvc/adjuster/spanlinks_test.go
new file mode 100644
index 00000000000..9d64b5c8531
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/spanlinks_test.go
@@ -0,0 +1,39 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+)
+
+func TestLinksAdjuster(t *testing.T) {
+	trace := ptrace.NewTraces()
+	resourceSpans := trace.ResourceSpans().AppendEmpty()
+	scopeSpans := resourceSpans.ScopeSpans().AppendEmpty()
+
+	// span with no links
+	scopeSpans.Spans().AppendEmpty()
+
+	// span with empty traceID link
+	spanA := scopeSpans.Spans().AppendEmpty()
+	spanA.Links().AppendEmpty().SetTraceID(pcommon.NewTraceIDEmpty())
+
+	// span with 2 non-empty traceID links and 1 empty (or zero) traceID link
+	spanB := scopeSpans.Spans().AppendEmpty()
+	spanB.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}))
+	spanB.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}))
+	spanB.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}))
+
+	trace, err := SpanLinks().Adjust(trace)
+	spans := trace.ResourceSpans().At(0).ScopeSpans().At(0).Spans()
+	require.NoError(t, err)
+	assert.Equal(t, 0, spans.At(0).Links().Len())
+	assert.Equal(t, 0, spans.At(1).Links().Len())
+	assert.Equal(t, 2, spans.At(2).Links().Len())
+}

From 989dcb0deb5f60ea42a3b50d8f322fa37858390f Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Date: Fri, 13 Dec 2024 12:33:54 -0400
Subject: [PATCH 27/59] Remove TLS loading and replace with OTEL configtls
 (#6345)

## Which problem is this PR solving?
- Resolves #4316
- The last places where racy TLS cert loading code was used

## Description of the changes
- Remove our custom logic for loading certificates
- Fully rely on `configtls` module from otel-collector

## How was this change tested?
- CI

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
---
 cmd/agent/app/reporter/grpc/builder.go        |  19 +-
 cmd/agent/app/reporter/grpc/builder_test.go   |  73 ++--
 .../app/reporter/grpc/collector_proxy.go      |  16 +-
 cmd/agent/app/reporter/grpc/flags.go          |   5 +-
 cmd/agent/app/reporter/grpc/flags_test.go     |  12 +
 pkg/config/tlscfg/cert_watcher.go             | 140 -------
 pkg/config/tlscfg/cert_watcher_test.go        | 377 ------------------
 pkg/config/tlscfg/certpool_unix.go            |  15 -
 pkg/config/tlscfg/certpool_windows.go         |  64 ---
 pkg/config/tlscfg/ciphersuites.go             |  47 ---
 pkg/config/tlscfg/ciphersuites_test.go        |  90 -----
 pkg/config/tlscfg/options.go                  | 124 ------
 pkg/config/tlscfg/options_test.go             | 166 --------
 13 files changed, 69 insertions(+), 1079 deletions(-)
 delete mode 100644 pkg/config/tlscfg/cert_watcher.go
 delete mode 100644 pkg/config/tlscfg/cert_watcher_test.go
 delete mode 100644 pkg/config/tlscfg/certpool_unix.go
 delete mode 100644 pkg/config/tlscfg/certpool_windows.go
 delete mode 100644 pkg/config/tlscfg/ciphersuites.go
 delete mode 100644 pkg/config/tlscfg/ciphersuites_test.go

diff --git a/cmd/agent/app/reporter/grpc/builder.go b/cmd/agent/app/reporter/grpc/builder.go
index a8953a8e644..939b82156ae 100644
--- a/cmd/agent/app/reporter/grpc/builder.go
+++ b/cmd/agent/app/reporter/grpc/builder.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/retry"
+	"go.opentelemetry.io/collector/config/configtls"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
@@ -19,7 +20,6 @@ import (
 	"google.golang.org/grpc/resolver/manual"
 
 	"github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
-	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
 	"github.com/jaegertracing/jaeger/pkg/discovery"
 	"github.com/jaegertracing/jaeger/pkg/discovery/grpcresolver"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
@@ -30,13 +30,11 @@ import (
 type ConnBuilder struct {
 	// CollectorHostPorts is list of host:port Jaeger Collectors.
 	CollectorHostPorts []string `yaml:"collectorHostPorts"`
-
-	MaxRetry uint
-	TLS      tlscfg.Options
-
-	DiscoveryMinPeers int
-	Notifier          discovery.Notifier
-	Discoverer        discovery.Discoverer
+	TLS                *configtls.ClientConfig
+	MaxRetry           uint
+	DiscoveryMinPeers  int
+	Notifier           discovery.Notifier
+	Discoverer         discovery.Discoverer
 
 	AdditionalDialOptions []grpc.DialOption
 }
@@ -50,13 +48,12 @@ func NewConnBuilder() *ConnBuilder {
 func (b *ConnBuilder) CreateConnection(ctx context.Context, logger *zap.Logger, mFactory metrics.Factory) (*grpc.ClientConn, error) {
 	var dialOptions []grpc.DialOption
 	var dialTarget string
-	if b.TLS.Enabled { // user requested a secure connection
+	if b.TLS != nil { // user requested a secure connection
 		logger.Info("Agent requested secure grpc connection to collector(s)")
-		tlsConf, err := b.TLS.Config(logger)
+		tlsConf, err := b.TLS.LoadTLSConfig(ctx)
 		if err != nil {
 			return nil, fmt.Errorf("failed to load TLS config: %w", err)
 		}
-
 		creds := credentials.NewTLS(tlsConf)
 		dialOptions = append(dialOptions, grpc.WithTransportCredentials(creds))
 	} else { // insecure connection
diff --git a/cmd/agent/app/reporter/grpc/builder_test.go b/cmd/agent/app/reporter/grpc/builder_test.go
index 1643fb2960a..a8a9cf952a5 100644
--- a/cmd/agent/app/reporter/grpc/builder_test.go
+++ b/cmd/agent/app/reporter/grpc/builder_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/config/configtls"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -151,9 +152,10 @@ func TestProxyBuilder(t *testing.T) {
 			name: "should fail with secure grpc connection and a CA file which does not exist",
 			grpcBuilder: &ConnBuilder{
 				CollectorHostPorts: []string{"localhost:0000"},
-				TLS: tlscfg.Options{
-					Enabled: true,
-					CAPath:  testCertKeyLocation + "/not/valid",
+				TLS: &configtls.ClientConfig{
+					Config: configtls.Config{
+						CAFile: testCertKeyLocation + "/not/valid",
+					},
 				},
 			},
 			expectError: true,
@@ -162,11 +164,12 @@ func TestProxyBuilder(t *testing.T) {
 			name: "should pass with secure grpc connection and valid TLS Client settings",
 			grpcBuilder: &ConnBuilder{
 				CollectorHostPorts: []string{"localhost:0000"},
-				TLS: tlscfg.Options{
-					Enabled:  true,
-					CAPath:   testCertKeyLocation + "/wrong-CA-cert.pem",
-					CertPath: testCertKeyLocation + "/example-client-cert.pem",
-					KeyPath:  testCertKeyLocation + "/example-client-key.pem",
+				TLS: &configtls.ClientConfig{
+					Config: configtls.Config{
+						CAFile:   testCertKeyLocation + "/wrong-CA-cert.pem",
+						CertFile: testCertKeyLocation + "/example-client-cert.pem",
+						KeyFile:  testCertKeyLocation + "/example-client-key.pem",
+					},
 				},
 			},
 			expectError: false,
@@ -197,7 +200,7 @@ func TestProxyBuilder(t *testing.T) {
 func TestProxyClientTLS(t *testing.T) {
 	tests := []struct {
 		name        string
-		clientTLS   tlscfg.Options
+		clientTLS   *configtls.ClientConfig
 		serverTLS   tlscfg.Options
 		expectError bool
 	}{
@@ -207,7 +210,7 @@ func TestProxyClientTLS(t *testing.T) {
 		},
 		{
 			name:        "should fail with TLS client to non-TLS server",
-			clientTLS:   tlscfg.Options{Enabled: true},
+			clientTLS:   &configtls.ClientConfig{},
 			expectError: true,
 		},
 		{
@@ -217,8 +220,7 @@ func TestProxyClientTLS(t *testing.T) {
 				CertPath: testCertKeyLocation + "/example-server-cert.pem",
 				KeyPath:  testCertKeyLocation + "/example-server-key.pem",
 			},
-			clientTLS: tlscfg.Options{
-				Enabled:    true,
+			clientTLS: &configtls.ClientConfig{
 				ServerName: "example.com",
 			},
 			expectError: true,
@@ -230,9 +232,10 @@ func TestProxyClientTLS(t *testing.T) {
 				CertPath: testCertKeyLocation + "/example-server-cert.pem",
 				KeyPath:  testCertKeyLocation + "/example-server-key.pem",
 			},
-			clientTLS: tlscfg.Options{
-				Enabled: true,
-				CAPath:  testCertKeyLocation + "/example-CA-cert.pem",
+			clientTLS: &configtls.ClientConfig{
+				Config: configtls.Config{
+					CAFile: testCertKeyLocation + "/example-CA-cert.pem",
+				},
 			},
 			expectError: true,
 		},
@@ -243,9 +246,10 @@ func TestProxyClientTLS(t *testing.T) {
 				CertPath: testCertKeyLocation + "/example-server-cert.pem",
 				KeyPath:  testCertKeyLocation + "/example-server-key.pem",
 			},
-			clientTLS: tlscfg.Options{
-				Enabled:    true,
-				CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+			clientTLS: &configtls.ClientConfig{
+				Config: configtls.Config{
+					CAFile: testCertKeyLocation + "/example-CA-cert.pem",
+				},
 				ServerName: "example.com",
 			},
 			expectError: false,
@@ -258,9 +262,10 @@ func TestProxyClientTLS(t *testing.T) {
 				KeyPath:      testCertKeyLocation + "/example-server-key.pem",
 				ClientCAPath: testCertKeyLocation + "/example-CA-cert.pem",
 			},
-			clientTLS: tlscfg.Options{
-				Enabled:    true,
-				CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+			clientTLS: &configtls.ClientConfig{
+				Config: configtls.Config{
+					CAFile: testCertKeyLocation + "/example-CA-cert.pem",
+				},
 				ServerName: "example.com",
 			},
 			expectError: true,
@@ -273,12 +278,13 @@ func TestProxyClientTLS(t *testing.T) {
 				KeyPath:      testCertKeyLocation + "/example-server-key.pem",
 				ClientCAPath: testCertKeyLocation + "/wrong-CA-cert.pem", // NB: wrong CA
 			},
-			clientTLS: tlscfg.Options{
-				Enabled:    true,
-				CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+			clientTLS: &configtls.ClientConfig{
+				Config: configtls.Config{
+					CAFile:   testCertKeyLocation + "/example-CA-cert.pem",
+					CertFile: testCertKeyLocation + "/example-client-cert.pem",
+					KeyFile:  testCertKeyLocation + "/example-client-key.pem",
+				},
 				ServerName: "example.com",
-				CertPath:   testCertKeyLocation + "/example-client-cert.pem",
-				KeyPath:    testCertKeyLocation + "/example-client-key.pem",
 			},
 			expectError: true,
 		},
@@ -290,12 +296,13 @@ func TestProxyClientTLS(t *testing.T) {
 				KeyPath:      testCertKeyLocation + "/example-server-key.pem",
 				ClientCAPath: testCertKeyLocation + "/example-CA-cert.pem",
 			},
-			clientTLS: tlscfg.Options{
-				Enabled:    true,
-				CAPath:     testCertKeyLocation + "/example-CA-cert.pem",
+			clientTLS: &configtls.ClientConfig{
+				Config: configtls.Config{
+					CAFile:   testCertKeyLocation + "/example-CA-cert.pem",
+					CertFile: testCertKeyLocation + "/example-client-cert.pem",
+					KeyFile:  testCertKeyLocation + "/example-client-key.pem",
+				},
 				ServerName: "example.com",
-				CertPath:   testCertKeyLocation + "/example-client-cert.pem",
-				KeyPath:    testCertKeyLocation + "/example-client-key.pem",
 			},
 			expectError: false,
 		},
@@ -308,12 +315,10 @@ func TestProxyClientTLS(t *testing.T) {
 			defer cancel()
 			var opts []grpc.ServerOption
 			if test.serverTLS.Enabled {
-				tlsCfg, err := test.serverTLS.Config(zap.NewNop())
+				tlsCfg, err := test.serverTLS.ToOtelServerConfig().LoadTLSConfig(ctx)
 				require.NoError(t, err)
 				opts = []grpc.ServerOption{grpc.Creds(credentials.NewTLS(tlsCfg))}
 			}
-
-			defer test.serverTLS.Close()
 			spanHandler := &mockSpanHandler{}
 			s, addr := initializeGRPCTestServer(t, func(s *grpc.Server) {
 				api_v2.RegisterCollectorServiceServer(s, spanHandler)
diff --git a/cmd/agent/app/reporter/grpc/collector_proxy.go b/cmd/agent/app/reporter/grpc/collector_proxy.go
index 554926459b0..bb7b3ff64e8 100644
--- a/cmd/agent/app/reporter/grpc/collector_proxy.go
+++ b/cmd/agent/app/reporter/grpc/collector_proxy.go
@@ -6,7 +6,6 @@ package grpc
 import (
 	"context"
 	"errors"
-	"io"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
@@ -19,10 +18,9 @@ import (
 
 // ProxyBuilder holds objects communicating with collector
 type ProxyBuilder struct {
-	reporter  *reporter.ClientMetricsReporter
-	manager   configmanager.ClientConfigManager
-	conn      *grpc.ClientConn
-	tlsCloser io.Closer
+	reporter *reporter.ClientMetricsReporter
+	manager  configmanager.ClientConfigManager
+	conn     *grpc.ClientConn
 }
 
 // NewCollectorProxy creates ProxyBuilder
@@ -40,10 +38,9 @@ func NewCollectorProxy(ctx context.Context, builder *ConnBuilder, agentTags map[
 		MetricsFactory: mFactory,
 	})
 	return &ProxyBuilder{
-		conn:      conn,
-		reporter:  r3,
-		manager:   configmanager.WrapWithMetrics(grpcManager.NewConfigManager(conn), grpcMetrics),
-		tlsCloser: &builder.TLS,
+		conn:     conn,
+		reporter: r3,
+		manager:  configmanager.WrapWithMetrics(grpcManager.NewConfigManager(conn), grpcMetrics),
 	}, nil
 }
 
@@ -66,7 +63,6 @@ func (b ProxyBuilder) GetManager() configmanager.ClientConfigManager {
 func (b ProxyBuilder) Close() error {
 	return errors.Join(
 		b.reporter.Close(),
-		b.tlsCloser.Close(),
 		b.GetConn().Close(),
 	)
 }
diff --git a/cmd/agent/app/reporter/grpc/flags.go b/cmd/agent/app/reporter/grpc/flags.go
index 47645c20cde..b19fe6ce421 100644
--- a/cmd/agent/app/reporter/grpc/flags.go
+++ b/cmd/agent/app/reporter/grpc/flags.go
@@ -44,7 +44,10 @@ func (b *ConnBuilder) InitFromViper(v *viper.Viper) (*ConnBuilder, error) {
 	if err != nil {
 		return b, fmt.Errorf("failed to process TLS options: %w", err)
 	}
-	b.TLS = tls
+	if tls.Enabled {
+		tlsConf := tls.ToOtelClientConfig()
+		b.TLS = &tlsConf
+	}
 	b.DiscoveryMinPeers = v.GetInt(discoveryMinPeers)
 	return b, nil
 }
diff --git a/cmd/agent/app/reporter/grpc/flags_test.go b/cmd/agent/app/reporter/grpc/flags_test.go
index 4b2783aa4f9..a06e3e0e75f 100644
--- a/cmd/agent/app/reporter/grpc/flags_test.go
+++ b/cmd/agent/app/reporter/grpc/flags_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/config/configtls"
 
 	"github.com/jaegertracing/jaeger/pkg/config"
 )
@@ -32,6 +33,17 @@ func TestBindFlags(t *testing.T) {
 			cOpts:    []string{"--reporter.grpc.host-port=localhost:1111,localhost:2222", "--reporter.grpc.discovery.min-peers=5"},
 			expected: &ConnBuilder{CollectorHostPorts: []string{"localhost:1111", "localhost:2222"}, MaxRetry: defaultMaxRetry, DiscoveryMinPeers: 5},
 		},
+		{
+			cOpts: []string{"--reporter.grpc.tls.enabled=true"},
+			expected: &ConnBuilder{
+				TLS: &configtls.ClientConfig{
+					Config: configtls.Config{
+						IncludeSystemCACertsPool: true,
+					},
+				},
+				MaxRetry: defaultMaxRetry, DiscoveryMinPeers: 3,
+			},
+		},
 	}
 	for _, test := range tests {
 		v := viper.New()
diff --git a/pkg/config/tlscfg/cert_watcher.go b/pkg/config/tlscfg/cert_watcher.go
deleted file mode 100644
index cff06f4e0a4..00000000000
--- a/pkg/config/tlscfg/cert_watcher.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright (c) 2020 The Jaeger Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package tlscfg
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"io"
-	"path/filepath"
-	"sync"
-
-	"go.uber.org/zap"
-
-	"github.com/jaegertracing/jaeger/pkg/fswatcher"
-)
-
-const (
-	logMsgPairReloaded    = "Reloaded modified key pair"
-	logMsgCertReloaded    = "Reloaded modified certificate"
-	logMsgPairNotReloaded = "Failed to reload key pair, using previous versions"
-	logMsgCertNotReloaded = "Failed to reload certificate, using previous version"
-)
-
-// certWatcher watches filesystem changes on certificates supplied via Options
-// The changed RootCAs and ClientCAs certificates are added to x509.CertPool without invalidating the previously used certificate.
-// The certificate and key can be obtained via certWatcher.certificate.
-// The consumers of this API should use GetCertificate or GetClientCertificate from tls.Config to supply the certificate to the config.
-type certWatcher struct {
-	mu       sync.RWMutex
-	opts     Options
-	logger   *zap.Logger
-	watchers []*fswatcher.FSWatcher
-	cert     *tls.Certificate
-}
-
-var _ io.Closer = (*certWatcher)(nil)
-
-func newCertWatcher(opts Options, logger *zap.Logger, rootCAs, clientCAs *x509.CertPool) (*certWatcher, error) {
-	var cert *tls.Certificate
-	if opts.CertPath != "" && opts.KeyPath != "" {
-		// load certs at startup to catch missing certs error early
-		c, err := tls.LoadX509KeyPair(filepath.Clean(opts.CertPath), filepath.Clean(opts.KeyPath))
-		if err != nil {
-			return nil, fmt.Errorf("failed to load server TLS cert and key: %w", err)
-		}
-		cert = &c
-	}
-
-	w := &certWatcher{
-		opts:   opts,
-		logger: logger,
-		cert:   cert,
-	}
-
-	if err := w.watchCertPair(); err != nil {
-		return nil, err
-	}
-	if err := w.watchCert(w.opts.CAPath, rootCAs); err != nil {
-		return nil, err
-	}
-	if err := w.watchCert(w.opts.ClientCAPath, clientCAs); err != nil {
-		return nil, err
-	}
-
-	return w, nil
-}
-
-func (w *certWatcher) Close() error {
-	var errs []error
-	for _, w := range w.watchers {
-		errs = append(errs, w.Close())
-	}
-	return errors.Join(errs...)
-}
-
-func (w *certWatcher) certificate() *tls.Certificate {
-	w.mu.RLock()
-	defer w.mu.RUnlock()
-	return w.cert
-}
-
-func (w *certWatcher) watchCertPair() error {
-	watcher, err := fswatcher.New(
-		[]string{w.opts.CertPath, w.opts.KeyPath},
-		w.onCertPairChange,
-		w.logger,
-	)
-	if err == nil {
-		w.watchers = append(w.watchers, watcher)
-		return nil
-	}
-	w.Close()
-	return fmt.Errorf("failed to watch key pair %s and %s: %w", w.opts.KeyPath, w.opts.CertPath, err)
-}
-
-func (w *certWatcher) watchCert(certPath string, certPool *x509.CertPool) error {
-	onCertChange := func() { w.onCertChange(certPath, certPool) }
-
-	watcher, err := fswatcher.New([]string{certPath}, onCertChange, w.logger)
-	if err == nil {
-		w.watchers = append(w.watchers, watcher)
-		return nil
-	}
-	w.Close()
-	return fmt.Errorf("failed to watch cert %s: %w", certPath, err)
-}
-
-func (w *certWatcher) onCertPairChange() {
-	cert, err := tls.LoadX509KeyPair(filepath.Clean(w.opts.CertPath), filepath.Clean(w.opts.KeyPath))
-	if err == nil {
-		w.mu.Lock()
-		w.cert = &cert
-		w.mu.Unlock()
-		w.logger.Info(
-			logMsgPairReloaded,
-			zap.String("key", w.opts.KeyPath),
-			zap.String("cert", w.opts.CertPath),
-		)
-	} else {
-		w.logger.Error(
-			logMsgPairNotReloaded,
-			zap.String("key", w.opts.KeyPath),
-			zap.String("cert", w.opts.CertPath),
-			zap.Error(err),
-		)
-	}
-}
-
-func (w *certWatcher) onCertChange(certPath string, certPool *x509.CertPool) {
-	w.mu.Lock() // prevent concurrent updates to the same certPool
-	if err := addCertToPool(certPath, certPool); err == nil {
-		w.logger.Info(logMsgCertReloaded, zap.String("cert", certPath))
-	} else {
-		w.logger.Error(logMsgCertNotReloaded, zap.String("cert", certPath), zap.Error(err))
-	}
-	w.mu.Unlock()
-}
diff --git a/pkg/config/tlscfg/cert_watcher_test.go b/pkg/config/tlscfg/cert_watcher_test.go
deleted file mode 100644
index fdeefbadce5..00000000000
--- a/pkg/config/tlscfg/cert_watcher_test.go
+++ /dev/null
@@ -1,377 +0,0 @@
-// Copyright (c) 2020 The Jaeger Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package tlscfg
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-	"go.uber.org/zap/zaptest/observer"
-)
-
-const (
-	serverCert = "./testdata/example-server-cert.pem"
-	serverKey  = "./testdata/example-server-key.pem"
-	clientCert = "./testdata/example-client-cert.pem"
-	clientKey  = "./testdata/example-client-key.pem"
-
-	caCert      = "./testdata/example-CA-cert.pem"
-	wrongCaCert = "./testdata/wrong-CA-cert.pem"
-	badCaCert   = "./testdata/bad-CA-cert.txt"
-)
-
-func copyToTempFile(t *testing.T, pattern string, filename string) (file *os.File, closeFn func()) {
-	tempFile, err := os.CreateTemp("", pattern+"_")
-	require.NoError(t, err)
-
-	data, err := os.ReadFile(filename)
-	require.NoError(t, err)
-
-	_, err = tempFile.Write(data)
-	require.NoError(t, err)
-	require.NoError(t, tempFile.Close())
-
-	return tempFile, func() {
-		// ignore error because some tests may remove the files earlier
-		_ = os.Remove(tempFile.Name())
-	}
-}
-
-func copyFile(t *testing.T, dest string, src string) {
-	certData, err := os.ReadFile(src)
-	require.NoError(t, err)
-	err = syncWrite(dest, certData, 0o644)
-	require.NoError(t, err)
-}
-
-func TestReloadKeyPair(t *testing.T) {
-	// copy certs to temp so we can modify them
-	certFile, certFileCloseFn := copyToTempFile(t, "cert.crt", serverCert)
-	defer certFileCloseFn()
-
-	keyFile, keyFileCloseFn := copyToTempFile(t, "key.crt", serverKey)
-	defer keyFileCloseFn()
-
-	zcore, logObserver := observer.New(zapcore.InfoLevel)
-	logger := zap.New(zcore)
-	opts := Options{
-		CAPath:       caCert,
-		ClientCAPath: caCert,
-		CertPath:     certFile.Name(),
-		KeyPath:      keyFile.Name(),
-	}
-	certPool := x509.NewCertPool()
-	watcher, err := newCertWatcher(opts, logger, certPool, certPool)
-	require.NoError(t, err)
-	assert.NotNil(t, watcher.certificate())
-	defer watcher.Close()
-
-	require.NoError(t, err)
-	cert, err := tls.LoadX509KeyPair(serverCert, serverKey)
-	require.NoError(t, err)
-	assert.Equal(t, &cert, watcher.certificate())
-
-	// Replace certificate part of the pair with client's cert, which should fail to load.
-	copyFile(t, certFile.Name(), clientCert)
-
-	assertLogs(t, logObserver, logMsgPairNotReloaded, [][2]string{{"key", keyFile.Name()}, {"cert", certFile.Name()}})
-	assert.Equal(t, &cert, watcher.certificate(), "key pair unchanged")
-	logObserver.TakeAll() // clean up logs
-
-	// Replace key part with client's private key. Valid pair, should reload.
-	copyFile(t, keyFile.Name(), clientKey)
-
-	assertLogs(t, logObserver, logMsgPairReloaded, [][2]string{{"key", keyFile.Name()}, {"cert", certFile.Name()}})
-	logObserver.TakeAll() // clean up logs
-
-	cert, err = tls.LoadX509KeyPair(filepath.Clean(clientCert), clientKey)
-	require.NoError(t, err)
-	assert.Equal(t, &cert, watcher.certificate())
-}
-
-func TestReload_ca_certs(t *testing.T) {
-	// copy certs to temp so we can modify them
-	caFile, caFileCloseFn := copyToTempFile(t, "ca.crt", caCert)
-	defer caFileCloseFn()
-	clientCaFile, clientCaFileClostFn := copyToTempFile(t, "client-ca.crt", caCert)
-	defer clientCaFileClostFn()
-
-	zcore, logObserver := observer.New(zapcore.InfoLevel)
-	logger := zap.New(zcore)
-	opts := Options{
-		CAPath:       caFile.Name(),
-		ClientCAPath: clientCaFile.Name(),
-	}
-	certPool := x509.NewCertPool()
-	watcher, err := newCertWatcher(opts, logger, certPool, certPool)
-	require.NoError(t, err)
-	defer watcher.Close()
-
-	require.NoError(t, err)
-
-	// update the content with different certs to trigger reload.
-	copyFile(t, caFile.Name(), wrongCaCert)
-	copyFile(t, clientCaFile.Name(), wrongCaCert)
-
-	assertLogs(t, logObserver, logMsgCertReloaded, [][2]string{{"cert", caFile.Name()}})
-	assertLogs(t, logObserver, logMsgCertReloaded, [][2]string{{"cert", clientCaFile.Name()}})
-	logObserver.TakeAll() // clean up logs
-
-	// update the content with invalid certs to trigger failed reload.
-	copyFile(t, caFile.Name(), badCaCert)
-	copyFile(t, clientCaFile.Name(), badCaCert)
-
-	assertLogs(t, logObserver, logMsgCertNotReloaded, [][2]string{{"cert", caFile.Name()}})
-	assertLogs(t, logObserver, logMsgCertNotReloaded, [][2]string{{"cert", clientCaFile.Name()}})
-}
-
-func TestReload_err_cert_update(t *testing.T) {
-	// copy certs to temp so we can modify them
-	certFile, certFileCloseFn := copyToTempFile(t, "cert.crt", serverCert)
-	defer certFileCloseFn()
-	keyFile, keyFileCloseFn := copyToTempFile(t, "key.crt", serverKey)
-	defer keyFileCloseFn()
-
-	zcore, logObserver := observer.New(zapcore.InfoLevel)
-	logger := zap.New(zcore)
-	opts := Options{
-		CAPath:       caCert,
-		ClientCAPath: caCert,
-		CertPath:     certFile.Name(),
-		KeyPath:      keyFile.Name(),
-	}
-	certPool := x509.NewCertPool()
-	watcher, err := newCertWatcher(opts, logger, certPool, certPool)
-	require.NoError(t, err)
-	assert.NotNil(t, watcher.certificate())
-	defer watcher.Close()
-
-	require.NoError(t, err)
-	serverCert, err := tls.LoadX509KeyPair(filepath.Clean(serverCert), filepath.Clean(serverKey))
-	require.NoError(t, err)
-	assert.Equal(t, &serverCert, watcher.certificate())
-
-	// update the content with bad client certs
-	copyFile(t, certFile.Name(), badCaCert)
-	copyFile(t, keyFile.Name(), clientKey)
-
-	assertLogs(t, logObserver, logMsgPairNotReloaded, [][2]string{{"key", opts.KeyPath}, {"cert", opts.CertPath}})
-	assert.Equal(t, &serverCert, watcher.certificate(), "values unchanged")
-}
-
-func TestReload_kubernetes_secret_update(t *testing.T) {
-	mountDir := t.TempDir()
-
-	// Create directory layout before update:
-	//
-	// /secret-mountpoint/ca.crt                # symbolic link to ..data/ca.crt
-	// /secret-mountpoint/tls.crt               # symbolic link to ..data/tls.crt
-	// /secret-mountpoint/tls.key               # symbolic link to ..data/tls.key
-	// /secret-mountpoint/..data                # symbolic link to ..timestamp-1
-	// /secret-mountpoint/..timestamp-1         # directory
-	// /secret-mountpoint/..timestamp-1/ca.crt  # initial version of ca.crt
-	// /secret-mountpoint/..timestamp-1/tls.crt # initial version of tls.crt
-	// /secret-mountpoint/..timestamp-1/tls.key # initial version of tls.key
-
-	err := os.Symlink("..timestamp-1", filepath.Join(mountDir, "..data"))
-	require.NoError(t, err)
-	err = os.Symlink(filepath.Join("..data", "ca.crt"), filepath.Join(mountDir, "ca.crt"))
-	require.NoError(t, err)
-	err = os.Symlink(filepath.Join("..data", "tls.crt"), filepath.Join(mountDir, "tls.crt"))
-	require.NoError(t, err)
-	err = os.Symlink(filepath.Join("..data", "tls.key"), filepath.Join(mountDir, "tls.key"))
-	require.NoError(t, err)
-
-	timestamp1Dir := filepath.Join(mountDir, "..timestamp-1")
-	createTimestampDir(t, timestamp1Dir, caCert, serverCert, serverKey)
-
-	opts := Options{
-		CAPath:       filepath.Join(mountDir, "ca.crt"),
-		ClientCAPath: filepath.Join(mountDir, "ca.crt"),
-		CertPath:     filepath.Join(mountDir, "tls.crt"),
-		KeyPath:      filepath.Join(mountDir, "tls.key"),
-	}
-
-	zcore, logObserver := observer.New(zapcore.InfoLevel)
-	logger := zap.New(zcore)
-
-	certPool := x509.NewCertPool()
-
-	watcher, err := newCertWatcher(opts, logger, certPool, certPool)
-	require.NoError(t, err)
-	defer watcher.Close()
-
-	require.NoError(t, err)
-
-	expectedCert, err := tls.LoadX509KeyPair(serverCert, serverKey)
-	require.NoError(t, err)
-
-	assert.Equal(t,
-		expectedCert.Certificate,
-		watcher.certificate().Certificate,
-		"certificate should be updated: %v", logObserver.All(),
-	)
-
-	logObserver.TakeAll() // clean logs
-
-	// Create second dir with different key pair and CA.
-	// After the update, the directory looks like following:
-	//
-	// /secret-mountpoint/ca.crt                # symbolic link to ..data/ca.crt
-	// /secret-mountpoint/tls.crt               # symbolic link to ..data/tls.crt
-	// /secret-mountpoint/tls.key               # symbolic link to ..data/tls.key
-	// /secret-mountpoint/..data                # symbolic link to ..timestamp-2
-	// /secret-mountpoint/..timestamp-2         # new directory
-	// /secret-mountpoint/..timestamp-2/ca.crt  # new version of ca.crt
-	// /secret-mountpoint/..timestamp-2/tls.crt # new version of tls.crt
-	// /secret-mountpoint/..timestamp-2/tls.key # new version of tls.key
-
-	timestamp2Dir := filepath.Join(mountDir, "..timestamp-2")
-	createTimestampDir(t, timestamp2Dir, serverCert, clientCert, clientKey)
-
-	err = os.Symlink("..timestamp-2", filepath.Join(mountDir, "..data_tmp"))
-	require.NoError(t, err)
-
-	os.Rename(filepath.Join(mountDir, "..data_tmp"), filepath.Join(mountDir, "..data"))
-	require.NoError(t, err)
-	err = os.RemoveAll(timestamp1Dir)
-	require.NoError(t, err)
-
-	assertLogs(t, logObserver, logMsgPairReloaded, [][2]string{{"key", opts.KeyPath}, {"cert", opts.CertPath}})
-	assertLogs(t, logObserver, logMsgCertReloaded, [][2]string{{"cert", opts.CAPath}})
-
-	expectedCert, err = tls.LoadX509KeyPair(clientCert, clientKey)
-	require.NoError(t, err)
-	assert.Equal(t, expectedCert.Certificate, watcher.certificate().Certificate,
-		"certificate should be updated: %v", logObserver.All())
-
-	logObserver.TakeAll() // clean logs
-
-	// Make third update to make sure that the watcher is still working.
-	timestamp3Dir := filepath.Join(mountDir, "..timestamp-3")
-	createTimestampDir(t, timestamp3Dir, caCert, serverCert, serverKey)
-	err = os.Symlink("..timestamp-3", filepath.Join(mountDir, "..data_tmp"))
-	require.NoError(t, err)
-	os.Rename(filepath.Join(mountDir, "..data_tmp"), filepath.Join(mountDir, "..data"))
-	require.NoError(t, err)
-	err = os.RemoveAll(timestamp2Dir)
-	require.NoError(t, err)
-
-	assertLogs(t, logObserver, logMsgPairReloaded, [][2]string{{"key", opts.KeyPath}, {"cert", opts.CertPath}})
-	assertLogs(t, logObserver, logMsgCertReloaded, [][2]string{{"cert", opts.CAPath}})
-
-	expectedCert, err = tls.LoadX509KeyPair(serverCert, serverKey)
-	require.NoError(t, err)
-	assert.Equal(t,
-		expectedCert.Certificate,
-		watcher.certificate().Certificate,
-		"certificate should be updated",
-	)
-}
-
-func createTimestampDir(t *testing.T, dir string, ca, cert, key string) {
-	t.Helper()
-	err := os.MkdirAll(dir, 0o700)
-	require.NoError(t, err)
-
-	data, err := os.ReadFile(ca)
-	require.NoError(t, err)
-	err = os.WriteFile(filepath.Join(dir, "ca.crt"), data, 0o600)
-	require.NoError(t, err)
-	data, err = os.ReadFile(cert)
-	require.NoError(t, err)
-	err = os.WriteFile(filepath.Join(dir, "tls.crt"), data, 0o600)
-	require.NoError(t, err)
-	data, err = os.ReadFile(key)
-	require.NoError(t, err)
-	err = os.WriteFile(filepath.Join(dir, "tls.key"), data, 0o600)
-	require.NoError(t, err)
-}
-
-func TestAddCertsToWatch_err(t *testing.T) {
-	tests := []struct {
-		opts Options
-	}{
-		{
-			opts: Options{
-				CAPath: "doesnotexists",
-			},
-		},
-		{
-			opts: Options{
-				CAPath:       caCert,
-				ClientCAPath: "doesnotexists",
-			},
-		},
-		{
-			opts: Options{
-				CAPath:       caCert,
-				ClientCAPath: caCert,
-				CertPath:     "doesnotexists",
-			},
-		},
-		{
-			opts: Options{
-				CAPath:       caCert,
-				ClientCAPath: caCert,
-				CertPath:     serverCert,
-				KeyPath:      "doesnotexists",
-			},
-		},
-	}
-	for _, test := range tests {
-		watcher, err := newCertWatcher(test.opts, nil, nil, nil)
-		require.ErrorContains(t, err, "no such file or directory")
-		assert.Nil(t, watcher)
-	}
-}
-
-func assertLogs(t *testing.T,
-	logs *observer.ObservedLogs,
-	logMsg string,
-	fields [][2]string,
-) {
-	errMsg := "Expecting log '" + logMsg + "'"
-	for _, field := range fields {
-		errMsg = errMsg + " " + field[0] + "=" + field[1]
-	}
-	fn := func() bool {
-		l := logs
-		if logMsg != "" {
-			l = l.FilterMessageSnippet(logMsg)
-		}
-		for _, field := range fields {
-			l = l.FilterField(zap.String(field[0], field[1]))
-		}
-		return l.Len() > 0
-	}
-	ok := assert.Eventuallyf(t, fn, 5*time.Second, 10*time.Millisecond, errMsg)
-	if !ok {
-		for _, log := range logs.All() {
-			t.Log(log)
-		}
-	}
-}
-
-// syncWrite ensures data is written to the given filename and flushed to disk.
-// This ensures that any watchers looking for file system changes can be reliably alerted.
-func syncWrite(filename string, data []byte, perm os.FileMode) error {
-	f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC|os.O_SYNC, perm)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	if _, err = f.Write(data); err != nil {
-		return err
-	}
-	return f.Sync()
-}
diff --git a/pkg/config/tlscfg/certpool_unix.go b/pkg/config/tlscfg/certpool_unix.go
deleted file mode 100644
index 15943a21c97..00000000000
--- a/pkg/config/tlscfg/certpool_unix.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2021 The Jaeger Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-//go:build !windows
-// +build !windows
-
-package tlscfg
-
-import (
-	"crypto/x509"
-)
-
-func loadSystemCertPool() (*x509.CertPool, error) {
-	return systemCertPool()
-}
diff --git a/pkg/config/tlscfg/certpool_windows.go b/pkg/config/tlscfg/certpool_windows.go
deleted file mode 100644
index fae3a4b2ebf..00000000000
--- a/pkg/config/tlscfg/certpool_windows.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2021 The Jaeger Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-//go:build windows
-// +build windows
-
-package tlscfg
-
-import (
-	"crypto/x509"
-	"syscall"
-	"unsafe"
-)
-
-const (
-	// CRYPT_E_NOT_FOUND is an error code specific to windows cert pool.
-	// See https://github.com/golang/go/issues/16736#issuecomment-540373689.
-	CRYPT_E_NOT_FOUND = 0x80092004
-)
-
-// workaround https://github.com/golang/go/issues/16736
-// fix borrowed from Sensu: https://github.com/sensu/sensu-go/pull/4018
-func appendCerts(rootCAs *x509.CertPool) (*x509.CertPool, error) {
-	name, _ := syscall.UTF16PtrFromString("Root")
-	storeHandle, err := syscall.CertOpenSystemStore(0, name)
-	if err != nil {
-		return nil, err
-	}
-
-	var cert *syscall.CertContext
-	for {
-		cert, err = syscall.CertEnumCertificatesInStore(storeHandle, cert)
-		if err != nil {
-			if errno, ok := err.(syscall.Errno); ok {
-				if errno == CRYPT_E_NOT_FOUND {
-					break
-				}
-			}
-			return nil, err
-		}
-		if cert == nil {
-			break
-		}
-		// Copy the buf, since ParseCertificate does not create its own copy.
-		buf := (*[1 << 20]byte)(unsafe.Pointer(cert.EncodedCert))[:]
-		buf2 := make([]byte, cert.Length)
-		copy(buf2, buf)
-		if c, err := x509.ParseCertificate(buf2); err == nil {
-			rootCAs.AddCert(c)
-		}
-	}
-	return rootCAs, nil
-}
-
-func loadSystemCertPool() (*x509.CertPool, error) {
-	certPool, err := systemCertPool()
-	if err != nil {
-		return nil, err
-	}
-	if certPool == nil {
-		certPool = x509.NewCertPool()
-	}
-	return appendCerts(certPool)
-}
diff --git a/pkg/config/tlscfg/ciphersuites.go b/pkg/config/tlscfg/ciphersuites.go
deleted file mode 100644
index dc667deed02..00000000000
--- a/pkg/config/tlscfg/ciphersuites.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2022 The Jaeger Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package tlscfg
-
-import (
-	"crypto/tls"
-	"fmt"
-)
-
-// https://pkg.go.dev/crypto/tls#pkg-constants
-var versions = map[string]uint16{
-	"1.0": tls.VersionTLS10,
-	"1.1": tls.VersionTLS11,
-	"1.2": tls.VersionTLS12,
-	"1.3": tls.VersionTLS13,
-}
-
-func allCiphers() map[string]uint16 {
-	acceptedCiphers := make(map[string]uint16)
-	for _, suite := range tls.CipherSuites() {
-		acceptedCiphers[suite.Name] = suite.ID
-	}
-	return acceptedCiphers
-}
-
-// CipherSuiteNamesToIDs returns a list of cipher suite IDs from the cipher suite names passed.
-func CipherSuiteNamesToIDs(cipherNames []string) ([]uint16, error) {
-	var ciphersIDs []uint16
-	possibleCiphers := allCiphers()
-	for _, cipher := range cipherNames {
-		intValue, ok := possibleCiphers[cipher]
-		if !ok {
-			return nil, fmt.Errorf("cipher suite %s not supported or doesn't exist", cipher)
-		}
-		ciphersIDs = append(ciphersIDs, intValue)
-	}
-	return ciphersIDs, nil
-}
-
-// VersionNameToID returns the version ID from version name
-func VersionNameToID(versionName string) (uint16, error) {
-	if version, ok := versions[versionName]; ok {
-		return version, nil
-	}
-	return 0, fmt.Errorf("unknown tls version %q", versionName)
-}
diff --git a/pkg/config/tlscfg/ciphersuites_test.go b/pkg/config/tlscfg/ciphersuites_test.go
deleted file mode 100644
index 006a9ab9ed0..00000000000
--- a/pkg/config/tlscfg/ciphersuites_test.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) 2022 The Jaeger Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package tlscfg
-
-import (
-	"crypto/tls"
-	"reflect"
-	"testing"
-)
-
-func TestCipherSuiteNamesToIDs(t *testing.T) {
-	tests := []struct {
-		flag          []string
-		expected      []uint16
-		expectedError bool
-	}{
-		{
-			// Happy case
-			flag:          []string{"TLS_AES_128_GCM_SHA256", "TLS_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"},
-			expected:      []uint16{tls.TLS_AES_128_GCM_SHA256, tls.TLS_AES_256_GCM_SHA384, tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384},
-			expectedError: false,
-		},
-		{
-			// One flag only
-			flag:          []string{"TLS_AES_128_GCM_SHA256"},
-			expected:      []uint16{tls.TLS_AES_128_GCM_SHA256},
-			expectedError: false,
-		},
-		{
-			// Empty flag
-			flag:          []string{},
-			expected:      nil,
-			expectedError: false,
-		},
-		{
-			// Duplicated flag
-			flag:          []string{"TLS_AES_128_GCM_SHA256", "TLS_AES_256_GCM_SHA384", "TLS_AES_128_GCM_SHA256"},
-			expected:      []uint16{tls.TLS_AES_128_GCM_SHA256, tls.TLS_AES_256_GCM_SHA384, tls.TLS_AES_128_GCM_SHA256},
-			expectedError: false,
-		},
-		{
-			// Invalid flag
-			flag:          []string{"TLS_INVALID_CIPHER_SUITE"},
-			expected:      nil,
-			expectedError: true,
-		},
-	}
-
-	for i, test := range tests {
-		uIntFlags, err := CipherSuiteNamesToIDs(test.flag)
-		if !reflect.DeepEqual(uIntFlags, test.expected) {
-			t.Errorf("%d: expected %+v, got %+v", i, test.expected, uIntFlags)
-		}
-		if test.expectedError && err == nil {
-			t.Errorf("%d: expecting error, got %+v", i, err)
-		}
-	}
-}
-
-func TestVersionNameToID(t *testing.T) {
-	tests := []struct {
-		flag          string
-		expected      uint16
-		expectedError bool
-	}{
-		{
-			// Happy case
-			flag:          "1.1",
-			expected:      tls.VersionTLS11,
-			expectedError: false,
-		},
-		{
-			// Invalid flag
-			flag:          "Invalid",
-			expected:      0,
-			expectedError: true,
-		},
-	}
-
-	for i, test := range tests {
-		uIntFlag, err := VersionNameToID(test.flag)
-		if !reflect.DeepEqual(uIntFlag, test.expected) {
-			t.Errorf("%d: expected %+v, got %+v", i, test.expected, uIntFlag)
-		}
-		if test.expectedError && err == nil {
-			t.Errorf("%d: expecting error, got %+v", i, err)
-		}
-	}
-}
diff --git a/pkg/config/tlscfg/options.go b/pkg/config/tlscfg/options.go
index c67dcb2b2ef..2ca55f5f7b4 100644
--- a/pkg/config/tlscfg/options.go
+++ b/pkg/config/tlscfg/options.go
@@ -4,17 +4,9 @@
 package tlscfg
 
 import (
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
 	"time"
 
 	"go.opentelemetry.io/collector/config/configtls"
-	"go.uber.org/zap"
 )
 
 // Options describes the configuration properties for TLS Connections.
@@ -30,100 +22,6 @@ type Options struct {
 	MaxVersion     string        `mapstructure:"max_version"`
 	SkipHostVerify bool          `mapstructure:"skip_host_verify"`
 	ReloadInterval time.Duration `mapstructure:"reload_interval"`
-	certWatcher    *certWatcher
-}
-
-var systemCertPool = x509.SystemCertPool // to allow overriding in unit test
-
-// Config loads TLS certificates and returns a TLS Config.
-func (o *Options) Config(logger *zap.Logger) (*tls.Config, error) {
-	var minVersionId, maxVersionId uint16
-
-	certPool, err := o.loadCertPool()
-	if err != nil {
-		return nil, fmt.Errorf("failed to load CA CertPool: %w", err)
-	}
-
-	cipherSuiteIds, err := CipherSuiteNamesToIDs(o.CipherSuites)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get cipher suite ids from cipher suite names: %w", err)
-	}
-
-	if o.MinVersion != "" {
-		minVersionId, err = VersionNameToID(o.MinVersion)
-		if err != nil {
-			return nil, fmt.Errorf("failed to get minimum tls version: %w", err)
-		}
-	}
-
-	if o.MaxVersion != "" {
-		maxVersionId, err = VersionNameToID(o.MaxVersion)
-		if err != nil {
-			return nil, fmt.Errorf("failed to get maximum tls version: %w", err)
-		}
-	}
-
-	if o.MinVersion != "" && o.MaxVersion != "" {
-		if minVersionId > maxVersionId {
-			return nil, errors.New("minimum tls version can't be greater than maximum tls version")
-		}
-	}
-
-	tlsCfg := &tls.Config{
-		RootCAs:            certPool,
-		ServerName:         o.ServerName,
-		InsecureSkipVerify: o.SkipHostVerify, /* #nosec G402*/
-		CipherSuites:       cipherSuiteIds,
-		MinVersion:         minVersionId,
-		MaxVersion:         maxVersionId,
-	}
-
-	if o.ClientCAPath != "" {
-		// TODO this should be moved to certWatcher, since it already loads key pair
-		certPool := x509.NewCertPool()
-		if err := addCertToPool(o.ClientCAPath, certPool); err != nil {
-			return nil, err
-		}
-		tlsCfg.ClientCAs = certPool
-		tlsCfg.ClientAuth = tls.RequireAndVerifyClientCert
-	}
-
-	certWatcher, err := newCertWatcher(*o, logger, tlsCfg.RootCAs, tlsCfg.ClientCAs)
-	if err != nil {
-		return nil, err
-	}
-	o.certWatcher = certWatcher
-
-	if (o.CertPath == "" && o.KeyPath != "") || (o.CertPath != "" && o.KeyPath == "") {
-		return nil, errors.New("for client auth via TLS, either both client certificate and key must be supplied, or neither")
-	}
-	if o.CertPath != "" && o.KeyPath != "" {
-		tlsCfg.GetCertificate = func(*tls.ClientHelloInfo) (*tls.Certificate, error) {
-			return o.certWatcher.certificate(), nil
-		}
-		// GetClientCertificate is used on the client side when server is configured with tls.RequireAndVerifyClientCert e.g. mTLS
-		tlsCfg.GetClientCertificate = func(*tls.CertificateRequestInfo) (*tls.Certificate, error) {
-			return o.certWatcher.certificate(), nil
-		}
-	}
-
-	return tlsCfg, nil
-}
-
-func (o Options) loadCertPool() (*x509.CertPool, error) {
-	if len(o.CAPath) == 0 { // no truststore given, use SystemCertPool
-		certPool, err := loadSystemCertPool()
-		if err != nil {
-			return nil, fmt.Errorf("failed to load SystemCertPool: %w", err)
-		}
-		return certPool, nil
-	}
-	certPool := x509.NewCertPool()
-	// setup user specified truststore
-	if err := addCertToPool(o.CAPath, certPool); err != nil {
-		return nil, err
-	}
-	return certPool, nil
 }
 
 func (o *Options) ToOtelClientConfig() configtls.ClientConfig {
@@ -172,25 +70,3 @@ func (o *Options) ToOtelServerConfig() *configtls.ServerConfig {
 
 	return cfg
 }
-
-func addCertToPool(caPath string, certPool *x509.CertPool) error {
-	caPEM, err := os.ReadFile(filepath.Clean(caPath))
-	if err != nil {
-		return fmt.Errorf("failed to load CA %s: %w", caPath, err)
-	}
-
-	if !certPool.AppendCertsFromPEM(caPEM) {
-		return fmt.Errorf("failed to parse CA %s", caPath)
-	}
-	return nil
-}
-
-var _ io.Closer = (*Options)(nil)
-
-// Close shuts down the embedded certificate watcher.
-func (o *Options) Close() error {
-	if o.certWatcher != nil {
-		return o.certWatcher.Close()
-	}
-	return nil
-}
diff --git a/pkg/config/tlscfg/options_test.go b/pkg/config/tlscfg/options_test.go
index 4a1d5d46555..342c1ff23f5 100644
--- a/pkg/config/tlscfg/options_test.go
+++ b/pkg/config/tlscfg/options_test.go
@@ -4,179 +4,13 @@
 package tlscfg
 
 import (
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"path/filepath"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/config/configtls"
-	"go.uber.org/zap"
 )
 
-var testCertKeyLocation = "./testdata"
-
-func TestOptionsToConfig(t *testing.T) {
-	tests := []struct {
-		name        string
-		options     Options
-		fakeSysPool bool
-		expectError string
-	}{
-		{
-			name:    "should load system CA",
-			options: Options{CAPath: ""},
-		},
-		{
-			name:        "should fail with fake system CA",
-			fakeSysPool: true,
-			options:     Options{CAPath: ""},
-			expectError: "fake system pool",
-		},
-		{
-			name:    "should load custom CA",
-			options: Options{CAPath: testCertKeyLocation + "/example-CA-cert.pem"},
-		},
-		{
-			name:        "should fail with invalid CA file path",
-			options:     Options{CAPath: testCertKeyLocation + "/not/valid"},
-			expectError: "failed to load CA",
-		},
-		{
-			name:        "should fail with invalid CA file content",
-			options:     Options{CAPath: testCertKeyLocation + "/bad-CA-cert.txt"},
-			expectError: "failed to parse CA",
-		},
-		{
-			name: "should load valid TLS Client settings",
-			options: Options{
-				CAPath:   testCertKeyLocation + "/example-CA-cert.pem",
-				CertPath: testCertKeyLocation + "/example-client-cert.pem",
-				KeyPath:  testCertKeyLocation + "/example-client-key.pem",
-			},
-		},
-		{
-			name: "should fail with missing TLS Client Key",
-			options: Options{
-				CAPath:   testCertKeyLocation + "/example-CA-cert.pem",
-				CertPath: testCertKeyLocation + "/example-client-cert.pem",
-			},
-			expectError: "both client certificate and key must be supplied",
-		},
-		{
-			name: "should fail with invalid TLS Client Key",
-			options: Options{
-				CAPath:   testCertKeyLocation + "/example-CA-cert.pem",
-				CertPath: testCertKeyLocation + "/example-client-cert.pem",
-				KeyPath:  testCertKeyLocation + "/not/valid",
-			},
-			expectError: "failed to load server TLS cert and key",
-		},
-		{
-			name: "should fail with missing TLS Client Cert",
-			options: Options{
-				CAPath:  testCertKeyLocation + "/example-CA-cert.pem",
-				KeyPath: testCertKeyLocation + "/example-client-key.pem",
-			},
-			expectError: "both client certificate and key must be supplied",
-		},
-		{
-			name: "should fail with invalid TLS Client Cert",
-			options: Options{
-				CAPath:   testCertKeyLocation + "/example-CA-cert.pem",
-				CertPath: testCertKeyLocation + "/not/valid",
-				KeyPath:  testCertKeyLocation + "/example-client-key.pem",
-			},
-			expectError: "failed to load server TLS cert and key",
-		},
-		{
-			name: "should fail with invalid TLS Client CA",
-			options: Options{
-				ClientCAPath: testCertKeyLocation + "/not/valid",
-			},
-			expectError: "failed to load CA",
-		},
-		{
-			name: "should fail with invalid TLS Client CA pool",
-			options: Options{
-				ClientCAPath: testCertKeyLocation + "/bad-CA-cert.txt",
-			},
-			expectError: "failed to parse CA",
-		},
-		{
-			name: "should pass with valid TLS Client CA pool",
-			options: Options{
-				ClientCAPath: testCertKeyLocation + "/example-CA-cert.pem",
-			},
-		},
-		{
-			name: "should fail with invalid TLS Cipher Suite",
-			options: Options{
-				CipherSuites: []string{"TLS_INVALID_CIPHER_SUITE"},
-			},
-			expectError: "failed to get cipher suite ids from cipher suite names: cipher suite TLS_INVALID_CIPHER_SUITE not supported or doesn't exist",
-		},
-		{
-			name: "should fail with invalid TLS Min Version",
-			options: Options{
-				MinVersion: "Invalid",
-			},
-			expectError: "failed to get minimum tls version",
-		},
-		{
-			name: "should fail with invalid TLS Max Version",
-			options: Options{
-				MaxVersion: "Invalid",
-			},
-			expectError: "failed to get maximum tls version",
-		},
-		{
-			name: "should fail with TLS Min Version greater than TLS Max Version error",
-			options: Options{
-				MinVersion: "1.2",
-				MaxVersion: "1.1",
-			},
-			expectError: "minimum tls version can't be greater than maximum tls version",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			if test.fakeSysPool {
-				saveSystemCertPool := systemCertPool
-				systemCertPool = func() (*x509.CertPool, error) {
-					return nil, errors.New("fake system pool")
-				}
-				defer func() {
-					systemCertPool = saveSystemCertPool
-				}()
-			}
-			cfg, err := test.options.Config(zap.NewNop())
-			if test.expectError != "" {
-				require.ErrorContains(t, err, test.expectError)
-			} else {
-				require.NoError(t, err)
-				assert.NotNil(t, cfg)
-
-				if test.options.CertPath != "" && test.options.KeyPath != "" {
-					c, e := tls.LoadX509KeyPair(filepath.Clean(test.options.CertPath), filepath.Clean(test.options.KeyPath))
-					require.NoError(t, e)
-					cert, err := cfg.GetCertificate(&tls.ClientHelloInfo{})
-					require.NoError(t, err)
-					assert.Equal(t, &c, cert)
-					cert, err = cfg.GetClientCertificate(&tls.CertificateRequestInfo{})
-					require.NoError(t, err)
-					assert.Equal(t, &c, cert)
-				}
-			}
-			require.NoError(t, test.options.Close())
-		})
-	}
-}
-
 func TestToOtelClientConfig(t *testing.T) {
 	testCases := []struct {
 		name     string

From cd995017d78b568ef292ff23c88a5604bafaf17e Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Fri, 13 Dec 2024 11:39:21 -0500
Subject: [PATCH 28/59] [v2][adjuster] Implement ip attribute adjuster to
 operate on otlp data model (#6355)

## Which problem is this PR solving?
- Towards https://github.com/jaegertracing/jaeger/issues/6344

## Description of the changes
- This PR implements the `IPTag` adjuster to operate on the OTLP data
model. In the OTLP model, tags are dubbed as attributes so the adjuster
was renamed to `IPAttribute`.

## How was this change tested?
- Added unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/query/app/querysvc/adjuster/adjuster.go   | 14 ++--
 .../app/querysvc/adjuster/ipattribute.go      | 77 ++++++++++++++++++
 .../app/querysvc/adjuster/ipattribute_test.go | 81 +++++++++++++++++++
 3 files changed, 165 insertions(+), 7 deletions(-)
 create mode 100644 cmd/query/app/querysvc/adjuster/ipattribute.go
 create mode 100644 cmd/query/app/querysvc/adjuster/ipattribute_test.go

diff --git a/cmd/query/app/querysvc/adjuster/adjuster.go b/cmd/query/app/querysvc/adjuster/adjuster.go
index 748eee10b07..e6c4f4039fb 100644
--- a/cmd/query/app/querysvc/adjuster/adjuster.go
+++ b/cmd/query/app/querysvc/adjuster/adjuster.go
@@ -18,11 +18,11 @@ type Adjuster interface {
 }
 
 // Func is a type alias that wraps a function and makes an Adjuster from it.
-type Func func(trace ptrace.Traces) (ptrace.Traces, error)
+type Func func(traces ptrace.Traces) (ptrace.Traces, error)
 
 // Adjust implements Adjuster interface for the Func alias.
-func (f Func) Adjust(trace ptrace.Traces) (ptrace.Traces, error) {
-	return f(trace)
+func (f Func) Adjust(traces ptrace.Traces) (ptrace.Traces, error) {
+	return f(traces)
 }
 
 // Sequence creates an adjuster that combines a series of adjusters
@@ -44,17 +44,17 @@ type sequence struct {
 	failFast  bool
 }
 
-func (c sequence) Adjust(trace ptrace.Traces) (ptrace.Traces, error) {
+func (c sequence) Adjust(traces ptrace.Traces) (ptrace.Traces, error) {
 	var errs []error
 	for _, adjuster := range c.adjusters {
 		var err error
-		trace, err = adjuster.Adjust(trace)
+		traces, err = adjuster.Adjust(traces)
 		if err != nil {
 			if c.failFast {
-				return trace, err
+				return traces, err
 			}
 			errs = append(errs, err)
 		}
 	}
-	return trace, errors.Join(errs...)
+	return traces, errors.Join(errs...)
 }
diff --git a/cmd/query/app/querysvc/adjuster/ipattribute.go b/cmd/query/app/querysvc/adjuster/ipattribute.go
new file mode 100644
index 00000000000..0ddb9b45447
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/ipattribute.go
@@ -0,0 +1,77 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"bytes"
+	"encoding/binary"
+	"strconv"
+
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+)
+
+var ipAttributesToCorrect = map[string]struct{}{
+	"ip":        {},
+	"peer.ipv4": {},
+}
+
+// IPAttribute returns an adjuster that replaces numeric "ip" attributes,
+// which usually contain IPv4 packed into uint32, with their string
+// representation (e.g. "8.8.8.8"").
+func IPAttribute() Adjuster {
+	return Func(func(traces ptrace.Traces) (ptrace.Traces, error) {
+		adjuster := ipAttributeAdjuster{}
+		resourceSpans := traces.ResourceSpans()
+		for i := 0; i < resourceSpans.Len(); i++ {
+			rs := resourceSpans.At(i)
+			adjuster.adjust(rs.Resource().Attributes())
+			scopeSpans := rs.ScopeSpans()
+			for j := 0; j < scopeSpans.Len(); j++ {
+				ss := scopeSpans.At(j)
+				spans := ss.Spans()
+				for k := 0; k < spans.Len(); k++ {
+					span := spans.At(k)
+					adjuster.adjust(span.Attributes())
+				}
+			}
+		}
+		return traces, nil
+	})
+}
+
+type ipAttributeAdjuster struct{}
+
+func (ipAttributeAdjuster) adjust(attributes pcommon.Map) {
+	adjusted := make(map[string]string)
+	attributes.Range(func(k string, v pcommon.Value) bool {
+		if _, ok := ipAttributesToCorrect[k]; !ok {
+			return true
+		}
+		var value uint32
+		switch v.Type() {
+		case pcommon.ValueTypeInt:
+			//nolint: gosec // G115
+			value = uint32(v.Int())
+		case pcommon.ValueTypeDouble:
+			value = uint32(v.Double())
+		default:
+			return true
+		}
+		var buf [4]byte
+		binary.BigEndian.PutUint32(buf[:], value)
+		var sBuf bytes.Buffer
+		for i, b := range buf {
+			if i > 0 {
+				sBuf.WriteRune('.')
+			}
+			sBuf.WriteString(strconv.FormatUint(uint64(b), 10))
+		}
+		adjusted[k] = sBuf.String()
+		return true
+	})
+	for k, v := range adjusted {
+		attributes.PutStr(k, v)
+	}
+}
diff --git a/cmd/query/app/querysvc/adjuster/ipattribute_test.go b/cmd/query/app/querysvc/adjuster/ipattribute_test.go
new file mode 100644
index 00000000000..cfd9ddeea26
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/ipattribute_test.go
@@ -0,0 +1,81 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+)
+
+func TestIPAttributeAdjuster(t *testing.T) {
+	traces := ptrace.NewTraces()
+	resourceSpans := traces.ResourceSpans().AppendEmpty()
+
+	resourceAttributes := resourceSpans.Resource().Attributes()
+	resourceAttributes.PutInt("a", 42)
+	resourceAttributes.PutInt("ip", 1<<24|2<<16|3<<8|4)
+	resourceAttributes.PutStr("peer.ipv4", "something")
+
+	spans := resourceSpans.ScopeSpans().AppendEmpty().Spans()
+
+	createSpan := func(attrs map[string]any) {
+		span := spans.AppendEmpty()
+		for key, value := range attrs {
+			switch v := value.(type) {
+			case int:
+				span.Attributes().PutInt(key, int64(v))
+			case string:
+				span.Attributes().PutStr(key, v)
+			case float64:
+				span.Attributes().PutDouble(key, v)
+			}
+		}
+	}
+
+	createSpan(map[string]any{
+		"a":         42,
+		"ip":        int(1<<25 | 2<<16 | 3<<8 | 4),
+		"peer.ipv4": "something else",
+	})
+
+	createSpan(map[string]any{
+		"ip": float64(1<<26 | 2<<16 | 3<<8 | 4),
+	})
+
+	assertAttribute := func(attributes pcommon.Map, key string, expected any) {
+		val, ok := attributes.Get(key)
+		require.True(t, ok)
+		switch v := expected.(type) {
+		case int:
+			require.EqualValues(t, v, val.Int())
+		case string:
+			require.EqualValues(t, v, val.Str())
+		}
+	}
+
+	trace, err := IPAttribute().Adjust(traces)
+	require.NoError(t, err)
+
+	resourceSpan := trace.ResourceSpans().At(0)
+	assert.Equal(t, 3, resourceSpan.Resource().Attributes().Len())
+
+	assertAttribute(resourceSpan.Resource().Attributes(), "a", 42)
+	assertAttribute(resourceSpan.Resource().Attributes(), "ip", "1.2.3.4")
+	assertAttribute(resourceSpan.Resource().Attributes(), "peer.ipv4", "something")
+
+	gotSpans := resourceSpan.ScopeSpans().At(0).Spans()
+	assert.Equal(t, 2, gotSpans.Len())
+
+	assert.Equal(t, 3, gotSpans.At(0).Attributes().Len())
+	assertAttribute(gotSpans.At(0).Attributes(), "a", 42)
+	assertAttribute(gotSpans.At(0).Attributes(), "ip", "2.2.3.4")
+	assertAttribute(gotSpans.At(0).Attributes(), "peer.ipv4", "something else")
+
+	assert.Equal(t, 1, gotSpans.At(1).Attributes().Len())
+	assertAttribute(gotSpans.At(1).Attributes(), "ip", "4.2.3.4")
+}

From 9eb0170af494910249c31154c5bdbf331907abbb Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Date: Fri, 13 Dec 2024 21:32:58 -0400
Subject: [PATCH 29/59] Respond correctly to stream send error (#6357)

## Which problem is this PR solving?
- Noticed by accident that apiv3 handler was ignoring stream send error

## Description of the changes
- Handle error propertly
- Add tests
- Remove impossible error handling from pdata converter

## How was this change tested?
- CI

Signed-off-by: Yuri Shkuro <github@ysh.us>
---
 cmd/query/app/apiv3/grpc_handler.go      | 26 ++++++++++-------
 cmd/query/app/apiv3/grpc_handler_test.go | 37 ++++++++++++++++++++++++
 cmd/query/app/apiv3/http_gateway.go      |  7 ++---
 cmd/query/app/apiv3/http_gateway_test.go | 16 ----------
 cmd/query/app/apiv3/otlp_translator.go   |  6 ++--
 5 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/cmd/query/app/apiv3/grpc_handler.go b/cmd/query/app/apiv3/grpc_handler.go
index f27f5560c89..0e684f60406 100644
--- a/cmd/query/app/apiv3/grpc_handler.go
+++ b/cmd/query/app/apiv3/grpc_handler.go
@@ -36,16 +36,22 @@ func (h *Handler) GetTrace(request *api_v3.GetTraceRequest, stream api_v3.QueryS
 	if err != nil {
 		return fmt.Errorf("cannot retrieve trace: %w", err)
 	}
-	td, err := modelToOTLP(trace.GetSpans())
-	if err != nil {
-		return err
-	}
+	td := modelToOTLP(trace.GetSpans())
 	tracesData := api_v3.TracesData(td)
 	return stream.Send(&tracesData)
 }
 
 // FindTraces implements api_v3.QueryServiceServer's FindTraces
 func (h *Handler) FindTraces(request *api_v3.FindTracesRequest, stream api_v3.QueryService_FindTracesServer) error {
+	return h.internalFindTraces(stream.Context(), request, stream.Send)
+}
+
+// separated for testing
+func (h *Handler) internalFindTraces(
+	ctx context.Context,
+	request *api_v3.FindTracesRequest,
+	streamSend func(*api_v3.TracesData) error,
+) error {
 	query := request.GetQuery()
 	if query == nil {
 		return status.Error(codes.InvalidArgument, "missing query")
@@ -74,17 +80,17 @@ func (h *Handler) FindTraces(request *api_v3.FindTracesRequest, stream api_v3.Qu
 		queryParams.DurationMax = d
 	}
 
-	traces, err := h.QueryService.FindTraces(stream.Context(), queryParams)
+	traces, err := h.QueryService.FindTraces(ctx, queryParams)
 	if err != nil {
 		return err
 	}
 	for _, t := range traces {
-		td, err := modelToOTLP(t.GetSpans())
-		if err != nil {
-			return err
-		}
+		td := modelToOTLP(t.GetSpans())
 		tracesData := api_v3.TracesData(td)
-		stream.Send(&tracesData)
+		if err := streamSend(&tracesData); err != nil {
+			return status.Error(codes.Internal,
+				fmt.Sprintf("failed to send response stream chunk to client: %v", err))
+		}
 	}
 	return nil
 }
diff --git a/cmd/query/app/apiv3/grpc_handler_test.go b/cmd/query/app/apiv3/grpc_handler_test.go
index 6534df23fe6..dbd0c48c82b 100644
--- a/cmd/query/app/apiv3/grpc_handler_test.go
+++ b/cmd/query/app/apiv3/grpc_handler_test.go
@@ -155,6 +155,9 @@ func TestFindTraces(t *testing.T) {
 			Attributes:    map[string]string{"foo": "bar"},
 			StartTimeMin:  time.Now().Add(-2 * time.Hour),
 			StartTimeMax:  time.Now(),
+			DurationMin:   1 * time.Second,
+			DurationMax:   2 * time.Second,
+			SearchDepth:   10,
 		},
 	})
 	require.NoError(t, err)
@@ -164,6 +167,40 @@ func TestFindTraces(t *testing.T) {
 	require.EqualValues(t, 1, td.SpanCount())
 }
 
+func TestFindTracesSendError(t *testing.T) {
+	reader := new(spanstoremocks.Reader)
+	reader.On("FindTraces", mock.Anything, mock.AnythingOfType("*spanstore.TraceQueryParameters")).Return(
+		[]*model.Trace{
+			{
+				Spans: []*model.Span{
+					{
+						OperationName: "name",
+					},
+				},
+			},
+		}, nil).Once()
+	h := &Handler{
+		QueryService: querysvc.NewQueryService(
+			factoryadapter.NewTraceReader(reader),
+			new(dependencyStoreMocks.Reader),
+			querysvc.QueryServiceOptions{},
+		),
+	}
+	err := h.internalFindTraces(context.Background(),
+		&api_v3.FindTracesRequest{
+			Query: &api_v3.TraceQueryParameters{
+				StartTimeMin: time.Now().Add(-2 * time.Hour),
+				StartTimeMax: time.Now(),
+			},
+		},
+		/* streamSend= */ func(*api_v3.TracesData) error {
+			return errors.New("send_error")
+		},
+	)
+	require.ErrorContains(t, err, "send_error")
+	require.ErrorContains(t, err, "failed to send response")
+}
+
 func TestFindTracesQueryNil(t *testing.T) {
 	tsc := newTestServerClient(t)
 	responseStream, err := tsc.client.FindTraces(context.Background(), &api_v3.FindTracesRequest{})
diff --git a/cmd/query/app/apiv3/http_gateway.go b/cmd/query/app/apiv3/http_gateway.go
index 1abbcece1f8..24f0e6c4396 100644
--- a/cmd/query/app/apiv3/http_gateway.go
+++ b/cmd/query/app/apiv3/http_gateway.go
@@ -112,12 +112,9 @@ func (h *HTTPGateway) returnSpans(spans []*model.Span, w http.ResponseWriter) {
 func (h *HTTPGateway) returnSpansTestable(
 	spans []*model.Span,
 	w http.ResponseWriter,
-	modelToOTLP func(_ []*model.Span) (ptrace.Traces, error),
+	modelToOTLP func(_ []*model.Span) ptrace.Traces,
 ) {
-	td, err := modelToOTLP(spans)
-	if h.tryHandleError(w, err, http.StatusInternalServerError) {
-		return
-	}
+	td := modelToOTLP(spans)
 	tracesData := api_v3.TracesData(td)
 	response := &api_v3.GRPCGatewayWrapper{
 		Result: &tracesData,
diff --git a/cmd/query/app/apiv3/http_gateway_test.go b/cmd/query/app/apiv3/http_gateway_test.go
index f0abbeb3307..c395715b662 100644
--- a/cmd/query/app/apiv3/http_gateway_test.go
+++ b/cmd/query/app/apiv3/http_gateway_test.go
@@ -15,11 +15,9 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
-	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
@@ -92,20 +90,6 @@ func TestHTTPGatewayTryHandleError(t *testing.T) {
 	assert.Contains(t, string(w.Body.String()), e, "writes error message to body")
 }
 
-func TestHTTPGatewayOTLPError(t *testing.T) {
-	w := httptest.NewRecorder()
-	gw := &HTTPGateway{
-		Logger: zap.NewNop(),
-	}
-	const simErr = "simulated error"
-	gw.returnSpansTestable(nil, w,
-		func(_ []*model.Span) (ptrace.Traces, error) {
-			return ptrace.Traces{}, errors.New(simErr)
-		},
-	)
-	assert.Contains(t, w.Body.String(), simErr)
-}
-
 func TestHTTPGatewayGetTraceErrors(t *testing.T) {
 	gw := setupHTTPGatewayNoServer(t, "")
 
diff --git a/cmd/query/app/apiv3/otlp_translator.go b/cmd/query/app/apiv3/otlp_translator.go
index 9fa952a3cc3..1a39ca79845 100644
--- a/cmd/query/app/apiv3/otlp_translator.go
+++ b/cmd/query/app/apiv3/otlp_translator.go
@@ -10,7 +10,9 @@ import (
 	"github.com/jaegertracing/jaeger/model"
 )
 
-func modelToOTLP(spans []*model.Span) (ptrace.Traces, error) {
+func modelToOTLP(spans []*model.Span) ptrace.Traces {
 	batch := &model.Batch{Spans: spans}
-	return model2otel.ProtoToTraces([]*model.Batch{batch})
+	// there is never an error returned from ProtoToTraces
+	tr, _ := model2otel.ProtoToTraces([]*model.Batch{batch})
+	return tr
 }

From c6fa1af0846404004f8a3718137b670fdad9611b Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Date: Sat, 14 Dec 2024 17:55:04 -0400
Subject: [PATCH 30/59] Change Storage v2 API to use streaming (#6359)

## Which problem is this PR solving?
- v1 storage API was fully synchronous that required buffering add span
data in memory, even though our gRPC Remote Storage API supported
streaming.

## Description of the changes
- Change `tracestore.Reader` interface to use function iterators in the
style of Go 1.23 `iter` package
- Add a sort of a backport of `iter` package until we can upgrade to Go
1.23

## How was this change tested?
- CI

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Co-authored-by: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
---
 cmd/query/app/querysvc/query_service_test.go |  34 +-----
 pkg/iter/iter.go                             |  44 +++++++
 pkg/iter/iter_test.go                        | 116 +++++++++++++++++++
 pkg/iter/package_test.go                     |  14 +++
 storage_v2/factoryadapter/reader.go          |  71 +++++++-----
 storage_v2/factoryadapter/reader_test.go     |  87 ++++++++------
 storage_v2/tracestore/mocks/Reader.go        |  64 +++-------
 storage_v2/tracestore/reader.go              |  45 ++++---
 8 files changed, 323 insertions(+), 152 deletions(-)
 create mode 100644 pkg/iter/iter.go
 create mode 100644 pkg/iter/iter_test.go
 create mode 100644 pkg/iter/package_test.go

diff --git a/cmd/query/app/querysvc/query_service_test.go b/cmd/query/app/querysvc/query_service_test.go
index 9cfd8ec6212..96e07047cf7 100644
--- a/cmd/query/app/querysvc/query_service_test.go
+++ b/cmd/query/app/querysvc/query_service_test.go
@@ -12,8 +12,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/pdata/pcommon"
-	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/model"
@@ -27,7 +25,7 @@ import (
 	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 	depsmocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
-	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
+	tracestoremocks "github.com/jaegertracing/jaeger/storage_v2/tracestore/mocks"
 )
 
 const millisToNanosMultiplier = int64(time.Millisecond / time.Nanosecond)
@@ -110,28 +108,6 @@ func initializeTestService(optionAppliers ...testOption) *testQueryService {
 	return &tqs
 }
 
-type fakeReader struct{}
-
-func (*fakeReader) GetTrace(_ context.Context, _ pcommon.TraceID) (ptrace.Traces, error) {
-	panic("not implemented")
-}
-
-func (*fakeReader) GetServices(_ context.Context) ([]string, error) {
-	panic("not implemented")
-}
-
-func (*fakeReader) GetOperations(_ context.Context, _ tracestore.OperationQueryParameters) ([]tracestore.Operation, error) {
-	panic("not implemented")
-}
-
-func (*fakeReader) FindTraces(_ context.Context, _ tracestore.TraceQueryParameters) ([]ptrace.Traces, error) {
-	panic("not implemented")
-}
-
-func (*fakeReader) FindTraceIDs(_ context.Context, _ tracestore.TraceQueryParameters) ([]pcommon.TraceID, error) {
-	panic("not implemented")
-}
-
 // Test QueryService.GetTrace()
 func TestGetTraceSuccess(t *testing.T) {
 	tqs := initializeTestService()
@@ -158,7 +134,7 @@ func TestGetTraceNotFound(t *testing.T) {
 }
 
 func TestGetTrace_V1ReaderNotFound(t *testing.T) {
-	fr := &fakeReader{}
+	fr := new(tracestoremocks.Reader)
 	qs := QueryService{
 		traceReader: fr,
 	}
@@ -195,7 +171,7 @@ func TestGetServices(t *testing.T) {
 }
 
 func TestGetServices_V1ReaderNotFound(t *testing.T) {
-	fr := &fakeReader{}
+	fr := new(tracestoremocks.Reader)
 	qs := QueryService{
 		traceReader: fr,
 	}
@@ -222,7 +198,7 @@ func TestGetOperations(t *testing.T) {
 }
 
 func TestGetOperations_V1ReaderNotFound(t *testing.T) {
-	fr := &fakeReader{}
+	fr := new(tracestoremocks.Reader)
 	qs := QueryService{
 		traceReader: fr,
 	}
@@ -253,7 +229,7 @@ func TestFindTraces(t *testing.T) {
 }
 
 func TestFindTraces_V1ReaderNotFound(t *testing.T) {
-	fr := &fakeReader{}
+	fr := new(tracestoremocks.Reader)
 	qs := QueryService{
 		traceReader: fr,
 	}
diff --git a/pkg/iter/iter.go b/pkg/iter/iter.go
new file mode 100644
index 00000000000..cd08f42368f
--- /dev/null
+++ b/pkg/iter/iter.go
@@ -0,0 +1,44 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+// Package iter is a backport of Go 1.23 official "iter" package, until we upgrade.
+package iter
+
+type (
+	Seq[V any]     func(yield func(V) bool)
+	Seq2[K, V any] func(yield func(K, V) bool)
+)
+
+func CollectWithErrors[V any](seq Seq2[V, error]) ([]V, error) {
+	var result []V
+	var err error
+	seq(func(v V, e error) bool {
+		if e != nil {
+			err = e
+			return false
+		}
+		result = append(result, v)
+		return true
+	})
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+func FlattenWithErrors[V any](seq Seq2[[]V, error]) ([]V, error) {
+	var result []V
+	var err error
+	seq(func(v []V, e error) bool {
+		if e != nil {
+			err = e
+			return false
+		}
+		result = append(result, v...)
+		return true
+	})
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
diff --git a/pkg/iter/iter_test.go b/pkg/iter/iter_test.go
new file mode 100644
index 00000000000..16d2bfc5246
--- /dev/null
+++ b/pkg/iter/iter_test.go
@@ -0,0 +1,116 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package iter
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCollectWithErrors(t *testing.T) {
+	tests := []struct {
+		name     string
+		seq      Seq2[string, error]
+		expected []string
+		err      error
+	}{
+		{
+			name: "no errors",
+			seq: func(yield func(string, error) bool) {
+				yield("a", nil)
+				yield("b", nil)
+				yield("c", nil)
+			},
+			expected: []string{"a", "b", "c"},
+		},
+		{
+			name: "first error",
+			seq: func(yield func(string, error) bool) {
+				yield("a", nil)
+				yield("b", nil)
+				yield("c", assert.AnError)
+			},
+			err: assert.AnError,
+		},
+		{
+			name: "second error",
+			seq: func(yield func(string, error) bool) {
+				yield("a", nil)
+				yield("b", assert.AnError)
+				yield("c", nil)
+			},
+			err: assert.AnError,
+		},
+		{
+			name: "third error",
+			seq: func(yield func(string, error) bool) {
+				yield("a", nil)
+				yield("b", nil)
+				yield("c", assert.AnError)
+			},
+			err: assert.AnError,
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			result, err := CollectWithErrors(test.seq)
+			if test.err != nil {
+				require.ErrorIs(t, err, test.err)
+			} else {
+				require.NoError(t, err)
+				assert.Equal(t, test.expected, result)
+			}
+		})
+	}
+}
+
+func TestFlattenWithErrors(t *testing.T) {
+	tests := []struct {
+		name     string
+		seq      Seq2[[]string, error]
+		expected []string
+		err      error
+	}{
+		{
+			name: "no errors",
+			seq: func(yield func([]string, error) bool) {
+				yield([]string{"a", "b", "c"}, nil)
+				yield([]string{"d", "e", "f"}, nil)
+				yield([]string{"g", "h", "i"}, nil)
+			},
+			expected: []string{"a", "b", "c", "d", "e", "f", "g", "h", "i"},
+		},
+		{
+			name: "first error",
+			seq: func(yield func([]string, error) bool) {
+				yield([]string{"a", "b", "c"}, nil)
+				yield([]string{"d", "e", "f"}, assert.AnError)
+				yield([]string{"g", "h", "i"}, nil)
+			},
+			err: assert.AnError,
+		},
+		{
+			name: "second error",
+			seq: func(yield func([]string, error) bool) {
+				yield([]string{"a", "b", "c"}, nil)
+				yield([]string{"d", "e", "f"}, nil)
+				yield([]string{"g", "h", "i"}, assert.AnError)
+			},
+			err: assert.AnError,
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			result, err := FlattenWithErrors(test.seq)
+			if test.err != nil {
+				require.ErrorIs(t, err, test.err)
+			} else {
+				require.NoError(t, err)
+				assert.Equal(t, test.expected, result)
+			}
+		})
+	}
+}
diff --git a/pkg/iter/package_test.go b/pkg/iter/package_test.go
new file mode 100644
index 00000000000..180cbf18934
--- /dev/null
+++ b/pkg/iter/package_test.go
@@ -0,0 +1,14 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package iter
+
+import (
+	"testing"
+
+	"github.com/jaegertracing/jaeger/pkg/testutils"
+)
+
+func TestMain(m *testing.M) {
+	testutils.VerifyGoLeaks(m)
+}
diff --git a/storage_v2/factoryadapter/reader.go b/storage_v2/factoryadapter/reader.go
index 85ebddab7e9..c5239abd8ab 100644
--- a/storage_v2/factoryadapter/reader.go
+++ b/storage_v2/factoryadapter/reader.go
@@ -12,6 +12,7 @@ import (
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
 	"github.com/jaegertracing/jaeger/model"
+	"github.com/jaegertracing/jaeger/pkg/iter"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	"github.com/jaegertracing/jaeger/storage_v2/depstore"
@@ -20,6 +21,8 @@ import (
 
 var errV1ReaderNotAvailable = errors.New("spanstore.Reader is not a wrapper around v1 reader")
 
+var _ tracestore.Reader = (*TraceReader)(nil)
+
 type TraceReader struct {
 	spanReader spanstore.Reader
 }
@@ -37,13 +40,20 @@ func NewTraceReader(spanReader spanstore.Reader) *TraceReader {
 	}
 }
 
-func (tr *TraceReader) GetTrace(ctx context.Context, traceID pcommon.TraceID) (ptrace.Traces, error) {
-	t, err := tr.spanReader.GetTrace(ctx, model.TraceIDFromOTEL(traceID))
-	if err != nil {
-		return ptrace.NewTraces(), err
+func (tr *TraceReader) GetTrace(ctx context.Context, traceID pcommon.TraceID) iter.Seq2[ptrace.Traces, error] {
+	return func(yield func(ptrace.Traces, error) bool) {
+		t, err := tr.spanReader.GetTrace(ctx, model.TraceIDFromOTEL(traceID))
+		if err != nil {
+			// if not found, return an empty iterator, otherwire yield the error.
+			if !errors.Is(err, spanstore.ErrTraceNotFound) {
+				yield(ptrace.NewTraces(), err)
+			}
+			return
+		}
+		batch := &model.Batch{Spans: t.GetSpans()}
+		tr, err := model2otel.ProtoToTraces([]*model.Batch{batch})
+		yield(tr, err)
 	}
-	batch := &model.Batch{Spans: t.GetSpans()}
-	return model2otel.ProtoToTraces([]*model.Batch{batch})
 }
 
 func (tr *TraceReader) GetServices(ctx context.Context) ([]string, error) {
@@ -71,30 +81,39 @@ func (tr *TraceReader) GetOperations(ctx context.Context, query tracestore.Opera
 func (tr *TraceReader) FindTraces(
 	ctx context.Context,
 	query tracestore.TraceQueryParameters,
-) ([]ptrace.Traces, error) {
-	t, err := tr.spanReader.FindTraces(ctx, query.ToSpanStoreQueryParameters())
-	if err != nil || t == nil {
-		return nil, err
+) iter.Seq2[[]ptrace.Traces, error] {
+	return func(yield func([]ptrace.Traces, error) bool) {
+		traces, err := tr.spanReader.FindTraces(ctx, query.ToSpanStoreQueryParameters())
+		if err != nil {
+			yield(nil, err)
+			return
+		}
+		for _, trace := range traces {
+			batch := &model.Batch{Spans: trace.GetSpans()}
+			otelTrace, _ := model2otel.ProtoToTraces([]*model.Batch{batch})
+			if !yield([]ptrace.Traces{otelTrace}, nil) {
+				return
+			}
+		}
 	}
-	otelTraces := []ptrace.Traces{}
-	for _, trace := range t {
-		batch := &model.Batch{Spans: trace.GetSpans()}
-		otelTrace, _ := model2otel.ProtoToTraces([]*model.Batch{batch})
-		otelTraces = append(otelTraces, otelTrace)
-	}
-	return otelTraces, nil
 }
 
-func (tr *TraceReader) FindTraceIDs(ctx context.Context, query tracestore.TraceQueryParameters) ([]pcommon.TraceID, error) {
-	t, err := tr.spanReader.FindTraceIDs(ctx, query.ToSpanStoreQueryParameters())
-	if err != nil || t == nil {
-		return nil, err
-	}
-	traceIDs := []pcommon.TraceID{}
-	for _, traceID := range t {
-		traceIDs = append(traceIDs, traceID.ToOTELTraceID())
+func (tr *TraceReader) FindTraceIDs(
+	ctx context.Context,
+	query tracestore.TraceQueryParameters,
+) iter.Seq2[[]pcommon.TraceID, error] {
+	return func(yield func([]pcommon.TraceID, error) bool) {
+		traceIDs, err := tr.spanReader.FindTraceIDs(ctx, query.ToSpanStoreQueryParameters())
+		if err != nil {
+			yield(nil, err)
+			return
+		}
+		otelIDs := make([]pcommon.TraceID, 0, len(traceIDs))
+		for _, traceID := range traceIDs {
+			otelIDs = append(otelIDs, traceID.ToOTELTraceID())
+		}
+		yield(otelIDs, nil)
 	}
-	return traceIDs, nil
 }
 
 type DependencyReader struct {
diff --git a/storage_v2/factoryadapter/reader_test.go b/storage_v2/factoryadapter/reader_test.go
index 0559f7e5d94..bd7c9c4a91a 100644
--- a/storage_v2/factoryadapter/reader_test.go
+++ b/storage_v2/factoryadapter/reader_test.go
@@ -9,18 +9,21 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
 	"github.com/jaegertracing/jaeger/model"
+	"github.com/jaegertracing/jaeger/pkg/iter"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanStoreMocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
+	tracestoremocks "github.com/jaegertracing/jaeger/storage_v2/tracestore/mocks"
 )
 
 func TestGetV1Reader_NoError(t *testing.T) {
@@ -33,30 +36,8 @@ func TestGetV1Reader_NoError(t *testing.T) {
 	require.Equal(t, memstore, v1Reader)
 }
 
-type fakeReader struct{}
-
-func (*fakeReader) GetTrace(_ context.Context, _ pcommon.TraceID) (ptrace.Traces, error) {
-	panic("not implemented")
-}
-
-func (*fakeReader) GetServices(_ context.Context) ([]string, error) {
-	panic("not implemented")
-}
-
-func (*fakeReader) GetOperations(_ context.Context, _ tracestore.OperationQueryParameters) ([]tracestore.Operation, error) {
-	panic("not implemented")
-}
-
-func (*fakeReader) FindTraces(_ context.Context, _ tracestore.TraceQueryParameters) ([]ptrace.Traces, error) {
-	panic("not implemented")
-}
-
-func (*fakeReader) FindTraceIDs(_ context.Context, _ tracestore.TraceQueryParameters) ([]pcommon.TraceID, error) {
-	panic("not implemented")
-}
-
 func TestGetV1Reader_Error(t *testing.T) {
-	fr := &fakeReader{}
+	fr := new(tracestoremocks.Reader)
 	_, err := GetV1Reader(fr)
 	require.ErrorIs(t, err, errV1ReaderNotAvailable)
 }
@@ -81,11 +62,13 @@ func TestTraceReader_GetTraceDelegatesSuccessResponse(t *testing.T) {
 	traceReader := &TraceReader{
 		spanReader: sr,
 	}
-	trace, err := traceReader.GetTrace(
+	traces, err := iter.CollectWithErrors(traceReader.GetTrace(
 		context.Background(),
 		pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}),
-	)
+	))
 	require.NoError(t, err)
+	require.Len(t, traces, 1)
+	trace := traces[0]
 	traceSpans := trace.ResourceSpans().At(0).ScopeSpans().At(0).Spans()
 	require.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}, traceSpans.At(0).TraceID())
 	require.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 1}, traceSpans.At(0).SpanID())
@@ -102,12 +85,12 @@ func TestTraceReader_GetTraceErrorResponse(t *testing.T) {
 	traceReader := &TraceReader{
 		spanReader: sr,
 	}
-	trace, err := traceReader.GetTrace(
+	traces, err := iter.CollectWithErrors(traceReader.GetTrace(
 		context.Background(),
 		pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}),
-	)
+	))
 	require.ErrorIs(t, err, testErr)
-	require.Equal(t, ptrace.NewTraces(), trace)
+	require.Empty(t, traces)
 }
 
 func TestTraceReader_GetServicesDelegatesToSpanReader(t *testing.T) {
@@ -239,7 +222,7 @@ func TestTraceReader_FindTracesDelegatesSuccessResponse(t *testing.T) {
 	traceReader := &TraceReader{
 		spanReader: sr,
 	}
-	traces, err := traceReader.FindTraces(
+	traces, err := iter.FlattenWithErrors(traceReader.FindTraces(
 		context.Background(),
 		tracestore.TraceQueryParameters{
 			ServiceName:   "service",
@@ -251,7 +234,7 @@ func TestTraceReader_FindTracesDelegatesSuccessResponse(t *testing.T) {
 			DurationMax:   time.Hour,
 			NumTraces:     10,
 		},
-	)
+	))
 	require.NoError(t, err)
 	require.Len(t, traces, len(modelTraces))
 	traceASpans := traces[0].ResourceSpans().At(0).ScopeSpans().At(0).Spans()
@@ -282,7 +265,7 @@ func TestTraceReader_FindTracesEdgeCases(t *testing.T) {
 		{
 			name:           "empty response",
 			modelTraces:    []*model.Trace{},
-			expectedTraces: []ptrace.Traces{},
+			expectedTraces: nil,
 		},
 		{
 			name:           "error response",
@@ -302,16 +285,48 @@ func TestTraceReader_FindTracesEdgeCases(t *testing.T) {
 			traceReader := &TraceReader{
 				spanReader: sr,
 			}
-			traces, err := traceReader.FindTraces(
+			traces, err := iter.FlattenWithErrors(traceReader.FindTraces(
 				context.Background(),
 				tracestore.TraceQueryParameters{},
-			)
+			))
 			require.ErrorIs(t, err, test.err)
 			require.Equal(t, test.expectedTraces, traces)
 		})
 	}
 }
 
+func TestTraceReader_FindTracesEarlyStop(t *testing.T) {
+	sr := new(spanStoreMocks.Reader)
+	sr.On(
+		"FindTraces",
+		mock.Anything,
+		mock.Anything,
+	).Return([]*model.Trace{{}, {}, {}}, nil).Twice()
+	traceReader := &TraceReader{
+		spanReader: sr,
+	}
+	called := 0
+	traceReader.FindTraces(
+		context.Background(), tracestore.TraceQueryParameters{},
+	)(func(tr []ptrace.Traces, err error) bool {
+		require.NoError(t, err)
+		require.Len(t, tr, 1)
+		called++
+		return true
+	})
+	assert.Equal(t, 3, called)
+	called = 0
+	traceReader.FindTraces(
+		context.Background(), tracestore.TraceQueryParameters{},
+	)(func(tr []ptrace.Traces, err error) bool {
+		require.NoError(t, err)
+		require.Len(t, tr, 1)
+		called++
+		return false // early return
+	})
+	assert.Equal(t, 1, called)
+}
+
 func TestTraceReader_FindTraceIDsDelegatesResponse(t *testing.T) {
 	tests := []struct {
 		name             string
@@ -333,7 +348,7 @@ func TestTraceReader_FindTraceIDsDelegatesResponse(t *testing.T) {
 		{
 			name:             "empty response",
 			modelTraceIDs:    []model.TraceID{},
-			expectedTraceIDs: []pcommon.TraceID{},
+			expectedTraceIDs: nil,
 		},
 		{
 			name:             "nil response",
@@ -368,7 +383,7 @@ func TestTraceReader_FindTraceIDsDelegatesResponse(t *testing.T) {
 			traceReader := &TraceReader{
 				spanReader: sr,
 			}
-			traceIDs, err := traceReader.FindTraceIDs(
+			traceIDs, err := iter.FlattenWithErrors(traceReader.FindTraceIDs(
 				context.Background(),
 				tracestore.TraceQueryParameters{
 					ServiceName:   "service",
@@ -380,7 +395,7 @@ func TestTraceReader_FindTraceIDsDelegatesResponse(t *testing.T) {
 					DurationMax:   time.Hour,
 					NumTraces:     10,
 				},
-			)
+			))
 			require.ErrorIs(t, err, test.err)
 			require.Equal(t, test.expectedTraceIDs, traceIDs)
 		})
diff --git a/storage_v2/tracestore/mocks/Reader.go b/storage_v2/tracestore/mocks/Reader.go
index a8ef4b103c0..3f4d0f02a42 100644
--- a/storage_v2/tracestore/mocks/Reader.go
+++ b/storage_v2/tracestore/mocks/Reader.go
@@ -10,7 +10,9 @@ package mocks
 import (
 	context "context"
 
+	iter "github.com/jaegertracing/jaeger/pkg/iter"
 	mock "github.com/stretchr/testify/mock"
+
 	pcommon "go.opentelemetry.io/collector/pdata/pcommon"
 
 	ptrace "go.opentelemetry.io/collector/pdata/ptrace"
@@ -24,63 +26,43 @@ type Reader struct {
 }
 
 // FindTraceIDs provides a mock function with given fields: ctx, query
-func (_m *Reader) FindTraceIDs(ctx context.Context, query tracestore.TraceQueryParameters) ([]pcommon.TraceID, error) {
+func (_m *Reader) FindTraceIDs(ctx context.Context, query tracestore.TraceQueryParameters) iter.Seq2[[]pcommon.TraceID, error] {
 	ret := _m.Called(ctx, query)
 
 	if len(ret) == 0 {
 		panic("no return value specified for FindTraceIDs")
 	}
 
-	var r0 []pcommon.TraceID
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, tracestore.TraceQueryParameters) ([]pcommon.TraceID, error)); ok {
-		return rf(ctx, query)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, tracestore.TraceQueryParameters) []pcommon.TraceID); ok {
+	var r0 iter.Seq2[[]pcommon.TraceID, error]
+	if rf, ok := ret.Get(0).(func(context.Context, tracestore.TraceQueryParameters) iter.Seq2[[]pcommon.TraceID, error]); ok {
 		r0 = rf(ctx, query)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]pcommon.TraceID)
+			r0 = ret.Get(0).(iter.Seq2[[]pcommon.TraceID, error])
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, tracestore.TraceQueryParameters) error); ok {
-		r1 = rf(ctx, query)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
+	return r0
 }
 
 // FindTraces provides a mock function with given fields: ctx, query
-func (_m *Reader) FindTraces(ctx context.Context, query tracestore.TraceQueryParameters) ([]ptrace.Traces, error) {
+func (_m *Reader) FindTraces(ctx context.Context, query tracestore.TraceQueryParameters) iter.Seq2[[]ptrace.Traces, error] {
 	ret := _m.Called(ctx, query)
 
 	if len(ret) == 0 {
 		panic("no return value specified for FindTraces")
 	}
 
-	var r0 []ptrace.Traces
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, tracestore.TraceQueryParameters) ([]ptrace.Traces, error)); ok {
-		return rf(ctx, query)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, tracestore.TraceQueryParameters) []ptrace.Traces); ok {
+	var r0 iter.Seq2[[]ptrace.Traces, error]
+	if rf, ok := ret.Get(0).(func(context.Context, tracestore.TraceQueryParameters) iter.Seq2[[]ptrace.Traces, error]); ok {
 		r0 = rf(ctx, query)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]ptrace.Traces)
+			r0 = ret.Get(0).(iter.Seq2[[]ptrace.Traces, error])
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, tracestore.TraceQueryParameters) error); ok {
-		r1 = rf(ctx, query)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
+	return r0
 }
 
 // GetOperations provides a mock function with given fields: ctx, query
@@ -144,31 +126,23 @@ func (_m *Reader) GetServices(ctx context.Context) ([]string, error) {
 }
 
 // GetTrace provides a mock function with given fields: ctx, traceID
-func (_m *Reader) GetTrace(ctx context.Context, traceID pcommon.TraceID) (ptrace.Traces, error) {
+func (_m *Reader) GetTrace(ctx context.Context, traceID pcommon.TraceID) iter.Seq2[ptrace.Traces, error] {
 	ret := _m.Called(ctx, traceID)
 
 	if len(ret) == 0 {
 		panic("no return value specified for GetTrace")
 	}
 
-	var r0 ptrace.Traces
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, pcommon.TraceID) (ptrace.Traces, error)); ok {
-		return rf(ctx, traceID)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, pcommon.TraceID) ptrace.Traces); ok {
+	var r0 iter.Seq2[ptrace.Traces, error]
+	if rf, ok := ret.Get(0).(func(context.Context, pcommon.TraceID) iter.Seq2[ptrace.Traces, error]); ok {
 		r0 = rf(ctx, traceID)
 	} else {
-		r0 = ret.Get(0).(ptrace.Traces)
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, pcommon.TraceID) error); ok {
-		r1 = rf(ctx, traceID)
-	} else {
-		r1 = ret.Error(1)
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(iter.Seq2[ptrace.Traces, error])
+		}
 	}
 
-	return r0, r1
+	return r0
 }
 
 // NewReader creates a new instance of Reader. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
diff --git a/storage_v2/tracestore/reader.go b/storage_v2/tracestore/reader.go
index 487758700c8..df4187b21c4 100644
--- a/storage_v2/tracestore/reader.go
+++ b/storage_v2/tracestore/reader.go
@@ -10,18 +10,19 @@ import (
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
+	"github.com/jaegertracing/jaeger/pkg/iter"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
-// ErrTraceNotFound is returned by Reader's GetTrace if no data is found for given trace ID.
-var ErrTraceNotFound = spanstore.ErrTraceNotFound
-
 // Reader finds and loads traces and other data from storage.
 type Reader interface {
-	// GetTrace retrieves the trace with a given id.
+	// GetTrace returns an iterator that retrieves all spans of the trace with a given id.
+	// The iterator is single-use: once consumed, it cannot be used again.
+	//
+	// If the trace is too large it may be returned in multiple chunks.
 	//
-	// If no spans are stored for this trace, it returns ErrTraceNotFound.
-	GetTrace(ctx context.Context, traceID pcommon.TraceID) (ptrace.Traces, error)
+	// If no spans are stored for this trace, it returns an empty iterator.
+	GetTrace(ctx context.Context, traceID pcommon.TraceID) iter.Seq2[ptrace.Traces, error]
 
 	// GetServices returns all service names known to the backend from spans
 	// within its retention period.
@@ -31,19 +32,31 @@ type Reader interface {
 	// known to the backend from spans within its retention period.
 	GetOperations(ctx context.Context, query OperationQueryParameters) ([]Operation, error)
 
-	// FindTraces returns all traces matching query parameters. There's currently
-	// an implementation-dependent ambiguity whether all query filters (such as
-	// multiple tags) must apply to the same span within a trace, or can be satisfied
-	// by different spans.
+	// FindTraces returns an iterator that retrieves traces matching query parameters.
+	// The iterator is single-use: once consumed, it cannot be used again.
+	//
+	// There is no guarantee that all spans for a single trace are returned in a single chunk
+	// (same as GetTrace: if the trace is too large, it may be returned in multiple chunks).
+	// However, it is guaranteed that all spans for a single trace are returned in
+	// one or more consecutive chunks, as if the total output is grouped by trace ID.
 	//
-	// If no matching traces are found, the function returns (nil, nil).
-	FindTraces(ctx context.Context, query TraceQueryParameters) ([]ptrace.Traces, error)
+	// If no matching traces are found, the function returns an empty iterator.
+	//
+	// There's currently an implementation-dependent ambiguity whether all query filters
+	// (such as multiple tags) must apply to the same span within a trace, or can be satisfied
+	// by different spans.
+	FindTraces(ctx context.Context, query TraceQueryParameters) iter.Seq2[[]ptrace.Traces, error]
 
-	// FindTraceIDs does the same search as FindTraces, but returns only the list
-	// of matching trace IDs.
+	// FindTraceIDs returns an iterator that retrieves IDs of traces matching query parameters.
+	// The iterator is single-use: once consumed, it cannot be used again.
+	//
+	// If no matching traces are found, the function returns an empty iterator.
 	//
-	// If no matching traces are found, the function returns (nil, nil).
-	FindTraceIDs(ctx context.Context, query TraceQueryParameters) ([]pcommon.TraceID, error)
+	// This function behaves identically to FindTraces, except that it returns only the list
+	// of matching trace IDs. This is useful in some contexts, such as batch jobs, where a
+	// large list of trace IDs may be queried first and then the full traces are loaded
+	// in batches.
+	FindTraceIDs(ctx context.Context, query TraceQueryParameters) iter.Seq2[[]pcommon.TraceID, error]
 }
 
 // TraceQueryParameters contains parameters of a trace query.

From 10cb6a963deeb79e6fae1651b2d25f53d2afc871 Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Sat, 14 Dec 2024 17:55:22 -0500
Subject: [PATCH 31/59] [v2][adjuster] Implement otel attribute adjuster to
 operate on otlp data model (#6358)

## Which problem is this PR solving?
- Towards https://github.com/jaegertracing/jaeger/issues/6344

## Description of the changes
- This PR implements the `OTelTag` adjuster to operate on the OTLP data
model. In the OTLP model, tags are dubbed as attributes so the adjuster
was renamed to `OTELAttribute`.

## How was this change tested?
- Added unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 .../querysvc/adjuster/resourceattributes.go   |  66 +++++++++
 .../adjuster/resourceattributes_test.go       | 138 ++++++++++++++++++
 cmd/query/app/querysvc/adjuster/warning.go    |  23 +++
 .../app/querysvc/adjuster/warning_test.go     |  58 ++++++++
 4 files changed, 285 insertions(+)
 create mode 100644 cmd/query/app/querysvc/adjuster/resourceattributes.go
 create mode 100644 cmd/query/app/querysvc/adjuster/resourceattributes_test.go
 create mode 100644 cmd/query/app/querysvc/adjuster/warning.go
 create mode 100644 cmd/query/app/querysvc/adjuster/warning_test.go

diff --git a/cmd/query/app/querysvc/adjuster/resourceattributes.go b/cmd/query/app/querysvc/adjuster/resourceattributes.go
new file mode 100644
index 00000000000..0c3cd6d512f
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/resourceattributes.go
@@ -0,0 +1,66 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/pkg/otelsemconv"
+)
+
+var libraryKeys = map[string]struct{}{
+	string(otelsemconv.TelemetrySDKLanguageKey):   {},
+	string(otelsemconv.TelemetrySDKNameKey):       {},
+	string(otelsemconv.TelemetrySDKVersionKey):    {},
+	string(otelsemconv.TelemetryDistroNameKey):    {},
+	string(otelsemconv.TelemetryDistroVersionKey): {},
+}
+
+// ResourceAttributes creates an adjuster that moves the OpenTelemetry library
+// attributes from spans to the parent resource so that the UI can
+// display them separately under Process.
+// https://github.com/jaegertracing/jaeger/issues/4534
+func ResourceAttributes() ResourceAttributesAdjuster {
+	return ResourceAttributesAdjuster{}
+}
+
+type ResourceAttributesAdjuster struct{}
+
+func (o ResourceAttributesAdjuster) Adjust(traces ptrace.Traces) (ptrace.Traces, error) {
+	resourceSpans := traces.ResourceSpans()
+	for i := 0; i < resourceSpans.Len(); i++ {
+		rs := resourceSpans.At(i)
+		resource := rs.Resource()
+		scopeSpans := rs.ScopeSpans()
+		for j := 0; j < scopeSpans.Len(); j++ {
+			ss := scopeSpans.At(j)
+			spans := ss.Spans()
+			for k := 0; k < spans.Len(); k++ {
+				span := spans.At(k)
+				o.moveAttributes(span, resource)
+			}
+		}
+	}
+	return traces, nil
+}
+
+func (ResourceAttributesAdjuster) moveAttributes(span ptrace.Span, resource pcommon.Resource) {
+	replace := make(map[string]pcommon.Value)
+	span.Attributes().Range(func(k string, v pcommon.Value) bool {
+		if _, ok := libraryKeys[k]; ok {
+			replace[k] = v
+		}
+		return true
+	})
+	for k, v := range replace {
+		existing, ok := resource.Attributes().Get(k)
+		if ok && existing.AsRaw() != v.AsRaw() {
+			addWarning(span, "conflicting values between Span and Resource for attribute "+k)
+			continue
+		}
+		v.CopyTo(resource.Attributes().PutEmpty(k))
+		span.Attributes().Remove(k)
+	}
+}
diff --git a/cmd/query/app/querysvc/adjuster/resourceattributes_test.go b/cmd/query/app/querysvc/adjuster/resourceattributes_test.go
new file mode 100644
index 00000000000..0d445671ad0
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/resourceattributes_test.go
@@ -0,0 +1,138 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/pkg/otelsemconv"
+)
+
+func TestResourceAttributesAdjuster_SpanWithLibraryAttributes(t *testing.T) {
+	traces := ptrace.NewTraces()
+	rs := traces.ResourceSpans().AppendEmpty()
+	span := rs.ScopeSpans().AppendEmpty().Spans().AppendEmpty()
+	span.Attributes().PutStr("random_key", "random_value")
+	span.Attributes().PutStr(string(otelsemconv.TelemetrySDKLanguageKey), "Go")
+	span.Attributes().PutStr(string(otelsemconv.TelemetrySDKNameKey), "opentelemetry")
+	span.Attributes().PutStr(string(otelsemconv.TelemetrySDKVersionKey), "1.27.0")
+	span.Attributes().PutStr(string(otelsemconv.TelemetryDistroNameKey), "opentelemetry")
+	span.Attributes().PutStr(string(otelsemconv.TelemetryDistroVersionKey), "blah")
+	span.Attributes().PutStr("another_key", "another_value")
+
+	adjuster := ResourceAttributes()
+	result, err := adjuster.Adjust(traces)
+	require.NoError(t, err)
+
+	resultSpanAttributes := result.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
+	require.Equal(t, 2, resultSpanAttributes.Len())
+	val, ok := resultSpanAttributes.Get("random_key")
+	require.True(t, ok)
+	require.Equal(t, "random_value", val.Str())
+
+	val, ok = resultSpanAttributes.Get("another_key")
+	require.True(t, ok)
+	require.Equal(t, "another_value", val.Str())
+
+	resultResourceAttributes := result.ResourceSpans().At(0).Resource().Attributes()
+
+	val, ok = resultResourceAttributes.Get(string(otelsemconv.TelemetrySDKLanguageKey))
+	require.True(t, ok)
+	require.Equal(t, "Go", val.Str())
+
+	val, ok = resultResourceAttributes.Get(string(otelsemconv.TelemetrySDKNameKey))
+	require.True(t, ok)
+	require.Equal(t, "opentelemetry", val.Str())
+
+	val, ok = resultResourceAttributes.Get(string(otelsemconv.TelemetrySDKVersionKey))
+	require.True(t, ok)
+	require.Equal(t, "1.27.0", val.Str())
+
+	val, ok = resultResourceAttributes.Get(string(otelsemconv.TelemetryDistroNameKey))
+	require.True(t, ok)
+	require.Equal(t, "opentelemetry", val.Str())
+
+	val, ok = resultResourceAttributes.Get(string(otelsemconv.TelemetryDistroVersionKey))
+	require.True(t, ok)
+	require.Equal(t, "blah", val.Str())
+}
+
+func TestResourceAttributesAdjuster_SpanWithoutLibraryAttributes(t *testing.T) {
+	traces := ptrace.NewTraces()
+	rs := traces.ResourceSpans().AppendEmpty()
+	span := rs.ScopeSpans().AppendEmpty().Spans().AppendEmpty()
+	span.Attributes().PutStr("random_key", "random_value")
+
+	adjuster := ResourceAttributes()
+	result, err := adjuster.Adjust(traces)
+	require.NoError(t, err)
+
+	resultSpanAttributes := result.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
+	require.Equal(t, 1, resultSpanAttributes.Len())
+	val, ok := resultSpanAttributes.Get("random_key")
+	require.True(t, ok)
+	require.Equal(t, "random_value", val.Str())
+}
+
+func TestResourceAttributesAdjuster_SpanWithConflictingLibraryAttributes(t *testing.T) {
+	traces := ptrace.NewTraces()
+	rs := traces.ResourceSpans().AppendEmpty()
+	rs.Resource().Attributes().PutStr(string(otelsemconv.TelemetrySDKLanguageKey), "Go")
+	span := rs.ScopeSpans().AppendEmpty().Spans().AppendEmpty()
+	span.Attributes().PutStr("random_key", "random_value")
+	span.Attributes().PutStr(string(otelsemconv.TelemetrySDKLanguageKey), "Java")
+
+	adjuster := ResourceAttributes()
+	result, err := adjuster.Adjust(traces)
+	require.NoError(t, err)
+
+	resultSpanAttributes := result.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
+	require.Equal(t, 3, resultSpanAttributes.Len())
+	val, ok := resultSpanAttributes.Get("random_key")
+	require.True(t, ok)
+	require.Equal(t, "random_value", val.Str())
+
+	// value remains in the span
+	val, ok = resultSpanAttributes.Get(string(otelsemconv.TelemetrySDKLanguageKey))
+	require.True(t, ok)
+	require.Equal(t, "Java", val.Str())
+
+	val, ok = resultSpanAttributes.Get("jaeger.adjuster.warning")
+	require.True(t, ok)
+	warnings := val.Slice()
+	require.Equal(t, 1, warnings.Len())
+	require.Equal(t, "conflicting values between Span and Resource for attribute telemetry.sdk.language", warnings.At(0).Str())
+
+	resultResourceAttributes := result.ResourceSpans().At(0).Resource().Attributes()
+	val, ok = resultResourceAttributes.Get(string(otelsemconv.TelemetrySDKLanguageKey))
+	require.True(t, ok)
+	require.Equal(t, "Go", val.Str())
+}
+
+func TestResourceAttributesAdjuster_SpanWithNonConflictingLibraryAttributes(t *testing.T) {
+	traces := ptrace.NewTraces()
+	rs := traces.ResourceSpans().AppendEmpty()
+	rs.Resource().Attributes().PutStr(string(otelsemconv.TelemetrySDKLanguageKey), "Go")
+	span := rs.ScopeSpans().AppendEmpty().Spans().AppendEmpty()
+	span.Attributes().PutStr("random_key", "random_value")
+	span.Attributes().PutStr(string(otelsemconv.TelemetrySDKLanguageKey), "Go")
+
+	adjuster := ResourceAttributes()
+	result, err := adjuster.Adjust(traces)
+	require.NoError(t, err)
+
+	resultSpanAttributes := result.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
+	require.Equal(t, 1, resultSpanAttributes.Len())
+	val, ok := resultSpanAttributes.Get("random_key")
+	require.True(t, ok)
+	require.Equal(t, "random_value", val.Str())
+
+	resultResourceAttributes := result.ResourceSpans().At(0).Resource().Attributes()
+	val, ok = resultResourceAttributes.Get(string(otelsemconv.TelemetrySDKLanguageKey))
+	require.True(t, ok)
+	require.Equal(t, "Go", val.Str())
+}
diff --git a/cmd/query/app/querysvc/adjuster/warning.go b/cmd/query/app/querysvc/adjuster/warning.go
new file mode 100644
index 00000000000..e7f1331bfab
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/warning.go
@@ -0,0 +1,23 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+)
+
+const (
+	adjusterWarningAttribute = "jaeger.adjuster.warning"
+)
+
+func addWarning(span ptrace.Span, warning string) {
+	var warnings pcommon.Slice
+	if currWarnings, ok := span.Attributes().Get(adjusterWarningAttribute); ok {
+		warnings = currWarnings.Slice()
+	} else {
+		warnings = span.Attributes().PutEmptySlice(adjusterWarningAttribute)
+	}
+	warnings.AppendEmpty().SetStr(warning)
+}
diff --git a/cmd/query/app/querysvc/adjuster/warning_test.go b/cmd/query/app/querysvc/adjuster/warning_test.go
new file mode 100644
index 00000000000..209d794e639
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/warning_test.go
@@ -0,0 +1,58 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+)
+
+func TestAddWarning(t *testing.T) {
+	tests := []struct {
+		name     string
+		existing []string
+		newWarn  string
+		expected []string
+	}{
+		{
+			name:     "add to nil warnings",
+			existing: nil,
+			newWarn:  "new warning",
+			expected: []string{"new warning"},
+		},
+		{
+			name:     "add to empty warnings",
+			existing: []string{},
+			newWarn:  "new warning",
+			expected: []string{"new warning"},
+		},
+		{
+			name:     "add to existing warnings",
+			existing: []string{"existing warning 1", "existing warning 2"},
+			newWarn:  "new warning",
+			expected: []string{"existing warning 1", "existing warning 2", "new warning"},
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			span := ptrace.NewSpan()
+			attrs := span.Attributes()
+			if test.existing != nil {
+				warnings := attrs.PutEmptySlice("jaeger.adjuster.warning")
+				for _, warn := range test.existing {
+					warnings.AppendEmpty().SetStr(warn)
+				}
+			}
+			addWarning(span, test.newWarn)
+			warnings, ok := attrs.Get("jaeger.adjuster.warning")
+			assert.True(t, ok)
+			assert.Equal(t, len(test.expected), warnings.Slice().Len())
+			for i, expectedWarn := range test.expected {
+				assert.Equal(t, expectedWarn, warnings.Slice().At(i).Str())
+			}
+		})
+	}
+}

From d3d70e017915558b7c05146827a393b3e3dec5a1 Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Date: Sun, 15 Dec 2024 12:23:27 -0400
Subject: [PATCH 32/59] Change storage_v2 GetTrace to GetTraces plural (#6361)

---
 storage_v2/factoryadapter/reader.go      |  40 ++++++---
 storage_v2/factoryadapter/reader_test.go | 106 +++++++++++++++++++----
 storage_v2/tracestore/mocks/Reader.go    |  31 ++++---
 storage_v2/tracestore/reader.go          |  42 ++++++---
 storage_v2/tracestore/reader_test.go     |   2 +-
 5 files changed, 164 insertions(+), 57 deletions(-)

diff --git a/storage_v2/factoryadapter/reader.go b/storage_v2/factoryadapter/reader.go
index c5239abd8ab..dd3f51041a1 100644
--- a/storage_v2/factoryadapter/reader.go
+++ b/storage_v2/factoryadapter/reader.go
@@ -40,19 +40,28 @@ func NewTraceReader(spanReader spanstore.Reader) *TraceReader {
 	}
 }
 
-func (tr *TraceReader) GetTrace(ctx context.Context, traceID pcommon.TraceID) iter.Seq2[ptrace.Traces, error] {
-	return func(yield func(ptrace.Traces, error) bool) {
-		t, err := tr.spanReader.GetTrace(ctx, model.TraceIDFromOTEL(traceID))
-		if err != nil {
-			// if not found, return an empty iterator, otherwire yield the error.
-			if !errors.Is(err, spanstore.ErrTraceNotFound) {
-				yield(ptrace.NewTraces(), err)
+func (tr *TraceReader) GetTraces(
+	ctx context.Context,
+	traceIDs ...tracestore.GetTraceParams,
+) iter.Seq2[[]ptrace.Traces, error] {
+	return func(yield func([]ptrace.Traces, error) bool) {
+		for _, idParams := range traceIDs {
+			// TODO start/end times are not supported by v1 reader
+			// https://github.com/jaegertracing/jaeger/pull/6242
+			t, err := tr.spanReader.GetTrace(ctx, model.TraceIDFromOTEL(idParams.TraceID))
+			if err != nil {
+				if errors.Is(err, spanstore.ErrTraceNotFound) {
+					continue
+				}
+				yield(nil, err)
+				return
+			}
+			batch := &model.Batch{Spans: t.GetSpans()}
+			tr, err := model2otel.ProtoToTraces([]*model.Batch{batch})
+			if !yield([]ptrace.Traces{tr}, err) || err != nil {
+				return
 			}
-			return
 		}
-		batch := &model.Batch{Spans: t.GetSpans()}
-		tr, err := model2otel.ProtoToTraces([]*model.Batch{batch})
-		yield(tr, err)
 	}
 }
 
@@ -60,7 +69,10 @@ func (tr *TraceReader) GetServices(ctx context.Context) ([]string, error) {
 	return tr.spanReader.GetServices(ctx)
 }
 
-func (tr *TraceReader) GetOperations(ctx context.Context, query tracestore.OperationQueryParameters) ([]tracestore.Operation, error) {
+func (tr *TraceReader) GetOperations(
+	ctx context.Context,
+	query tracestore.OperationQueryParameters,
+) ([]tracestore.Operation, error) {
 	o, err := tr.spanReader.GetOperations(ctx, spanstore.OperationQueryParameters{
 		ServiceName: query.ServiceName,
 		SpanKind:    query.SpanKind,
@@ -80,7 +92,7 @@ func (tr *TraceReader) GetOperations(ctx context.Context, query tracestore.Opera
 
 func (tr *TraceReader) FindTraces(
 	ctx context.Context,
-	query tracestore.TraceQueryParameters,
+	query tracestore.TraceQueryParams,
 ) iter.Seq2[[]ptrace.Traces, error] {
 	return func(yield func([]ptrace.Traces, error) bool) {
 		traces, err := tr.spanReader.FindTraces(ctx, query.ToSpanStoreQueryParameters())
@@ -100,7 +112,7 @@ func (tr *TraceReader) FindTraces(
 
 func (tr *TraceReader) FindTraceIDs(
 	ctx context.Context,
-	query tracestore.TraceQueryParameters,
+	query tracestore.TraceQueryParams,
 ) iter.Seq2[[]pcommon.TraceID, error] {
 	return func(yield func([]pcommon.TraceID, error) bool) {
 		traceIDs, err := tr.spanReader.FindTraceIDs(ctx, query.ToSpanStoreQueryParameters())
diff --git a/storage_v2/factoryadapter/reader_test.go b/storage_v2/factoryadapter/reader_test.go
index bd7c9c4a91a..ddab5192bfe 100644
--- a/storage_v2/factoryadapter/reader_test.go
+++ b/storage_v2/factoryadapter/reader_test.go
@@ -42,7 +42,7 @@ func TestGetV1Reader_Error(t *testing.T) {
 	require.ErrorIs(t, err, errV1ReaderNotAvailable)
 }
 
-func TestTraceReader_GetTraceDelegatesSuccessResponse(t *testing.T) {
+func TestTraceReader_GetTracesDelegatesSuccessResponse(t *testing.T) {
 	sr := new(spanStoreMocks.Reader)
 	modelTrace := &model.Trace{
 		Spans: []*model.Span{
@@ -62,9 +62,11 @@ func TestTraceReader_GetTraceDelegatesSuccessResponse(t *testing.T) {
 	traceReader := &TraceReader{
 		spanReader: sr,
 	}
-	traces, err := iter.CollectWithErrors(traceReader.GetTrace(
+	traces, err := iter.FlattenWithErrors(traceReader.GetTraces(
 		context.Background(),
-		pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}),
+		tracestore.GetTraceParams{
+			TraceID: pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}),
+		},
 	))
 	require.NoError(t, err)
 	require.Len(t, traces, 1)
@@ -78,19 +80,89 @@ func TestTraceReader_GetTraceDelegatesSuccessResponse(t *testing.T) {
 	require.Equal(t, "operation-b", traceSpans.At(1).Name())
 }
 
-func TestTraceReader_GetTraceErrorResponse(t *testing.T) {
+func TestTraceReader_GetTracesErrorResponse(t *testing.T) {
+	testCases := []struct {
+		name          string
+		firstErr      error
+		expectedErr   error
+		expectedIters int
+	}{
+		{
+			name:          "real error aborts iterator",
+			firstErr:      assert.AnError,
+			expectedErr:   assert.AnError,
+			expectedIters: 0, // technically 1 but FlattenWithErrors makes it 0
+		},
+		{
+			name:          "trace not found error skips iteration",
+			firstErr:      spanstore.ErrTraceNotFound,
+			expectedErr:   nil,
+			expectedIters: 1,
+		},
+		{
+			name:          "no error produces two iterations",
+			firstErr:      nil,
+			expectedErr:   nil,
+			expectedIters: 2,
+		},
+	}
+	traceID := func(i byte) tracestore.GetTraceParams {
+		return tracestore.GetTraceParams{
+			TraceID: pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, i}),
+		}
+	}
+	for _, test := range testCases {
+		t.Run(test.name, func(t *testing.T) {
+			sr := new(spanStoreMocks.Reader)
+			sr.On("GetTrace", mock.Anything, mock.Anything).Return(&model.Trace{}, test.firstErr).Once()
+			sr.On("GetTrace", mock.Anything, mock.Anything).Return(&model.Trace{}, nil).Once()
+			traceReader := &TraceReader{
+				spanReader: sr,
+			}
+			traces, err := iter.FlattenWithErrors(traceReader.GetTraces(
+				context.Background(), traceID(1), traceID(2),
+			))
+			require.ErrorIs(t, err, test.expectedErr)
+			assert.Len(t, traces, test.expectedIters)
+		})
+	}
+}
+
+func TestTraceReader_GetTracesEarlyStop(t *testing.T) {
 	sr := new(spanStoreMocks.Reader)
-	testErr := errors.New("test error")
-	sr.On("GetTrace", mock.Anything, mock.Anything).Return(nil, testErr)
+	sr.On(
+		"GetTrace",
+		mock.Anything,
+		mock.Anything,
+	).Return(&model.Trace{}, nil)
 	traceReader := &TraceReader{
 		spanReader: sr,
 	}
-	traces, err := iter.CollectWithErrors(traceReader.GetTrace(
-		context.Background(),
-		pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3}),
-	))
-	require.ErrorIs(t, err, testErr)
-	require.Empty(t, traces)
+	traceID := func(i byte) tracestore.GetTraceParams {
+		return tracestore.GetTraceParams{
+			TraceID: pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, i}),
+		}
+	}
+	called := 0
+	traceReader.GetTraces(
+		context.Background(), traceID(1), traceID(2), traceID(3),
+	)(func(tr []ptrace.Traces, err error) bool {
+		require.NoError(t, err)
+		require.Len(t, tr, 1)
+		called++
+		return true
+	})
+	assert.Equal(t, 3, called)
+	called = 0
+	traceReader.GetTraces(
+		context.Background(), traceID(1), traceID(2), traceID(3),
+	)(func(tr []ptrace.Traces, err error) bool {
+		require.NoError(t, err)
+		require.Len(t, tr, 1)
+		called++
+		return false // early return
+	})
+	assert.Equal(t, 1, called)
 }
 
 func TestTraceReader_GetServicesDelegatesToSpanReader(t *testing.T) {
@@ -224,7 +296,7 @@ func TestTraceReader_FindTracesDelegatesSuccessResponse(t *testing.T) {
 	}
 	traces, err := iter.FlattenWithErrors(traceReader.FindTraces(
 		context.Background(),
-		tracestore.TraceQueryParameters{
+		tracestore.TraceQueryParams{
 			ServiceName:   "service",
 			OperationName: "operation",
 			Tags:          map[string]string{"tag-a": "val-a"},
@@ -287,7 +359,7 @@ func TestTraceReader_FindTracesEdgeCases(t *testing.T) {
 			}
 			traces, err := iter.FlattenWithErrors(traceReader.FindTraces(
 				context.Background(),
-				tracestore.TraceQueryParameters{},
+				tracestore.TraceQueryParams{},
 			))
 			require.ErrorIs(t, err, test.err)
 			require.Equal(t, test.expectedTraces, traces)
@@ -307,7 +379,7 @@ func TestTraceReader_FindTracesEarlyStop(t *testing.T) {
 	}
 	called := 0
 	traceReader.FindTraces(
-		context.Background(), tracestore.TraceQueryParameters{},
+		context.Background(), tracestore.TraceQueryParams{},
 	)(func(tr []ptrace.Traces, err error) bool {
 		require.NoError(t, err)
 		require.Len(t, tr, 1)
@@ -317,7 +389,7 @@ func TestTraceReader_FindTracesEarlyStop(t *testing.T) {
 	assert.Equal(t, 3, called)
 	called = 0
 	traceReader.FindTraces(
-		context.Background(), tracestore.TraceQueryParameters{},
+		context.Background(), tracestore.TraceQueryParams{},
 	)(func(tr []ptrace.Traces, err error) bool {
 		require.NoError(t, err)
 		require.Len(t, tr, 1)
@@ -385,7 +457,7 @@ func TestTraceReader_FindTraceIDsDelegatesResponse(t *testing.T) {
 			}
 			traceIDs, err := iter.FlattenWithErrors(traceReader.FindTraceIDs(
 				context.Background(),
-				tracestore.TraceQueryParameters{
+				tracestore.TraceQueryParams{
 					ServiceName:   "service",
 					OperationName: "operation",
 					Tags:          map[string]string{"tag-a": "val-a"},
diff --git a/storage_v2/tracestore/mocks/Reader.go b/storage_v2/tracestore/mocks/Reader.go
index 3f4d0f02a42..5f87e43581b 100644
--- a/storage_v2/tracestore/mocks/Reader.go
+++ b/storage_v2/tracestore/mocks/Reader.go
@@ -26,7 +26,7 @@ type Reader struct {
 }
 
 // FindTraceIDs provides a mock function with given fields: ctx, query
-func (_m *Reader) FindTraceIDs(ctx context.Context, query tracestore.TraceQueryParameters) iter.Seq2[[]pcommon.TraceID, error] {
+func (_m *Reader) FindTraceIDs(ctx context.Context, query tracestore.TraceQueryParams) iter.Seq2[[]pcommon.TraceID, error] {
 	ret := _m.Called(ctx, query)
 
 	if len(ret) == 0 {
@@ -34,7 +34,7 @@ func (_m *Reader) FindTraceIDs(ctx context.Context, query tracestore.TraceQueryP
 	}
 
 	var r0 iter.Seq2[[]pcommon.TraceID, error]
-	if rf, ok := ret.Get(0).(func(context.Context, tracestore.TraceQueryParameters) iter.Seq2[[]pcommon.TraceID, error]); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, tracestore.TraceQueryParams) iter.Seq2[[]pcommon.TraceID, error]); ok {
 		r0 = rf(ctx, query)
 	} else {
 		if ret.Get(0) != nil {
@@ -46,7 +46,7 @@ func (_m *Reader) FindTraceIDs(ctx context.Context, query tracestore.TraceQueryP
 }
 
 // FindTraces provides a mock function with given fields: ctx, query
-func (_m *Reader) FindTraces(ctx context.Context, query tracestore.TraceQueryParameters) iter.Seq2[[]ptrace.Traces, error] {
+func (_m *Reader) FindTraces(ctx context.Context, query tracestore.TraceQueryParams) iter.Seq2[[]ptrace.Traces, error] {
 	ret := _m.Called(ctx, query)
 
 	if len(ret) == 0 {
@@ -54,7 +54,7 @@ func (_m *Reader) FindTraces(ctx context.Context, query tracestore.TraceQueryPar
 	}
 
 	var r0 iter.Seq2[[]ptrace.Traces, error]
-	if rf, ok := ret.Get(0).(func(context.Context, tracestore.TraceQueryParameters) iter.Seq2[[]ptrace.Traces, error]); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, tracestore.TraceQueryParams) iter.Seq2[[]ptrace.Traces, error]); ok {
 		r0 = rf(ctx, query)
 	} else {
 		if ret.Get(0) != nil {
@@ -125,20 +125,27 @@ func (_m *Reader) GetServices(ctx context.Context) ([]string, error) {
 	return r0, r1
 }
 
-// GetTrace provides a mock function with given fields: ctx, traceID
-func (_m *Reader) GetTrace(ctx context.Context, traceID pcommon.TraceID) iter.Seq2[ptrace.Traces, error] {
-	ret := _m.Called(ctx, traceID)
+// GetTraces provides a mock function with given fields: ctx, traceIDs
+func (_m *Reader) GetTraces(ctx context.Context, traceIDs ...tracestore.GetTraceParams) iter.Seq2[[]ptrace.Traces, error] {
+	_va := make([]interface{}, len(traceIDs))
+	for _i := range traceIDs {
+		_va[_i] = traceIDs[_i]
+	}
+	var _ca []interface{}
+	_ca = append(_ca, ctx)
+	_ca = append(_ca, _va...)
+	ret := _m.Called(_ca...)
 
 	if len(ret) == 0 {
-		panic("no return value specified for GetTrace")
+		panic("no return value specified for GetTraces")
 	}
 
-	var r0 iter.Seq2[ptrace.Traces, error]
-	if rf, ok := ret.Get(0).(func(context.Context, pcommon.TraceID) iter.Seq2[ptrace.Traces, error]); ok {
-		r0 = rf(ctx, traceID)
+	var r0 iter.Seq2[[]ptrace.Traces, error]
+	if rf, ok := ret.Get(0).(func(context.Context, ...tracestore.GetTraceParams) iter.Seq2[[]ptrace.Traces, error]); ok {
+		r0 = rf(ctx, traceIDs...)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(iter.Seq2[ptrace.Traces, error])
+			r0 = ret.Get(0).(iter.Seq2[[]ptrace.Traces, error])
 		}
 	}
 
diff --git a/storage_v2/tracestore/reader.go b/storage_v2/tracestore/reader.go
index df4187b21c4..5426ff8e8d8 100644
--- a/storage_v2/tracestore/reader.go
+++ b/storage_v2/tracestore/reader.go
@@ -16,13 +16,18 @@ import (
 
 // Reader finds and loads traces and other data from storage.
 type Reader interface {
-	// GetTrace returns an iterator that retrieves all spans of the trace with a given id.
+	// GetTraces returns an iterator that retrieves all traces with given IDs.
 	// The iterator is single-use: once consumed, it cannot be used again.
 	//
-	// If the trace is too large it may be returned in multiple chunks.
+	// Chunking requirements:
+	// - A single ptrace.Traces chunk MUST NOT contain spans from multiple traces.
+	// - Large traces MAY be split across multiple, *consecutive* ptrace.Traces chunks.
 	//
-	// If no spans are stored for this trace, it returns an empty iterator.
-	GetTrace(ctx context.Context, traceID pcommon.TraceID) iter.Seq2[ptrace.Traces, error]
+	// Edge cases:
+	// - If no spans are found for any given trace ID, the ID is ignored.
+	// - If none of the trace IDs are found in the storage, an empty iterator is returned.
+	// - If an error is encountered, the iterator returns the error and stops.
+	GetTraces(ctx context.Context, traceIDs ...GetTraceParams) iter.Seq2[[]ptrace.Traces, error]
 
 	// GetServices returns all service names known to the backend from spans
 	// within its retention period.
@@ -35,32 +40,43 @@ type Reader interface {
 	// FindTraces returns an iterator that retrieves traces matching query parameters.
 	// The iterator is single-use: once consumed, it cannot be used again.
 	//
-	// There is no guarantee that all spans for a single trace are returned in a single chunk
-	// (same as GetTrace: if the trace is too large, it may be returned in multiple chunks).
-	// However, it is guaranteed that all spans for a single trace are returned in
-	// one or more consecutive chunks, as if the total output is grouped by trace ID.
+	// The chunking rules is the same as for GetTraces.
 	//
 	// If no matching traces are found, the function returns an empty iterator.
+	// If an error is encountered, the iterator returns the error and stops.
 	//
 	// There's currently an implementation-dependent ambiguity whether all query filters
 	// (such as multiple tags) must apply to the same span within a trace, or can be satisfied
 	// by different spans.
-	FindTraces(ctx context.Context, query TraceQueryParameters) iter.Seq2[[]ptrace.Traces, error]
+	FindTraces(ctx context.Context, query TraceQueryParams) iter.Seq2[[]ptrace.Traces, error]
 
 	// FindTraceIDs returns an iterator that retrieves IDs of traces matching query parameters.
 	// The iterator is single-use: once consumed, it cannot be used again.
 	//
 	// If no matching traces are found, the function returns an empty iterator.
+	// If an error is encountered, the iterator returns the error and stops.
 	//
 	// This function behaves identically to FindTraces, except that it returns only the list
 	// of matching trace IDs. This is useful in some contexts, such as batch jobs, where a
 	// large list of trace IDs may be queried first and then the full traces are loaded
 	// in batches.
-	FindTraceIDs(ctx context.Context, query TraceQueryParameters) iter.Seq2[[]pcommon.TraceID, error]
+	FindTraceIDs(ctx context.Context, query TraceQueryParams) iter.Seq2[[]pcommon.TraceID, error]
 }
 
-// TraceQueryParameters contains parameters of a trace query.
-type TraceQueryParameters struct {
+// GetTraceParams contains single-trace parameters for a GetTraces request.
+// Some storage backends (e.g. Tempo) perform GetTraces much more efficiently
+// if they know the approximate time range of the trace.
+type GetTraceParams struct {
+	// TraceID is the ID of the trace to retrieve. Required.
+	TraceID pcommon.TraceID
+	// Start of the time interval to search for trace ID. Optional.
+	Start time.Time
+	// End of the time interval to search for trace ID. Optional.
+	End time.Time
+}
+
+// TraceQueryParams contains parameters of a trace query.
+type TraceQueryParams struct {
 	ServiceName   string
 	OperationName string
 	Tags          map[string]string
@@ -71,7 +87,7 @@ type TraceQueryParameters struct {
 	NumTraces     int
 }
 
-func (t *TraceQueryParameters) ToSpanStoreQueryParameters() *spanstore.TraceQueryParameters {
+func (t *TraceQueryParams) ToSpanStoreQueryParameters() *spanstore.TraceQueryParameters {
 	return &spanstore.TraceQueryParameters{
 		ServiceName:   t.ServiceName,
 		OperationName: t.OperationName,
diff --git a/storage_v2/tracestore/reader_test.go b/storage_v2/tracestore/reader_test.go
index 16f558c9877..f40630d7b46 100644
--- a/storage_v2/tracestore/reader_test.go
+++ b/storage_v2/tracestore/reader_test.go
@@ -14,7 +14,7 @@ import (
 
 func TestToSpanStoreQueryParameters(t *testing.T) {
 	now := time.Now()
-	query := &TraceQueryParameters{
+	query := &TraceQueryParams{
 		ServiceName:   "service",
 		OperationName: "operation",
 		Tags:          map[string]string{"tag-a": "val-a"},

From d6456fb13b16d4694bc3ba32fa21d7c6d302d9b2 Mon Sep 17 00:00:00 2001
From: Zhang Xin <zhangxin@outlook.com>
Date: Mon, 16 Dec 2024 02:28:20 +0800
Subject: [PATCH 33/59] [feat] Add time window for GetTrace in span store
 interface (#6242)

## Which problem is this PR solving?
Part of https://github.com/jaegertracing/jaeger/issues/4150

## Description of the changes

Refactor trace get method in span store interface:
- use struct instead of literal trace id
- add time window in the new struct

## How was this change tested?
- unit test

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: rim99 <zhangxin@outlook.com>
Signed-off-by: Zhang Xin <zxin3306@126.com>
Signed-off-by: Zhang Xin <zhangxin@outlook.com>
Signed-off-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Co-authored-by: Yuri Shkuro <github@ysh.us>
---
 cmd/anonymizer/app/query/query.go             |   8 +-
 cmd/anonymizer/app/query/query_test.go        |   8 +-
 .../storageexporter/exporter_test.go          |   3 +-
 .../internal/integration/span_reader.go       |   6 +-
 cmd/query/app/apiv3/gateway_test.go           |  15 +--
 cmd/query/app/apiv3/grpc_handler.go           |   7 +-
 cmd/query/app/apiv3/grpc_handler_test.go      |  78 +++++++++----
 cmd/query/app/apiv3/http_gateway.go           |  10 +-
 cmd/query/app/apiv3/http_gateway_test.go      |   2 +-
 cmd/query/app/grpc_handler.go                 |  14 ++-
 cmd/query/app/grpc_handler_test.go            | 103 +++++++++++++-----
 cmd/query/app/handler_archive_test.go         |  16 +--
 cmd/query/app/http_handler.go                 |  18 ++-
 cmd/query/app/http_handler_test.go            |  32 +++---
 cmd/query/app/querysvc/query_service.go       |  10 +-
 cmd/query/app/querysvc/query_service_test.go  |  40 ++++---
 cmd/query/app/server_test.go                  |   3 +-
 .../badger/spanstore/read_write_test.go       |  10 +-
 plugin/storage/badger/spanstore/reader.go     |   4 +-
 .../badger/spanstore/rw_internal_test.go      |   4 +-
 plugin/storage/blackhole/blackhole.go         |   2 +-
 plugin/storage/blackhole/blackhole_test.go    |   2 +-
 .../storage/cassandra/savetracetest/main.go   |   2 +-
 plugin/storage/cassandra/spanstore/reader.go  |   6 +-
 .../cassandra/spanstore/reader_test.go        |   4 +-
 plugin/storage/es/spanstore/reader.go         |   5 +-
 plugin/storage/es/spanstore/reader_test.go    |  26 +++--
 plugin/storage/grpc/shared/archive.go         |   6 +-
 plugin/storage/grpc/shared/archive_test.go    |   8 +-
 plugin/storage/grpc/shared/grpc_client.go     |   6 +-
 .../storage/grpc/shared/grpc_client_test.go   |  45 ++++++--
 plugin/storage/grpc/shared/grpc_handler.go    |  12 +-
 .../storage/grpc/shared/grpc_handler_test.go  |  14 +--
 plugin/storage/integration/integration.go     |   8 +-
 plugin/storage/integration/kafka_test.go      |   4 +-
 plugin/storage/memory/memory.go               |   4 +-
 plugin/storage/memory/memory_test.go          |  26 +++--
 storage/spanstore/interface.go                |   9 +-
 storage/spanstore/mocks/Reader.go             |  18 +--
 .../spanstoremetrics/read_metrics.go          |   4 +-
 .../spanstoremetrics/read_metrics_test.go     |   8 +-
 storage_v2/factoryadapter/reader.go           |   9 +-
 storage_v2/factoryadapter/reader_test.go      |   3 +-
 storage_v2/factoryadapter/writer_test.go      |   4 +-
 44 files changed, 408 insertions(+), 218 deletions(-)

diff --git a/cmd/anonymizer/app/query/query.go b/cmd/anonymizer/app/query/query.go
index 755d8317d19..6cca46408ba 100644
--- a/cmd/anonymizer/app/query/query.go
+++ b/cmd/anonymizer/app/query/query.go
@@ -54,10 +54,12 @@ func (q *Query) QueryTrace(traceID string) ([]model.Span, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to convert the provided trace id: %w", err)
 	}
-
-	stream, err := q.client.GetTrace(context.Background(), &api_v2.GetTraceRequest{
+	// TODO: add start time & end time
+	request := api_v2.GetTraceRequest{
 		TraceID: mTraceID,
-	})
+	}
+
+	stream, err := q.client.GetTrace(context.Background(), &request)
 	if err != nil {
 		return nil, unwrapNotFoundErr(err)
 	}
diff --git a/cmd/anonymizer/app/query/query_test.go b/cmd/anonymizer/app/query/query_test.go
index 768dbc3c1fb..a4a7ed241dd 100644
--- a/cmd/anonymizer/app/query/query_test.go
+++ b/cmd/anonymizer/app/query/query_test.go
@@ -25,8 +25,8 @@ import (
 )
 
 var (
-	matchContext = mock.AnythingOfType("*context.valueCtx")
-	matchTraceID = mock.AnythingOfType("model.TraceID")
+	matchContext            = mock.AnythingOfType("*context.valueCtx")
+	matchGetTraceParameters = mock.AnythingOfType("spanstore.GetTraceParameters")
 
 	mockInvalidTraceID = "xyz"
 	mockTraceID        = model.NewTraceID(0, 123456)
@@ -108,7 +108,7 @@ func TestQueryTrace(t *testing.T) {
 	defer q.Close()
 
 	t.Run("No error", func(t *testing.T) {
-		s.spanReader.On("GetTrace", matchContext, matchTraceID).Return(
+		s.spanReader.On("GetTrace", matchContext, matchGetTraceParameters).Return(
 			mockTraceGRPC, nil).Once()
 
 		spans, err := q.QueryTrace(mockTraceID.String())
@@ -122,7 +122,7 @@ func TestQueryTrace(t *testing.T) {
 	})
 
 	t.Run("Trace not found", func(t *testing.T) {
-		s.spanReader.On("GetTrace", matchContext, matchTraceID).Return(
+		s.spanReader.On("GetTrace", matchContext, matchGetTraceParameters).Return(
 			nil, spanstore.ErrTraceNotFound).Once()
 
 		spans, err := q.QueryTrace(mockTraceID.String())
diff --git a/cmd/jaeger/internal/exporters/storageexporter/exporter_test.go b/cmd/jaeger/internal/exporters/storageexporter/exporter_test.go
index 14f9ae29926..0e684a0bb2f 100644
--- a/cmd/jaeger/internal/exporters/storageexporter/exporter_test.go
+++ b/cmd/jaeger/internal/exporters/storageexporter/exporter_test.go
@@ -27,6 +27,7 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 	"github.com/jaegertracing/jaeger/storage"
 	factoryMocks "github.com/jaegertracing/jaeger/storage/mocks"
+	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
 type mockStorageExt struct {
@@ -152,7 +153,7 @@ func TestExporter(t *testing.T) {
 	spanReader, err := storageFactory.CreateSpanReader()
 	require.NoError(t, err)
 	requiredTraceID := model.NewTraceID(0, 1) // 00000000000000000000000000000001
-	requiredTrace, err := spanReader.GetTrace(ctx, requiredTraceID)
+	requiredTrace, err := spanReader.GetTrace(ctx, spanstore.GetTraceParameters{TraceID: requiredTraceID})
 	require.NoError(t, err)
 	assert.Equal(t, spanID.String(), requiredTrace.Spans[0].SpanID.String())
 
diff --git a/cmd/jaeger/internal/integration/span_reader.go b/cmd/jaeger/internal/integration/span_reader.go
index abd98ecd6aa..3aaf0c09ece 100644
--- a/cmd/jaeger/internal/integration/span_reader.go
+++ b/cmd/jaeger/internal/integration/span_reader.go
@@ -66,9 +66,11 @@ func unwrapNotFoundErr(err error) error {
 	return err
 }
 
-func (r *spanReader) GetTrace(ctx context.Context, traceID model.TraceID) (*model.Trace, error) {
+func (r *spanReader) GetTrace(ctx context.Context, query spanstore.GetTraceParameters) (*model.Trace, error) {
 	stream, err := r.client.GetTrace(ctx, &api_v2.GetTraceRequest{
-		TraceID: traceID,
+		TraceID:   query.TraceID,
+		StartTime: query.StartTime,
+		EndTime:   query.EndTime,
 	})
 	if err != nil {
 		return nil, unwrapNotFoundErr(err)
diff --git a/cmd/query/app/apiv3/gateway_test.go b/cmd/query/app/apiv3/gateway_test.go
index 6c942fcfb0f..22a08dc2641 100644
--- a/cmd/query/app/apiv3/gateway_test.go
+++ b/cmd/query/app/apiv3/gateway_test.go
@@ -80,8 +80,9 @@ func parseResponse(t *testing.T, body []byte, obj gogoproto.Message) {
 	require.NoError(t, gogojsonpb.Unmarshal(bytes.NewBuffer(body), obj))
 }
 
-func makeTestTrace() (*model.Trace, model.TraceID) {
+func makeTestTrace() (*model.Trace, spanstore.GetTraceParameters) {
 	traceID := model.NewTraceID(150, 160)
+	query := spanstore.GetTraceParameters{TraceID: traceID}
 	return &model.Trace{
 		Spans: []*model.Span{
 			{
@@ -94,7 +95,7 @@ func makeTestTrace() (*model.Trace, model.TraceID) {
 				},
 			},
 		},
-	}, traceID
+	}, query
 }
 
 func runGatewayTests(
@@ -140,18 +141,18 @@ func (gw *testGateway) runGatewayGetOperations(t *testing.T) {
 }
 
 func (gw *testGateway) runGatewayGetTrace(t *testing.T) {
-	trace, traceID := makeTestTrace()
-	gw.reader.On("GetTrace", matchContext, traceID).Return(trace, nil).Once()
-	gw.getTracesAndVerify(t, "/api/v3/traces/"+traceID.String(), traceID)
+	trace, query := makeTestTrace()
+	gw.reader.On("GetTrace", matchContext, query).Return(trace, nil).Once()
+	gw.getTracesAndVerify(t, "/api/v3/traces/"+query.TraceID.String(), query.TraceID)
 }
 
 func (gw *testGateway) runGatewayFindTraces(t *testing.T) {
-	trace, traceID := makeTestTrace()
+	trace, query := makeTestTrace()
 	q, qp := mockFindQueries()
 	gw.reader.
 		On("FindTraces", matchContext, qp).
 		Return([]*model.Trace{trace}, nil).Once()
-	gw.getTracesAndVerify(t, "/api/v3/traces?"+q.Encode(), traceID)
+	gw.getTracesAndVerify(t, "/api/v3/traces?"+q.Encode(), query.TraceID)
 }
 
 func (gw *testGateway) getTracesAndVerify(t *testing.T, url string, expectedTraceID model.TraceID) {
diff --git a/cmd/query/app/apiv3/grpc_handler.go b/cmd/query/app/apiv3/grpc_handler.go
index 0e684f60406..b12342214c8 100644
--- a/cmd/query/app/apiv3/grpc_handler.go
+++ b/cmd/query/app/apiv3/grpc_handler.go
@@ -32,7 +32,12 @@ func (h *Handler) GetTrace(request *api_v3.GetTraceRequest, stream api_v3.QueryS
 		return fmt.Errorf("malform trace ID: %w", err)
 	}
 
-	trace, err := h.QueryService.GetTrace(stream.Context(), traceID)
+	query := spanstore.GetTraceParameters{
+		TraceID:   traceID,
+		StartTime: request.GetStartTime(),
+		EndTime:   request.GetEndTime(),
+	}
+	trace, err := h.QueryService.GetTrace(stream.Context(), query)
 	if err != nil {
 		return fmt.Errorf("cannot retrieve trace: %w", err)
 	}
diff --git a/cmd/query/app/apiv3/grpc_handler_test.go b/cmd/query/app/apiv3/grpc_handler_test.go
index dbd0c48c82b..ffadfbb9ac5 100644
--- a/cmd/query/app/apiv3/grpc_handler_test.go
+++ b/cmd/query/app/apiv3/grpc_handler_test.go
@@ -27,8 +27,8 @@ import (
 )
 
 var (
-	matchContext = mock.AnythingOfType("*context.valueCtx")
-	matchTraceID = mock.AnythingOfType("model.TraceID")
+	matchContext            = mock.AnythingOfType("*context.valueCtx")
+	matchGetTraceParameters = mock.AnythingOfType("spanstore.GetTraceParameters")
 )
 
 func newGrpcServer(t *testing.T, handler *Handler) (*grpc.Server, net.Addr) {
@@ -79,33 +79,63 @@ func newTestServerClient(t *testing.T) *testServerClient {
 }
 
 func TestGetTrace(t *testing.T) {
-	tsc := newTestServerClient(t)
-	tsc.reader.On("GetTrace", matchContext, matchTraceID).Return(
-		&model.Trace{
-			Spans: []*model.Span{
-				{
-					OperationName: "foobar",
-				},
+	traceId, _ := model.TraceIDFromString("156")
+	testCases := []struct {
+		name          string
+		expectedQuery spanstore.GetTraceParameters
+		request       api_v3.GetTraceRequest
+	}{
+		{
+			"TestGetTrace",
+			spanstore.GetTraceParameters{
+				TraceID:   traceId,
+				StartTime: time.Time{},
+				EndTime:   time.Time{},
 			},
-		}, nil).Once()
-
-	getTraceStream, err := tsc.client.GetTrace(context.Background(),
-		&api_v3.GetTraceRequest{
-			TraceId: "156",
+			api_v3.GetTraceRequest{TraceId: "156"},
 		},
-	)
-	require.NoError(t, err)
-	recv, err := getTraceStream.Recv()
-	require.NoError(t, err)
-	td := recv.ToTraces()
-	require.EqualValues(t, 1, td.SpanCount())
-	assert.Equal(t, "foobar",
-		td.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Name())
+		{
+			"TestGetTraceWithTimeWindow",
+			spanstore.GetTraceParameters{
+				TraceID:   traceId,
+				StartTime: time.Unix(1, 2).UTC(),
+				EndTime:   time.Unix(3, 4).UTC(),
+			},
+			api_v3.GetTraceRequest{
+				TraceId:   "156",
+				StartTime: time.Unix(1, 2).UTC(),
+				EndTime:   time.Unix(3, 4).UTC(),
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			tsc := newTestServerClient(t)
+			tsc.reader.On("GetTrace", matchContext, tc.expectedQuery).Return(
+				&model.Trace{
+					Spans: []*model.Span{
+						{
+							OperationName: "foobar",
+						},
+					},
+				}, nil).Once()
+
+			getTraceStream, err := tsc.client.GetTrace(context.Background(), &tc.request)
+			require.NoError(t, err)
+			recv, err := getTraceStream.Recv()
+			require.NoError(t, err)
+			td := recv.ToTraces()
+			require.EqualValues(t, 1, td.SpanCount())
+			assert.Equal(t, "foobar",
+				td.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Name())
+		})
+	}
 }
 
 func TestGetTraceStorageError(t *testing.T) {
 	tsc := newTestServerClient(t)
-	tsc.reader.On("GetTrace", matchContext, matchTraceID).Return(
+	tsc.reader.On("GetTrace", matchContext, matchGetTraceParameters).Return(
 		nil, errors.New("storage_error")).Once()
 
 	getTraceStream, err := tsc.client.GetTrace(context.Background(), &api_v3.GetTraceRequest{
@@ -119,7 +149,7 @@ func TestGetTraceStorageError(t *testing.T) {
 
 func TestGetTraceTraceIDError(t *testing.T) {
 	tsc := newTestServerClient(t)
-	tsc.reader.On("GetTrace", matchContext, matchTraceID).Return(
+	tsc.reader.On("GetTrace", matchContext, matchGetTraceParameters).Return(
 		&model.Trace{
 			Spans: []*model.Span{},
 		}, nil).Once()
diff --git a/cmd/query/app/apiv3/http_gateway.go b/cmd/query/app/apiv3/http_gateway.go
index 24f0e6c4396..e4e8874d748 100644
--- a/cmd/query/app/apiv3/http_gateway.go
+++ b/cmd/query/app/apiv3/http_gateway.go
@@ -27,7 +27,9 @@ import (
 )
 
 const (
-	paramTraceID       = "trace_id"           // get trace by ID
+	paramTraceID       = "trace_id" // get trace by ID
+	paramStartTime     = "start_time"
+	paramEndTime       = "end_time"
 	paramServiceName   = "query.service_name" // find traces
 	paramOperationName = "query.operation_name"
 	paramTimeMin       = "query.start_time_min"
@@ -133,7 +135,11 @@ func (h *HTTPGateway) getTrace(w http.ResponseWriter, r *http.Request) {
 	if h.tryParamError(w, err, paramTraceID) {
 		return
 	}
-	trc, err := h.QueryService.GetTrace(r.Context(), traceID)
+	// TODO: add start time & end time
+	request := spanstore.GetTraceParameters{
+		TraceID: traceID,
+	}
+	trc, err := h.QueryService.GetTrace(r.Context(), request)
 	if h.tryHandleError(w, err, http.StatusInternalServerError) {
 		return
 	}
diff --git a/cmd/query/app/apiv3/http_gateway_test.go b/cmd/query/app/apiv3/http_gateway_test.go
index c395715b662..4dcdbbafa9d 100644
--- a/cmd/query/app/apiv3/http_gateway_test.go
+++ b/cmd/query/app/apiv3/http_gateway_test.go
@@ -103,7 +103,7 @@ func TestHTTPGatewayGetTraceErrors(t *testing.T) {
 	// error from span reader
 	const simErr = "simulated error"
 	gw.reader.
-		On("GetTrace", matchContext, matchTraceID).
+		On("GetTrace", matchContext, matchGetTraceParameters).
 		Return(nil, errors.New(simErr)).Once()
 
 	r, err = http.NewRequest(http.MethodGet, "/api/v3/traces/123", nil)
diff --git a/cmd/query/app/grpc_handler.go b/cmd/query/app/grpc_handler.go
index 7cbeab083cb..0c562a4d5dc 100644
--- a/cmd/query/app/grpc_handler.go
+++ b/cmd/query/app/grpc_handler.go
@@ -89,7 +89,12 @@ func (g *GRPCHandler) GetTrace(r *api_v2.GetTraceRequest, stream api_v2.QuerySer
 	if r.TraceID == (model.TraceID{}) {
 		return errUninitializedTraceID
 	}
-	trace, err := g.queryService.GetTrace(stream.Context(), r.TraceID)
+	query := spanstore.GetTraceParameters{
+		TraceID:   r.TraceID,
+		StartTime: r.StartTime,
+		EndTime:   r.EndTime,
+	}
+	trace, err := g.queryService.GetTrace(stream.Context(), query)
 	if errors.Is(err, spanstore.ErrTraceNotFound) {
 		g.logger.Warn(msgTraceNotFound, zap.Stringer("id", r.TraceID), zap.Error(err))
 		return status.Errorf(codes.NotFound, "%s: %v", msgTraceNotFound, err)
@@ -109,7 +114,12 @@ func (g *GRPCHandler) ArchiveTrace(ctx context.Context, r *api_v2.ArchiveTraceRe
 	if r.TraceID == (model.TraceID{}) {
 		return nil, errUninitializedTraceID
 	}
-	err := g.queryService.ArchiveTrace(ctx, r.TraceID)
+	query := spanstore.GetTraceParameters{
+		TraceID:   r.TraceID,
+		StartTime: r.StartTime,
+		EndTime:   r.EndTime,
+	}
+	err := g.queryService.ArchiveTrace(ctx, query)
 	if errors.Is(err, spanstore.ErrTraceNotFound) {
 		g.logger.Warn(msgTraceNotFound, zap.Stringer("id", r.TraceID), zap.Error(err))
 		return nil, status.Errorf(codes.NotFound, "%s: %v", msgTraceNotFound, err)
diff --git a/cmd/query/app/grpc_handler_test.go b/cmd/query/app/grpc_handler_test.go
index a5c59638031..b3c8b93e5ba 100644
--- a/cmd/query/app/grpc_handler_test.go
+++ b/cmd/query/app/grpc_handler_test.go
@@ -198,19 +198,41 @@ func withServerAndClient(t *testing.T, actualTest func(server *grpcServer, clien
 }
 
 func TestGetTraceSuccessGRPC(t *testing.T) {
-	withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
-		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
-			Return(mockTrace, nil).Once()
+	inputs := []struct {
+		expectedQuery spanstore.GetTraceParameters
+		request       api_v2.GetTraceRequest
+	}{
+		{
+			spanstore.GetTraceParameters{TraceID: mockTraceID},
+			api_v2.GetTraceRequest{TraceID: mockTraceID},
+		},
+		{
+			spanstore.GetTraceParameters{
+				TraceID:   mockTraceID,
+				StartTime: startTime,
+				EndTime:   endTime,
+			},
+			api_v2.GetTraceRequest{
+				TraceID:   mockTraceID,
+				StartTime: startTime,
+				EndTime:   endTime,
+			},
+		},
+	}
 
-		res, err := client.GetTrace(context.Background(), &api_v2.GetTraceRequest{
-			TraceID: mockTraceID,
-		})
+	for _, input := range inputs {
+		withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
+			server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), input.expectedQuery).
+				Return(mockTrace, nil).Once()
 
-		spanResChunk, _ := res.Recv()
+			res, err := client.GetTrace(context.Background(), &input.request)
 
-		require.NoError(t, err)
-		assert.Equal(t, spanResChunk.Spans[0].TraceID, mockTraceID)
-	})
+			spanResChunk, _ := res.Recv()
+
+			require.NoError(t, err)
+			assert.Equal(t, spanResChunk.Spans[0].TraceID, mockTraceID)
+		})
+	}
 }
 
 func assertGRPCError(t *testing.T, err error, code codes.Code, msg string) {
@@ -222,7 +244,7 @@ func assertGRPCError(t *testing.T, err error, code codes.Code, msg string) {
 
 func TestGetTraceEmptyTraceIDFailure_GRPC(t *testing.T) {
 	withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
-		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(mockTrace, nil).Once()
 
 		res, err := client.GetTrace(context.Background(), &api_v2.GetTraceRequest{
@@ -239,7 +261,7 @@ func TestGetTraceEmptyTraceIDFailure_GRPC(t *testing.T) {
 
 func TestGetTraceDBFailureGRPC(t *testing.T) {
 	withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
-		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(nil, errStorageGRPC).Once()
 
 		res, err := client.GetTrace(context.Background(), &api_v2.GetTraceRequest{
@@ -255,10 +277,10 @@ func TestGetTraceDBFailureGRPC(t *testing.T) {
 
 func TestGetTraceNotFoundGRPC(t *testing.T) {
 	withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
-		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(nil, spanstore.ErrTraceNotFound).Once()
 
-		server.archiveSpanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		server.archiveSpanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(nil, spanstore.ErrTraceNotFound).Once()
 
 		res, err := client.GetTrace(context.Background(), &api_v2.GetTraceRequest{
@@ -279,25 +301,46 @@ func TestGetTraceNilRequestOnHandlerGRPC(t *testing.T) {
 }
 
 func TestArchiveTraceSuccessGRPC(t *testing.T) {
-	withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
-		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
-			Return(mockTrace, nil).Once()
-		server.archiveSpanWriter.On("WriteSpan", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*model.Span")).
-			Return(nil).Times(2)
+	inputs := []struct {
+		expectedQuery spanstore.GetTraceParameters
+		request       api_v2.ArchiveTraceRequest
+	}{
+		{
+			spanstore.GetTraceParameters{TraceID: mockTraceID},
+			api_v2.ArchiveTraceRequest{TraceID: mockTraceID},
+		},
+		{
+			spanstore.GetTraceParameters{
+				TraceID:   mockTraceID,
+				StartTime: startTime,
+				EndTime:   endTime,
+			},
+			api_v2.ArchiveTraceRequest{
+				TraceID:   mockTraceID,
+				StartTime: startTime,
+				EndTime:   endTime,
+			},
+		},
+	}
+	for _, input := range inputs {
+		withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
+			server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), input.expectedQuery).
+				Return(mockTrace, nil).Once()
+			server.archiveSpanWriter.On("WriteSpan", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*model.Span")).
+				Return(nil).Times(2)
 
-		_, err := client.ArchiveTrace(context.Background(), &api_v2.ArchiveTraceRequest{
-			TraceID: mockTraceID,
-		})
+			_, err := client.ArchiveTrace(context.Background(), &input.request)
 
-		require.NoError(t, err)
-	})
+			require.NoError(t, err)
+		})
+	}
 }
 
 func TestArchiveTraceNotFoundGRPC(t *testing.T) {
 	withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
-		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(nil, spanstore.ErrTraceNotFound).Once()
-		server.archiveSpanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		server.archiveSpanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(nil, spanstore.ErrTraceNotFound).Once()
 
 		_, err := client.ArchiveTrace(context.Background(), &api_v2.ArchiveTraceRequest{
@@ -326,7 +369,7 @@ func TestArchiveTraceNilRequestOnHandlerGRPC(t *testing.T) {
 
 func TestArchiveTraceFailureGRPC(t *testing.T) {
 	withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
-		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(mockTrace, nil).Once()
 		server.archiveSpanWriter.On("WriteSpan", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*model.Span")).
 			Return(errStorageGRPC).Times(2)
@@ -961,7 +1004,7 @@ func TestSearchTenancyGRPC(t *testing.T) {
 		Enabled: true,
 	})
 	withTenantedServerAndClient(t, tm, func(server *grpcServer, client *grpcClient) {
-		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(mockTrace, nil).Once()
 
 		// First try without tenancy header
@@ -1018,7 +1061,7 @@ func TestSearchTenancyGRPCExplicitList(t *testing.T) {
 		Tenants: []string{"mercury", "venus", "mars"},
 	})
 	withTenantedServerAndClient(t, tm, func(server *grpcServer, client *grpcClient) {
-		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		server.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(mockTrace, nil).Once()
 
 		for _, tc := range []struct {
@@ -1130,7 +1173,7 @@ func TestTenancyContextFlowGRPC(t *testing.T) {
 					return false
 				}
 				return true
-			}), mock.AnythingOfType("model.TraceID")).Return(trace, err).Once()
+			}), mock.AnythingOfType("spanstore.GetTraceParameters")).Return(trace, err).Once()
 		}
 
 		for tenant, expected := range allExpectedResults {
diff --git a/cmd/query/app/handler_archive_test.go b/cmd/query/app/handler_archive_test.go
index 78a0afba11f..87ae3e304b2 100644
--- a/cmd/query/app/handler_archive_test.go
+++ b/cmd/query/app/handler_archive_test.go
@@ -20,7 +20,7 @@ import (
 
 func TestGetArchivedTrace_NotFound(t *testing.T) {
 	mockReader := &spanstoremocks.Reader{}
-	mockReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	mockReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(nil, spanstore.ErrTraceNotFound).Once()
 	for _, tc := range []struct {
 		name   string
@@ -37,7 +37,7 @@ func TestGetArchivedTrace_NotFound(t *testing.T) {
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			withTestServer(t, func(ts *testServer) {
-				ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+				ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 					Return(nil, spanstore.ErrTraceNotFound).Once()
 				var response structuredResponse
 				err := getJSON(ts.server.URL+"/api/traces/"+mockTraceID.String(), &response)
@@ -52,11 +52,11 @@ func TestGetArchivedTrace_NotFound(t *testing.T) {
 func TestGetArchivedTraceSuccess(t *testing.T) {
 	traceID := model.NewTraceID(0, 123456)
 	mockReader := &spanstoremocks.Reader{}
-	mockReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	mockReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(mockTrace, nil).Once()
 	withTestServer(t, func(ts *testServer) {
 		// make main reader return NotFound
-		ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(nil, spanstore.ErrTraceNotFound).Once()
 		var response structuredTraceResponse
 		err := getJSON(ts.server.URL+"/api/traces/"+mockTraceID.String(), &response)
@@ -79,13 +79,13 @@ func TestArchiveTrace_BadTraceID(t *testing.T) {
 // Test return of 404 when trace is not found in APIHandler.archive
 func TestArchiveTrace_TraceNotFound(t *testing.T) {
 	mockReader := &spanstoremocks.Reader{}
-	mockReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	mockReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(nil, spanstore.ErrTraceNotFound).Once()
 	mockWriter := &spanstoremocks.Writer{}
 	// Not actually going to write the trace, so no need to define mockWriter action
 	withTestServer(t, func(ts *testServer) {
 		// make main reader return NotFound
-		ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(nil, spanstore.ErrTraceNotFound).Once()
 		var response structuredResponse
 		err := postJSON(ts.server.URL+"/api/archive/"+mockTraceID.String(), []string{}, &response)
@@ -106,7 +106,7 @@ func TestArchiveTrace_Success(t *testing.T) {
 	mockWriter.On("WriteSpan", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*model.Span")).
 		Return(nil).Times(2)
 	withTestServer(t, func(ts *testServer) {
-		ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(mockTrace, nil).Once()
 		var response structuredResponse
 		err := postJSON(ts.server.URL+"/api/archive/"+mockTraceID.String(), []string{}, &response)
@@ -119,7 +119,7 @@ func TestArchiveTrace_WriteErrors(t *testing.T) {
 	mockWriter.On("WriteSpan", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*model.Span")).
 		Return(errors.New("cannot save")).Times(2)
 	withTestServer(t, func(ts *testServer) {
-		ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+		ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 			Return(mockTrace, nil).Once()
 		var response structuredResponse
 		err := postJSON(ts.server.URL+"/api/archive/"+mockTraceID.String(), []string{}, &response)
diff --git a/cmd/query/app/http_handler.go b/cmd/query/app/http_handler.go
index bed670240a9..157fc398626 100644
--- a/cmd/query/app/http_handler.go
+++ b/cmd/query/app/http_handler.go
@@ -266,7 +266,11 @@ func (aH *APIHandler) tracesByIDs(ctx context.Context, traceIDs []model.TraceID)
 	var traceErrors []structuredError
 	retMe := make([]*model.Trace, 0, len(traceIDs))
 	for _, traceID := range traceIDs {
-		if trc, err := aH.queryService.GetTrace(ctx, traceID); err != nil {
+		// TODO: add start time & end time
+		query := spanstore.GetTraceParameters{
+			TraceID: traceID,
+		}
+		if trc, err := aH.queryService.GetTrace(ctx, query); err != nil {
 			if !errors.Is(err, spanstore.ErrTraceNotFound) {
 				return nil, nil, err
 			}
@@ -429,7 +433,11 @@ func (aH *APIHandler) getTrace(w http.ResponseWriter, r *http.Request) {
 	if !ok {
 		return
 	}
-	trc, err := aH.queryService.GetTrace(r.Context(), traceID)
+	// TODO: add start time & end time
+	query := spanstore.GetTraceParameters{
+		TraceID: traceID,
+	}
+	trc, err := aH.queryService.GetTrace(r.Context(), query)
 	if errors.Is(err, spanstore.ErrTraceNotFound) {
 		aH.handleError(w, err, http.StatusNotFound)
 		return
@@ -458,7 +466,11 @@ func (aH *APIHandler) archiveTrace(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// QueryService.ArchiveTrace can now archive this traceID.
-	err := aH.queryService.ArchiveTrace(r.Context(), traceID)
+	// TODO: add start time & end time
+	query := spanstore.GetTraceParameters{
+		TraceID: traceID,
+	}
+	err := aH.queryService.ArchiveTrace(r.Context(), query)
 	if errors.Is(err, spanstore.ErrTraceNotFound) {
 		aH.handleError(w, err, http.StatusNotFound)
 		return
diff --git a/cmd/query/app/http_handler_test.go b/cmd/query/app/http_handler_test.go
index 511495193c3..6c09caa155f 100644
--- a/cmd/query/app/http_handler_test.go
+++ b/cmd/query/app/http_handler_test.go
@@ -66,6 +66,8 @@ var (
 	}
 
 	mockTraceID = model.NewTraceID(0, 123456)
+	startTime   = time.Date(2020, time.January, 1, 13, 0, 0, 0, time.UTC)
+	endTime     = time.Date(2020, time.January, 1, 14, 0, 0, 0, time.UTC)
 	mockTrace   = &model.Trace{
 		Spans: []*model.Span{
 			{
@@ -155,7 +157,7 @@ func withTestServer(t *testing.T, doTest func(s *testServer), queryOptions query
 
 func TestGetTraceSuccess(t *testing.T) {
 	ts := initializeTestServer(t)
-	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(mockTrace, nil).Once()
 
 	var response structuredResponse
@@ -182,7 +184,7 @@ func TestGetTraceDedupeSuccess(t *testing.T) {
 	}
 
 	ts := initializeTestServer(t)
-	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(dupedMockTrace, nil).Once()
 
 	var response structuredResponse
@@ -324,7 +326,7 @@ func TestGetTrace(t *testing.T) {
 
 			ts := initializeTestServer(t, HandlerOptions.Tracer(jTracer.OTEL))
 
-			ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), model.NewTraceID(0, 0x123456abc)).
+			ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), spanstore.GetTraceParameters{TraceID: model.NewTraceID(0, 0x123456abc)}).
 				Return(makeMockTrace(t), nil).Once()
 
 			var response structuredResponse
@@ -341,7 +343,7 @@ func TestGetTrace(t *testing.T) {
 
 func TestGetTraceDBFailure(t *testing.T) {
 	ts := initializeTestServer(t)
-	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(nil, errStorage).Once()
 
 	var response structuredResponse
@@ -351,7 +353,7 @@ func TestGetTraceDBFailure(t *testing.T) {
 
 func TestGetTraceNotFound(t *testing.T) {
 	ts := initializeTestServer(t)
-	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(nil, spanstore.ErrTraceNotFound).Once()
 
 	var response structuredResponse
@@ -368,7 +370,7 @@ func TestGetTraceAdjustmentFailure(t *testing.T) {
 			}),
 		},
 	)
-	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(mockTrace, nil).Once()
 
 	var response structuredResponse
@@ -399,7 +401,7 @@ func TestSearchSuccess(t *testing.T) {
 
 func TestSearchByTraceIDSuccess(t *testing.T) {
 	ts := initializeTestServer(t)
-	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(mockTrace, nil).Twice()
 
 	var response structuredResponse
@@ -414,9 +416,9 @@ func TestSearchByTraceIDSuccessWithArchive(t *testing.T) {
 	ts := initializeTestServerWithOptions(t, &tenancy.Manager{}, querysvc.QueryServiceOptions{
 		ArchiveSpanReader: archiveReadMock,
 	})
-	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(nil, spanstore.ErrTraceNotFound).Twice()
-	archiveReadMock.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	archiveReadMock.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(mockTrace, nil).Twice()
 
 	var response structuredResponse
@@ -428,7 +430,7 @@ func TestSearchByTraceIDSuccessWithArchive(t *testing.T) {
 
 func TestSearchByTraceIDNotFound(t *testing.T) {
 	ts := initializeTestServer(t)
-	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(nil, spanstore.ErrTraceNotFound).Once()
 
 	var response structuredResponse
@@ -441,7 +443,7 @@ func TestSearchByTraceIDNotFound(t *testing.T) {
 func TestSearchByTraceIDFailure(t *testing.T) {
 	ts := initializeTestServer(t)
 	whatsamattayou := "whatsamattayou"
-	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(nil, errors.New(whatsamattayou)).Once()
 
 	var response structuredResponse
@@ -915,7 +917,7 @@ func TestSearchTenancyHTTP(t *testing.T) {
 	ts := initializeTestServerWithOptions(t,
 		tenancy.NewManager(&tenancyOptions),
 		querysvc.QueryServiceOptions{})
-	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(mockTrace, nil).Twice()
 
 	var response structuredResponse
@@ -939,7 +941,7 @@ func TestSearchTenancyRejectionHTTP(t *testing.T) {
 		Enabled: true,
 	}
 	ts := initializeTestServerWithOptions(t, tenancy.NewManager(&tenancyOptions), querysvc.QueryServiceOptions{})
-	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(mockTrace, nil).Twice()
 
 	req, err := http.NewRequest(http.MethodGet, ts.server.URL+`/api/traces?traceID=1&traceID=2`, nil)
@@ -971,14 +973,14 @@ func TestSearchTenancyFlowTenantHTTP(t *testing.T) {
 			return false
 		}
 		return true
-	}), mock.AnythingOfType("model.TraceID")).Return(mockTrace, nil).Twice()
+	}), mock.AnythingOfType("spanstore.GetTraceParameters")).Return(mockTrace, nil).Twice()
 	ts.spanReader.On("GetTrace", mock.MatchedBy(func(v any) bool {
 		ctx, ok := v.(context.Context)
 		if !ok || tenancy.GetTenant(ctx) != "megacorp" {
 			return false
 		}
 		return true
-	}), mock.AnythingOfType("model.TraceID")).Return(nil, errStorage).Once()
+	}), mock.AnythingOfType("spanstore.GetTraceParameters")).Return(nil, errStorage).Once()
 
 	var responseAcme structuredResponse
 	err := getJSONCustomHeaders(
diff --git a/cmd/query/app/querysvc/query_service.go b/cmd/query/app/querysvc/query_service.go
index 1a34cd1e408..02abd07074a 100644
--- a/cmd/query/app/querysvc/query_service.go
+++ b/cmd/query/app/querysvc/query_service.go
@@ -62,17 +62,17 @@ func NewQueryService(traceReader tracestore.Reader, dependencyReader depstore.Re
 }
 
 // GetTrace is the queryService implementation of spanstore.Reader.GetTrace
-func (qs QueryService) GetTrace(ctx context.Context, traceID model.TraceID) (*model.Trace, error) {
+func (qs QueryService) GetTrace(ctx context.Context, query spanstore.GetTraceParameters) (*model.Trace, error) {
 	spanReader, err := factoryadapter.GetV1Reader(qs.traceReader)
 	if err != nil {
 		return nil, err
 	}
-	trace, err := spanReader.GetTrace(ctx, traceID)
+	trace, err := spanReader.GetTrace(ctx, query)
 	if errors.Is(err, spanstore.ErrTraceNotFound) {
 		if qs.options.ArchiveSpanReader == nil {
 			return nil, err
 		}
-		trace, err = qs.options.ArchiveSpanReader.GetTrace(ctx, traceID)
+		trace, err = qs.options.ArchiveSpanReader.GetTrace(ctx, query)
 	}
 	return trace, err
 }
@@ -108,11 +108,11 @@ func (qs QueryService) FindTraces(ctx context.Context, query *spanstore.TraceQue
 }
 
 // ArchiveTrace is the queryService utility to archive traces.
-func (qs QueryService) ArchiveTrace(ctx context.Context, traceID model.TraceID) error {
+func (qs QueryService) ArchiveTrace(ctx context.Context, query spanstore.GetTraceParameters) error {
 	if qs.options.ArchiveSpanWriter == nil {
 		return errNoArchiveSpanStorage
 	}
-	trace, err := qs.GetTrace(ctx, traceID)
+	trace, err := qs.GetTrace(ctx, query)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/query/app/querysvc/query_service_test.go b/cmd/query/app/querysvc/query_service_test.go
index 96e07047cf7..10a3b21e5af 100644
--- a/cmd/query/app/querysvc/query_service_test.go
+++ b/cmd/query/app/querysvc/query_service_test.go
@@ -111,12 +111,13 @@ func initializeTestService(optionAppliers ...testOption) *testQueryService {
 // Test QueryService.GetTrace()
 func TestGetTraceSuccess(t *testing.T) {
 	tqs := initializeTestService()
-	tqs.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	tqs.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(mockTrace, nil).Once()
 
 	type contextKey string
 	ctx := context.Background()
-	res, err := tqs.queryService.GetTrace(context.WithValue(ctx, contextKey("foo"), "bar"), mockTraceID)
+	query := spanstore.GetTraceParameters{TraceID: mockTraceID}
+	res, err := tqs.queryService.GetTrace(context.WithValue(ctx, contextKey("foo"), "bar"), query)
 	require.NoError(t, err)
 	assert.Equal(t, res, mockTrace)
 }
@@ -124,12 +125,13 @@ func TestGetTraceSuccess(t *testing.T) {
 // Test QueryService.GetTrace() without ArchiveSpanReader
 func TestGetTraceNotFound(t *testing.T) {
 	tqs := initializeTestService()
-	tqs.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	tqs.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(nil, spanstore.ErrTraceNotFound).Once()
 
 	type contextKey string
 	ctx := context.Background()
-	_, err := tqs.queryService.GetTrace(context.WithValue(ctx, contextKey("foo"), "bar"), mockTraceID)
+	query := spanstore.GetTraceParameters{TraceID: mockTraceID}
+	_, err := tqs.queryService.GetTrace(context.WithValue(ctx, contextKey("foo"), "bar"), query)
 	assert.Equal(t, err, spanstore.ErrTraceNotFound)
 }
 
@@ -138,21 +140,23 @@ func TestGetTrace_V1ReaderNotFound(t *testing.T) {
 	qs := QueryService{
 		traceReader: fr,
 	}
-	_, err := qs.GetTrace(context.Background(), mockTraceID)
+	query := spanstore.GetTraceParameters{TraceID: mockTraceID}
+	_, err := qs.GetTrace(context.Background(), query)
 	require.Error(t, err)
 }
 
 // Test QueryService.GetTrace() with ArchiveSpanReader
 func TestGetTraceFromArchiveStorage(t *testing.T) {
 	tqs := initializeTestService(withArchiveSpanReader())
-	tqs.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	tqs.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(nil, spanstore.ErrTraceNotFound).Once()
-	tqs.archiveSpanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	tqs.archiveSpanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(mockTrace, nil).Once()
 
 	type contextKey string
 	ctx := context.Background()
-	res, err := tqs.queryService.GetTrace(context.WithValue(ctx, contextKey("foo"), "bar"), mockTraceID)
+	query := spanstore.GetTraceParameters{TraceID: mockTraceID}
+	res, err := tqs.queryService.GetTrace(context.WithValue(ctx, contextKey("foo"), "bar"), query)
 	require.NoError(t, err)
 	assert.Equal(t, res, mockTrace)
 }
@@ -252,35 +256,38 @@ func TestArchiveTraceNoOptions(t *testing.T) {
 
 	type contextKey string
 	ctx := context.Background()
-	err := tqs.queryService.ArchiveTrace(context.WithValue(ctx, contextKey("foo"), "bar"), mockTraceID)
+	query := spanstore.GetTraceParameters{TraceID: mockTraceID}
+	err := tqs.queryService.ArchiveTrace(context.WithValue(ctx, contextKey("foo"), "bar"), query)
 	assert.Equal(t, errNoArchiveSpanStorage, err)
 }
 
 // Test QueryService.ArchiveTrace() with ArchiveSpanWriter but invalid traceID.
 func TestArchiveTraceWithInvalidTraceID(t *testing.T) {
 	tqs := initializeTestService(withArchiveSpanReader(), withArchiveSpanWriter())
-	tqs.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	tqs.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(nil, spanstore.ErrTraceNotFound).Once()
-	tqs.archiveSpanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	tqs.archiveSpanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(nil, spanstore.ErrTraceNotFound).Once()
 
 	type contextKey string
 	ctx := context.Background()
-	err := tqs.queryService.ArchiveTrace(context.WithValue(ctx, contextKey("foo"), "bar"), mockTraceID)
+	query := spanstore.GetTraceParameters{TraceID: mockTraceID}
+	err := tqs.queryService.ArchiveTrace(context.WithValue(ctx, contextKey("foo"), "bar"), query)
 	assert.Equal(t, spanstore.ErrTraceNotFound, err)
 }
 
 // Test QueryService.ArchiveTrace(), save error with ArchiveSpanWriter.
 func TestArchiveTraceWithArchiveWriterError(t *testing.T) {
 	tqs := initializeTestService(withArchiveSpanWriter())
-	tqs.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	tqs.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(mockTrace, nil).Once()
 	tqs.archiveSpanWriter.On("WriteSpan", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*model.Span")).
 		Return(errors.New("cannot save")).Times(2)
 
 	type contextKey string
 	ctx := context.Background()
-	joinErr := tqs.queryService.ArchiveTrace(context.WithValue(ctx, contextKey("foo"), "bar"), mockTraceID)
+	query := spanstore.GetTraceParameters{TraceID: mockTraceID}
+	joinErr := tqs.queryService.ArchiveTrace(context.WithValue(ctx, contextKey("foo"), "bar"), query)
 	// There are two spans in the mockTrace, ArchiveTrace should return a wrapped error.
 	require.EqualError(t, joinErr, "cannot save\ncannot save")
 }
@@ -288,14 +295,15 @@ func TestArchiveTraceWithArchiveWriterError(t *testing.T) {
 // Test QueryService.ArchiveTrace() with correctly configured ArchiveSpanWriter.
 func TestArchiveTraceSuccess(t *testing.T) {
 	tqs := initializeTestService(withArchiveSpanWriter())
-	tqs.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
+	tqs.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
 		Return(mockTrace, nil).Once()
 	tqs.archiveSpanWriter.On("WriteSpan", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*model.Span")).
 		Return(nil).Times(2)
 
 	type contextKey string
 	ctx := context.Background()
-	err := tqs.queryService.ArchiveTrace(context.WithValue(ctx, contextKey("foo"), "bar"), mockTraceID)
+	query := spanstore.GetTraceParameters{TraceID: mockTraceID}
+	err := tqs.queryService.ArchiveTrace(context.WithValue(ctx, contextKey("foo"), "bar"), query)
 	require.NoError(t, err)
 }
 
diff --git a/cmd/query/app/server_test.go b/cmd/query/app/server_test.go
index fc2c0d298f0..f12723439a6 100644
--- a/cmd/query/app/server_test.go
+++ b/cmd/query/app/server_test.go
@@ -39,6 +39,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/ports"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
+	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 	depsmocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
@@ -895,7 +896,7 @@ func TestServerHTTP_TracesRequest(t *testing.T) {
 
 			tenancyMgr := tenancy.NewManager(&serverOptions.Tenancy)
 			querySvc := makeQuerySvc()
-			querySvc.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), model.NewTraceID(0, 0x123456abc)).
+			querySvc.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), spanstore.GetTraceParameters{TraceID: model.NewTraceID(0, 0x123456abc)}).
 				Return(makeMockTrace(t), nil).Once()
 			telset := initTelSet(zaptest.NewLogger(t), &tracer, healthcheck.New())
 
diff --git a/plugin/storage/badger/spanstore/read_write_test.go b/plugin/storage/badger/spanstore/read_write_test.go
index 9c4d8f22be7..b324a9ffccc 100644
--- a/plugin/storage/badger/spanstore/read_write_test.go
+++ b/plugin/storage/badger/spanstore/read_write_test.go
@@ -68,10 +68,10 @@ func TestWriteReadBack(t *testing.T) {
 		}
 
 		for i := 0; i < traces; i++ {
-			tr, err := sr.GetTrace(context.Background(), model.TraceID{
+			tr, err := sr.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: model.TraceID{
 				Low:  uint64(i),
 				High: 1,
-			})
+			}})
 			require.NoError(t, err)
 
 			assert.Len(t, tr.Spans, spans)
@@ -291,7 +291,7 @@ func TestFindNothing(t *testing.T) {
 		require.NoError(t, err)
 		assert.Empty(t, trs)
 
-		tr, err := sr.GetTrace(context.Background(), model.TraceID{High: 0, Low: 0})
+		tr, err := sr.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: model.TraceID{Low: 0, High: 0}})
 		assert.Equal(t, spanstore.ErrTraceNotFound, err)
 		assert.Nil(t, tr)
 	})
@@ -418,10 +418,10 @@ func TestPersist(t *testing.T) {
 	})
 
 	p(t, dir, func(t *testing.T, _ spanstore.Writer, sr spanstore.Reader) {
-		trace, err := sr.GetTrace(context.Background(), model.TraceID{
+		trace, err := sr.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: model.TraceID{
 			Low:  uint64(1),
 			High: 1,
-		})
+		}})
 		require.NoError(t, err)
 		assert.Equal(t, "operation-p", trace.Spans[0].OperationName)
 
diff --git a/plugin/storage/badger/spanstore/reader.go b/plugin/storage/badger/spanstore/reader.go
index 84c5212d775..810f774a2c2 100644
--- a/plugin/storage/badger/spanstore/reader.go
+++ b/plugin/storage/badger/spanstore/reader.go
@@ -146,8 +146,8 @@ func (r *TraceReader) getTraces(traceIDs []model.TraceID) ([]*model.Trace, error
 }
 
 // GetTrace takes a traceID and returns a Trace associated with that traceID
-func (r *TraceReader) GetTrace(_ context.Context, traceID model.TraceID) (*model.Trace, error) {
-	traces, err := r.getTraces([]model.TraceID{traceID})
+func (r *TraceReader) GetTrace(_ context.Context, query spanstore.GetTraceParameters) (*model.Trace, error) {
+	traces, err := r.getTraces([]model.TraceID{query.TraceID})
 	if err != nil {
 		return nil, err
 	}
diff --git a/plugin/storage/badger/spanstore/rw_internal_test.go b/plugin/storage/badger/spanstore/rw_internal_test.go
index 60828a8b80a..01a78a820cd 100644
--- a/plugin/storage/badger/spanstore/rw_internal_test.go
+++ b/plugin/storage/badger/spanstore/rw_internal_test.go
@@ -31,7 +31,7 @@ func TestEncodingTypes(t *testing.T) {
 		err := sw.WriteSpan(context.Background(), &testSpan)
 		require.NoError(t, err)
 
-		tr, err := rw.GetTrace(context.Background(), model.TraceID{Low: 0, High: 1})
+		tr, err := rw.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: model.TraceID{Low: 0, High: 1}})
 		require.NoError(t, err)
 		assert.Len(t, tr.Spans, 1)
 	})
@@ -74,7 +74,7 @@ func TestEncodingTypes(t *testing.T) {
 			return nil
 		})
 
-		_, err = rw.GetTrace(context.Background(), model.TraceID{Low: 0, High: 1})
+		_, err = rw.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: model.TraceID{Low: 0, High: 1}})
 		require.EqualError(t, err, "unknown encoding type: 0x04")
 	})
 }
diff --git a/plugin/storage/blackhole/blackhole.go b/plugin/storage/blackhole/blackhole.go
index 5ffa51bb3af..e75d2b1be17 100644
--- a/plugin/storage/blackhole/blackhole.go
+++ b/plugin/storage/blackhole/blackhole.go
@@ -36,7 +36,7 @@ func (*Store) WriteSpan(context.Context, *model.Span) error {
 }
 
 // GetTrace gets nothing.
-func (*Store) GetTrace(context.Context, model.TraceID) (*model.Trace, error) {
+func (*Store) GetTrace(context.Context, spanstore.GetTraceParameters) (*model.Trace, error) {
 	return nil, spanstore.ErrTraceNotFound
 }
 
diff --git a/plugin/storage/blackhole/blackhole_test.go b/plugin/storage/blackhole/blackhole_test.go
index 236ce82406d..3c71fa9896d 100644
--- a/plugin/storage/blackhole/blackhole_test.go
+++ b/plugin/storage/blackhole/blackhole_test.go
@@ -37,7 +37,7 @@ func TestStoreWriteSpan(t *testing.T) {
 
 func TestStoreGetTrace(t *testing.T) {
 	withBlackhole(func(store *Store) {
-		trace, err := store.GetTrace(context.Background(), model.NewTraceID(1, 2))
+		trace, err := store.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: model.NewTraceID(1, 2)})
 		require.Error(t, err)
 		assert.Nil(t, trace)
 	})
diff --git a/plugin/storage/cassandra/savetracetest/main.go b/plugin/storage/cassandra/savetracetest/main.go
index d6c2b1f3fa1..a208c44dc59 100644
--- a/plugin/storage/cassandra/savetracetest/main.go
+++ b/plugin/storage/cassandra/savetracetest/main.go
@@ -60,7 +60,7 @@ func main() {
 		logger.Info("Saved span", zap.String("spanID", getSomeSpan().SpanID.String()))
 	}
 	s := getSomeSpan()
-	trace, err := spanReader.GetTrace(ctx, s.TraceID)
+	trace, err := spanReader.GetTrace(ctx, spanstore.GetTraceParameters{TraceID: s.TraceID})
 	if err != nil {
 		logger.Fatal("Failed to read", zap.Error(err))
 	} else {
diff --git a/plugin/storage/cassandra/spanstore/reader.go b/plugin/storage/cassandra/spanstore/reader.go
index 88ba7b8f335..e79d8224ae0 100644
--- a/plugin/storage/cassandra/spanstore/reader.go
+++ b/plugin/storage/cassandra/spanstore/reader.go
@@ -204,8 +204,8 @@ func (s *SpanReader) readTraceInSpan(_ context.Context, traceID dbmodel.TraceID)
 }
 
 // GetTrace takes a traceID and returns a Trace associated with that traceID
-func (s *SpanReader) GetTrace(ctx context.Context, traceID model.TraceID) (*model.Trace, error) {
-	return s.readTrace(ctx, dbmodel.TraceIDFromDomain(traceID))
+func (s *SpanReader) GetTrace(ctx context.Context, query spanstore.GetTraceParameters) (*model.Trace, error) {
+	return s.readTrace(ctx, dbmodel.TraceIDFromDomain(query.TraceID))
 }
 
 func validateQuery(p *spanstore.TraceQueryParameters) error {
@@ -238,7 +238,7 @@ func (s *SpanReader) FindTraces(ctx context.Context, traceQuery *spanstore.Trace
 	}
 	var retMe []*model.Trace
 	for _, traceID := range uniqueTraceIDs {
-		jTrace, err := s.GetTrace(ctx, traceID)
+		jTrace, err := s.GetTrace(ctx, spanstore.GetTraceParameters{TraceID: traceID})
 		if err != nil {
 			s.logger.Error("Failure to read trace", zap.String("trace_id", traceID.String()), zap.Error(err))
 			continue
diff --git a/plugin/storage/cassandra/spanstore/reader_test.go b/plugin/storage/cassandra/spanstore/reader_test.go
index 7dbef606ccb..afbcf48f0fb 100644
--- a/plugin/storage/cassandra/spanstore/reader_test.go
+++ b/plugin/storage/cassandra/spanstore/reader_test.go
@@ -171,7 +171,7 @@ func TestSpanReaderGetTrace(t *testing.T) {
 
 				r.session.On("Query", mock.AnythingOfType("string"), matchEverything()).Return(query)
 
-				trace, err := r.reader.GetTrace(context.Background(), model.TraceID{})
+				trace, err := r.reader.GetTrace(context.Background(), spanstore.GetTraceParameters{})
 				if testCase.expectedErr == "" {
 					require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded")
 					require.NoError(t, err)
@@ -197,7 +197,7 @@ func TestSpanReaderGetTrace_TraceNotFound(t *testing.T) {
 
 		r.session.On("Query", mock.AnythingOfType("string"), matchEverything()).Return(query)
 
-		trace, err := r.reader.GetTrace(context.Background(), model.TraceID{})
+		trace, err := r.reader.GetTrace(context.Background(), spanstore.GetTraceParameters{})
 		require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded")
 		assert.Nil(t, trace)
 		require.EqualError(t, err, "trace not found")
diff --git a/plugin/storage/es/spanstore/reader.go b/plugin/storage/es/spanstore/reader.go
index 622e3bcd01b..47bc32abf75 100644
--- a/plugin/storage/es/spanstore/reader.go
+++ b/plugin/storage/es/spanstore/reader.go
@@ -231,11 +231,12 @@ func timeRangeIndices(indexName, indexDateLayout string, startTime time.Time, en
 }
 
 // GetTrace takes a traceID and returns a Trace associated with that traceID
-func (s *SpanReader) GetTrace(ctx context.Context, traceID model.TraceID) (*model.Trace, error) {
+func (s *SpanReader) GetTrace(ctx context.Context, query spanstore.GetTraceParameters) (*model.Trace, error) {
 	ctx, span := s.tracer.Start(ctx, "GetTrace")
 	defer span.End()
 	currentTime := time.Now()
-	traces, err := s.multiRead(ctx, []model.TraceID{traceID}, currentTime.Add(-s.maxSpanAge), currentTime)
+	// TODO: use start time & end time in "query" struct
+	traces, err := s.multiRead(ctx, []model.TraceID{query.TraceID}, currentTime.Add(-s.maxSpanAge), currentTime)
 	if err != nil {
 		return nil, es.DetailedError(err)
 	}
diff --git a/plugin/storage/es/spanstore/reader_test.go b/plugin/storage/es/spanstore/reader_test.go
index f40041c2abd..d597dd35fb5 100644
--- a/plugin/storage/es/spanstore/reader_test.go
+++ b/plugin/storage/es/spanstore/reader_test.go
@@ -327,8 +327,8 @@ func TestSpanReader_GetTrace(t *testing.T) {
 					{Hits: searchHits},
 				},
 			}, nil)
-
-		trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1))
+		query := spanstore.GetTraceParameters{TraceID: model.NewTraceID(0, 1)}
+		trace, err := r.reader.GetTrace(context.Background(), query)
 		require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded")
 		require.NoError(t, err)
 		require.NotNil(t, trace)
@@ -443,7 +443,8 @@ func TestSpanReader_SearchAfter(t *testing.T) {
 				},
 			}, nil).Times(2)
 
-		trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1))
+		query := spanstore.GetTraceParameters{TraceID: model.NewTraceID(0, 1)}
+		trace, err := r.reader.GetTrace(context.Background(), query)
 		require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded")
 		require.NoError(t, err)
 		require.NotNil(t, trace)
@@ -463,7 +464,8 @@ func TestSpanReader_GetTraceQueryError(t *testing.T) {
 			Return(&elastic.MultiSearchResult{
 				Responses: []*elastic.SearchResult{},
 			}, nil)
-		trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1))
+		query := spanstore.GetTraceParameters{TraceID: model.NewTraceID(0, 1)}
+		trace, err := r.reader.GetTrace(context.Background(), query)
 		require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded")
 		require.EqualError(t, err, "trace not found")
 		require.Nil(t, trace)
@@ -483,7 +485,8 @@ func TestSpanReader_GetTraceNilHits(t *testing.T) {
 				},
 			}, nil)
 
-		trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1))
+		query := spanstore.GetTraceParameters{TraceID: model.NewTraceID(0, 1)}
+		trace, err := r.reader.GetTrace(context.Background(), query)
 		require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded")
 		require.EqualError(t, err, "trace not found")
 		require.Nil(t, trace)
@@ -507,7 +510,8 @@ func TestSpanReader_GetTraceInvalidSpanError(t *testing.T) {
 				},
 			}, nil)
 
-		trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1))
+		query := spanstore.GetTraceParameters{TraceID: model.NewTraceID(0, 1)}
+		trace, err := r.reader.GetTrace(context.Background(), query)
 		require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded")
 		require.Error(t, err, "invalid span")
 		require.Nil(t, trace)
@@ -532,7 +536,8 @@ func TestSpanReader_GetTraceSpanConversionError(t *testing.T) {
 				},
 			}, nil)
 
-		trace, err := r.reader.GetTrace(context.Background(), model.NewTraceID(0, 1))
+		query := spanstore.GetTraceParameters{TraceID: model.NewTraceID(0, 1)}
+		trace, err := r.reader.GetTrace(context.Background(), query)
 		require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded")
 		require.Error(t, err, "span conversion error, because lacks elements")
 		require.Nil(t, trace)
@@ -1269,8 +1274,8 @@ func TestSpanReader_ArchiveTraces(t *testing.T) {
 			Return(&elastic.MultiSearchResult{
 				Responses: []*elastic.SearchResult{},
 			}, nil)
-
-		trace, err := r.reader.GetTrace(context.Background(), model.TraceID{})
+		query := spanstore.GetTraceParameters{}
+		trace, err := r.reader.GetTrace(context.Background(), query)
 		require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded")
 		require.Nil(t, trace)
 		require.EqualError(t, err, "trace not found")
@@ -1286,7 +1291,8 @@ func TestSpanReader_ArchiveTraces_ReadAlias(t *testing.T) {
 				Responses: []*elastic.SearchResult{},
 			}, nil)
 
-		trace, err := r.reader.GetTrace(context.Background(), model.TraceID{})
+		query := spanstore.GetTraceParameters{}
+		trace, err := r.reader.GetTrace(context.Background(), query)
 		require.NotEmpty(t, r.traceBuffer.GetSpans(), "Spans recorded")
 		require.Nil(t, trace)
 		require.EqualError(t, err, "trace not found")
diff --git a/plugin/storage/grpc/shared/archive.go b/plugin/storage/grpc/shared/archive.go
index 2bd14685d27..8eeb3b609b2 100644
--- a/plugin/storage/grpc/shared/archive.go
+++ b/plugin/storage/grpc/shared/archive.go
@@ -32,9 +32,11 @@ type archiveWriter struct {
 }
 
 // GetTrace takes a traceID and returns a Trace associated with that traceID from Archive Storage
-func (r *archiveReader) GetTrace(ctx context.Context, traceID model.TraceID) (*model.Trace, error) {
+func (r *archiveReader) GetTrace(ctx context.Context, q spanstore.GetTraceParameters) (*model.Trace, error) {
 	stream, err := r.client.GetArchiveTrace(ctx, &storage_v1.GetTraceRequest{
-		TraceID: traceID,
+		TraceID:   q.TraceID,
+		StartTime: q.StartTime,
+		EndTime:   q.EndTime,
 	})
 	if status.Code(err) == codes.NotFound {
 		return nil, spanstore.ErrTraceNotFound
diff --git a/plugin/storage/grpc/shared/archive_test.go b/plugin/storage/grpc/shared/archive_test.go
index 75857f9e3cc..3f5128ff590 100644
--- a/plugin/storage/grpc/shared/archive_test.go
+++ b/plugin/storage/grpc/shared/archive_test.go
@@ -59,7 +59,9 @@ func TestArchiveReader_GetTrace(t *testing.T) {
 	}).Return(traceClient, nil)
 	reader := &archiveReader{client: archiveSpanReader}
 
-	trace, err := reader.GetTrace(context.Background(), mockTraceID)
+	trace, err := reader.GetTrace(context.Background(), spanstore.GetTraceParameters{
+		TraceID: mockTraceID,
+	})
 	require.NoError(t, err)
 	assert.Equal(t, expected, trace)
 }
@@ -73,7 +75,9 @@ func TestArchiveReaderGetTrace_NoTrace(t *testing.T) {
 	}).Return(nil, status.Errorf(codes.NotFound, ""))
 	reader := &archiveReader{client: archiveSpanReader}
 
-	_, err := reader.GetTrace(context.Background(), mockTraceID)
+	_, err := reader.GetTrace(context.Background(), spanstore.GetTraceParameters{
+		TraceID: mockTraceID,
+	})
 	assert.Equal(t, spanstore.ErrTraceNotFound, err)
 }
 
diff --git a/plugin/storage/grpc/shared/grpc_client.go b/plugin/storage/grpc/shared/grpc_client.go
index abe296b70e3..f6323be4568 100644
--- a/plugin/storage/grpc/shared/grpc_client.go
+++ b/plugin/storage/grpc/shared/grpc_client.go
@@ -81,9 +81,11 @@ func (c *GRPCClient) ArchiveSpanWriter() spanstore.Writer {
 }
 
 // GetTrace takes a traceID and returns a Trace associated with that traceID
-func (c *GRPCClient) GetTrace(ctx context.Context, traceID model.TraceID) (*model.Trace, error) {
+func (c *GRPCClient) GetTrace(ctx context.Context, query spanstore.GetTraceParameters) (*model.Trace, error) {
 	stream, err := c.readerClient.GetTrace(ctx, &storage_v1.GetTraceRequest{
-		TraceID: traceID,
+		TraceID:   query.TraceID,
+		StartTime: query.StartTime,
+		EndTime:   query.EndTime,
 	})
 	if status.Code(err) == codes.NotFound {
 		return nil, spanstore.ErrTraceNotFound
diff --git a/plugin/storage/grpc/shared/grpc_client_test.go b/plugin/storage/grpc/shared/grpc_client_test.go
index a8bb88fcf34..85814a3163a 100644
--- a/plugin/storage/grpc/shared/grpc_client_test.go
+++ b/plugin/storage/grpc/shared/grpc_client_test.go
@@ -157,13 +157,17 @@ func TestGRPCClientGetOperationsV2(t *testing.T) {
 
 func TestGRPCClientGetTrace(t *testing.T) {
 	withGRPCClient(func(r *grpcClientTest) {
+		startTime := time.Date(2020, time.January, 1, 13, 0, 0, 0, time.UTC)
+		endTime := time.Date(2020, time.January, 1, 14, 0, 0, 0, time.UTC)
 		traceClient := new(grpcMocks.SpanReaderPlugin_GetTraceClient)
 		traceClient.On("Recv").Return(&storage_v1.SpansResponseChunk{
 			Spans: mockTraceSpans,
 		}, nil).Once()
 		traceClient.On("Recv").Return(nil, io.EOF)
 		r.spanReader.On("GetTrace", mock.Anything, &storage_v1.GetTraceRequest{
-			TraceID: mockTraceID,
+			TraceID:   mockTraceID,
+			StartTime: startTime,
+			EndTime:   endTime,
 		}).Return(traceClient, nil)
 
 		var expectedSpans []*model.Span
@@ -171,7 +175,11 @@ func TestGRPCClientGetTrace(t *testing.T) {
 			expectedSpans = append(expectedSpans, &mockTraceSpans[i])
 		}
 
-		s, err := r.client.GetTrace(context.Background(), mockTraceID)
+		s, err := r.client.GetTrace(context.Background(), spanstore.GetTraceParameters{
+			TraceID:   mockTraceID,
+			StartTime: startTime,
+			EndTime:   endTime,
+		})
 		require.NoError(t, err)
 		assert.Equal(t, &model.Trace{
 			Spans: expectedSpans,
@@ -187,7 +195,7 @@ func TestGRPCClientGetTrace_StreamError(t *testing.T) {
 			TraceID: mockTraceID,
 		}).Return(traceClient, nil)
 
-		s, err := r.client.GetTrace(context.Background(), mockTraceID)
+		s, err := r.client.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: mockTraceID})
 		require.Error(t, err)
 		assert.Nil(t, s)
 	})
@@ -199,7 +207,7 @@ func TestGRPCClientGetTrace_NoTrace(t *testing.T) {
 			TraceID: mockTraceID,
 		}).Return(nil, status.Errorf(codes.NotFound, ""))
 
-		s, err := r.client.GetTrace(context.Background(), mockTraceID)
+		s, err := r.client.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: mockTraceID})
 		assert.Equal(t, spanstore.ErrTraceNotFound, err)
 		assert.Nil(t, s)
 	})
@@ -215,7 +223,7 @@ func TestGRPCClientGetTrace_StreamErrorTraceNotFound(t *testing.T) {
 			TraceID: mockTraceID,
 		}).Return(traceClient, nil)
 
-		s, err := r.client.GetTrace(context.Background(), mockTraceID)
+		s, err := r.client.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: mockTraceID})
 		assert.Equal(t, spanstore.ErrTraceNotFound, err)
 		assert.Nil(t, s)
 	})
@@ -364,13 +372,17 @@ func TestGrpcClientStreamWriterWriteSpan(t *testing.T) {
 
 func TestGrpcClientGetArchiveTrace(t *testing.T) {
 	withGRPCClient(func(r *grpcClientTest) {
+		startTime := time.Date(2020, time.January, 1, 13, 0, 0, 0, time.UTC)
+		endTime := time.Date(2020, time.January, 1, 14, 0, 0, 0, time.UTC)
 		traceClient := new(grpcMocks.ArchiveSpanReaderPlugin_GetArchiveTraceClient)
 		traceClient.On("Recv").Return(&storage_v1.SpansResponseChunk{
 			Spans: mockTraceSpans,
 		}, nil).Once()
 		traceClient.On("Recv").Return(nil, io.EOF)
 		r.archiveReader.On("GetArchiveTrace", mock.Anything, &storage_v1.GetTraceRequest{
-			TraceID: mockTraceID,
+			TraceID:   mockTraceID,
+			StartTime: startTime,
+			EndTime:   endTime,
 		}).Return(traceClient, nil)
 
 		var expectedSpans []*model.Span
@@ -378,7 +390,11 @@ func TestGrpcClientGetArchiveTrace(t *testing.T) {
 			expectedSpans = append(expectedSpans, &mockTraceSpans[i])
 		}
 
-		s, err := r.client.ArchiveSpanReader().GetTrace(context.Background(), mockTraceID)
+		s, err := r.client.ArchiveSpanReader().GetTrace(context.Background(), spanstore.GetTraceParameters{
+			TraceID:   mockTraceID,
+			StartTime: startTime,
+			EndTime:   endTime,
+		})
 		require.NoError(t, err)
 		assert.Equal(t, &model.Trace{
 			Spans: expectedSpans,
@@ -394,7 +410,9 @@ func TestGrpcClientGetArchiveTrace_StreamError(t *testing.T) {
 			TraceID: mockTraceID,
 		}).Return(traceClient, nil)
 
-		s, err := r.client.ArchiveSpanReader().GetTrace(context.Background(), mockTraceID)
+		s, err := r.client.ArchiveSpanReader().GetTrace(context.Background(), spanstore.GetTraceParameters{
+			TraceID: mockTraceID,
+		})
 		require.Error(t, err)
 		assert.Nil(t, s)
 	})
@@ -406,7 +424,12 @@ func TestGrpcClientGetArchiveTrace_NoTrace(t *testing.T) {
 			TraceID: mockTraceID,
 		}).Return(nil, spanstore.ErrTraceNotFound)
 
-		s, err := r.client.ArchiveSpanReader().GetTrace(context.Background(), mockTraceID)
+		s, err := r.client.ArchiveSpanReader().GetTrace(
+			context.Background(),
+			spanstore.GetTraceParameters{
+				TraceID: mockTraceID,
+			},
+		)
 		require.Error(t, err)
 		assert.Nil(t, s)
 	})
@@ -420,7 +443,9 @@ func TestGrpcClientGetArchiveTrace_StreamErrorTraceNotFound(t *testing.T) {
 			TraceID: mockTraceID,
 		}).Return(traceClient, nil)
 
-		s, err := r.client.ArchiveSpanReader().GetTrace(context.Background(), mockTraceID)
+		s, err := r.client.ArchiveSpanReader().GetTrace(context.Background(), spanstore.GetTraceParameters{
+			TraceID: mockTraceID,
+		})
 		assert.Equal(t, spanstore.ErrTraceNotFound, err)
 		assert.Nil(t, s)
 	})
diff --git a/plugin/storage/grpc/shared/grpc_handler.go b/plugin/storage/grpc/shared/grpc_handler.go
index 564a625ebf0..28dc0adf8cb 100644
--- a/plugin/storage/grpc/shared/grpc_handler.go
+++ b/plugin/storage/grpc/shared/grpc_handler.go
@@ -151,7 +151,11 @@ func (s *GRPCHandler) Close(context.Context, *storage_v1.CloseWriterRequest) (*s
 
 // GetTrace takes a traceID and streams a Trace associated with that traceID
 func (s *GRPCHandler) GetTrace(r *storage_v1.GetTraceRequest, stream storage_v1.SpanReaderPlugin_GetTraceServer) error {
-	trace, err := s.impl.SpanReader().GetTrace(stream.Context(), r.TraceID)
+	trace, err := s.impl.SpanReader().GetTrace(stream.Context(), spanstore.GetTraceParameters{
+		TraceID:   r.TraceID,
+		StartTime: r.StartTime,
+		EndTime:   r.EndTime,
+	})
 	if errors.Is(err, spanstore.ErrTraceNotFound) {
 		return status.Error(codes.NotFound, spanstore.ErrTraceNotFound.Error())
 	}
@@ -276,7 +280,11 @@ func (s *GRPCHandler) GetArchiveTrace(r *storage_v1.GetTraceRequest, stream stor
 	if reader == nil {
 		return status.Error(codes.Unimplemented, "not implemented")
 	}
-	trace, err := reader.GetTrace(stream.Context(), r.TraceID)
+	trace, err := reader.GetTrace(stream.Context(), spanstore.GetTraceParameters{
+		TraceID:   r.TraceID,
+		StartTime: r.StartTime,
+		EndTime:   r.EndTime,
+	})
 	if errors.Is(err, spanstore.ErrTraceNotFound) {
 		return status.Error(codes.NotFound, spanstore.ErrTraceNotFound.Error())
 	}
diff --git a/plugin/storage/grpc/shared/grpc_handler_test.go b/plugin/storage/grpc/shared/grpc_handler_test.go
index 6fe228387c7..726ea30c6b4 100644
--- a/plugin/storage/grpc/shared/grpc_handler_test.go
+++ b/plugin/storage/grpc/shared/grpc_handler_test.go
@@ -136,7 +136,7 @@ func TestGRPCServerGetTrace(t *testing.T) {
 		for i := range mockTraceSpans {
 			traceSpans = append(traceSpans, &mockTraceSpans[i])
 		}
-		r.impl.spanReader.On("GetTrace", mock.Anything, mockTraceID).
+		r.impl.spanReader.On("GetTrace", mock.Anything, spanstore.GetTraceParameters{TraceID: mockTraceID}).
 			Return(&model.Trace{Spans: traceSpans}, nil)
 
 		err := r.server.GetTrace(&storage_v1.GetTraceRequest{
@@ -151,7 +151,7 @@ func TestGRPCServerGetTrace_NotFound(t *testing.T) {
 		traceSteam := new(grpcMocks.SpanReaderPlugin_GetTraceServer)
 		traceSteam.On("Context").Return(context.Background())
 
-		r.impl.spanReader.On("GetTrace", mock.Anything, mockTraceID).
+		r.impl.spanReader.On("GetTrace", mock.Anything, spanstore.GetTraceParameters{TraceID: mockTraceID}).
 			Return(nil, spanstore.ErrTraceNotFound)
 
 		err := r.server.GetTrace(&storage_v1.GetTraceRequest{
@@ -284,7 +284,7 @@ func TestGRPCServerGetArchiveTrace(t *testing.T) {
 		for i := range mockTraceSpans {
 			traceSpans = append(traceSpans, &mockTraceSpans[i])
 		}
-		r.impl.archiveReader.On("GetTrace", mock.Anything, mockTraceID).
+		r.impl.archiveReader.On("GetTrace", mock.Anything, spanstore.GetTraceParameters{TraceID: mockTraceID}).
 			Return(&model.Trace{Spans: traceSpans}, nil)
 
 		err := r.server.GetArchiveTrace(&storage_v1.GetTraceRequest{
@@ -299,7 +299,7 @@ func TestGRPCServerGetArchiveTrace_NotFound(t *testing.T) {
 		traceSteam := new(grpcMocks.SpanReaderPlugin_GetTraceServer)
 		traceSteam.On("Context").Return(context.Background())
 
-		r.impl.archiveReader.On("GetTrace", mock.Anything, mockTraceID).
+		r.impl.archiveReader.On("GetTrace", mock.Anything, spanstore.GetTraceParameters{TraceID: mockTraceID}).
 			Return(nil, spanstore.ErrTraceNotFound)
 
 		err := r.server.GetArchiveTrace(&storage_v1.GetTraceRequest{
@@ -314,7 +314,7 @@ func TestGRPCServerGetArchiveTrace_Error(t *testing.T) {
 		traceSteam := new(grpcMocks.SpanReaderPlugin_GetTraceServer)
 		traceSteam.On("Context").Return(context.Background())
 
-		r.impl.archiveReader.On("GetTrace", mock.Anything, mockTraceID).
+		r.impl.archiveReader.On("GetTrace", mock.Anything, spanstore.GetTraceParameters{TraceID: mockTraceID}).
 			Return(nil, errors.New("some error"))
 
 		err := r.server.GetArchiveTrace(&storage_v1.GetTraceRequest{
@@ -329,7 +329,7 @@ func TestGRPCServerGetArchiveTrace_NoImpl(t *testing.T) {
 		r.server.impl.ArchiveSpanReader = func() spanstore.Reader { return nil }
 		traceSteam := new(grpcMocks.SpanReaderPlugin_GetTraceServer)
 
-		r.impl.archiveReader.On("GetTrace", mock.Anything, mockTraceID).
+		r.impl.archiveReader.On("GetTrace", mock.Anything, spanstore.GetTraceParameters{TraceID: mockTraceID}).
 			Return(nil, errors.New("some error"))
 
 		err := r.server.GetArchiveTrace(&storage_v1.GetTraceRequest{
@@ -350,7 +350,7 @@ func TestGRPCServerGetArchiveTrace_StreamError(t *testing.T) {
 		for i := range mockTraceSpans {
 			traceSpans = append(traceSpans, &mockTraceSpans[i])
 		}
-		r.impl.archiveReader.On("GetTrace", mock.Anything, mockTraceID).
+		r.impl.archiveReader.On("GetTrace", mock.Anything, spanstore.GetTraceParameters{TraceID: mockTraceID}).
 			Return(&model.Trace{Spans: traceSpans}, nil)
 
 		err := r.server.GetArchiveTrace(&storage_v1.GetTraceRequest{
diff --git a/plugin/storage/integration/integration.go b/plugin/storage/integration/integration.go
index a778776e63f..35f7c6e6025 100644
--- a/plugin/storage/integration/integration.go
+++ b/plugin/storage/integration/integration.go
@@ -198,7 +198,7 @@ func (s *StorageIntegration) testArchiveTrace(t *testing.T) {
 	var actual *model.Trace
 	found := s.waitForCondition(t, func(_ *testing.T) bool {
 		var err error
-		actual, err = s.ArchiveSpanReader.GetTrace(context.Background(), tID)
+		actual, err = s.ArchiveSpanReader.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: tID})
 		return err == nil && len(actual.Spans) == 1
 	})
 	require.True(t, found)
@@ -217,7 +217,7 @@ func (s *StorageIntegration) testGetLargeSpan(t *testing.T) {
 	var actual *model.Trace
 	found := s.waitForCondition(t, func(_ *testing.T) bool {
 		var err error
-		actual, err = s.SpanReader.GetTrace(context.Background(), expectedTraceID)
+		actual, err = s.SpanReader.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: expectedTraceID})
 		return err == nil && len(actual.Spans) >= len(expected.Spans)
 	})
 
@@ -290,7 +290,7 @@ func (s *StorageIntegration) testGetTrace(t *testing.T) {
 	var actual *model.Trace
 	found := s.waitForCondition(t, func(t *testing.T) bool {
 		var err error
-		actual, err = s.SpanReader.GetTrace(context.Background(), expectedTraceID)
+		actual, err = s.SpanReader.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: expectedTraceID})
 		if err != nil {
 			t.Log(err)
 		}
@@ -302,7 +302,7 @@ func (s *StorageIntegration) testGetTrace(t *testing.T) {
 
 	t.Run("NotFound error", func(t *testing.T) {
 		fakeTraceID := model.TraceID{High: 0, Low: 1}
-		trace, err := s.SpanReader.GetTrace(context.Background(), fakeTraceID)
+		trace, err := s.SpanReader.GetTrace(context.Background(), spanstore.GetTraceParameters{TraceID: fakeTraceID})
 		assert.Equal(t, spanstore.ErrTraceNotFound, err)
 		assert.Nil(t, trace)
 	})
diff --git a/plugin/storage/integration/kafka_test.go b/plugin/storage/integration/kafka_test.go
index 987f49057b1..24b2131993d 100644
--- a/plugin/storage/integration/kafka_test.go
+++ b/plugin/storage/integration/kafka_test.go
@@ -101,8 +101,8 @@ type ingester struct {
 	traceStore *memory.Store
 }
 
-func (r *ingester) GetTrace(ctx context.Context, traceID model.TraceID) (*model.Trace, error) {
-	return r.traceStore.GetTrace(ctx, traceID)
+func (r *ingester) GetTrace(ctx context.Context, query spanstore.GetTraceParameters) (*model.Trace, error) {
+	return r.traceStore.GetTrace(ctx, query)
 }
 
 func (*ingester) GetServices(context.Context) ([]string, error) {
diff --git a/plugin/storage/memory/memory.go b/plugin/storage/memory/memory.go
index 48276aabffb..a20e1a5afc6 100644
--- a/plugin/storage/memory/memory.go
+++ b/plugin/storage/memory/memory.go
@@ -182,11 +182,11 @@ func (st *Store) WriteSpan(ctx context.Context, span *model.Span) error {
 }
 
 // GetTrace gets a trace
-func (st *Store) GetTrace(ctx context.Context, traceID model.TraceID) (*model.Trace, error) {
+func (st *Store) GetTrace(ctx context.Context, query spanstore.GetTraceParameters) (*model.Trace, error) {
 	m := st.getTenant(tenancy.GetTenant(ctx))
 	m.RLock()
 	defer m.RUnlock()
-	trace, ok := m.traces[traceID]
+	trace, ok := m.traces[query.TraceID]
 	if !ok {
 		return nil, spanstore.ErrTraceNotFound
 	}
diff --git a/plugin/storage/memory/memory_test.go b/plugin/storage/memory/memory_test.go
index 7005c273b33..af130edd566 100644
--- a/plugin/storage/memory/memory_test.go
+++ b/plugin/storage/memory/memory_test.go
@@ -187,7 +187,8 @@ func TestStoreWithLimit(t *testing.T) {
 
 func TestStoreGetTraceSuccess(t *testing.T) {
 	withPopulatedMemoryStore(func(store *Store) {
-		trace, err := store.GetTrace(context.Background(), testingSpan.TraceID)
+		query := spanstore.GetTraceParameters{TraceID: testingSpan.TraceID}
+		trace, err := store.GetTrace(context.Background(), query)
 		require.NoError(t, err)
 		assert.Len(t, trace.Spans, 1)
 		assert.Equal(t, testingSpan, trace.Spans[0])
@@ -196,7 +197,8 @@ func TestStoreGetTraceSuccess(t *testing.T) {
 
 func TestStoreGetAndMutateTrace(t *testing.T) {
 	withPopulatedMemoryStore(func(store *Store) {
-		trace, err := store.GetTrace(context.Background(), testingSpan.TraceID)
+		query := spanstore.GetTraceParameters{TraceID: testingSpan.TraceID}
+		trace, err := store.GetTrace(context.Background(), query)
 		require.NoError(t, err)
 		assert.Len(t, trace.Spans, 1)
 		assert.Equal(t, testingSpan, trace.Spans[0])
@@ -204,7 +206,7 @@ func TestStoreGetAndMutateTrace(t *testing.T) {
 
 		trace.Spans[0].Warnings = append(trace.Spans[0].Warnings, "the end is near")
 
-		trace, err = store.GetTrace(context.Background(), testingSpan.TraceID)
+		trace, err = store.GetTrace(context.Background(), query)
 		require.NoError(t, err)
 		assert.Len(t, trace.Spans, 1)
 		assert.Equal(t, testingSpan, trace.Spans[0])
@@ -217,14 +219,16 @@ func TestStoreGetTraceError(t *testing.T) {
 		store.getTenant("").traces[testingSpan.TraceID] = &model.Trace{
 			Spans: []*model.Span{nonSerializableSpan},
 		}
-		_, err := store.GetTrace(context.Background(), testingSpan.TraceID)
+		query := spanstore.GetTraceParameters{TraceID: testingSpan.TraceID}
+		_, err := store.GetTrace(context.Background(), query)
 		require.Error(t, err)
 	})
 }
 
 func TestStoreGetTraceFailure(t *testing.T) {
 	withPopulatedMemoryStore(func(store *Store) {
-		trace, err := store.GetTrace(context.Background(), model.TraceID{})
+		query := spanstore.GetTraceParameters{}
+		trace, err := store.GetTrace(context.Background(), query)
 		require.EqualError(t, err, spanstore.ErrTraceNotFound.Error())
 		assert.Nil(t, trace)
 	})
@@ -448,12 +452,14 @@ func TestTenantStore(t *testing.T) {
 		require.NoError(t, store.WriteSpan(ctxWonka, testingSpan2))
 
 		// Can we retrieve the spans with correct tenancy
-		trace1, err := store.GetTrace(ctxAcme, testingSpan.TraceID)
+		query := spanstore.GetTraceParameters{TraceID: testingSpan.TraceID}
+		trace1, err := store.GetTrace(ctxAcme, query)
 		require.NoError(t, err)
 		assert.Len(t, trace1.Spans, 1)
 		assert.Equal(t, testingSpan, trace1.Spans[0])
 
-		trace2, err := store.GetTrace(ctxWonka, testingSpan2.TraceID)
+		query2 := spanstore.GetTraceParameters{TraceID: testingSpan2.TraceID}
+		trace2, err := store.GetTrace(ctxWonka, query2)
 		require.NoError(t, err)
 		assert.Len(t, trace2.Spans, 1)
 		assert.Equal(t, testingSpan2, trace2.Spans[0])
@@ -476,13 +482,13 @@ func TestTenantStore(t *testing.T) {
 		assert.Equal(t, testingSpan2, traces2[0].Spans[0])
 
 		// Do the spans fail with incorrect tenancy?
-		_, err = store.GetTrace(ctxAcme, testingSpan2.TraceID)
+		_, err = store.GetTrace(ctxAcme, query2)
 		require.Error(t, err)
 
-		_, err = store.GetTrace(ctxWonka, testingSpan.TraceID)
+		_, err = store.GetTrace(ctxWonka, query)
 		require.Error(t, err)
 
-		_, err = store.GetTrace(context.Background(), testingSpan.TraceID)
+		_, err = store.GetTrace(context.Background(), query)
 		require.Error(t, err)
 	})
 }
diff --git a/storage/spanstore/interface.go b/storage/spanstore/interface.go
index c4c29181502..3c4dd0dd4e7 100644
--- a/storage/spanstore/interface.go
+++ b/storage/spanstore/interface.go
@@ -25,7 +25,7 @@ type Reader interface {
 	// GetTrace retrieves the trace with a given id.
 	//
 	// If no spans are stored for this trace, it returns ErrTraceNotFound.
-	GetTrace(ctx context.Context, traceID model.TraceID) (*model.Trace, error)
+	GetTrace(ctx context.Context, query GetTraceParameters) (*model.Trace, error)
 
 	// GetServices returns all service names known to the backend from spans
 	// within its retention period.
@@ -50,6 +50,13 @@ type Reader interface {
 	FindTraceIDs(ctx context.Context, query *TraceQueryParameters) ([]model.TraceID, error)
 }
 
+// GetTraceParameters contains parameters of a trace get.
+type GetTraceParameters struct {
+	TraceID   model.TraceID
+	StartTime time.Time // optional
+	EndTime   time.Time // optional
+}
+
 // TraceQueryParameters contains parameters of a trace query.
 type TraceQueryParameters struct {
 	ServiceName   string
diff --git a/storage/spanstore/mocks/Reader.go b/storage/spanstore/mocks/Reader.go
index d48658937c3..29d745996f3 100644
--- a/storage/spanstore/mocks/Reader.go
+++ b/storage/spanstore/mocks/Reader.go
@@ -141,9 +141,9 @@ func (_m *Reader) GetServices(ctx context.Context) ([]string, error) {
 	return r0, r1
 }
 
-// GetTrace provides a mock function with given fields: ctx, traceID
-func (_m *Reader) GetTrace(ctx context.Context, traceID model.TraceID) (*model.Trace, error) {
-	ret := _m.Called(ctx, traceID)
+// GetTrace provides a mock function with given fields: ctx, query
+func (_m *Reader) GetTrace(ctx context.Context, query spanstore.GetTraceParameters) (*model.Trace, error) {
+	ret := _m.Called(ctx, query)
 
 	if len(ret) == 0 {
 		panic("no return value specified for GetTrace")
@@ -151,19 +151,19 @@ func (_m *Reader) GetTrace(ctx context.Context, traceID model.TraceID) (*model.T
 
 	var r0 *model.Trace
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, model.TraceID) (*model.Trace, error)); ok {
-		return rf(ctx, traceID)
+	if rf, ok := ret.Get(0).(func(context.Context, spanstore.GetTraceParameters) (*model.Trace, error)); ok {
+		return rf(ctx, query)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, model.TraceID) *model.Trace); ok {
-		r0 = rf(ctx, traceID)
+	if rf, ok := ret.Get(0).(func(context.Context, spanstore.GetTraceParameters) *model.Trace); ok {
+		r0 = rf(ctx, query)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(*model.Trace)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, model.TraceID) error); ok {
-		r1 = rf(ctx, traceID)
+	if rf, ok := ret.Get(1).(func(context.Context, spanstore.GetTraceParameters) error); ok {
+		r1 = rf(ctx, query)
 	} else {
 		r1 = ret.Error(1)
 	}
diff --git a/storage/spanstore/spanstoremetrics/read_metrics.go b/storage/spanstore/spanstoremetrics/read_metrics.go
index 0f4ca13d0c0..b87453cc053 100644
--- a/storage/spanstore/spanstoremetrics/read_metrics.go
+++ b/storage/spanstore/spanstoremetrics/read_metrics.go
@@ -78,9 +78,9 @@ func (m *ReadMetricsDecorator) FindTraceIDs(ctx context.Context, traceQuery *spa
 }
 
 // GetTrace implements spanstore.Reader#GetTrace
-func (m *ReadMetricsDecorator) GetTrace(ctx context.Context, traceID model.TraceID) (*model.Trace, error) {
+func (m *ReadMetricsDecorator) GetTrace(ctx context.Context, query spanstore.GetTraceParameters) (*model.Trace, error) {
 	start := time.Now()
-	retMe, err := m.spanReader.GetTrace(ctx, traceID)
+	retMe, err := m.spanReader.GetTrace(ctx, query)
 	m.getTraceMetrics.emit(err, time.Since(start), 1)
 	return retMe, err
 }
diff --git a/storage/spanstore/spanstoremetrics/read_metrics_test.go b/storage/spanstore/spanstoremetrics/read_metrics_test.go
index 8f9c40863b5..8581cbf9875 100644
--- a/storage/spanstore/spanstoremetrics/read_metrics_test.go
+++ b/storage/spanstore/spanstoremetrics/read_metrics_test.go
@@ -29,8 +29,8 @@ func TestSuccessfulUnderlyingCalls(t *testing.T) {
 	mockReader.On("GetOperations", context.Background(), operationQuery).
 		Return([]spanstore.Operation{}, nil)
 	mrs.GetOperations(context.Background(), operationQuery)
-	mockReader.On("GetTrace", context.Background(), model.TraceID{}).Return(&model.Trace{}, nil)
-	mrs.GetTrace(context.Background(), model.TraceID{})
+	mockReader.On("GetTrace", context.Background(), spanstore.GetTraceParameters{}).Return(&model.Trace{}, nil)
+	mrs.GetTrace(context.Background(), spanstore.GetTraceParameters{})
 	mockReader.On("FindTraces", context.Background(), &spanstore.TraceQueryParameters{}).
 		Return([]*model.Trace{}, nil)
 	mrs.FindTraces(context.Background(), &spanstore.TraceQueryParameters{})
@@ -97,9 +97,9 @@ func TestFailingUnderlyingCalls(t *testing.T) {
 	mockReader.On("GetOperations", context.Background(), operationQuery).
 		Return(nil, errors.New("Failure"))
 	mrs.GetOperations(context.Background(), operationQuery)
-	mockReader.On("GetTrace", context.Background(), model.TraceID{}).
+	mockReader.On("GetTrace", context.Background(), spanstore.GetTraceParameters{}).
 		Return(nil, errors.New("Failure"))
-	mrs.GetTrace(context.Background(), model.TraceID{})
+	mrs.GetTrace(context.Background(), spanstore.GetTraceParameters{})
 	mockReader.On("FindTraces", context.Background(), &spanstore.TraceQueryParameters{}).
 		Return(nil, errors.New("Failure"))
 	mrs.FindTraces(context.Background(), &spanstore.TraceQueryParameters{})
diff --git a/storage_v2/factoryadapter/reader.go b/storage_v2/factoryadapter/reader.go
index dd3f51041a1..d90a31479c8 100644
--- a/storage_v2/factoryadapter/reader.go
+++ b/storage_v2/factoryadapter/reader.go
@@ -46,9 +46,12 @@ func (tr *TraceReader) GetTraces(
 ) iter.Seq2[[]ptrace.Traces, error] {
 	return func(yield func([]ptrace.Traces, error) bool) {
 		for _, idParams := range traceIDs {
-			// TODO start/end times are not supported by v1 reader
-			// https://github.com/jaegertracing/jaeger/pull/6242
-			t, err := tr.spanReader.GetTrace(ctx, model.TraceIDFromOTEL(idParams.TraceID))
+			query := spanstore.GetTraceParameters{
+				TraceID:   model.TraceIDFromOTEL(idParams.TraceID),
+				StartTime: idParams.Start,
+				EndTime:   idParams.End,
+			}
+			t, err := tr.spanReader.GetTrace(ctx, query)
 			if err != nil {
 				if errors.Is(err, spanstore.ErrTraceNotFound) {
 					continue
diff --git a/storage_v2/factoryadapter/reader_test.go b/storage_v2/factoryadapter/reader_test.go
index ddab5192bfe..c870b6a72d9 100644
--- a/storage_v2/factoryadapter/reader_test.go
+++ b/storage_v2/factoryadapter/reader_test.go
@@ -58,7 +58,8 @@ func TestTraceReader_GetTracesDelegatesSuccessResponse(t *testing.T) {
 			},
 		},
 	}
-	sr.On("GetTrace", mock.Anything, model.NewTraceID(2, 3)).Return(modelTrace, nil)
+	expectedQuery := spanstore.GetTraceParameters{TraceID: model.NewTraceID(2, 3)}
+	sr.On("GetTrace", mock.Anything, expectedQuery).Return(modelTrace, nil)
 	traceReader := &TraceReader{
 		spanReader: sr,
 	}
diff --git a/storage_v2/factoryadapter/writer_test.go b/storage_v2/factoryadapter/writer_test.go
index df5966cd33f..68a09af6e4c 100644
--- a/storage_v2/factoryadapter/writer_test.go
+++ b/storage_v2/factoryadapter/writer_test.go
@@ -16,6 +16,7 @@ import (
 
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
+	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoreMocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 )
 
@@ -32,7 +33,8 @@ func TestWriteTraces(t *testing.T) {
 	tdID := td.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).TraceID()
 	traceID, err := model.TraceIDFromBytes(tdID[:])
 	require.NoError(t, err)
-	trace, err := memstore.GetTrace(context.Background(), traceID)
+	query := spanstore.GetTraceParameters{TraceID: traceID}
+	trace, err := memstore.GetTrace(context.Background(), query)
 	require.NoError(t, err)
 	require.NotNil(t, trace)
 	assert.Len(t, trace.Spans, 1)

From dad636be7adb8be29c8cbf984f5f06be18d661ac Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Date: Sun, 15 Dec 2024 21:59:17 -0400
Subject: [PATCH 34/59] [refactor] Rename factoryadapter to v1adapter (#6365)

## Which problem is this PR solving?
- `factoryadapter` was inaccurate name since it provides more than a
factory

## Description of the changes
- Rename `factoryadapter` package to `v1adapter`

## How was this change tested?
- CI

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
---
 cmd/all-in-one/main.go                                 |  4 ++--
 cmd/anonymizer/app/query/query_test.go                 |  4 ++--
 .../internal/extension/jaegerstorage/extension.go      |  4 ++--
 cmd/query/app/apiv3/grpc_handler_test.go               |  6 +++---
 cmd/query/app/apiv3/http_gateway_test.go               |  4 ++--
 cmd/query/app/grpc_handler_test.go                     |  6 +++---
 cmd/query/app/http_handler_test.go                     |  6 +++---
 cmd/query/app/querysvc/query_service.go                | 10 +++++-----
 cmd/query/app/querysvc/query_service_test.go           |  4 ++--
 cmd/query/app/server_test.go                           |  4 ++--
 cmd/query/app/token_propagation_test.go                |  4 ++--
 cmd/query/main.go                                      |  4 ++--
 storage_v2/{factoryadapter => v1adapter}/README.md     |  0
 storage_v2/{factoryadapter => v1adapter}/factory.go    |  2 +-
 .../{factoryadapter => v1adapter}/factory_test.go      |  2 +-
 .../{factoryadapter => v1adapter}/package_test.go      |  2 +-
 storage_v2/{factoryadapter => v1adapter}/reader.go     |  2 +-
 .../{factoryadapter => v1adapter}/reader_test.go       |  2 +-
 storage_v2/{factoryadapter => v1adapter}/writer.go     |  2 +-
 .../{factoryadapter => v1adapter}/writer_test.go       |  2 +-
 20 files changed, 37 insertions(+), 37 deletions(-)
 rename storage_v2/{factoryadapter => v1adapter}/README.md (100%)
 rename storage_v2/{factoryadapter => v1adapter}/factory.go (98%)
 rename storage_v2/{factoryadapter => v1adapter}/factory_test.go (99%)
 rename storage_v2/{factoryadapter => v1adapter}/package_test.go (90%)
 rename storage_v2/{factoryadapter => v1adapter}/reader.go (99%)
 rename storage_v2/{factoryadapter => v1adapter}/reader_test.go (99%)
 rename storage_v2/{factoryadapter => v1adapter}/writer.go (97%)
 rename storage_v2/{factoryadapter => v1adapter}/writer_test.go (98%)

diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go
index 7f31b472945..180a538c4b3 100644
--- a/cmd/all-in-one/main.go
+++ b/cmd/all-in-one/main.go
@@ -39,8 +39,8 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/storage"
 	"github.com/jaegertracing/jaeger/ports"
 	"github.com/jaegertracing/jaeger/storage_v2/depstore"
-	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
+	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 
 // all-in-one/main is a standalone full-stack jaeger backend, backed by a memory store
@@ -106,7 +106,7 @@ by default uses only in-memory database.`,
 				logger.Fatal("Failed to init storage factory", zap.Error(err))
 			}
 
-			v2Factory := factoryadapter.NewFactory(storageFactory)
+			v2Factory := v1adapter.NewFactory(storageFactory)
 			traceReader, err := v2Factory.CreateTraceReader()
 			if err != nil {
 				logger.Fatal("Failed to create span reader", zap.Error(err))
diff --git a/cmd/anonymizer/app/query/query_test.go b/cmd/anonymizer/app/query/query_test.go
index a4a7ed241dd..8f350a191a0 100644
--- a/cmd/anonymizer/app/query/query_test.go
+++ b/cmd/anonymizer/app/query/query_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
-	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
+	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 
 var (
@@ -56,7 +56,7 @@ type testServer struct {
 
 func newTestServer(t *testing.T) *testServer {
 	spanReader := &spanstoremocks.Reader{}
-	traceReader := factoryadapter.NewTraceReader(spanReader)
+	traceReader := v1adapter.NewTraceReader(spanReader)
 	metricsReader, err := disabled.NewMetricsReader()
 	require.NoError(t, err)
 
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension.go b/cmd/jaeger/internal/extension/jaegerstorage/extension.go
index c1dd68b01b7..53e29a07d7e 100644
--- a/cmd/jaeger/internal/extension/jaegerstorage/extension.go
+++ b/cmd/jaeger/internal/extension/jaegerstorage/extension.go
@@ -21,8 +21,8 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 	"github.com/jaegertracing/jaeger/storage"
-	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
+	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 
 var _ Extension = (*storageExt)(nil)
@@ -80,7 +80,7 @@ func GetTraceStoreFactory(name string, host component.Host) (tracestore.Factory,
 		return nil, err
 	}
 
-	return factoryadapter.NewFactory(f), nil
+	return v1adapter.NewFactory(f), nil
 }
 
 func findExtension(host component.Host) (Extension, error) {
diff --git a/cmd/query/app/apiv3/grpc_handler_test.go b/cmd/query/app/apiv3/grpc_handler_test.go
index ffadfbb9ac5..b40ec48e3c2 100644
--- a/cmd/query/app/apiv3/grpc_handler_test.go
+++ b/cmd/query/app/apiv3/grpc_handler_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
-	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
+	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 
 var (
@@ -58,7 +58,7 @@ func newTestServerClient(t *testing.T) *testServerClient {
 	}
 
 	q := querysvc.NewQueryService(
-		factoryadapter.NewTraceReader(tsc.reader),
+		v1adapter.NewTraceReader(tsc.reader),
 		&dependencyStoreMocks.Reader{},
 		querysvc.QueryServiceOptions{},
 	)
@@ -211,7 +211,7 @@ func TestFindTracesSendError(t *testing.T) {
 		}, nil).Once()
 	h := &Handler{
 		QueryService: querysvc.NewQueryService(
-			factoryadapter.NewTraceReader(reader),
+			v1adapter.NewTraceReader(reader),
 			new(dependencyStoreMocks.Reader),
 			querysvc.QueryServiceOptions{},
 		),
diff --git a/cmd/query/app/apiv3/http_gateway_test.go b/cmd/query/app/apiv3/http_gateway_test.go
index 4dcdbbafa9d..66fda73ef17 100644
--- a/cmd/query/app/apiv3/http_gateway_test.go
+++ b/cmd/query/app/apiv3/http_gateway_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
-	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
+	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 
 func setupHTTPGatewayNoServer(
@@ -34,7 +34,7 @@ func setupHTTPGatewayNoServer(
 		reader: &spanstoremocks.Reader{},
 	}
 
-	q := querysvc.NewQueryService(factoryadapter.NewTraceReader(gw.reader),
+	q := querysvc.NewQueryService(v1adapter.NewTraceReader(gw.reader),
 		&dependencyStoreMocks.Reader{},
 		querysvc.QueryServiceOptions{},
 	)
diff --git a/cmd/query/app/grpc_handler_test.go b/cmd/query/app/grpc_handler_test.go
index b3c8b93e5ba..aeaecf4be80 100644
--- a/cmd/query/app/grpc_handler_test.go
+++ b/cmd/query/app/grpc_handler_test.go
@@ -34,7 +34,7 @@ import (
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 	depsmocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
-	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
+	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 
 var (
@@ -950,7 +950,7 @@ func initializeTenantedTestServerGRPCWithOptions(t *testing.T, tm *tenancy.Manag
 	require.NoError(t, err)
 
 	q := querysvc.NewQueryService(
-		factoryadapter.NewTraceReader(spanReader),
+		v1adapter.NewTraceReader(spanReader),
 		dependencyReader,
 		querysvc.QueryServiceOptions{
 			ArchiveSpanReader: archiveSpanReader,
@@ -1214,7 +1214,7 @@ func TestNewGRPCHandlerWithEmptyOptions(t *testing.T) {
 	require.NoError(t, err)
 
 	q := querysvc.NewQueryService(
-		factoryadapter.NewTraceReader(&spanstoremocks.Reader{}),
+		v1adapter.NewTraceReader(&spanstoremocks.Reader{}),
 		&depsmocks.Reader{},
 		querysvc.QueryServiceOptions{})
 
diff --git a/cmd/query/app/http_handler_test.go b/cmd/query/app/http_handler_test.go
index 6c09caa155f..126e4c194bb 100644
--- a/cmd/query/app/http_handler_test.go
+++ b/cmd/query/app/http_handler_test.go
@@ -42,7 +42,7 @@ import (
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 	depsmocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
-	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
+	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 
 const millisToNanosMultiplier = int64(time.Millisecond / time.Nanosecond)
@@ -122,7 +122,7 @@ func initializeTestServerWithOptions(
 	options = append(options, HandlerOptions.Logger(zaptest.NewLogger(t)))
 	readStorage := &spanstoremocks.Reader{}
 	dependencyStorage := &depsmocks.Reader{}
-	traceReader := factoryadapter.NewTraceReader(readStorage)
+	traceReader := v1adapter.NewTraceReader(readStorage)
 	qs := querysvc.NewQueryService(traceReader, dependencyStorage, queryOptions)
 	r := NewRouter()
 	apiHandler := NewAPIHandler(qs, options...)
@@ -202,7 +202,7 @@ func TestLogOnServerError(t *testing.T) {
 	zapCore, logs := observer.New(zap.InfoLevel)
 	logger := zap.New(zapCore)
 	readStorage := &spanstoremocks.Reader{}
-	traceReader := factoryadapter.NewTraceReader(readStorage)
+	traceReader := v1adapter.NewTraceReader(readStorage)
 	dependencyStorage := &depsmocks.Reader{}
 	qs := querysvc.NewQueryService(traceReader, dependencyStorage, querysvc.QueryServiceOptions{})
 	h := NewAPIHandler(qs, HandlerOptions.Logger(logger))
diff --git a/cmd/query/app/querysvc/query_service.go b/cmd/query/app/querysvc/query_service.go
index 02abd07074a..724a2536583 100644
--- a/cmd/query/app/querysvc/query_service.go
+++ b/cmd/query/app/querysvc/query_service.go
@@ -15,8 +15,8 @@ import (
 	"github.com/jaegertracing/jaeger/storage"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	"github.com/jaegertracing/jaeger/storage_v2/depstore"
-	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
+	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 
 var errNoArchiveSpanStorage = errors.New("archive span storage was not configured")
@@ -63,7 +63,7 @@ func NewQueryService(traceReader tracestore.Reader, dependencyReader depstore.Re
 
 // GetTrace is the queryService implementation of spanstore.Reader.GetTrace
 func (qs QueryService) GetTrace(ctx context.Context, query spanstore.GetTraceParameters) (*model.Trace, error) {
-	spanReader, err := factoryadapter.GetV1Reader(qs.traceReader)
+	spanReader, err := v1adapter.GetV1Reader(qs.traceReader)
 	if err != nil {
 		return nil, err
 	}
@@ -79,7 +79,7 @@ func (qs QueryService) GetTrace(ctx context.Context, query spanstore.GetTracePar
 
 // GetServices is the queryService implementation of spanstore.Reader.GetServices
 func (qs QueryService) GetServices(ctx context.Context) ([]string, error) {
-	spanReader, err := factoryadapter.GetV1Reader(qs.traceReader)
+	spanReader, err := v1adapter.GetV1Reader(qs.traceReader)
 	if err != nil {
 		return nil, err
 	}
@@ -91,7 +91,7 @@ func (qs QueryService) GetOperations(
 	ctx context.Context,
 	query spanstore.OperationQueryParameters,
 ) ([]spanstore.Operation, error) {
-	spanReader, err := factoryadapter.GetV1Reader(qs.traceReader)
+	spanReader, err := v1adapter.GetV1Reader(qs.traceReader)
 	if err != nil {
 		return nil, err
 	}
@@ -100,7 +100,7 @@ func (qs QueryService) GetOperations(
 
 // FindTraces is the queryService implementation of spanstore.Reader.FindTraces
 func (qs QueryService) FindTraces(ctx context.Context, query *spanstore.TraceQueryParameters) ([]*model.Trace, error) {
-	spanReader, err := factoryadapter.GetV1Reader(qs.traceReader)
+	spanReader, err := v1adapter.GetV1Reader(qs.traceReader)
 	if err != nil {
 		return nil, err
 	}
diff --git a/cmd/query/app/querysvc/query_service_test.go b/cmd/query/app/querysvc/query_service_test.go
index 10a3b21e5af..2b1176cf96f 100644
--- a/cmd/query/app/querysvc/query_service_test.go
+++ b/cmd/query/app/querysvc/query_service_test.go
@@ -24,8 +24,8 @@ import (
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 	"github.com/jaegertracing/jaeger/storage_v2/depstore"
 	depsmocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
-	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 	tracestoremocks "github.com/jaegertracing/jaeger/storage_v2/tracestore/mocks"
+	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 
 const millisToNanosMultiplier = int64(time.Millisecond / time.Nanosecond)
@@ -90,7 +90,7 @@ func withAdjuster() testOption {
 
 func initializeTestService(optionAppliers ...testOption) *testQueryService {
 	readStorage := &spanstoremocks.Reader{}
-	traceReader := factoryadapter.NewTraceReader(readStorage)
+	traceReader := v1adapter.NewTraceReader(readStorage)
 	dependencyStorage := &depsmocks.Reader{}
 
 	options := QueryServiceOptions{}
diff --git a/cmd/query/app/server_test.go b/cmd/query/app/server_test.go
index f12723439a6..6a5a625bec6 100644
--- a/cmd/query/app/server_test.go
+++ b/cmd/query/app/server_test.go
@@ -42,7 +42,7 @@ import (
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 	depsmocks "github.com/jaegertracing/jaeger/storage_v2/depstore/mocks"
-	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
+	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 
 var testCertKeyLocation = "../../../pkg/config/tlscfg/testdata"
@@ -324,7 +324,7 @@ type fakeQueryService struct {
 
 func makeQuerySvc() *fakeQueryService {
 	spanReader := &spanstoremocks.Reader{}
-	traceReader := factoryadapter.NewTraceReader(spanReader)
+	traceReader := v1adapter.NewTraceReader(spanReader)
 	dependencyReader := &depsmocks.Reader{}
 	expectedServices := []string{"test"}
 	spanReader.On("GetServices", mock.AnythingOfType("*context.valueCtx")).Return(expectedServices, nil)
diff --git a/cmd/query/app/token_propagation_test.go b/cmd/query/app/token_propagation_test.go
index 0a48802f37b..333904d7b0a 100644
--- a/cmd/query/app/token_propagation_test.go
+++ b/cmd/query/app/token_propagation_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/plugin/storage/es"
 	"github.com/jaegertracing/jaeger/ports"
-	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
+	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 
 const (
@@ -86,7 +86,7 @@ func runQueryService(t *testing.T, esURL string) *Server {
 
 	spanReader, err := f.CreateSpanReader()
 	require.NoError(t, err)
-	traceReader := factoryadapter.NewTraceReader(spanReader)
+	traceReader := v1adapter.NewTraceReader(spanReader)
 
 	querySvc := querysvc.NewQueryService(traceReader, nil, querysvc.QueryServiceOptions{})
 	server, err := NewServer(context.Background(), querySvc, nil,
diff --git a/cmd/query/main.go b/cmd/query/main.go
index 1b8b353a7ae..a2250c9f6a1 100644
--- a/cmd/query/main.go
+++ b/cmd/query/main.go
@@ -32,7 +32,7 @@ import (
 	metricsPlugin "github.com/jaegertracing/jaeger/plugin/metricstore"
 	"github.com/jaegertracing/jaeger/plugin/storage"
 	"github.com/jaegertracing/jaeger/ports"
-	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
+	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 
 func main() {
@@ -92,7 +92,7 @@ func main() {
 				logger.Fatal("Failed to init storage factory", zap.Error(err))
 			}
 
-			v2Factory := factoryadapter.NewFactory(storageFactory)
+			v2Factory := v1adapter.NewFactory(storageFactory)
 			traceReader, err := v2Factory.CreateTraceReader()
 			if err != nil {
 				logger.Fatal("Failed to create trace reader", zap.Error(err))
diff --git a/storage_v2/factoryadapter/README.md b/storage_v2/v1adapter/README.md
similarity index 100%
rename from storage_v2/factoryadapter/README.md
rename to storage_v2/v1adapter/README.md
diff --git a/storage_v2/factoryadapter/factory.go b/storage_v2/v1adapter/factory.go
similarity index 98%
rename from storage_v2/factoryadapter/factory.go
rename to storage_v2/v1adapter/factory.go
index 1eaaea146ed..243fccebf65 100644
--- a/storage_v2/factoryadapter/factory.go
+++ b/storage_v2/v1adapter/factory.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package factoryadapter
+package v1adapter
 
 import (
 	"context"
diff --git a/storage_v2/factoryadapter/factory_test.go b/storage_v2/v1adapter/factory_test.go
similarity index 99%
rename from storage_v2/factoryadapter/factory_test.go
rename to storage_v2/v1adapter/factory_test.go
index d8794adf327..6222138e435 100644
--- a/storage_v2/factoryadapter/factory_test.go
+++ b/storage_v2/v1adapter/factory_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package factoryadapter
+package v1adapter
 
 import (
 	"context"
diff --git a/storage_v2/factoryadapter/package_test.go b/storage_v2/v1adapter/package_test.go
similarity index 90%
rename from storage_v2/factoryadapter/package_test.go
rename to storage_v2/v1adapter/package_test.go
index 086d725c713..d97d8a197a2 100644
--- a/storage_v2/factoryadapter/package_test.go
+++ b/storage_v2/v1adapter/package_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package factoryadapter
+package v1adapter
 
 import (
 	"testing"
diff --git a/storage_v2/factoryadapter/reader.go b/storage_v2/v1adapter/reader.go
similarity index 99%
rename from storage_v2/factoryadapter/reader.go
rename to storage_v2/v1adapter/reader.go
index d90a31479c8..a3d2293dd25 100644
--- a/storage_v2/factoryadapter/reader.go
+++ b/storage_v2/v1adapter/reader.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package factoryadapter
+package v1adapter
 
 import (
 	"context"
diff --git a/storage_v2/factoryadapter/reader_test.go b/storage_v2/v1adapter/reader_test.go
similarity index 99%
rename from storage_v2/factoryadapter/reader_test.go
rename to storage_v2/v1adapter/reader_test.go
index c870b6a72d9..c142ee99c13 100644
--- a/storage_v2/factoryadapter/reader_test.go
+++ b/storage_v2/v1adapter/reader_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package factoryadapter
+package v1adapter
 
 import (
 	"context"
diff --git a/storage_v2/factoryadapter/writer.go b/storage_v2/v1adapter/writer.go
similarity index 97%
rename from storage_v2/factoryadapter/writer.go
rename to storage_v2/v1adapter/writer.go
index a36355d7a89..c0a9d4ced99 100644
--- a/storage_v2/factoryadapter/writer.go
+++ b/storage_v2/v1adapter/writer.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package factoryadapter
+package v1adapter
 
 import (
 	"context"
diff --git a/storage_v2/factoryadapter/writer_test.go b/storage_v2/v1adapter/writer_test.go
similarity index 98%
rename from storage_v2/factoryadapter/writer_test.go
rename to storage_v2/v1adapter/writer_test.go
index 68a09af6e4c..bc00c7ae0bd 100644
--- a/storage_v2/factoryadapter/writer_test.go
+++ b/storage_v2/v1adapter/writer_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package factoryadapter
+package v1adapter
 
 import (
 	"context"

From ef799d10d440580db4a465f9a3ee9427c8cf989e Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Sun, 15 Dec 2024 21:53:50 -0500
Subject: [PATCH 35/59] [v2][adjuster] Rework adjuster interface and refactor
 adjusters to return implemented struct (#6362)

## Which problem is this PR solving?
- Towards #6344

## Description of the changes
- This PR performs the following refactorings to the adjuster package
  - Remove the `Func` alias
- Change the implemented adjusters to return a struct that implements
the Adjuster interface
- Change the interface to only return an error to indicate that traces
are modified in place
  - Move the warnings utility to `cmd/query/app/internal/jotlp`

## How was this change tested?
- CI and unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/query/app/querysvc/adjuster/adjuster.go   | 27 ++++-------
 .../app/querysvc/adjuster/adjuster_test.go    | 43 ++++++++---------
 .../app/querysvc/adjuster/ipattribute.go      | 41 +++++++++--------
 .../app/querysvc/adjuster/ipattribute_test.go |  4 +-
 .../querysvc/adjuster/resourceattributes.go   |  7 +--
 .../adjuster/resourceattributes_test.go       | 35 +++++++-------
 cmd/query/app/querysvc/adjuster/spanlinks.go  | 43 ++++++++---------
 .../app/querysvc/adjuster/spanlinks_test.go   |  8 ++--
 cmd/query/app/querysvc/adjuster/warning.go    | 23 ----------
 internal/jptrace/package_test.go              | 14 ++++++
 internal/jptrace/warning.go                   | 39 ++++++++++++++++
 .../jptrace}/warning_test.go                  | 46 +++++++++++++++++--
 12 files changed, 195 insertions(+), 135 deletions(-)
 delete mode 100644 cmd/query/app/querysvc/adjuster/warning.go
 create mode 100644 internal/jptrace/package_test.go
 create mode 100644 internal/jptrace/warning.go
 rename {cmd/query/app/querysvc/adjuster => internal/jptrace}/warning_test.go (54%)

diff --git a/cmd/query/app/querysvc/adjuster/adjuster.go b/cmd/query/app/querysvc/adjuster/adjuster.go
index e6c4f4039fb..33b8de79d91 100644
--- a/cmd/query/app/querysvc/adjuster/adjuster.go
+++ b/cmd/query/app/querysvc/adjuster/adjuster.go
@@ -9,20 +9,12 @@ import (
 	"go.opentelemetry.io/collector/pdata/ptrace"
 )
 
-// Adjuster defines an interface for modifying a trace object.
-// It returns the adjusted trace object, which is also updated in place.
-// If the adjuster encounters an issue that prevents it from applying
-// modifications, it should return the original trace object along with an error.
+// Adjuster is an interface for modifying a trace object in place.
+// If an issue is encountered that prevents modifications, an error should be returned.
+// The caller must ensure that all spans in the ptrace.Traces argument
+// belong to the same trace and represent the complete trace.
 type Adjuster interface {
-	Adjust(ptrace.Traces) (ptrace.Traces, error)
-}
-
-// Func is a type alias that wraps a function and makes an Adjuster from it.
-type Func func(traces ptrace.Traces) (ptrace.Traces, error)
-
-// Adjust implements Adjuster interface for the Func alias.
-func (f Func) Adjust(traces ptrace.Traces) (ptrace.Traces, error) {
-	return f(traces)
+	Adjust(ptrace.Traces) error
 }
 
 // Sequence creates an adjuster that combines a series of adjusters
@@ -44,17 +36,16 @@ type sequence struct {
 	failFast  bool
 }
 
-func (c sequence) Adjust(traces ptrace.Traces) (ptrace.Traces, error) {
+func (c sequence) Adjust(traces ptrace.Traces) error {
 	var errs []error
 	for _, adjuster := range c.adjusters {
-		var err error
-		traces, err = adjuster.Adjust(traces)
+		err := adjuster.Adjust(traces)
 		if err != nil {
 			if c.failFast {
-				return traces, err
+				return err
 			}
 			errs = append(errs, err)
 		}
 	}
-	return traces, errors.Join(errs...)
+	return errors.Join(errs...)
 }
diff --git a/cmd/query/app/querysvc/adjuster/adjuster_test.go b/cmd/query/app/querysvc/adjuster/adjuster_test.go
index 96cd4336988..fbc5804ed9e 100644
--- a/cmd/query/app/querysvc/adjuster/adjuster_test.go
+++ b/cmd/query/app/querysvc/adjuster/adjuster_test.go
@@ -4,7 +4,6 @@
 package adjuster_test
 
 import (
-	"errors"
 	"fmt"
 	"testing"
 
@@ -16,21 +15,23 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc/adjuster"
 )
 
-func TestSequences(t *testing.T) {
-	// mock adjuster that increments last byte of span ID
-	adj := adjuster.Func(func(trace ptrace.Traces) (ptrace.Traces, error) {
-		span := trace.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
-		spanId := span.SpanID()
-		spanId[7]++
-		span.SetSpanID(spanId)
-		return trace, nil
-	})
+type mockAdjuster struct{}
+
+func (mockAdjuster) Adjust(traces ptrace.Traces) error {
+	span := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
+	spanId := span.SpanID()
+	spanId[7]++
+	span.SetSpanID(spanId)
+	return nil
+}
+
+type mockAdjusterError struct{}
 
-	adjErr := errors.New("mock adjuster error")
-	failingAdj := adjuster.Func(func(trace ptrace.Traces) (ptrace.Traces, error) {
-		return trace, adjErr
-	})
+func (mockAdjusterError) Adjust(ptrace.Traces) error {
+	return assert.AnError
+}
 
+func TestSequences(t *testing.T) {
 	tests := []struct {
 		name       string
 		adjuster   adjuster.Adjuster
@@ -39,14 +40,14 @@ func TestSequences(t *testing.T) {
 	}{
 		{
 			name:       "normal sequence",
-			adjuster:   adjuster.Sequence(adj, failingAdj, adj, failingAdj),
-			err:        fmt.Sprintf("%s\n%s", adjErr, adjErr),
+			adjuster:   adjuster.Sequence(mockAdjuster{}, mockAdjusterError{}, mockAdjuster{}, mockAdjusterError{}),
+			err:        fmt.Sprintf("%s\n%s", assert.AnError, assert.AnError),
 			lastSpanID: [8]byte{0, 0, 0, 0, 0, 0, 0, 2},
 		},
 		{
 			name:       "fail fast sequence",
-			adjuster:   adjuster.FailFastSequence(adj, failingAdj, adj, failingAdj),
-			err:        adjErr.Error(),
+			adjuster:   adjuster.FailFastSequence(mockAdjuster{}, mockAdjusterError{}, mockAdjuster{}, mockAdjusterError{}),
+			err:        assert.AnError.Error(),
 			lastSpanID: [8]byte{0, 0, 0, 0, 0, 0, 0, 1},
 		},
 	}
@@ -57,12 +58,12 @@ func TestSequences(t *testing.T) {
 			span := trace.ResourceSpans().AppendEmpty().ScopeSpans().AppendEmpty().Spans().AppendEmpty()
 			span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 0})
 
-			adjTrace, err := test.adjuster.Adjust(trace)
-			adjTraceSpan := adjTrace.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
+			err := test.adjuster.Adjust(trace)
+			require.EqualError(t, err, test.err)
 
+			adjTraceSpan := trace.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
 			assert.Equal(t, span, adjTraceSpan)
 			assert.EqualValues(t, test.lastSpanID, span.SpanID())
-			require.EqualError(t, err, test.err)
 		})
 	}
 }
diff --git a/cmd/query/app/querysvc/adjuster/ipattribute.go b/cmd/query/app/querysvc/adjuster/ipattribute.go
index 0ddb9b45447..4dcd70bd888 100644
--- a/cmd/query/app/querysvc/adjuster/ipattribute.go
+++ b/cmd/query/app/querysvc/adjuster/ipattribute.go
@@ -20,30 +20,31 @@ var ipAttributesToCorrect = map[string]struct{}{
 // IPAttribute returns an adjuster that replaces numeric "ip" attributes,
 // which usually contain IPv4 packed into uint32, with their string
 // representation (e.g. "8.8.8.8"").
-func IPAttribute() Adjuster {
-	return Func(func(traces ptrace.Traces) (ptrace.Traces, error) {
-		adjuster := ipAttributeAdjuster{}
-		resourceSpans := traces.ResourceSpans()
-		for i := 0; i < resourceSpans.Len(); i++ {
-			rs := resourceSpans.At(i)
-			adjuster.adjust(rs.Resource().Attributes())
-			scopeSpans := rs.ScopeSpans()
-			for j := 0; j < scopeSpans.Len(); j++ {
-				ss := scopeSpans.At(j)
-				spans := ss.Spans()
-				for k := 0; k < spans.Len(); k++ {
-					span := spans.At(k)
-					adjuster.adjust(span.Attributes())
-				}
+func IPAttribute() IPAttributeAdjuster {
+	return IPAttributeAdjuster{}
+}
+
+type IPAttributeAdjuster struct{}
+
+func (ia IPAttributeAdjuster) Adjust(traces ptrace.Traces) error {
+	resourceSpans := traces.ResourceSpans()
+	for i := 0; i < resourceSpans.Len(); i++ {
+		rs := resourceSpans.At(i)
+		ia.adjustAttributes(rs.Resource().Attributes())
+		scopeSpans := rs.ScopeSpans()
+		for j := 0; j < scopeSpans.Len(); j++ {
+			ss := scopeSpans.At(j)
+			spans := ss.Spans()
+			for k := 0; k < spans.Len(); k++ {
+				span := spans.At(k)
+				ia.adjustAttributes(span.Attributes())
 			}
 		}
-		return traces, nil
-	})
+	}
+	return nil
 }
 
-type ipAttributeAdjuster struct{}
-
-func (ipAttributeAdjuster) adjust(attributes pcommon.Map) {
+func (IPAttributeAdjuster) adjustAttributes(attributes pcommon.Map) {
 	adjusted := make(map[string]string)
 	attributes.Range(func(k string, v pcommon.Value) bool {
 		if _, ok := ipAttributesToCorrect[k]; !ok {
diff --git a/cmd/query/app/querysvc/adjuster/ipattribute_test.go b/cmd/query/app/querysvc/adjuster/ipattribute_test.go
index cfd9ddeea26..e55a9dd8bdc 100644
--- a/cmd/query/app/querysvc/adjuster/ipattribute_test.go
+++ b/cmd/query/app/querysvc/adjuster/ipattribute_test.go
@@ -58,10 +58,10 @@ func TestIPAttributeAdjuster(t *testing.T) {
 		}
 	}
 
-	trace, err := IPAttribute().Adjust(traces)
+	err := IPAttribute().Adjust(traces)
 	require.NoError(t, err)
 
-	resourceSpan := trace.ResourceSpans().At(0)
+	resourceSpan := traces.ResourceSpans().At(0)
 	assert.Equal(t, 3, resourceSpan.Resource().Attributes().Len())
 
 	assertAttribute(resourceSpan.Resource().Attributes(), "a", 42)
diff --git a/cmd/query/app/querysvc/adjuster/resourceattributes.go b/cmd/query/app/querysvc/adjuster/resourceattributes.go
index 0c3cd6d512f..356cd4f800f 100644
--- a/cmd/query/app/querysvc/adjuster/resourceattributes.go
+++ b/cmd/query/app/querysvc/adjuster/resourceattributes.go
@@ -7,6 +7,7 @@ import (
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
+	"github.com/jaegertracing/jaeger/internal/jptrace"
 	"github.com/jaegertracing/jaeger/pkg/otelsemconv"
 )
 
@@ -28,7 +29,7 @@ func ResourceAttributes() ResourceAttributesAdjuster {
 
 type ResourceAttributesAdjuster struct{}
 
-func (o ResourceAttributesAdjuster) Adjust(traces ptrace.Traces) (ptrace.Traces, error) {
+func (o ResourceAttributesAdjuster) Adjust(traces ptrace.Traces) error {
 	resourceSpans := traces.ResourceSpans()
 	for i := 0; i < resourceSpans.Len(); i++ {
 		rs := resourceSpans.At(i)
@@ -43,7 +44,7 @@ func (o ResourceAttributesAdjuster) Adjust(traces ptrace.Traces) (ptrace.Traces,
 			}
 		}
 	}
-	return traces, nil
+	return nil
 }
 
 func (ResourceAttributesAdjuster) moveAttributes(span ptrace.Span, resource pcommon.Resource) {
@@ -57,7 +58,7 @@ func (ResourceAttributesAdjuster) moveAttributes(span ptrace.Span, resource pcom
 	for k, v := range replace {
 		existing, ok := resource.Attributes().Get(k)
 		if ok && existing.AsRaw() != v.AsRaw() {
-			addWarning(span, "conflicting values between Span and Resource for attribute "+k)
+			jptrace.AddWarning(span, "conflicting values between Span and Resource for attribute "+k)
 			continue
 		}
 		v.CopyTo(resource.Attributes().PutEmpty(k))
diff --git a/cmd/query/app/querysvc/adjuster/resourceattributes_test.go b/cmd/query/app/querysvc/adjuster/resourceattributes_test.go
index 0d445671ad0..5dc5c438133 100644
--- a/cmd/query/app/querysvc/adjuster/resourceattributes_test.go
+++ b/cmd/query/app/querysvc/adjuster/resourceattributes_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
+	"github.com/jaegertracing/jaeger/internal/jptrace"
 	"github.com/jaegertracing/jaeger/pkg/otelsemconv"
 )
 
@@ -25,10 +26,9 @@ func TestResourceAttributesAdjuster_SpanWithLibraryAttributes(t *testing.T) {
 	span.Attributes().PutStr("another_key", "another_value")
 
 	adjuster := ResourceAttributes()
-	result, err := adjuster.Adjust(traces)
-	require.NoError(t, err)
+	require.NoError(t, adjuster.Adjust(traces))
 
-	resultSpanAttributes := result.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
+	resultSpanAttributes := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
 	require.Equal(t, 2, resultSpanAttributes.Len())
 	val, ok := resultSpanAttributes.Get("random_key")
 	require.True(t, ok)
@@ -38,7 +38,7 @@ func TestResourceAttributesAdjuster_SpanWithLibraryAttributes(t *testing.T) {
 	require.True(t, ok)
 	require.Equal(t, "another_value", val.Str())
 
-	resultResourceAttributes := result.ResourceSpans().At(0).Resource().Attributes()
+	resultResourceAttributes := traces.ResourceSpans().At(0).Resource().Attributes()
 
 	val, ok = resultResourceAttributes.Get(string(otelsemconv.TelemetrySDKLanguageKey))
 	require.True(t, ok)
@@ -68,10 +68,9 @@ func TestResourceAttributesAdjuster_SpanWithoutLibraryAttributes(t *testing.T) {
 	span.Attributes().PutStr("random_key", "random_value")
 
 	adjuster := ResourceAttributes()
-	result, err := adjuster.Adjust(traces)
-	require.NoError(t, err)
+	require.NoError(t, adjuster.Adjust(traces))
 
-	resultSpanAttributes := result.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
+	resultSpanAttributes := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
 	require.Equal(t, 1, resultSpanAttributes.Len())
 	val, ok := resultSpanAttributes.Get("random_key")
 	require.True(t, ok)
@@ -87,10 +86,10 @@ func TestResourceAttributesAdjuster_SpanWithConflictingLibraryAttributes(t *test
 	span.Attributes().PutStr(string(otelsemconv.TelemetrySDKLanguageKey), "Java")
 
 	adjuster := ResourceAttributes()
-	result, err := adjuster.Adjust(traces)
-	require.NoError(t, err)
+	require.NoError(t, adjuster.Adjust(traces))
 
-	resultSpanAttributes := result.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
+	resultSpan := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
+	resultSpanAttributes := resultSpan.Attributes()
 	require.Equal(t, 3, resultSpanAttributes.Len())
 	val, ok := resultSpanAttributes.Get("random_key")
 	require.True(t, ok)
@@ -101,13 +100,12 @@ func TestResourceAttributesAdjuster_SpanWithConflictingLibraryAttributes(t *test
 	require.True(t, ok)
 	require.Equal(t, "Java", val.Str())
 
-	val, ok = resultSpanAttributes.Get("jaeger.adjuster.warning")
+	warnings := jptrace.GetWarnings(resultSpan)
 	require.True(t, ok)
-	warnings := val.Slice()
-	require.Equal(t, 1, warnings.Len())
-	require.Equal(t, "conflicting values between Span and Resource for attribute telemetry.sdk.language", warnings.At(0).Str())
+	require.Len(t, warnings, 1)
+	require.Equal(t, "conflicting values between Span and Resource for attribute telemetry.sdk.language", warnings[0])
 
-	resultResourceAttributes := result.ResourceSpans().At(0).Resource().Attributes()
+	resultResourceAttributes := traces.ResourceSpans().At(0).Resource().Attributes()
 	val, ok = resultResourceAttributes.Get(string(otelsemconv.TelemetrySDKLanguageKey))
 	require.True(t, ok)
 	require.Equal(t, "Go", val.Str())
@@ -122,16 +120,15 @@ func TestResourceAttributesAdjuster_SpanWithNonConflictingLibraryAttributes(t *t
 	span.Attributes().PutStr(string(otelsemconv.TelemetrySDKLanguageKey), "Go")
 
 	adjuster := ResourceAttributes()
-	result, err := adjuster.Adjust(traces)
-	require.NoError(t, err)
+	require.NoError(t, adjuster.Adjust(traces))
 
-	resultSpanAttributes := result.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
+	resultSpanAttributes := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
 	require.Equal(t, 1, resultSpanAttributes.Len())
 	val, ok := resultSpanAttributes.Get("random_key")
 	require.True(t, ok)
 	require.Equal(t, "random_value", val.Str())
 
-	resultResourceAttributes := result.ResourceSpans().At(0).Resource().Attributes()
+	resultResourceAttributes := traces.ResourceSpans().At(0).Resource().Attributes()
 	val, ok = resultResourceAttributes.Get(string(otelsemconv.TelemetrySDKLanguageKey))
 	require.True(t, ok)
 	require.Equal(t, "Go", val.Str())
diff --git a/cmd/query/app/querysvc/adjuster/spanlinks.go b/cmd/query/app/querysvc/adjuster/spanlinks.go
index bb93dc1f9c3..d58ad63ab39 100644
--- a/cmd/query/app/querysvc/adjuster/spanlinks.go
+++ b/cmd/query/app/querysvc/adjuster/spanlinks.go
@@ -8,35 +8,36 @@ import (
 )
 
 // SpanLinks creates an adjuster that removes span links with empty trace IDs.
-func SpanLinks() Adjuster {
-	return Func(func(traces ptrace.Traces) (ptrace.Traces, error) {
-		adjuster := linksAdjuster{}
-		resourceSpans := traces.ResourceSpans()
-		for i := 0; i < resourceSpans.Len(); i++ {
-			rs := resourceSpans.At(i)
-			scopeSpans := rs.ScopeSpans()
-			for j := 0; j < scopeSpans.Len(); j++ {
-				ss := scopeSpans.At(j)
-				spans := ss.Spans()
-				for k := 0; k < spans.Len(); k++ {
-					span := spans.At(k)
-					adjuster.adjust(span)
-				}
+func SpanLinks() LinksAdjuster {
+	return LinksAdjuster{}
+}
+
+type LinksAdjuster struct{}
+
+func (la LinksAdjuster) Adjust(traces ptrace.Traces) error {
+	resourceSpans := traces.ResourceSpans()
+	for i := 0; i < resourceSpans.Len(); i++ {
+		rs := resourceSpans.At(i)
+		scopeSpans := rs.ScopeSpans()
+		for j := 0; j < scopeSpans.Len(); j++ {
+			ss := scopeSpans.At(j)
+			spans := ss.Spans()
+			for k := 0; k < spans.Len(); k++ {
+				span := spans.At(k)
+				la.adjust(span)
 			}
 		}
-		return traces, nil
-	})
+	}
+	return nil
 }
 
-type linksAdjuster struct{}
-
 // adjust removes invalid links from a span.
-func (l linksAdjuster) adjust(span ptrace.Span) {
+func (la LinksAdjuster) adjust(span ptrace.Span) {
 	links := span.Links()
 	validLinks := ptrace.NewSpanLinkSlice()
 	for i := 0; i < links.Len(); i++ {
 		link := links.At(i)
-		if l.valid(link) {
+		if la.valid(link) {
 			newLink := validLinks.AppendEmpty()
 			link.CopyTo(newLink)
 		}
@@ -45,6 +46,6 @@ func (l linksAdjuster) adjust(span ptrace.Span) {
 }
 
 // valid checks if a span link's TraceID is not empty.
-func (linksAdjuster) valid(link ptrace.SpanLink) bool {
+func (LinksAdjuster) valid(link ptrace.SpanLink) bool {
 	return !link.TraceID().IsEmpty()
 }
diff --git a/cmd/query/app/querysvc/adjuster/spanlinks_test.go b/cmd/query/app/querysvc/adjuster/spanlinks_test.go
index 9d64b5c8531..af687e50bc4 100644
--- a/cmd/query/app/querysvc/adjuster/spanlinks_test.go
+++ b/cmd/query/app/querysvc/adjuster/spanlinks_test.go
@@ -13,8 +13,8 @@ import (
 )
 
 func TestLinksAdjuster(t *testing.T) {
-	trace := ptrace.NewTraces()
-	resourceSpans := trace.ResourceSpans().AppendEmpty()
+	traces := ptrace.NewTraces()
+	resourceSpans := traces.ResourceSpans().AppendEmpty()
 	scopeSpans := resourceSpans.ScopeSpans().AppendEmpty()
 
 	// span with no links
@@ -30,8 +30,8 @@ func TestLinksAdjuster(t *testing.T) {
 	spanB.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}))
 	spanB.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}))
 
-	trace, err := SpanLinks().Adjust(trace)
-	spans := trace.ResourceSpans().At(0).ScopeSpans().At(0).Spans()
+	err := SpanLinks().Adjust(traces)
+	spans := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans()
 	require.NoError(t, err)
 	assert.Equal(t, 0, spans.At(0).Links().Len())
 	assert.Equal(t, 0, spans.At(1).Links().Len())
diff --git a/cmd/query/app/querysvc/adjuster/warning.go b/cmd/query/app/querysvc/adjuster/warning.go
deleted file mode 100644
index e7f1331bfab..00000000000
--- a/cmd/query/app/querysvc/adjuster/warning.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2024 The Jaeger Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package adjuster
-
-import (
-	"go.opentelemetry.io/collector/pdata/pcommon"
-	"go.opentelemetry.io/collector/pdata/ptrace"
-)
-
-const (
-	adjusterWarningAttribute = "jaeger.adjuster.warning"
-)
-
-func addWarning(span ptrace.Span, warning string) {
-	var warnings pcommon.Slice
-	if currWarnings, ok := span.Attributes().Get(adjusterWarningAttribute); ok {
-		warnings = currWarnings.Slice()
-	} else {
-		warnings = span.Attributes().PutEmptySlice(adjusterWarningAttribute)
-	}
-	warnings.AppendEmpty().SetStr(warning)
-}
diff --git a/internal/jptrace/package_test.go b/internal/jptrace/package_test.go
new file mode 100644
index 00000000000..c86c58d3df0
--- /dev/null
+++ b/internal/jptrace/package_test.go
@@ -0,0 +1,14 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package jptrace
+
+import (
+	"testing"
+
+	"github.com/jaegertracing/jaeger/pkg/testutils"
+)
+
+func TestMain(m *testing.M) {
+	testutils.VerifyGoLeaks(m)
+}
diff --git a/internal/jptrace/warning.go b/internal/jptrace/warning.go
new file mode 100644
index 00000000000..0d96296c214
--- /dev/null
+++ b/internal/jptrace/warning.go
@@ -0,0 +1,39 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package jptrace
+
+import (
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+)
+
+const (
+	// WarningsAttribute is the name of the span attribute where we can
+	// store various warnings produced from transformations,
+	// such as inbound sanitizers and outbound adjusters.
+	// The value type of the attribute is a string slice.
+	warningsAttribute = "jaeger.internal.warnings"
+)
+
+func AddWarning(span ptrace.Span, warning string) {
+	var warnings pcommon.Slice
+	if currWarnings, ok := span.Attributes().Get(warningsAttribute); ok {
+		warnings = currWarnings.Slice()
+	} else {
+		warnings = span.Attributes().PutEmptySlice(warningsAttribute)
+	}
+	warnings.AppendEmpty().SetStr(warning)
+}
+
+func GetWarnings(span ptrace.Span) []string {
+	if w, ok := span.Attributes().Get(warningsAttribute); ok {
+		warnings := []string{}
+		ws := w.Slice()
+		for i := 0; i < ws.Len(); i++ {
+			warnings = append(warnings, ws.At(i).Str())
+		}
+		return warnings
+	}
+	return nil
+}
diff --git a/cmd/query/app/querysvc/adjuster/warning_test.go b/internal/jptrace/warning_test.go
similarity index 54%
rename from cmd/query/app/querysvc/adjuster/warning_test.go
rename to internal/jptrace/warning_test.go
index 209d794e639..b8e3c38032c 100644
--- a/cmd/query/app/querysvc/adjuster/warning_test.go
+++ b/internal/jptrace/warning_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package adjuster
+package jptrace
 
 import (
 	"testing"
@@ -41,13 +41,13 @@ func TestAddWarning(t *testing.T) {
 			span := ptrace.NewSpan()
 			attrs := span.Attributes()
 			if test.existing != nil {
-				warnings := attrs.PutEmptySlice("jaeger.adjuster.warning")
+				warnings := attrs.PutEmptySlice("jaeger.internal.warnings")
 				for _, warn := range test.existing {
 					warnings.AppendEmpty().SetStr(warn)
 				}
 			}
-			addWarning(span, test.newWarn)
-			warnings, ok := attrs.Get("jaeger.adjuster.warning")
+			AddWarning(span, test.newWarn)
+			warnings, ok := attrs.Get("jaeger.internal.warnings")
 			assert.True(t, ok)
 			assert.Equal(t, len(test.expected), warnings.Slice().Len())
 			for i, expectedWarn := range test.expected {
@@ -56,3 +56,41 @@ func TestAddWarning(t *testing.T) {
 		})
 	}
 }
+
+func TestGetWarnings(t *testing.T) {
+	tests := []struct {
+		name     string
+		existing []string
+		expected []string
+	}{
+		{
+			name:     "get from nil warnings",
+			existing: nil,
+			expected: nil,
+		},
+		{
+			name:     "get from empty warnings",
+			existing: []string{},
+			expected: []string{},
+		},
+		{
+			name:     "get from existing warnings",
+			existing: []string{"existing warning 1", "existing warning 2"},
+			expected: []string{"existing warning 1", "existing warning 2"},
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			span := ptrace.NewSpan()
+			attrs := span.Attributes()
+			if test.existing != nil {
+				warnings := attrs.PutEmptySlice("jaeger.internal.warnings")
+				for _, warn := range test.existing {
+					warnings.AppendEmpty().SetStr(warn)
+				}
+			}
+			actual := GetWarnings(span)
+			assert.Equal(t, test.expected, actual)
+		})
+	}
+}

From a416cc513d29de17cdb49352096584b7fe85403c Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 16 Dec 2024 22:24:08 +0100
Subject: [PATCH 36/59] fix(deps): update module google.golang.org/protobuf to
 v1.36.0 (#6371)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[google.golang.org/protobuf](https://redirect.github.com/protocolbuffers/protobuf-go)
| `v1.35.2` -> `v1.36.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/google.golang.org%2fprotobuf/v1.36.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/google.golang.org%2fprotobuf/v1.36.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/google.golang.org%2fprotobuf/v1.35.2/v1.36.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/google.golang.org%2fprotobuf/v1.35.2/v1.36.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>protocolbuffers/protobuf-go
(google.golang.org/protobuf)</summary>

###
[`v1.36.0`](https://redirect.github.com/protocolbuffers/protobuf-go/releases/tag/v1.36.0)

[Compare
Source](https://redirect.github.com/protocolbuffers/protobuf-go/compare/v1.35.2...v1.36.0)

**Full Changelog**:
https://github.com/protocolbuffers/protobuf-go/compare/v1.35.2...v1.36.0

User-visible changes:

[CL/635139](https://go-review.googlesource.com/c/protobuf/+/635139):
src/google/protobuf: document UnmarshalJSON / API level behavior
[CL/635138](https://go-review.googlesource.com/c/protobuf/+/635138):
reflect/protoreflect: use \[] syntax to reference method
[CL/635137](https://go-review.googlesource.com/c/protobuf/+/635137):
proto: add reference to size semantics with lazy decoding to comment
[CL/634818](https://go-review.googlesource.com/c/protobuf/+/634818):
compiler/protogen: allow overriding API level from --go_opt
[CL/634817](https://go-review.googlesource.com/c/protobuf/+/634817):
cmd/protoc-gen-go: generate \_protoopaque variant for hybrid
[CL/634816](https://go-review.googlesource.com/c/protobuf/+/634816):
all: regenerate.bash for Opaque API
[CL/634815](https://go-review.googlesource.com/c/protobuf/+/634815):
all: Release the Opaque API
[CL/634015](https://go-review.googlesource.com/c/protobuf/+/634015):
types/descriptorpb: regenerate using latest protobuf v29.1 release
[CL/632735](https://go-review.googlesource.com/c/protobuf/+/632735):
internal/impl: skip synthetic oneofs in messageInfo
[CL/627876](https://go-review.googlesource.com/c/protobuf/+/627876):
all: start v1.35.2-devel

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS42OS4zIiwidXBkYXRlZEluVmVyIjoiMzkuNjkuMyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 8fcd77df2cc..e4d99641a67 100644
--- a/go.mod
+++ b/go.mod
@@ -97,7 +97,7 @@ require (
 	golang.org/x/net v0.32.0
 	golang.org/x/sys v0.28.0
 	google.golang.org/grpc v1.69.0
-	google.golang.org/protobuf v1.35.2
+	google.golang.org/protobuf v1.36.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
diff --git a/go.sum b/go.sum
index 7200135b269..3ec65a01f15 100644
--- a/go.sum
+++ b/go.sum
@@ -935,8 +935,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
+google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

From d8984bba76cee77190792ccd26a8690dbb0ae9e0 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Tue, 17 Dec 2024 01:48:20 +0100
Subject: [PATCH 37/59] fix(deps): update all otel collector packages (#6373)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[go.opentelemetry.io/collector/component](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fcomponent/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fcomponent/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fcomponent/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fcomponent/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/component/componentstatus](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fcomponent%2fcomponentstatus/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fcomponent%2fcomponentstatus/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fcomponent%2fcomponentstatus/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fcomponent%2fcomponentstatus/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/component/componenttest](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fcomponent%2fcomponenttest/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fcomponent%2fcomponenttest/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fcomponent%2fcomponenttest/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fcomponent%2fcomponenttest/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/config/configauth](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigauth/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigauth/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigauth/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigauth/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/config/configgrpc](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfiggrpc/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfiggrpc/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfiggrpc/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfiggrpc/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/config/confighttp](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfighttp/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfighttp/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfighttp/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfighttp/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/config/confignet](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v1.21.0` -> `v1.22.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfignet/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfignet/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfignet/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfignet/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/config/configopaque](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v1.21.0` -> `v1.22.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigopaque/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigopaque/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigopaque/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigopaque/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/config/configretry](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v1.21.0` -> `v1.22.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigretry/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigretry/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigretry/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigretry/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/config/configtelemetry](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigtelemetry/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigtelemetry/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigtelemetry/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigtelemetry/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/config/configtls](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v1.21.0` -> `v1.22.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigtls/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigtls/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigtls/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfig%2fconfigtls/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/confmap](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v1.21.0` -> `v1.22.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfmap/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfmap/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfmap/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfmap/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/confmap/provider/envprovider](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v1.21.0` -> `v1.22.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fenvprovider/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fenvprovider/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fenvprovider/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fenvprovider/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/confmap/provider/fileprovider](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v1.21.0` -> `v1.22.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2ffileprovider/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2ffileprovider/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2ffileprovider/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2ffileprovider/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/confmap/provider/httpprovider](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v1.21.0` -> `v1.22.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fhttpprovider/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fhttpprovider/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fhttpprovider/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fhttpprovider/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/confmap/provider/httpsprovider](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v1.21.0` -> `v1.22.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fhttpsprovider/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fhttpsprovider/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fhttpsprovider/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fhttpsprovider/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/confmap/provider/yamlprovider](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v1.21.0` -> `v1.22.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fyamlprovider/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fyamlprovider/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fyamlprovider/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconfmap%2fprovider%2fyamlprovider/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/connector](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconnector/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconnector/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconnector/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconnector/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/connector/forwardconnector](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconnector%2fforwardconnector/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconnector%2fforwardconnector/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconnector%2fforwardconnector/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconnector%2fforwardconnector/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/consumer](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v1.21.0` -> `v1.22.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconsumer/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconsumer/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconsumer/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconsumer/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/consumer/consumertest](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fconsumer%2fconsumertest/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fconsumer%2fconsumertest/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fconsumer%2fconsumertest/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fconsumer%2fconsumertest/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/exporter](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/exporter/debugexporter](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter%2fdebugexporter/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter%2fdebugexporter/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter%2fdebugexporter/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter%2fdebugexporter/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/exporter/exportertest](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter%2fexportertest/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter%2fexportertest/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter%2fexportertest/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter%2fexportertest/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/exporter/otlpexporter](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlpexporter/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/exporter/otlphttpexporter](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fexporter%2fotlphttpexporter/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/extension](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fextension/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fextension/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fextension/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fextension/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/extension/extensioncapabilities](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fextension%2fextensioncapabilities/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fextension%2fextensioncapabilities/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fextension%2fextensioncapabilities/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fextension%2fextensioncapabilities/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/extension/extensiontest](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fextension%2fextensiontest/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fextension%2fextensiontest/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fextension%2fextensiontest/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fextension%2fextensiontest/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/extension/zpagesextension](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fextension%2fzpagesextension/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fextension%2fzpagesextension/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fextension%2fzpagesextension/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fextension%2fzpagesextension/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/otelcol](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fotelcol/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fotelcol/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fotelcol/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fotelcol/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/pdata](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v1.21.0` -> `v1.22.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fpdata/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fpdata/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fpdata/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fpdata/v1.21.0/v1.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/pipeline](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fpipeline/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fpipeline/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fpipeline/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fpipeline/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/processor](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fprocessor/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fprocessor/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fprocessor/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fprocessor/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/processor/batchprocessor](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fprocessor%2fbatchprocessor/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fprocessor%2fbatchprocessor/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fprocessor%2fbatchprocessor/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fprocessor%2fbatchprocessor/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/processor/memorylimiterprocessor](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fprocessor%2fmemorylimiterprocessor/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fprocessor%2fmemorylimiterprocessor/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fprocessor%2fmemorylimiterprocessor/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fprocessor%2fmemorylimiterprocessor/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/processor/processortest](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2fprocessor%2fprocessortest/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2fprocessor%2fprocessortest/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2fprocessor%2fprocessortest/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2fprocessor%2fprocessortest/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/receiver](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2freceiver/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2freceiver/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2freceiver/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2freceiver/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[go.opentelemetry.io/collector/receiver/otlpreceiver](https://redirect.github.com/open-telemetry/opentelemetry-collector)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcollector%2freceiver%2fotlpreceiver/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>open-telemetry/opentelemetry-collector
(go.opentelemetry.io/collector/component)</summary>

###
[`v0.116.0`](https://redirect.github.com/open-telemetry/opentelemetry-collector/blob/HEAD/CHANGELOG.md#v1220v01160)

[Compare
Source](https://redirect.github.com/open-telemetry/opentelemetry-collector/compare/v0.115.0...v0.116.0)

##### 🛑 Breaking changes 🛑

- `pdata/pprofile`: Remove deprecated `Profile.EndTime` and
`Profile.SetEndTime` methods.
([#&#8203;11796](https://redirect.github.com/open-telemetry/opentelemetry-collector/issues/11796))

##### 💡 Enhancements 💡

- `xconfighttp`: Add WithOtelHTTPOptions to experimental module
xconfighttp
([#&#8203;11770](https://redirect.github.com/open-telemetry/opentelemetry-collector/issues/11770))

##### 🧰 Bug fixes 🧰

- `exporterhelper`: Fix memory leak at exporter shutdown
([#&#8203;11401](https://redirect.github.com/open-telemetry/opentelemetry-collector/issues/11401))
- `sharedcomponent`: Remove race-condition and cleanup locking
([#&#8203;11819](https://redirect.github.com/open-telemetry/opentelemetry-collector/issues/11819))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS42OS4zIiwidXBkYXRlZEluVmVyIjoiMzkuNjkuMyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

---------

Signed-off-by: Mend Renovate <bot@renovateapp.com>
Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
Co-authored-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/collector/app/handler/otlp_receiver.go    |   8 +-
 cmd/collector/app/handler/zipkin_receiver.go  |   8 +-
 .../storageexporter/exporter_test.go          |  12 +-
 .../extension/jaegerstorage/extension_test.go |   7 +-
 .../remotesampling/extension_test.go          |   7 +-
 .../adaptivesampling/processor_test.go        |  12 +-
 go.mod                                        | 128 ++++-----
 go.sum                                        | 260 +++++++++---------
 plugin/storage/grpc/factory.go                |   5 +-
 9 files changed, 203 insertions(+), 244 deletions(-)

diff --git a/cmd/collector/app/handler/otlp_receiver.go b/cmd/collector/app/handler/otlp_receiver.go
index 1bb2b2a96d9..ba450e4a298 100644
--- a/cmd/collector/app/handler/otlp_receiver.go
+++ b/cmd/collector/app/handler/otlp_receiver.go
@@ -11,14 +11,12 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componentstatus"
 	"go.opentelemetry.io/collector/config/confignet"
-	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/extension"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.opentelemetry.io/collector/pipeline"
 	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
-	"go.opentelemetry.io/otel/metric"
 	noopmetric "go.opentelemetry.io/otel/metric/noop"
 	nooptrace "go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap"
@@ -70,11 +68,7 @@ func startOTLPReceiver(
 		TelemetrySettings: component.TelemetrySettings{
 			Logger:         logger,
 			TracerProvider: nooptrace.NewTracerProvider(),
-			// TODO wire this with jaegerlib metrics?
-			LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
-				return noopmetric.NewMeterProvider()
-			},
-			MeterProvider: noopmetric.NewMeterProvider(),
+			MeterProvider:  noopmetric.NewMeterProvider(),
 		},
 	}
 
diff --git a/cmd/collector/app/handler/zipkin_receiver.go b/cmd/collector/app/handler/zipkin_receiver.go
index b7fc18619e3..5d5455ee7af 100644
--- a/cmd/collector/app/handler/zipkin_receiver.go
+++ b/cmd/collector/app/handler/zipkin_receiver.go
@@ -9,10 +9,8 @@ import (
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver"
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/receiver"
-	"go.opentelemetry.io/otel/metric"
 	noopmetric "go.opentelemetry.io/otel/metric/noop"
 	nooptrace "go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap"
@@ -61,11 +59,7 @@ func startZipkinReceiver(
 		TelemetrySettings: component.TelemetrySettings{
 			Logger:         logger,
 			TracerProvider: nooptrace.NewTracerProvider(),
-			// TODO wire this with jaegerlib metrics?
-			LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
-				return noopmetric.NewMeterProvider()
-			},
-			MeterProvider: noopmetric.NewMeterProvider(),
+			MeterProvider:  noopmetric.NewMeterProvider(),
 		},
 	}
 
diff --git a/cmd/jaeger/internal/exporters/storageexporter/exporter_test.go b/cmd/jaeger/internal/exporters/storageexporter/exporter_test.go
index 0e684a0bb2f..637d045f061 100644
--- a/cmd/jaeger/internal/exporters/storageexporter/exporter_test.go
+++ b/cmd/jaeger/internal/exporters/storageexporter/exporter_test.go
@@ -12,12 +12,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/exporter"
 	"go.opentelemetry.io/collector/extension"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
-	"go.opentelemetry.io/otel/metric"
 	noopmetric "go.opentelemetry.io/otel/metric/noop"
 	nooptrace "go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap/zaptest"
@@ -105,10 +103,7 @@ func TestExporter(t *testing.T) {
 	telemetrySettings := component.TelemetrySettings{
 		Logger:         zaptest.NewLogger(t),
 		TracerProvider: nooptrace.NewTracerProvider(),
-		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
-			return noopmetric.NewMeterProvider()
-		},
-		MeterProvider: noopmetric.NewMeterProvider(),
+		MeterProvider:  noopmetric.NewMeterProvider(),
 	}
 
 	const memstoreName = "memstore"
@@ -165,10 +160,7 @@ func makeStorageExtension(t *testing.T, memstoreName string) component.Host {
 	telemetrySettings := component.TelemetrySettings{
 		Logger:         zaptest.NewLogger(t),
 		TracerProvider: nooptrace.NewTracerProvider(),
-		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
-			return noopmetric.NewMeterProvider()
-		},
-		MeterProvider: noopmetric.NewMeterProvider(),
+		MeterProvider:  noopmetric.NewMeterProvider(),
 	}
 	extensionFactory := jaegerstorage.NewFactory()
 	storageExtension, err := extensionFactory.Create(
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go b/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go
index 8623703ad83..b202ee4bb7e 100644
--- a/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go
+++ b/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go
@@ -16,9 +16,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config/configgrpc"
-	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/extension"
-	"go.opentelemetry.io/otel/metric"
 	noopmetric "go.opentelemetry.io/otel/metric/noop"
 	nooptrace "go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap"
@@ -256,10 +254,7 @@ func noopTelemetrySettings() component.TelemetrySettings {
 	return component.TelemetrySettings{
 		Logger:         zap.L(),
 		TracerProvider: nooptrace.NewTracerProvider(),
-		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
-			return noopmetric.NewMeterProvider()
-		},
-		MeterProvider: noopmetric.NewMeterProvider(),
+		MeterProvider:  noopmetric.NewMeterProvider(),
 	}
 }
 
diff --git a/cmd/jaeger/internal/extension/remotesampling/extension_test.go b/cmd/jaeger/internal/extension/remotesampling/extension_test.go
index 5b6483b60d8..62c84319762 100644
--- a/cmd/jaeger/internal/extension/remotesampling/extension_test.go
+++ b/cmd/jaeger/internal/extension/remotesampling/extension_test.go
@@ -19,9 +19,7 @@ import (
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/confignet"
-	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/extension"
-	"go.opentelemetry.io/otel/metric"
 	noopmetric "go.opentelemetry.io/otel/metric/noop"
 	nooptrace "go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap"
@@ -39,10 +37,7 @@ func makeStorageExtension(t *testing.T, memstoreName string) component.Host {
 	telemetrySettings := component.TelemetrySettings{
 		Logger:         zaptest.NewLogger(t),
 		TracerProvider: nooptrace.NewTracerProvider(),
-		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
-			return noopmetric.NewMeterProvider()
-		},
-		MeterProvider: noopmetric.NewMeterProvider(),
+		MeterProvider:  noopmetric.NewMeterProvider(),
 	}
 	extensionFactory := jaegerstorage.NewFactory()
 	storageExtension, err := extensionFactory.Create(
diff --git a/cmd/jaeger/internal/processors/adaptivesampling/processor_test.go b/cmd/jaeger/internal/processors/adaptivesampling/processor_test.go
index fe5198e4efb..57b25bf08ca 100644
--- a/cmd/jaeger/internal/processors/adaptivesampling/processor_test.go
+++ b/cmd/jaeger/internal/processors/adaptivesampling/processor_test.go
@@ -11,10 +11,8 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/storagetest"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/extension"
 	"go.opentelemetry.io/collector/pdata/ptrace"
-	"go.opentelemetry.io/otel/metric"
 	noopmetric "go.opentelemetry.io/otel/metric/noop"
 	nooptrace "go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap"
@@ -31,10 +29,7 @@ func makeStorageExtension(t *testing.T, memstoreName string) component.Host {
 	telemetrySettings := component.TelemetrySettings{
 		Logger:         zaptest.NewLogger(t),
 		TracerProvider: nooptrace.NewTracerProvider(),
-		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
-			return noopmetric.NewMeterProvider()
-		},
-		MeterProvider: noopmetric.NewMeterProvider(),
+		MeterProvider:  noopmetric.NewMeterProvider(),
 	}
 	extensionFactory := jaegerstorage.NewFactory()
 	storageExtension, err := extensionFactory.Create(
@@ -95,10 +90,7 @@ func TestNewTraceProcessor(t *testing.T) {
 
 func TestTraceProcessor(t *testing.T) {
 	telemetrySettings := component.TelemetrySettings{
-		Logger: zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller())),
-		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
-			return noopmetric.NewMeterProvider()
-		},
+		Logger:        zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller())),
 		MeterProvider: noopmetric.NewMeterProvider(),
 	}
 	config := createDefaultConfig().(*Config)
diff --git a/go.mod b/go.mod
index e4d99641a67..c9dab8c2d47 100644
--- a/go.mod
+++ b/go.mod
@@ -44,40 +44,40 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
 	github.com/xdg-go/scram v1.1.2
-	go.opentelemetry.io/collector/component v0.115.0
-	go.opentelemetry.io/collector/component/componentstatus v0.115.0
-	go.opentelemetry.io/collector/component/componenttest v0.115.0
-	go.opentelemetry.io/collector/config/configauth v0.115.0
-	go.opentelemetry.io/collector/config/configgrpc v0.115.0
-	go.opentelemetry.io/collector/config/confighttp v0.115.0
-	go.opentelemetry.io/collector/config/configretry v1.21.0
-	go.opentelemetry.io/collector/config/configtls v1.21.0
-	go.opentelemetry.io/collector/confmap v1.21.0
-	go.opentelemetry.io/collector/confmap/provider/envprovider v1.21.0
-	go.opentelemetry.io/collector/confmap/provider/fileprovider v1.21.0
-	go.opentelemetry.io/collector/confmap/provider/httpprovider v1.21.0
-	go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.21.0
-	go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.21.0
-	go.opentelemetry.io/collector/connector v0.115.0
-	go.opentelemetry.io/collector/connector/forwardconnector v0.115.0
-	go.opentelemetry.io/collector/consumer v1.21.0
-	go.opentelemetry.io/collector/consumer/consumertest v0.115.0
-	go.opentelemetry.io/collector/exporter v0.115.0
-	go.opentelemetry.io/collector/exporter/exportertest v0.115.0
-	go.opentelemetry.io/collector/exporter/otlpexporter v0.115.0
-	go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0
-	go.opentelemetry.io/collector/extension v0.115.0
-	go.opentelemetry.io/collector/extension/extensiontest v0.115.0
-	go.opentelemetry.io/collector/extension/zpagesextension v0.115.0
-	go.opentelemetry.io/collector/otelcol v0.115.0
-	go.opentelemetry.io/collector/pdata v1.21.0
-	go.opentelemetry.io/collector/pipeline v0.115.0
-	go.opentelemetry.io/collector/processor v0.115.0
-	go.opentelemetry.io/collector/processor/batchprocessor v0.115.0
-	go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.115.0
-	go.opentelemetry.io/collector/processor/processortest v0.115.0
-	go.opentelemetry.io/collector/receiver v0.115.0
-	go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0
+	go.opentelemetry.io/collector/component v0.116.0
+	go.opentelemetry.io/collector/component/componentstatus v0.116.0
+	go.opentelemetry.io/collector/component/componenttest v0.116.0
+	go.opentelemetry.io/collector/config/configauth v0.116.0
+	go.opentelemetry.io/collector/config/configgrpc v0.116.0
+	go.opentelemetry.io/collector/config/confighttp v0.116.0
+	go.opentelemetry.io/collector/config/configretry v1.22.0
+	go.opentelemetry.io/collector/config/configtls v1.22.0
+	go.opentelemetry.io/collector/confmap v1.22.0
+	go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.0
+	go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.0
+	go.opentelemetry.io/collector/confmap/provider/httpprovider v1.22.0
+	go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.22.0
+	go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.22.0
+	go.opentelemetry.io/collector/connector v0.116.0
+	go.opentelemetry.io/collector/connector/forwardconnector v0.116.0
+	go.opentelemetry.io/collector/consumer v1.22.0
+	go.opentelemetry.io/collector/consumer/consumertest v0.116.0
+	go.opentelemetry.io/collector/exporter v0.116.0
+	go.opentelemetry.io/collector/exporter/exportertest v0.116.0
+	go.opentelemetry.io/collector/exporter/otlpexporter v0.116.0
+	go.opentelemetry.io/collector/exporter/otlphttpexporter v0.116.0
+	go.opentelemetry.io/collector/extension v0.116.0
+	go.opentelemetry.io/collector/extension/extensiontest v0.116.0
+	go.opentelemetry.io/collector/extension/zpagesextension v0.116.0
+	go.opentelemetry.io/collector/otelcol v0.116.0
+	go.opentelemetry.io/collector/pdata v1.22.0
+	go.opentelemetry.io/collector/pipeline v0.116.0
+	go.opentelemetry.io/collector/processor v0.116.0
+	go.opentelemetry.io/collector/processor/batchprocessor v0.116.0
+	go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.116.0
+	go.opentelemetry.io/collector/processor/processortest v0.116.0
+	go.opentelemetry.io/collector/receiver v0.116.0
+	go.opentelemetry.io/collector/receiver/otlpreceiver v0.116.0
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0
 	go.opentelemetry.io/contrib/samplers/jaegerremote v0.27.0
@@ -109,15 +109,20 @@ require (
 	github.com/expr-lang/expr v1.16.9 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.115.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/collector/connector/connectortest v0.115.0 // indirect
-	go.opentelemetry.io/collector/consumer/consumererror v0.115.0 // indirect
-	go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles v0.115.0 // indirect
-	go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles v0.115.0 // indirect
-	go.opentelemetry.io/collector/internal/fanoutconsumer v0.115.0 // indirect
-	go.opentelemetry.io/collector/internal/memorylimiter v0.115.0 // indirect
-	go.opentelemetry.io/collector/internal/sharedcomponent v0.115.0 // indirect
-	go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.115.0 // indirect
-	go.opentelemetry.io/collector/receiver/receivertest v0.115.0 // indirect
+	go.opentelemetry.io/collector/connector/connectortest v0.116.0 // indirect
+	go.opentelemetry.io/collector/connector/xconnector v0.116.0 // indirect
+	go.opentelemetry.io/collector/consumer/consumererror v0.116.0 // indirect
+	go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.116.0 // indirect
+	go.opentelemetry.io/collector/consumer/xconsumer v0.116.0 // indirect
+	go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.116.0 // indirect
+	go.opentelemetry.io/collector/exporter/xexporter v0.116.0 // indirect
+	go.opentelemetry.io/collector/internal/fanoutconsumer v0.116.0 // indirect
+	go.opentelemetry.io/collector/internal/memorylimiter v0.116.0 // indirect
+	go.opentelemetry.io/collector/internal/sharedcomponent v0.116.0 // indirect
+	go.opentelemetry.io/collector/pipeline/xpipeline v0.116.0 // indirect
+	go.opentelemetry.io/collector/processor/xprocessor v0.116.0 // indirect
+	go.opentelemetry.io/collector/receiver/receivertest v0.116.0 // indirect
+	go.opentelemetry.io/collector/receiver/xreceiver v0.116.0 // indirect
 	go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect
 )
 
@@ -229,27 +234,22 @@ require (
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/collector v0.115.0 // indirect
-	go.opentelemetry.io/collector/client v1.21.0 // indirect
-	go.opentelemetry.io/collector/config/configcompression v1.21.0 // indirect
-	go.opentelemetry.io/collector/config/confignet v1.21.0
-	go.opentelemetry.io/collector/config/configopaque v1.21.0
-	go.opentelemetry.io/collector/config/configtelemetry v0.115.0
-	go.opentelemetry.io/collector/config/internal v0.115.0 // indirect
-	go.opentelemetry.io/collector/connector/connectorprofiles v0.115.0 // indirect
-	go.opentelemetry.io/collector/consumer/consumerprofiles v0.115.0 // indirect
-	go.opentelemetry.io/collector/exporter/debugexporter v0.115.0
-	go.opentelemetry.io/collector/exporter/exporterprofiles v0.115.0 // indirect
-	go.opentelemetry.io/collector/extension/auth v0.115.0 // indirect
-	go.opentelemetry.io/collector/extension/experimental/storage v0.115.0 // indirect
-	go.opentelemetry.io/collector/extension/extensioncapabilities v0.115.0
-	go.opentelemetry.io/collector/featuregate v1.21.0 // indirect
-	go.opentelemetry.io/collector/pdata/pprofile v0.115.0 // indirect
-	go.opentelemetry.io/collector/pdata/testdata v0.115.0 // indirect
-	go.opentelemetry.io/collector/processor/processorprofiles v0.115.0 // indirect
-	go.opentelemetry.io/collector/receiver/receiverprofiles v0.115.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.115.0 // indirect
-	go.opentelemetry.io/collector/service v0.115.0 // indirect
+	go.opentelemetry.io/collector v0.116.0 // indirect
+	go.opentelemetry.io/collector/client v1.22.0 // indirect
+	go.opentelemetry.io/collector/config/configcompression v1.22.0 // indirect
+	go.opentelemetry.io/collector/config/confignet v1.22.0
+	go.opentelemetry.io/collector/config/configopaque v1.22.0
+	go.opentelemetry.io/collector/config/configtelemetry v0.116.0
+	go.opentelemetry.io/collector/config/internal v0.116.0 // indirect
+	go.opentelemetry.io/collector/exporter/debugexporter v0.116.0
+	go.opentelemetry.io/collector/extension/auth v0.116.0 // indirect
+	go.opentelemetry.io/collector/extension/experimental/storage v0.116.0 // indirect
+	go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.0
+	go.opentelemetry.io/collector/featuregate v1.22.0 // indirect
+	go.opentelemetry.io/collector/pdata/pprofile v0.116.0 // indirect
+	go.opentelemetry.io/collector/pdata/testdata v0.116.0 // indirect
+	go.opentelemetry.io/collector/semconv v0.116.0 // indirect
+	go.opentelemetry.io/collector/service v0.116.0 // indirect
 	go.opentelemetry.io/contrib/config v0.10.0 // indirect
 	go.opentelemetry.io/contrib/propagators/b3 v1.31.0 // indirect
 	go.opentelemetry.io/contrib/zpages v0.56.0 // indirect
diff --git a/go.sum b/go.sum
index 3ec65a01f15..b5ca2831cff 100644
--- a/go.sum
+++ b/go.sum
@@ -590,136 +590,136 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/collector v0.115.0 h1:qUZ0bTeNBudMxNQ7FJKS//TxTjeJ7tfU/z22mcFavWU=
-go.opentelemetry.io/collector v0.115.0/go.mod h1:66qx0xKnVvdwq60e1DEfb4e+zmM9szhPsv2hxZ/Mpj4=
-go.opentelemetry.io/collector/client v1.21.0 h1:3Kes8lOFMYVxoxeAmX+DTEAkuS1iTA3NkSfqzGmygJA=
-go.opentelemetry.io/collector/client v1.21.0/go.mod h1:jYJGiL0UA975OOyHmjbQSokNWt1OiviI5KjPOMUMGwc=
-go.opentelemetry.io/collector/component v0.115.0 h1:iLte1oCiXzjiCnaOBKdsXacfFiECecpWxW3/LeriMoo=
-go.opentelemetry.io/collector/component v0.115.0/go.mod h1:oIUFiH7w1eOimdeYhFI+gAIxYSiLDocKVJ0PTvX7d6s=
-go.opentelemetry.io/collector/component/componentstatus v0.115.0 h1:pbpUIL+uKDfEiSgKK+S5nuSL6MDIIQYsp4b65ZGVb9M=
-go.opentelemetry.io/collector/component/componentstatus v0.115.0/go.mod h1:36A+9XSiOz0Cdhq+UwwPRlEr5CYuSkEnVO9om4BH7d0=
-go.opentelemetry.io/collector/component/componenttest v0.115.0 h1:9URDJ9VyP6tuij+YHjp/kSSMecnZOd7oGvzu+rw9SJY=
-go.opentelemetry.io/collector/component/componenttest v0.115.0/go.mod h1:PzXvNqKLCiSADZGZFKH+IOHMkaQ0GTHuzysfVbTPKYY=
-go.opentelemetry.io/collector/config/configauth v0.115.0 h1:xa+ALdyPgva3rZnLBh1H2oS5MsHP6JxSqMtQmcELnys=
-go.opentelemetry.io/collector/config/configauth v0.115.0/go.mod h1:C7anpb3Rf4KswMT+dgOzkW9UX0z/65PLORpUw3p0VYc=
-go.opentelemetry.io/collector/config/configcompression v1.21.0 h1:0zbPdZAgPFMAarwJEC4gaR6f/JBP686A3TYSgb3oa+E=
-go.opentelemetry.io/collector/config/configcompression v1.21.0/go.mod h1:LvYG00tbPTv0NOLoZN0wXq1F5thcxvukO8INq7xyfWU=
-go.opentelemetry.io/collector/config/configgrpc v0.115.0 h1:gZzXSFe6hB3RUcEeAYqk1yT+TBa+X9tp6/1x29Yg2yk=
-go.opentelemetry.io/collector/config/configgrpc v0.115.0/go.mod h1:107lRZ5LdQPMdGJGd4m1GhyKxyH0az2cUOqrJgTEN8E=
-go.opentelemetry.io/collector/config/confighttp v0.115.0 h1:BIy394oNXnqySJwrCqgAJu4gWgAV5aQUDD6k1hy6C8o=
-go.opentelemetry.io/collector/config/confighttp v0.115.0/go.mod h1:Wr50ut12NmCEAl4bWLJryw2EjUmJTtYRg89560Q51wc=
-go.opentelemetry.io/collector/config/confignet v1.21.0 h1:PeQ5YrMnfftysFL/WVaSrjPOWjD6DfeABY50pf9CZxU=
-go.opentelemetry.io/collector/config/confignet v1.21.0/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc=
-go.opentelemetry.io/collector/config/configopaque v1.21.0 h1:PcvRGkBk4Px8BQM7tX+kw4i3jBsfAHGoGQbtZg6Ox7U=
-go.opentelemetry.io/collector/config/configopaque v1.21.0/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs=
-go.opentelemetry.io/collector/config/configretry v1.21.0 h1:ZHoOvAkEcv5BBeaJn8IQ6rQ4GMPZWW4S+W7R4QTEbZU=
-go.opentelemetry.io/collector/config/configretry v1.21.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro=
-go.opentelemetry.io/collector/config/configtelemetry v0.115.0 h1:U07FinCDop+r2RjWQ3aP9ZWONC7r7kQIp1GkXQi6nsI=
-go.opentelemetry.io/collector/config/configtelemetry v0.115.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE=
-go.opentelemetry.io/collector/config/configtls v1.21.0 h1:ZfrlAYgBD8lzp04W0GxwiDmUbrvKsvDYJi+wkyiXlpA=
-go.opentelemetry.io/collector/config/configtls v1.21.0/go.mod h1:5EsNefPfVCMOTlOrr3wyj7LrsOgY7V8iqRl8oFZEqtw=
-go.opentelemetry.io/collector/config/internal v0.115.0 h1:eVk57iufZpUXyPJFKTb1Ebx5tmcCyroIlt427r5pxS8=
-go.opentelemetry.io/collector/config/internal v0.115.0/go.mod h1:OVkadRWlKAoWjHslqjWtBLAne8ceQm8WYT71ZcBWLFc=
-go.opentelemetry.io/collector/confmap v1.21.0 h1:1tIcx2/Suwg8VhuPmQw87ba0ludPmumpFCFRZZa6RXA=
-go.opentelemetry.io/collector/confmap v1.21.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec=
-go.opentelemetry.io/collector/confmap/provider/envprovider v1.21.0 h1:YLf++Z8CMp86AanfOCWUiE7vKbb1kSjgC3a9VJoxbD4=
-go.opentelemetry.io/collector/confmap/provider/envprovider v1.21.0/go.mod h1:aSWLYcmgZZJDNtWN1M8JKQuehoGgOxibl1KuvKTar4M=
-go.opentelemetry.io/collector/confmap/provider/fileprovider v1.21.0 h1:+zukkM+3l426iGoJkXTpLB2Z8QnZFu26TkGPjh5Rn/4=
-go.opentelemetry.io/collector/confmap/provider/fileprovider v1.21.0/go.mod h1:BXBpQhF3n4CNLYO2n/mWZPd2U9ekpbLXLRGZrun1VfI=
-go.opentelemetry.io/collector/confmap/provider/httpprovider v1.21.0 h1:NYYGM+SgIlTuNGjd8eGzDr8DkvOe4q7cXon8djF9yyI=
-go.opentelemetry.io/collector/confmap/provider/httpprovider v1.21.0/go.mod h1:XRYbuwqq1awFuNhLDUv4aSvn6MzqX+abcevx1O+APJI=
-go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.21.0 h1:2EEUI2DzA2DvrvCImMWRSNqIHdRJ6+qbgvZL44Zb2ac=
-go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.21.0/go.mod h1:axezjjQWY4kZc5pr/+wOKAuqSYMhea/tWzP5S30h+dc=
-go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.21.0 h1:P3Q9RytCMY76ORPCnkkjOa4fkuFqmZiQRor+F/nPlYE=
-go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.21.0/go.mod h1:xhYhHK3yLQ78tsoaKPIGUfFulgy961ImOe2gATH3RQc=
-go.opentelemetry.io/collector/connector v0.115.0 h1:4Kkm3HQFzNT1eliMOB8FbIn+PLMRJ2qQku5Vmy3V8Ko=
-go.opentelemetry.io/collector/connector v0.115.0/go.mod h1:+ByuAmYLrYHoKh9B+LGqUc0N2kXcN2l8Dea8Mp6brZ8=
-go.opentelemetry.io/collector/connector/connectorprofiles v0.115.0 h1:aW1f4Az0I+QJyImFccNWAXqik80bnNu27aQqi2hFfD8=
-go.opentelemetry.io/collector/connector/connectorprofiles v0.115.0/go.mod h1:lmynB1CucydOsHa8RSSBh5roUZPfuiv65imXhtNzClM=
-go.opentelemetry.io/collector/connector/connectortest v0.115.0 h1:GjtourFr0MJmlbtEPAZ/1BZCxkNAeJ0aMTlrxwftJ0k=
-go.opentelemetry.io/collector/connector/connectortest v0.115.0/go.mod h1:f3KQXXNlh/XuV8elmnuVVyfY92dJCAovz10gD72OH0k=
-go.opentelemetry.io/collector/connector/forwardconnector v0.115.0 h1:8qpQJa2fSusEYAfnMTFwQi4Om8y1N440G6OkZ+zhap4=
-go.opentelemetry.io/collector/connector/forwardconnector v0.115.0/go.mod h1:4z+iBKXypSYjup0SLShe3kJ57qRGXALOIHJ4o+ANMo0=
-go.opentelemetry.io/collector/consumer v1.21.0 h1:THKZ2Vbi6GkamjTBI2hFq5Dc4kINZTWGwQNa8d/Ty9g=
-go.opentelemetry.io/collector/consumer v1.21.0/go.mod h1:FQcC4ThMtRYY41dv+IPNK8POLLhAFY3r1YR5fuP7iiY=
-go.opentelemetry.io/collector/consumer/consumererror v0.115.0 h1:yli//xBCQMPZKXNgNlXemo4dvqhnFrAmCZ11DvQgmcY=
-go.opentelemetry.io/collector/consumer/consumererror v0.115.0/go.mod h1:LwVzAvQ6ZVNG7mbOvurbAo+W/rKws0IcjOwriuZXqPE=
-go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles v0.115.0 h1:gaIhzpaGFWauiyznrQ3f++TbcdXxA5rpsX3L9uGjMM8=
-go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles v0.115.0/go.mod h1:7oXvuGBSawS5bc413lh1KEMcXkqBcrCqZQahOdnE24U=
-go.opentelemetry.io/collector/consumer/consumerprofiles v0.115.0 h1:H3fDuyQW1t2HWHkz96WMBQJKUevypOCjBqnqtaAWyoA=
-go.opentelemetry.io/collector/consumer/consumerprofiles v0.115.0/go.mod h1:IzEmZ91Tp7TBxVDq8Cc9xvLsmO7H08njr6Pu9P5d9ns=
-go.opentelemetry.io/collector/consumer/consumertest v0.115.0 h1:hru0I2447y0TluCdwlKYFFtgcpyCnlM+LiOK1JZyA70=
-go.opentelemetry.io/collector/consumer/consumertest v0.115.0/go.mod h1:ybjALRJWR6aKNOzEMy1T1ruCULVDEjj4omtOJMrH/kU=
-go.opentelemetry.io/collector/exporter v0.115.0 h1:JnxfpOnsuqhTPKJXVKJLS1Cv3BiVrVLzpHOjJEQw+xw=
-go.opentelemetry.io/collector/exporter v0.115.0/go.mod h1:xof3fHQK8wADhaKLIJcQ7ChZaFLNC+haRdPN0wgl6kY=
-go.opentelemetry.io/collector/exporter/debugexporter v0.115.0 h1:gb9VMQhcbvYqp0SJ4Hp8R9XqOLNLsoTgNJCPKpNEaVc=
-go.opentelemetry.io/collector/exporter/debugexporter v0.115.0/go.mod h1:H/HS1UJlcZPNBbOcrsGZc2sPdQDHtbOjHOxMtJkmlcU=
-go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles v0.115.0 h1:fetbc740pODH6JW+H49SW0hiAJwQE+/B0SbuIlaY2rg=
-go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles v0.115.0/go.mod h1:oEKZ/d5BeaCK6Made9iwaeqmlT4lRbJSlW9nhIn/TwM=
-go.opentelemetry.io/collector/exporter/exporterprofiles v0.115.0 h1:lSQEleCn/q9eFufcuK61NdFKU70ZlgI9dBjPCO/4CrE=
-go.opentelemetry.io/collector/exporter/exporterprofiles v0.115.0/go.mod h1:7l5K2AecimX2kx+nZC1gKG3QkP247CO1+SodmJ4fFkQ=
-go.opentelemetry.io/collector/exporter/exportertest v0.115.0 h1:P9SMTUXQOtcaq40bGtnnAe14zRmR4/yUgj/Tb2BEf/k=
-go.opentelemetry.io/collector/exporter/exportertest v0.115.0/go.mod h1:1jMZ9gFGXglb8wfNrBZIgd+RvpZhSyFwdfE+Jtf9w4U=
-go.opentelemetry.io/collector/exporter/otlpexporter v0.115.0 h1:Kqr31VFrQvgEMzeg8T1JSXWacjUQoZph39efKN8jBpY=
-go.opentelemetry.io/collector/exporter/otlpexporter v0.115.0/go.mod h1:5uy/gduFx2mH0GxJ84sY75NfzQJb9xYmgiL9Pf0dKF8=
-go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0 h1:I0qzSWGbgph+iva5/jU8tkeUTkkqqcj8+UzMxg5ubF8=
-go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0/go.mod h1:cUrv5EG12iOs5MXaecfi9K+ZATEELefpyZY6Hj4NlUo=
-go.opentelemetry.io/collector/extension v0.115.0 h1:/cBb8AUdD0KMWC6V3lvCC16eP9Fg0wd1Upcp5rgvuGI=
-go.opentelemetry.io/collector/extension v0.115.0/go.mod h1:HI7Ak6loyi6ZrZPsQJW1OO1wbaAW8OqXLFNQlTZnreQ=
-go.opentelemetry.io/collector/extension/auth v0.115.0 h1:TTMokbBsSHZRFH48PvGSJmgSS8F3Rkr9MWGHZn8eJDk=
-go.opentelemetry.io/collector/extension/auth v0.115.0/go.mod h1:3w+2mzeb2OYNOO4Bi41TUo4jr32ap2y7AOq64IDpxQo=
-go.opentelemetry.io/collector/extension/auth/authtest v0.115.0 h1:OZe7dKbZ01qodSpZU0ZYzI6zpmmzJ3UvfdBSFAbSgDw=
-go.opentelemetry.io/collector/extension/auth/authtest v0.115.0/go.mod h1:fk9WCXP0x91Q64Z8HZKWTHh9PWtgoWE1KXe3n2Bff3U=
-go.opentelemetry.io/collector/extension/experimental/storage v0.115.0 h1:sZXw0+77092pq24CkUoTRoHQPLQUsDq6HFRNB0g5yR4=
-go.opentelemetry.io/collector/extension/experimental/storage v0.115.0/go.mod h1:qjFH7Y3QYYs88By2ZB5GMSUN5k3ul4Brrq2J6lKACA0=
-go.opentelemetry.io/collector/extension/extensioncapabilities v0.115.0 h1:/g25Hp5aoCNKdDjIb3Fc7XRglO8yaBRFLO/IUNPnqNI=
-go.opentelemetry.io/collector/extension/extensioncapabilities v0.115.0/go.mod h1:EQx7ETiy330O6q05S2KRZsRNDg0aQEeJmVl7Ipx+Fcw=
-go.opentelemetry.io/collector/extension/extensiontest v0.115.0 h1:GBVFxFEskR8jSdu9uaQh2qpXnN5VNXhXjpJ2UjxtE8I=
-go.opentelemetry.io/collector/extension/extensiontest v0.115.0/go.mod h1:eu1ecbz5mT+cHoH2H3GmD/rOO0WsicSJD2RLrYuOmRA=
-go.opentelemetry.io/collector/extension/zpagesextension v0.115.0 h1:zYrZZocc7n0ZuDyXNkIaX0P0qk2fjMQj7NegwBJZA4k=
-go.opentelemetry.io/collector/extension/zpagesextension v0.115.0/go.mod h1:OaXwNHF3MAcInBzCXrhXbTNHfIi9b7YGhXjtCFZqxNY=
-go.opentelemetry.io/collector/featuregate v1.21.0 h1:+EULHPJDLMipcwAGZVp9Nm8NriRvoBBMxp7MSiIZVMI=
-go.opentelemetry.io/collector/featuregate v1.21.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg=
-go.opentelemetry.io/collector/internal/fanoutconsumer v0.115.0 h1:6DRiSECeApFq6Jj5ug77rG53R6FzJEZBfygkyMEXdpg=
-go.opentelemetry.io/collector/internal/fanoutconsumer v0.115.0/go.mod h1:vgQf5HQdmLQqpDHpDq2S3nTRoUuKtRcZpRTsy+UiwYw=
-go.opentelemetry.io/collector/internal/memorylimiter v0.115.0 h1:U07IJxyHZXM6eLn8cOq/Lycx6DhQZhpDOuYtIRw/d6I=
-go.opentelemetry.io/collector/internal/memorylimiter v0.115.0/go.mod h1:KNcU8WVpW5y7Ij6CGnsefb7q1UZT7VvrTDhe5FKNOA4=
-go.opentelemetry.io/collector/internal/sharedcomponent v0.115.0 h1:9TL6T6ALqDpumUJ0tYIuPIg5LGo4r6eoqlNArYX116o=
-go.opentelemetry.io/collector/internal/sharedcomponent v0.115.0/go.mod h1:SgBLKMh11bOTPR1bdDZbi5MlqsoDBBFI3uBIwnei+0k=
-go.opentelemetry.io/collector/otelcol v0.115.0 h1:wZhFGrSCZcTQ4qw4ePjI2PaSrOCejoQKAjprKD/xavs=
-go.opentelemetry.io/collector/otelcol v0.115.0/go.mod h1:iK8DPvaizirIYKDl1zZG7DDYUj6GkkH4KHifVVM88vk=
-go.opentelemetry.io/collector/pdata v1.21.0 h1:PG+UbiFMJ35X/WcAR7Rf/PWmWtRdW0aHlOidsR6c5MA=
-go.opentelemetry.io/collector/pdata v1.21.0/go.mod h1:GKb1/zocKJMvxKbS+sl0W85lxhYBTFJ6h6I1tphVyDU=
-go.opentelemetry.io/collector/pdata/pprofile v0.115.0 h1:NI89hy13vNDw7EOnQf7Jtitks4HJFO0SUWznTssmP94=
-go.opentelemetry.io/collector/pdata/pprofile v0.115.0/go.mod h1:jGzdNfO0XTtfLjXCL/uCC1livg1LlfR+ix2WE/z3RpQ=
-go.opentelemetry.io/collector/pdata/testdata v0.115.0 h1:Rblz+AKXdo3fG626jS+KSd0OSA4uMXcTQfpwed6P8LI=
-go.opentelemetry.io/collector/pdata/testdata v0.115.0/go.mod h1:inNnRt6S2Nn260EfCBEcjesjlKOSsr0jPwkPqpBkt4s=
-go.opentelemetry.io/collector/pipeline v0.115.0 h1:bmACBqb0e8U9ag+vGGHUP7kCfAO7HHROdtzIEg8ulus=
-go.opentelemetry.io/collector/pipeline v0.115.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74=
-go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.115.0 h1:3l9ruCAOrssTUDnyChKNzHWOdTtfThnYaoPZ1/+5sD0=
-go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.115.0/go.mod h1:2Myg+law/5lcezo9PhhZ0wjCaLYdGK24s1jDWbSW9VY=
-go.opentelemetry.io/collector/processor v0.115.0 h1:+fveHGRe24PZPv/F5taahGuZ9HdNW44hgNWEJhIUdyc=
-go.opentelemetry.io/collector/processor v0.115.0/go.mod h1:/oLHBlLsm7tFb7zOIrA5C0j14yBtjXKAgxJJ2Bktyk4=
-go.opentelemetry.io/collector/processor/batchprocessor v0.115.0 h1:dgw1jcE/YVFTs41b3Y7SerU3BBSyMEE93AYV+BAxR8E=
-go.opentelemetry.io/collector/processor/batchprocessor v0.115.0/go.mod h1:imG1kDEq14UGlxyCjSCf1TUEFdSWRvF7tLoYX9nixEQ=
-go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.115.0 h1:LCA2jwxy1PRc7X/AtRJfMdOANh5rVLdwo5PAM+gAuyo=
-go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.115.0/go.mod h1:gPcHyza7Rek3jfrQFxw99fcWBDkkRqBaMHcUz9yYv5I=
-go.opentelemetry.io/collector/processor/processorprofiles v0.115.0 h1:cCZAs+FXaebZPppqAN3m+X3etoSBL6NvyQo8l0hOZoo=
-go.opentelemetry.io/collector/processor/processorprofiles v0.115.0/go.mod h1:kMxF0gknlWX4duuAJFi2/HuIRi6C3w95tOenRa0GKOY=
-go.opentelemetry.io/collector/processor/processortest v0.115.0 h1:j9HEaYFOeOB6VYl9zGhBnhQbTkqGBa2udUvu5NTh6hc=
-go.opentelemetry.io/collector/processor/processortest v0.115.0/go.mod h1:Gws+VEnp/eW3qAqPpqbKsrbnnxxNfyDjqrfUXbZfZic=
-go.opentelemetry.io/collector/receiver v0.115.0 h1:55Q3Jvj6zHCIA1psKqi/3kEMJO4OqUF5tNAEYNdB1U8=
-go.opentelemetry.io/collector/receiver v0.115.0/go.mod h1:nBSCh2O/WUcfgpJ+Jpz+B0z0Hn5jHeRvF2WmLij5EIY=
-go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0 h1:NqMWsGuVy6y6VKTaPeJS7NZ9KAxhE/xyGUC7GaLYm/o=
-go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0/go.mod h1:9ituzngnjsh/YvO+Phayq9BTk/nw0rgK5ZVvX1oxULk=
-go.opentelemetry.io/collector/receiver/receiverprofiles v0.115.0 h1:R9JLaj2Al93smIPUkbJshAkb/cY0H5JBOxIx+Zu0NG4=
-go.opentelemetry.io/collector/receiver/receiverprofiles v0.115.0/go.mod h1:05E5hGujWeeXJmzKZwTdHyZ/+rRyrQlQB5p5Q2XY39M=
-go.opentelemetry.io/collector/receiver/receivertest v0.115.0 h1:OiB684SbHQi6/Pd3ZH0cXjYvCpBS9ilQBfTQx0wVXHg=
-go.opentelemetry.io/collector/receiver/receivertest v0.115.0/go.mod h1:Y8Z9U/bz9Xpyt8GI8DxZZgryw3mnnIw+AeKVLTD2cP8=
-go.opentelemetry.io/collector/semconv v0.115.0 h1:SoqMvg4ZEB3mz2EdAb6XYa+TuMo5Mir5FRBr3nVFUDY=
-go.opentelemetry.io/collector/semconv v0.115.0/go.mod h1:N6XE8Q0JKgBN2fAhkUQtqK9LT7rEGR6+Wu/Rtbal1iI=
-go.opentelemetry.io/collector/service v0.115.0 h1:k4GAOiI5tZgB2QKgwA6c3TeAVr7QL/ft5cOQbzUr8Iw=
-go.opentelemetry.io/collector/service v0.115.0/go.mod h1:DKde9LMhNebdREecDSsqiTFLI2wRc+IoV4/wGxU6goY=
+go.opentelemetry.io/collector v0.116.0 h1:Dscd6Nsnc7hjFQosO0SofcPQsXRfcj5N5PjQAslnmj4=
+go.opentelemetry.io/collector v0.116.0/go.mod h1:Ug2hpW0SINPmJAGVEALRlux78NTZc3YXSuh5/Q/hFrA=
+go.opentelemetry.io/collector/client v1.22.0 h1:AAUzHuqYQqxoNqacw1WXgGF/MxtBTwNZuhBvJIorgA0=
+go.opentelemetry.io/collector/client v1.22.0/go.mod h1:wcCSdTwbDVNTycoqs7BiDNVj3e1Ta7EnWH2sAofKnEk=
+go.opentelemetry.io/collector/component v0.116.0 h1:SQE1YeVfYCN7bw1n4hknUwJE5U/1qJL552sDhAdSlaA=
+go.opentelemetry.io/collector/component v0.116.0/go.mod h1:MYgXFZWDTq0uPgF1mkLSFibtpNqksRVAOrmihckOQEs=
+go.opentelemetry.io/collector/component/componentstatus v0.116.0 h1:wpgY0H2K9IPBzaNAvavKziK86VZ7TuNFQbS9OC4Z6Cs=
+go.opentelemetry.io/collector/component/componentstatus v0.116.0/go.mod h1:ZRlVwHFMGNfcsAywEJqivOn5JzDZkpe3KZVSwMWu4tw=
+go.opentelemetry.io/collector/component/componenttest v0.116.0 h1:UIcnx4Rrs/oDRYSAZNHRMUiYs2FBlwgV5Nc0oMYfR6A=
+go.opentelemetry.io/collector/component/componenttest v0.116.0/go.mod h1:W40HaKPHdBFMVI7zzHE7dhdWC+CgAnAC9SmWetFBATY=
+go.opentelemetry.io/collector/config/configauth v0.116.0 h1:8Y5y18fxilLobjDqNHO5FvGhC5HKYupWhT1DB3KrFaw=
+go.opentelemetry.io/collector/config/configauth v0.116.0/go.mod h1:2JZ5PRvNZcrBvPz1SjPWCwFQx7qXGVginb7AkFQu0iU=
+go.opentelemetry.io/collector/config/configcompression v1.22.0 h1:B4UCZjW2IVootcEL3iZFnCp8BOhLKEnWkHXHSo23ewk=
+go.opentelemetry.io/collector/config/configcompression v1.22.0/go.mod h1:LvYG00tbPTv0NOLoZN0wXq1F5thcxvukO8INq7xyfWU=
+go.opentelemetry.io/collector/config/configgrpc v0.116.0 h1:O8Y1X9wDH5dDdqDJ9kqoaMrxEauaDSJBg9aNC6QgB7g=
+go.opentelemetry.io/collector/config/configgrpc v0.116.0/go.mod h1:RPrSQrr6xhIaAK2DdcECi142NjSo0npQfVQB3nommSo=
+go.opentelemetry.io/collector/config/confighttp v0.116.0 h1:MLI88LmGzlN5D4pH6nFMg5hU3UCeTZb72iVx1lWb0c8=
+go.opentelemetry.io/collector/config/confighttp v0.116.0/go.mod h1:iJzNYVOiE1V3lpOIZIkR3JJk3aX/RGp9+SEssJMJ/bY=
+go.opentelemetry.io/collector/config/confignet v1.22.0 h1:SBEMHJZWD8J4qgFw1O+BEkXW9AWldDi6Fz5YeDeoU58=
+go.opentelemetry.io/collector/config/confignet v1.22.0/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc=
+go.opentelemetry.io/collector/config/configopaque v1.22.0 h1:CJgsm/Ynr2JE5Y66hYJBdybjHs20ywHtBHiV1jlI4yE=
+go.opentelemetry.io/collector/config/configopaque v1.22.0/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs=
+go.opentelemetry.io/collector/config/configretry v1.22.0 h1:gKZeYPvCho1+pO6ePRXkloA2nKUUFnA+yBUSHfOzJPU=
+go.opentelemetry.io/collector/config/configretry v1.22.0/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro=
+go.opentelemetry.io/collector/config/configtelemetry v0.116.0 h1:Vl49VCHQwBOeMswDpFwcl2HD8e9y94xlrfII3SR2VeQ=
+go.opentelemetry.io/collector/config/configtelemetry v0.116.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE=
+go.opentelemetry.io/collector/config/configtls v1.22.0 h1:Bu+GZMBYCufYDF72Wup+3jIGNsHuQUvZpMEPjllmYus=
+go.opentelemetry.io/collector/config/configtls v1.22.0/go.mod h1:CYFyMvbf10EoWhoFG8EYyxzFy4jcIPGIRMc8/HWLNQM=
+go.opentelemetry.io/collector/config/internal v0.116.0 h1:RG4tvK6Ozzk/SBUPyTnGD+miya0U7Z7GSpCY92qIEUY=
+go.opentelemetry.io/collector/config/internal v0.116.0/go.mod h1:OVkadRWlKAoWjHslqjWtBLAne8ceQm8WYT71ZcBWLFc=
+go.opentelemetry.io/collector/confmap v1.22.0 h1:ZKQzRuj5lKu+seKArAAZ1yPRroDPricaIVIREm/jr3w=
+go.opentelemetry.io/collector/confmap v1.22.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec=
+go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.0 h1:AdHaQo/GSSRLJvEFLCMHo02r+u6Ed8j0/MNz7u3noug=
+go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.0/go.mod h1:InKYEGFdkwz3H2q648kT6rMCFBhPvevIW9ZbWIY5QR4=
+go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.0 h1:upFhnU8EyPp0WMR53mJIdx+UR2EGFOr+ppYKzUCY/Vg=
+go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.0/go.mod h1:FhjMWU5nf3IctX27lVZomM5SKMyRywShRsA4/rHoBe8=
+go.opentelemetry.io/collector/confmap/provider/httpprovider v1.22.0 h1:jKLicfZRiA+G/sgso26aM6Dmmva4Dx9Txk2R58+R3e8=
+go.opentelemetry.io/collector/confmap/provider/httpprovider v1.22.0/go.mod h1:nZhEGDufHuZAaeVyFVz15IluXwrnQRCp+U/w7j8Lx9Y=
+go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.22.0 h1:SJy1cv/ChsEL+xzggMG0G0jJTF7RGWm1cqJmpUra8k0=
+go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.22.0/go.mod h1:VOil+29aaVqPwk4kYJdH23ocA0PC8EjKEGxAeEqk/GQ=
+go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.22.0 h1:dkiNwLxBqeNDN5fIwtvr2GoA0I2xZB2SEdQ9ceBbJVs=
+go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.22.0/go.mod h1:P9SxKZvim1C3K1R2j3gI+Qb4/l9MffX2sY5f9ajsk7Y=
+go.opentelemetry.io/collector/connector v0.116.0 h1:0Pz8RAXH1swLeA1fiyGGQWdv0Kemz4mbq+jnmd1TACE=
+go.opentelemetry.io/collector/connector v0.116.0/go.mod h1:VQiZ2yW9KhZuF0yjDbvlgrAxm7+o8KQoxHxurQWLjKU=
+go.opentelemetry.io/collector/connector/connectortest v0.116.0 h1:MdttvjqdZmp0ewW5IPCEtzzYmCqxrQxsjJ5m6gMVjzA=
+go.opentelemetry.io/collector/connector/connectortest v0.116.0/go.mod h1:ko7aPyvAVf6SvRhWGZdPXSyk+7zPmsSCcMq0gYPMMIQ=
+go.opentelemetry.io/collector/connector/forwardconnector v0.116.0 h1:USMDkZwMH9hlQ95Eh1Y4WLKF3IbR8cZJ2tna9165zXo=
+go.opentelemetry.io/collector/connector/forwardconnector v0.116.0/go.mod h1:GLhaRzl3W75GApUGut1jo77Q/tOHnSRf7E2/xsbR9KM=
+go.opentelemetry.io/collector/connector/xconnector v0.116.0 h1:fFJzrRco0g7HMkhnQ+ehlvicFf58vzsCLXnfuHyQM8w=
+go.opentelemetry.io/collector/connector/xconnector v0.116.0/go.mod h1:m9oCk32zX6wDciYBpy+qMQkWKtOxb0gAkEUm8+trflY=
+go.opentelemetry.io/collector/consumer v1.22.0 h1:QmfnNizyNZFt0uK3GG/EoT5h6PvZJ0dgVTc5hFEc1l0=
+go.opentelemetry.io/collector/consumer v1.22.0/go.mod h1:tiz2khNceFAPokxxfzAuFfIpShBasMT2AL2Sbc7+m0I=
+go.opentelemetry.io/collector/consumer/consumererror v0.116.0 h1:GRPnuvwxUeHKVTRzy35di8OFlxypY4YWrK+1nWMsExM=
+go.opentelemetry.io/collector/consumer/consumererror v0.116.0/go.mod h1:OvQvQ2V7sHT4Vz+1/4mwdEajWZNoFUsY1NhOM8rGvXo=
+go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.116.0 h1:sSPDz4Qu7H86SrxtE6sQHDuWjFkTWHdKyGdsxhjZzcw=
+go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.116.0/go.mod h1:0K7jbkCWtydn1IA3JwAUJeLVL79tJTxWoXR2gYTnCk0=
+go.opentelemetry.io/collector/consumer/consumertest v0.116.0 h1:pIVR7FtQMNAzfxBUSMEIC2dX5Lfo3O9ZBfx+sAwrrrM=
+go.opentelemetry.io/collector/consumer/consumertest v0.116.0/go.mod h1:cV3cNDiPnls5JdhnOJJFVlclrClg9kPs04cXgYP9Gmk=
+go.opentelemetry.io/collector/consumer/xconsumer v0.116.0 h1:ZrWvq7HumB0jRYmS2ztZ3hhXRNpUVBWPKMbPhsVGmZM=
+go.opentelemetry.io/collector/consumer/xconsumer v0.116.0/go.mod h1:C+VFMk8vLzPun6XK8aMts6h4RaDjmzXHCPaiOxzRQzQ=
+go.opentelemetry.io/collector/exporter v0.116.0 h1:Ps8sLPiGqJ4XGfmAVR6sxrtNBQOqAaWJvgqEOGxTvUU=
+go.opentelemetry.io/collector/exporter v0.116.0/go.mod h1:9alTWZILqY8Y3L/YLdJHFA0sx/LJDgZZjng0PHsIJkU=
+go.opentelemetry.io/collector/exporter/debugexporter v0.116.0 h1:NCVGIkaA0eSDZPg0/NdWt7ivUmVukPVEixBDTulMa08=
+go.opentelemetry.io/collector/exporter/debugexporter v0.116.0/go.mod h1:QZL/MKrgErI7O64ams2lmsQduLOkw/SLmtvS7W+iQNo=
+go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.116.0 h1:BzMvZf9RKRcQPFjGnQSEWvfI5Er9kXfzyZ/4GHkUTa4=
+go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.116.0/go.mod h1:RCbA3MNnZPTy2mViwQxMlnrq5moJ1XgetNQx2XHIpaI=
+go.opentelemetry.io/collector/exporter/exportertest v0.116.0 h1:2XEiNkBtvOq2+KzjM3OA92vlDATAi1Nn+xT9GT74QQc=
+go.opentelemetry.io/collector/exporter/exportertest v0.116.0/go.mod h1:t3CYc//OqP5pxpIN/5tYJhVP/mmtyoc5vHkBCau2IkM=
+go.opentelemetry.io/collector/exporter/otlpexporter v0.116.0 h1:2yA8fUW0R0hml2OFxfCmSdtdqpfCLqBGazJ8eALajgU=
+go.opentelemetry.io/collector/exporter/otlpexporter v0.116.0/go.mod h1:hbK5ggV3hjsjdifV7oUQKhbjg0ijgIeK9BHixTAzuYo=
+go.opentelemetry.io/collector/exporter/otlphttpexporter v0.116.0 h1:NKd1T+TfCss0Qo0RlkN2C30AO2/6ceHS0q+97hpQhI8=
+go.opentelemetry.io/collector/exporter/otlphttpexporter v0.116.0/go.mod h1:ev8EFap0FyqEUe02sct8Aon4ctlCANcsHrIxROH1jTU=
+go.opentelemetry.io/collector/exporter/xexporter v0.116.0 h1:z97GOTSJu4qMkp21yeUWAo6gskMEJi2j8vdnakLcKgI=
+go.opentelemetry.io/collector/exporter/xexporter v0.116.0/go.mod h1:9wWrMBpX6/s3dSx4mLf+QeEA8ZpYts4GdQkv4BOXEEg=
+go.opentelemetry.io/collector/extension v0.116.0 h1:/PYrsAqb87XlC1Cra7I3mU6CDs+TAjqj7LO/9tXX9qk=
+go.opentelemetry.io/collector/extension v0.116.0/go.mod h1:OF8pL6ioyT+f2V0CsEaM1EAmqaEMNCIgw7DS4agcOcc=
+go.opentelemetry.io/collector/extension/auth v0.116.0 h1:oolKkFBIS4vhJ4ZWTD4Bp+35ATBf7dBsln63RKWAJm0=
+go.opentelemetry.io/collector/extension/auth v0.116.0/go.mod h1:3WeZgIiiP7wcB+tID4G3ml6J/R2oJ359PxQh/pUFnSk=
+go.opentelemetry.io/collector/extension/auth/authtest v0.116.0 h1:KcMvjb4R0wpkmmi7EOk7zT5sgl7uwXY/VQfMEUVYcLM=
+go.opentelemetry.io/collector/extension/auth/authtest v0.116.0/go.mod h1:zyWTdh+CUKh7BbszTWUWp806NA6EDyix77O4Q6XaOA8=
+go.opentelemetry.io/collector/extension/experimental/storage v0.116.0 h1:Pb0ljtJMtsdiJoLOWbtVIYAViLkcZUF3V9MUNHyzn1c=
+go.opentelemetry.io/collector/extension/experimental/storage v0.116.0/go.mod h1:AQgDz5IJB4d9PExwV6RTlYkiVGp05/+/TAR9gCJpPJA=
+go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.0 h1:bXDgoiDiwFfrO5S6q1Wpe0su303CW4Qxthoy4CxG6eg=
+go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.0/go.mod h1:uFZlAPxk2+s6zk1W+u22DgxxSDugWy0QaY5kQzjNy7Q=
+go.opentelemetry.io/collector/extension/extensiontest v0.116.0 h1:NEPis256V4pFVocdZH6gOdsGDueyOe9vvx/BE9QxMf0=
+go.opentelemetry.io/collector/extension/extensiontest v0.116.0/go.mod h1:rpb4W2OimGXY5Oalk/NCemoPhgM03JZxBjXvlIveH5I=
+go.opentelemetry.io/collector/extension/zpagesextension v0.116.0 h1:D0VY/ESPwkREfMaqJleGVTiCYoCs3MDipU93ywaIn68=
+go.opentelemetry.io/collector/extension/zpagesextension v0.116.0/go.mod h1:MqkQSYKarMrjVSyGrAes1FBcsW6HDDPj/ouvcDvSjfk=
+go.opentelemetry.io/collector/featuregate v1.22.0 h1:1TUcdqA5VpEsX1Lrr6GG15CptZxDXxiu5AXgwpeNSR4=
+go.opentelemetry.io/collector/featuregate v1.22.0/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg=
+go.opentelemetry.io/collector/internal/fanoutconsumer v0.116.0 h1:KKFb3u8iLk4V5GYz7eVpw8QgEdob5koX6GNEbaoDQJY=
+go.opentelemetry.io/collector/internal/fanoutconsumer v0.116.0/go.mod h1:YyWHUWeSnRmy2CF7kPHpwJ6qkVjufbLZ8PYuY0Ph0o8=
+go.opentelemetry.io/collector/internal/memorylimiter v0.116.0 h1:xLt/2jPHvaWQiNle66DsTz3kRbWoQ93AEMfSeKyCdN0=
+go.opentelemetry.io/collector/internal/memorylimiter v0.116.0/go.mod h1:12KU4unWjF3nxrpOuuTi4TGK3KaD+kzmgA2Vd86MhWU=
+go.opentelemetry.io/collector/internal/sharedcomponent v0.116.0 h1:5QhpnwgogQhBrcsOjk1Yhkugopj043XlSDB1lpHKCGo=
+go.opentelemetry.io/collector/internal/sharedcomponent v0.116.0/go.mod h1:wMQM1Sqbj6J6jNVBb5hawkCfmqrLJ0hAeDKkalUfrEY=
+go.opentelemetry.io/collector/otelcol v0.116.0 h1:8NoPEY2uAemwNzUcMxiZuuI8w/Ff+0p1DXXk6NVEGlk=
+go.opentelemetry.io/collector/otelcol v0.116.0/go.mod h1:c/EhsBdHmC44SxhWMi7pTlYB+I6GBSJNBsj9NCwXMxM=
+go.opentelemetry.io/collector/pdata v1.22.0 h1:3yhjL46NLdTMoP8rkkcE9B0pzjf2973crn0KKhX5UrI=
+go.opentelemetry.io/collector/pdata v1.22.0/go.mod h1:nLLf6uDg8Kn5g3WNZwGyu8+kf77SwOqQvMTb5AXEbEY=
+go.opentelemetry.io/collector/pdata/pprofile v0.116.0 h1:iE6lqkO7Hi6lTIIml1RI7yQ55CKqW12R2qHinwF5Zuk=
+go.opentelemetry.io/collector/pdata/pprofile v0.116.0/go.mod h1:xQiPpjzIiXRFb+1fPxUy/3ygEZgo0Bu/xmLKOWu8vMQ=
+go.opentelemetry.io/collector/pdata/testdata v0.116.0 h1:zmn1zpeX2BvzL6vt2dBF4OuAyFF2ml/OXcqflNgFiP0=
+go.opentelemetry.io/collector/pdata/testdata v0.116.0/go.mod h1:ytWzICFN4XTDP6o65B4+Ed52JGdqgk9B8CpLHCeCpMo=
+go.opentelemetry.io/collector/pipeline v0.116.0 h1:o8eKEuWEszmRpfShy7ElBoQ3Jo6kCi9ucm3yRgdNb9s=
+go.opentelemetry.io/collector/pipeline v0.116.0/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74=
+go.opentelemetry.io/collector/pipeline/xpipeline v0.116.0 h1:PFNy+Il/kqPdPL9rhG+1kG63Aauya+FhBKGXoB6ivxU=
+go.opentelemetry.io/collector/pipeline/xpipeline v0.116.0/go.mod h1:bVn9V4TGyeXi58/JDkeXCuKtc+V+qcOoTl8hNpV0qa8=
+go.opentelemetry.io/collector/processor v0.116.0 h1:Kyu4tPzTdWNHtZjcxvI/bGNAgyv8L8Kem2r/Mk4IDAw=
+go.opentelemetry.io/collector/processor v0.116.0/go.mod h1:+/Ugy48RAxlZEXmN2cw51W8t5wdHS9No+GAoP+moskk=
+go.opentelemetry.io/collector/processor/batchprocessor v0.116.0 h1:jZMC+jlay3xCBBjcL85oT8nMFB5B3zvvwS6lW6xVGAc=
+go.opentelemetry.io/collector/processor/batchprocessor v0.116.0/go.mod h1:KmLVhDjnatsZm5xQkgRLl12lwvHohmk3djJXfu8m33c=
+go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.116.0 h1:7YwVMfpr0igtILydBFDXJsEGskI/4FIKPqc0hGIjJIE=
+go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.116.0/go.mod h1:nMEGCezCKUedDmxTLNL9cpFUhG2ku8ThNn7t/wfKWI0=
+go.opentelemetry.io/collector/processor/processortest v0.116.0 h1:+IqNEVEE0E2MsO2g7+Y/9dz35sDuvAXRXrLts9NdXrA=
+go.opentelemetry.io/collector/processor/processortest v0.116.0/go.mod h1:DLaQDBxzgeeaUO0ULMn/efos9PmHZkmYCHuxwCsiVHI=
+go.opentelemetry.io/collector/processor/xprocessor v0.116.0 h1:iin/UwuWvSLB7ZNfINFUYbZ5lxIi1NjZ2brkyyFdiRA=
+go.opentelemetry.io/collector/processor/xprocessor v0.116.0/go.mod h1:cnA43/XpKDbaOmd8buqKp/LGJ2l/OoCqbR//u5DMfn8=
+go.opentelemetry.io/collector/receiver v0.116.0 h1:voiBluWLwe4lbyLVwxloK6CudqqszWF+bgYKHuxnETU=
+go.opentelemetry.io/collector/receiver v0.116.0/go.mod h1:zb6m8l+knUuN62ASCDqQPIm9punK8PEX1mFrF/yzMI8=
+go.opentelemetry.io/collector/receiver/otlpreceiver v0.116.0 h1:81u+wJsQp9VfrAdVpVvcV31YAs8qsZp/UnMmG9YCJ0A=
+go.opentelemetry.io/collector/receiver/otlpreceiver v0.116.0/go.mod h1:JXIwjUyh3Q+gNvr7YE937se4/E4UJ/oz5z9xbJeVl3M=
+go.opentelemetry.io/collector/receiver/receivertest v0.116.0 h1:ZF4QVcots0OUiutblkyPR02pc+g7v1QaJSFW8tOzHoQ=
+go.opentelemetry.io/collector/receiver/receivertest v0.116.0/go.mod h1:7GGvtHhW3o6457/wGtSWXJtCtlW6VGFUZSlf6wboNTw=
+go.opentelemetry.io/collector/receiver/xreceiver v0.116.0 h1:Kc+ixqgMjU2sHhzNrFn5TttVNiJlJwTLL3sQrM9uH6s=
+go.opentelemetry.io/collector/receiver/xreceiver v0.116.0/go.mod h1:H2YGSNFoMbWMIDvB8tzkReHSVqvogihjtet+ppHfYv8=
+go.opentelemetry.io/collector/semconv v0.116.0 h1:63xCZomsKJAWmKGWD3lnORiE3WKW6AO4LjnzcHzGx3Y=
+go.opentelemetry.io/collector/semconv v0.116.0/go.mod h1:N6XE8Q0JKgBN2fAhkUQtqK9LT7rEGR6+Wu/Rtbal1iI=
+go.opentelemetry.io/collector/service v0.116.0 h1:1rFmax3ILOlQq4bW//0VKRcG/HmN2rxrgfTybn6bisU=
+go.opentelemetry.io/collector/service v0.116.0/go.mod h1:CzQzj72mWr5arag+q8uUWGRuUkenNo5Gw9oA97SFZ78=
 go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 h1:j8icMXyyqNf6HGuwlYhniPnVsbJIq7n+WirDu3VAJdQ=
 go.opentelemetry.io/contrib/bridges/otelzap v0.6.0/go.mod h1:evIOZpl+kAlU5IsaYX2Siw+IbpacAZvXemVsgt70uvw=
 go.opentelemetry.io/contrib/config v0.10.0 h1:2JknAzMaYjxrHkTnZh3eOme/Y2P5eHE2SWfhfV6Xd6c=
diff --git a/plugin/storage/grpc/factory.go b/plugin/storage/grpc/factory.go
index 28edfa6f2ae..c5e97f75310 100644
--- a/plugin/storage/grpc/factory.go
+++ b/plugin/storage/grpc/factory.go
@@ -13,7 +13,6 @@ import (
 	"github.com/spf13/viper"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/configgrpc"
-	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/metric"
@@ -246,8 +245,6 @@ func getTelset(logger *zap.Logger, tracerProvider trace.TracerProvider, meterPro
 	return component.TelemetrySettings{
 		Logger:         logger,
 		TracerProvider: tracerProvider,
-		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
-			return meterProvider
-		},
+		MeterProvider:  meterProvider,
 	}
 }

From 988ce8a5e817bdc7011a17135b8827706191059b Mon Sep 17 00:00:00 2001
From: Zhang Xin <zhangxin@outlook.com>
Date: Tue, 17 Dec 2024 22:39:22 +0800
Subject: [PATCH 38/59] Feat: Add time window for GetTrace of anonymizer
 (#6368)

---
 cmd/anonymizer/app/flags.go            | 14 ++++++++++++++
 cmd/anonymizer/app/flags_test.go       |  6 ++++++
 cmd/anonymizer/app/query/query.go      |  9 ++++++---
 cmd/anonymizer/app/query/query_test.go | 16 ++++++++++++----
 cmd/anonymizer/main.go                 | 15 ++++++++++++++-
 5 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/cmd/anonymizer/app/flags.go b/cmd/anonymizer/app/flags.go
index 51b14d88a07..f376f4af151 100644
--- a/cmd/anonymizer/app/flags.go
+++ b/cmd/anonymizer/app/flags.go
@@ -17,6 +17,8 @@ type Options struct {
 	HashCustomTags    bool
 	HashLogs          bool
 	HashProcess       bool
+	StartTime         int64
+	EndTime           int64
 }
 
 const (
@@ -28,6 +30,8 @@ const (
 	hashLogsFlag          = "hash-logs"
 	hashProcessFlag       = "hash-process"
 	maxSpansCount         = "max-spans-count"
+	startTime             = "start-time"
+	endTime               = "end-time"
 )
 
 // AddFlags adds flags for anonymizer main program
@@ -72,6 +76,16 @@ func (o *Options) AddFlags(command *cobra.Command) {
 		maxSpansCount,
 		-1,
 		"The maximum number of spans to anonymize")
+	command.Flags().Int64Var(
+		&o.StartTime,
+		startTime,
+		0,
+		"The start time of time window for searching trace, timestampe in unix nanoseconds")
+	command.Flags().Int64Var(
+		&o.EndTime,
+		endTime,
+		0,
+		"The end time of time window for searching trace, timestampe in unix nanoseconds")
 
 	// mark traceid flag as mandatory
 	command.MarkFlagRequired(traceIDFlag)
diff --git a/cmd/anonymizer/app/flags_test.go b/cmd/anonymizer/app/flags_test.go
index a7f6ff28ef4..08b6bbb8538 100644
--- a/cmd/anonymizer/app/flags_test.go
+++ b/cmd/anonymizer/app/flags_test.go
@@ -24,6 +24,8 @@ func TestOptionsWithDefaultFlags(t *testing.T) {
 	assert.False(t, o.HashLogs)
 	assert.False(t, o.HashProcess)
 	assert.Equal(t, -1, o.MaxSpansCount)
+	assert.Equal(t, int64(0), o.StartTime)
+	assert.Equal(t, int64(0), o.EndTime)
 }
 
 func TestOptionsWithFlags(t *testing.T) {
@@ -40,6 +42,8 @@ func TestOptionsWithFlags(t *testing.T) {
 		"--hash-logs",
 		"--hash-process",
 		"--max-spans-count=100",
+		"--start-time=1",
+		"--end-time=2",
 	})
 
 	assert.Equal(t, "192.168.1.10:16686", o.QueryGRPCHostPort)
@@ -50,6 +54,8 @@ func TestOptionsWithFlags(t *testing.T) {
 	assert.True(t, o.HashLogs)
 	assert.True(t, o.HashProcess)
 	assert.Equal(t, 100, o.MaxSpansCount)
+	assert.Equal(t, int64(1), o.StartTime)
+	assert.Equal(t, int64(2), o.EndTime)
 }
 
 func TestMain(m *testing.M) {
diff --git a/cmd/anonymizer/app/query/query.go b/cmd/anonymizer/app/query/query.go
index 6cca46408ba..77e82fcd103 100644
--- a/cmd/anonymizer/app/query/query.go
+++ b/cmd/anonymizer/app/query/query.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io"
 	"strings"
+	"time"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
@@ -49,14 +50,16 @@ func unwrapNotFoundErr(err error) error {
 }
 
 // QueryTrace queries for a trace and returns all spans inside it
-func (q *Query) QueryTrace(traceID string) ([]model.Span, error) {
+func (q *Query) QueryTrace(traceID string, startTime time.Time, endTime time.Time) ([]model.Span, error) {
 	mTraceID, err := model.TraceIDFromString(traceID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to convert the provided trace id: %w", err)
 	}
-	// TODO: add start time & end time
+
 	request := api_v2.GetTraceRequest{
-		TraceID: mTraceID,
+		TraceID:   mTraceID,
+		StartTime: startTime,
+		EndTime:   endTime,
 	}
 
 	stream, err := q.client.GetTrace(context.Background(), &request)
diff --git a/cmd/anonymizer/app/query/query_test.go b/cmd/anonymizer/app/query/query_test.go
index 8f350a191a0..2aad2f235c7 100644
--- a/cmd/anonymizer/app/query/query_test.go
+++ b/cmd/anonymizer/app/query/query_test.go
@@ -7,6 +7,7 @@ import (
 	"net"
 	"sync"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -108,16 +109,23 @@ func TestQueryTrace(t *testing.T) {
 	defer q.Close()
 
 	t.Run("No error", func(t *testing.T) {
-		s.spanReader.On("GetTrace", matchContext, matchGetTraceParameters).Return(
+		startTime := time.Date(1970, time.January, 1, 0, 0, 0, 1000, time.UTC)
+		endTime := time.Date(1970, time.January, 1, 0, 0, 0, 2000, time.UTC)
+		expectedGetTraceParameters := spanstore.GetTraceParameters{
+			TraceID:   mockTraceID,
+			StartTime: startTime,
+			EndTime:   endTime,
+		}
+		s.spanReader.On("GetTrace", matchContext, expectedGetTraceParameters).Return(
 			mockTraceGRPC, nil).Once()
 
-		spans, err := q.QueryTrace(mockTraceID.String())
+		spans, err := q.QueryTrace(mockTraceID.String(), startTime, endTime)
 		require.NoError(t, err)
 		assert.Equal(t, len(spans), len(mockTraceGRPC.Spans))
 	})
 
 	t.Run("Invalid TraceID", func(t *testing.T) {
-		_, err := q.QueryTrace(mockInvalidTraceID)
+		_, err := q.QueryTrace(mockInvalidTraceID, time.Time{}, time.Time{})
 		assert.ErrorContains(t, err, "failed to convert the provided trace id")
 	})
 
@@ -125,7 +133,7 @@ func TestQueryTrace(t *testing.T) {
 		s.spanReader.On("GetTrace", matchContext, matchGetTraceParameters).Return(
 			nil, spanstore.ErrTraceNotFound).Once()
 
-		spans, err := q.QueryTrace(mockTraceID.String())
+		spans, err := q.QueryTrace(mockTraceID.String(), time.Time{}, time.Time{})
 		assert.Nil(t, spans)
 		assert.ErrorIs(t, err, spanstore.ErrTraceNotFound)
 	})
diff --git a/cmd/anonymizer/main.go b/cmd/anonymizer/main.go
index 6f5e27c620b..ad57673cea2 100644
--- a/cmd/anonymizer/main.go
+++ b/cmd/anonymizer/main.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
@@ -53,7 +54,11 @@ func main() {
 				logger.Fatal("error while creating query object", zap.Error(err))
 			}
 
-			spans, err := query.QueryTrace(options.TraceID)
+			spans, err := query.QueryTrace(
+				options.TraceID,
+				initTime(options.StartTime),
+				initTime(options.EndTime),
+			)
 			if err != nil {
 				logger.Fatal("error while querying for trace", zap.Error(err))
 			}
@@ -93,3 +98,11 @@ func main() {
 		os.Exit(1)
 	}
 }
+
+func initTime(ts int64) time.Time {
+	var t time.Time
+	if ts != 0 {
+		t = time.Unix(0, ts)
+	}
+	return t
+}

From 1e5a8ff4b8cdfb2778535c829299d1006c47e97c Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Tue, 17 Dec 2024 18:22:08 +0100
Subject: [PATCH 39/59] fix(deps): update all otel collector contrib packages
 to v0.116.0 (#6378)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fconnector%2fspanmetricsconnector/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fconnector%2fspanmetricsconnector/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fconnector%2fspanmetricsconnector/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fconnector%2fspanmetricsconnector/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fexporter%2fkafkaexporter/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fexporter%2fkafkaexporter/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fexporter%2fkafkaexporter/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fexporter%2fkafkaexporter/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fexporter%2fprometheusexporter/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fexporter%2fprometheusexporter/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fexporter%2fprometheusexporter/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fexporter%2fprometheusexporter/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fextension%2fhealthcheckv2extension/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fextension%2fhealthcheckv2extension/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fextension%2fhealthcheckv2extension/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fextension%2fhealthcheckv2extension/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fextension%2fstorage/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fextension%2fstorage/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fextension%2fstorage/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fextension%2fstorage/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fpkg%2ftranslator%2fjaeger/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fpkg%2ftranslator%2fjaeger/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fpkg%2ftranslator%2fjaeger/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fpkg%2ftranslator%2fjaeger/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fprocessor%2fattributesprocessor/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fprocessor%2fattributesprocessor/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fprocessor%2fattributesprocessor/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fprocessor%2fattributesprocessor/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fprocessor%2ftailsamplingprocessor/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fprocessor%2ftailsamplingprocessor/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fprocessor%2ftailsamplingprocessor/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fprocessor%2ftailsamplingprocessor/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fjaegerreceiver/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fjaegerreceiver/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fjaegerreceiver/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fjaegerreceiver/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fkafkareceiver/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fkafkareceiver/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fkafkareceiver/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fkafkareceiver/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib)
| `v0.115.0` -> `v0.116.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fzipkinreceiver/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fzipkinreceiver/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fzipkinreceiver/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fzipkinreceiver/v0.115.0/v0.116.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>open-telemetry/opentelemetry-collector-contrib
(github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector)</summary>

###
[`v0.116.0`](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/blob/HEAD/CHANGELOG.md#v01160)

[Compare
Source](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.115.0...v0.116.0)

##### 🛑 Breaking changes 🛑

- `jsonlogencodingextension`: Change how logs are marshaled. Instead of
marshaling just the first log, marshal all logs into a JSON array.
([#&#8203;34064](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/34064))
- `githubreceiver`: Update metric names to match VCS Metric Semantic
Conventions and scraper key name.
([#&#8203;36714](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36714))
    -   Change the `github` scraper key to `scraper`
    -   Add `vcs.repository.url.full` attribute
    -   Change attribute `repository.name` to `vcs.repository.name`
    -   Change attribute `ref.name` to `vcs.ref.head.name`
    -   Change attribute `ref.type` to `vcs.ref.head.type`
    -   Change attribute `change.state` to `vcs.change.state`
- Add attribute `vcs.revision_delta.direction` with `ahead` and `behind`
values
- Change metric `vcs.repository.ref.revisions_ahead` to
`vcs.ref.revisions_delta` with `vcs.revision_delta.direction=ahead`
- Change metric `vcs.repository.ref.revisions_behind` to
`vcs.ref.revisions_delta` with `vcs.revision_delta.direction=behind`
    -   Change metric `vcs.repository.ref.count` to `vcs.ref.count`
    -   Change metric `vcs.repository.ref.time` to `vcs.ref.time`
- Add attribute `vcs.line_change.type` with `added` and `removed` values
- Change metric `vcs.repository.ref.lines_added` to
`vcs.ref.lines_delta` with `vcs.line_change.type=added`
- Change metric `vcs.repository.ref.lines_removed` to
`vcs.ref.lines_delta` with `vcs.line_change.type=removed`
- Change metric `vcs.repository.contributor.count` to
`vcs.contributor.count`
- Change metric `vcs.repository.change.time_open` to
`vcs.change.duration` with `vcs.change.state=open`
- Change metric `vcs.repository.change.time_to_approval` to
`vcs.change.time_to_approval`
- Change metric `vcs.repository.change.time_to_merge` to
`vcs.change.time_to_merge`
- Change metric `vcs.repository.change.count` to `vcs.change.count`
- `processor/tailsampling`: Reverts
[#&#8203;33671](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/33671),
allowing for composite policies to specify inverted clauses in
conjunction with other policies. This is a change bringing the previous
state into place, breaking users who rely on what was introduced as part
of
[#&#8203;33671](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/33671).
([#&#8203;34085](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/34085))

##### 🚩 Deprecations 🚩

- `connector/routing`: Deprecate `match_once` parameter.
([#&#8203;29882](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/29882))

- `routingprocessor`: Deprecated in favor of the routing connector.
([#&#8203;36616](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36616))

- `splunkhecexporter`: Add `otel_attrs_to_hec_metadata/*` config fields
to replace `hec_metadata_to_otel_attrs/*` fields.
([#&#8203;35092](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/35092))
`otel_attrs_to_hec_metadata/*` config fields will replace the
`hec_metadata_to_otel_attrs/*` fields in a later release.

- `kineticaexporter`: The kineticaexporter is now Unmaintained as it has
no active code owners from the vendor
([#&#8203;36808](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36808))

##### 🚀 New components 🚀

- `dorisexporter`: Mark the Doris exporter as Alpha.
([#&#8203;33479](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/33479))
- `libhoneyreceiver`: Introduce the scaffolding of a new component,
libhoneyreceiver
([#&#8203;36693](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36693))

##### 💡 Enhancements 💡

- `purefareceiver`: Implements support for scraping Pure Storage
FlashArray with Purity version 6.6.11+
([#&#8203;36251](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36251))

- `azureeventhubreceiver`: support providing one or more time formats
for timestamp parsing
([#&#8203;36650](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36650))

- `googlecloudmonitoringreceiver`: Add metric-specific labels to
googlecloudmonitoringreceiver component
([#&#8203;35711](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/35711))

- `awss3receiver`: Add support RFC3339 format for starttime and endtime
([#&#8203;36787](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36787))

- `awsxrayexporter`: Generate url section in xray segment when
`net.peer.name` is available
([#&#8203;35375](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/35375))

- `clickhouseexporter`: Exporter now sorts attribute maps' keys during
INSERT, yielding better compression and predictable aggregates
([#&#8203;33634](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/33634))

- `datadogconnector`: Flip configs `traces::compute_stats_by_span_kind`,
`traces::peer_tags_aggregation` and `traces::peer_service_aggregation`
to true by default
([#&#8203;35969](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/35969))
This enables Datadog APM stats on peer tags by default and is a
backwards-compatible change. Read more on
https://docs.datadoghq.com/tracing/guide/inferred-service-opt-in/.

- `datadogexporter`: Flip configs `traces::compute_stats_by_span_kind`,
`traces::peer_tags_aggregation` and `traces::peer_service_aggregation`
to true by default
([#&#8203;35969](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/35969))
This enables Datadog APM stats on peer tags by default and is a
backwards-compatible change. Read more on
https://docs.datadoghq.com/tracing/guide/inferred-service-opt-in/.

- `elasticsearchexporter`: Map \*.geo.location.{lat,lon} as geo_point
field in OTel mode
([#&#8203;36565](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36565))
In OTel mapping mode, merge \*.geo.location.{lat,lon} to \*.geo.location
such that they are stored as geo_point in Elasticsearch.

- `fileexporter`: Add support for profiles signal.
([#&#8203;35978](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/35978))

- `pkg/ottl`: GetXML Converter now supports selecting text, CDATA, and
attribute (value) content.
([#&#8203;36821](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36821))

- `githubreceiver`: Adds webhook skeleton to GitHub receiver to receive
events from GitHub for tracing.
([#&#8203;27460](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/27460))
This PR adds a skeleton for the GitHub receiver to receive events from
GitHub
for tracing via a webhook. The trace portion of this receiver will run
and
    respond to GET requests for the health check only.

- `kafkaexporter, kafkareceiver`: Add a new mechanism
"AWS_MSK_IAM_OAUTHBEARER" for kafka exporter and kafka receiver. This
mechanism use the AWS MSK IAM SASL Signer for Go
https://github.com/aws/aws-msk-iam-sasl-signer-go.
([#&#8203;19747](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/19747))

- `loadbalancingexporter`: Adds a an optional configuration to the k8s
resolver which returns hostnames instead of IPs for headless services
pointing at statefulsets
([#&#8203;18412](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/18412))

- `mongodbatlasreceiver`: Adds additional metrics to the MongoDB Atlas
receiver
([#&#8203;36525](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36525))
Adds a number of new default disabled metrics to the MongoDB Atlas
receiver. These metrics are:
    -   mongodbatlas.disk.partition.queue.depth
    -   mongodbatlas.disk.partition.throughput
    -   mongodbatlas.process.cache.ratio

- `s3exporter`: Upgrading to adopt aws sdk v2
([#&#8203;36699](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36699))

- `opampextension`: Use status subscription for fine granular component
health reporting
([#&#8203;35856](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/35856))

- `pkg/pdatatest`: Add support for Profiles signal comparison.
([#&#8203;36232](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36232))

- `receiver/prometheusremotewrite`: Parse labels from Prometheus Remote
Write requests into Resource and Metric Attributes.
([#&#8203;35656](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/35656))
Warning - The HTTP Server still doesn't pass metrics to the next
consumer. The component is unusable for now.

- `signaltometrics`: Add config validation and custom OTTL functions
([#&#8203;35930](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/35930))
Adds config validation for the signal to metrics connector. Also
introduces `AdjustedCount` OTTL function.

- `testbed`: Add batcher performance tests
([#&#8203;36206](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36206))

- `tesbed`: add options for retry/storage for filelog sender
([#&#8203;36781](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36781))

##### 🧰 Bug fixes 🧰

- `azuremonitorexporter`: fix bug to remove default config of endpoint
which causes failing to parse endpoint correctly.
([#&#8203;36704](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36704))

- `receiver/prometheusreceiver`: Metric adjuster no longer assumes that
all metrics from a scrape come from the same resource
([#&#8203;36477](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36477))

- `connector/datadog, exporter/datadog, pkg/datadog`: throw error if
datadog API key contains invalid characters
([#&#8203;36509](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36509))

- `parseutils`: Handle escaped quotes when parsing pairs using
SplitString.
([#&#8203;36176](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36176))

- `exporter/prometheusremotewrite`: Fix exemplar handling when the
exemplar is an integer value.
([#&#8203;36657](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36657))
Send metrics with exemplars as integer values now are correctly handled.

- `googlecloudmonitoringreceiver`: Fix "no validation found" error if
workload is running on Google Cloud Platform
([#&#8203;36607](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36607))

- `k8sattributesprocessor`: Override extracted k8s attributes if
original value has been empty
([#&#8203;36373](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36373))

- `k8sattributesreceiver`: Log any errors encountered during kube client
initialisation
([#&#8203;35879](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/35879))
This addresses an issue where the collector, due to an error encountered
during the kubernetes client initialisation,
was reporting an 'unavailable' status via the health check extension
without any further information to be found in the logs.

- `opampextension`: Fix blocking agent shutdown due to unclosed channel
([#&#8203;36764](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36764))

- `opampsupervisor`: avoid nil pointer access when reporting the last
received remote config
([#&#8203;36850](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36850))

- `postgresqlreceiver`: Update the postgresqlreceiver to handle new
table schema for the bgwriter metrics in pg17+
([#&#8203;36784](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36784))

- `jaegerreceiver`: Remove ineffectual warning from jaegerreceiver
([#&#8203;35894](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/35894))

- `datadogexporter`: read response body on pushSketches to allow
connection re-use
([#&#8203;36779](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36779))

- `sumologicextension`: Skip likely zombie processes on Windows.
([#&#8203;36481](https://redirect.github.com/open-telemetry/opentelemetry-collector-contrib/issues/36481))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these
updates again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS42OS4zIiwidXBkYXRlZEluVmVyIjoiMzkuNjkuMyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
---
 go.mod |  67 ++++++++++++++++-----------
 go.sum | 139 ++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 123 insertions(+), 83 deletions(-)

diff --git a/go.mod b/go.mod
index c9dab8c2d47..a9df79aaca3 100644
--- a/go.mod
+++ b/go.mod
@@ -23,17 +23,17 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0
 	github.com/kr/pretty v0.3.1
 	github.com/olivere/elastic v6.2.37+incompatible
-	github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.115.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.115.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.115.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.115.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.115.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.115.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.115.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.115.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.115.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.115.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.115.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.116.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.116.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.116.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.116.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.116.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.116.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.116.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.116.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.116.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.116.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.116.0
 	github.com/prometheus/client_golang v1.20.5
 	github.com/prometheus/client_model v0.6.1
 	github.com/prometheus/common v0.61.0
@@ -104,10 +104,23 @@ require (
 require (
 	github.com/antchfx/xmlquery v1.4.2 // indirect
 	github.com/antchfx/xpath v1.3.2 // indirect
+	github.com/aws/aws-msk-iam-sasl-signer-go v1.0.0 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.19.0 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.18.28 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.13.27 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.36 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.29 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.12.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.19.3 // indirect
+	github.com/aws/smithy-go v1.13.5 // indirect
 	github.com/dgraph-io/ristretto/v2 v2.0.0 // indirect
 	github.com/ebitengine/purego v0.8.1 // indirect
 	github.com/expr-lang/expr v1.16.9 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.115.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.116.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/collector/connector/connectortest v0.116.0 // indirect
 	go.opentelemetry.io/collector/connector/xconnector v0.116.0 // indirect
@@ -148,7 +161,7 @@ require (
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/goccy/go-json v0.10.4 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/flatbuffers v24.3.25+incompatible // indirect
@@ -191,19 +204,19 @@ require (
 	github.com/mostynb/go-grpc-compression v1.2.3 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.115.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.115.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.115.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.115.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.115.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.115.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.115.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.115.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.115.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.115.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.115.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.115.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.115.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.116.0 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/openzipkin/zipkin-go v0.4.3 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
@@ -239,7 +252,7 @@ require (
 	go.opentelemetry.io/collector/config/configcompression v1.22.0 // indirect
 	go.opentelemetry.io/collector/config/confignet v1.22.0
 	go.opentelemetry.io/collector/config/configopaque v1.22.0
-	go.opentelemetry.io/collector/config/configtelemetry v0.116.0
+	go.opentelemetry.io/collector/config/configtelemetry v0.116.0 // indirect
 	go.opentelemetry.io/collector/config/internal v0.116.0 // indirect
 	go.opentelemetry.io/collector/exporter/debugexporter v0.116.0
 	go.opentelemetry.io/collector/extension/auth v0.116.0 // indirect
diff --git a/go.sum b/go.sum
index b5ca2831cff..ae7caa88ed5 100644
--- a/go.sum
+++ b/go.sum
@@ -53,8 +53,34 @@ github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJ
 github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
+github.com/aws/aws-msk-iam-sasl-signer-go v1.0.0 h1:UyjtGmO0Uwl/K+zpzPwLoXzMhcN9xmnR2nrqJoBrg3c=
+github.com/aws/aws-msk-iam-sasl-signer-go v1.0.0/go.mod h1:TJAXuFs2HcMib3sN5L0gUC+Q01Qvy3DemvA55WuC+iA=
 github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
 github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
+github.com/aws/aws-sdk-go-v2 v1.19.0 h1:klAT+y3pGFBU/qVf1uzwttpBbiuozJYWzNLHioyDJ+k=
+github.com/aws/aws-sdk-go-v2 v1.19.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
+github.com/aws/aws-sdk-go-v2/config v1.18.28 h1:TINEaKyh1Td64tqFvn09iYpKiWjmHYrG1fa91q2gnqw=
+github.com/aws/aws-sdk-go-v2/config v1.18.28/go.mod h1:nIL+4/8JdAuNHEjn/gPEXqtnS02Q3NXB/9Z7o5xE4+A=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.27 h1:dz0yr/yR1jweAnsCx+BmjerUILVPQ6FS5AwF/OyG1kA=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.27/go.mod h1:syOqAek45ZXZp29HlnRS/BNgMIW6uiRmeuQsz4Qh2UE=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5 h1:kP3Me6Fy3vdi+9uHd7YLr6ewPxRL+PU6y15urfTaamU=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5/go.mod h1:Gj7tm95r+QsDoN2Fhuz/3npQvcZbkEf5mL70n3Xfluc=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35 h1:hMUCiE3Zi5AHrRNGf5j985u0WyqI6r2NULhUfo0N/No=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35/go.mod h1:ipR5PvpSPqIqL5Mi82BxLnfMkHVbmco8kUwO2xrCi0M=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29 h1:yOpYx+FTBdpk/g+sBU6Cb1H0U/TLEcYYp66mYqsPpcc=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29/go.mod h1:M/eUABlDbw2uVrdAn+UsI6M727qp2fxkp8K0ejcBDUY=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.36 h1:8r5m1BoAWkn0TDC34lUculryf7nUF25EgIMdjvGCkgo=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.36/go.mod h1:Rmw2M1hMVTwiUhjwMoIBFWFJMhvJbct06sSidxInkhY=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.29 h1:IiDolu/eLmuB18DRZibj77n1hHQT7z12jnGO7Ze3pLc=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.29/go.mod h1:fDbkK4o7fpPXWn8YAPmTieAMuB9mk/VgvW64uaUqxd4=
+github.com/aws/aws-sdk-go-v2/service/sso v1.12.13 h1:sWDv7cMITPcZ21QdreULwxOOAmE05JjEsT6fCDtDA9k=
+github.com/aws/aws-sdk-go-v2/service/sso v1.12.13/go.mod h1:DfX0sWuT46KpcqbMhJ9QWtxAIP1VozkDWf8VAkByjYY=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13 h1:BFubHS/xN5bjl818QaroN6mQdjneYQ+AOx44KNXlyH4=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13/go.mod h1:BzqsVVFduubEmzrVtUFQQIQdFqvUItF8XUq2EnS8Wog=
+github.com/aws/aws-sdk-go-v2/service/sts v1.19.3 h1:e5mnydVdCVWxP+5rPAGi2PYxC7u2OZgH1ypC114H04U=
+github.com/aws/aws-sdk-go-v2/service/sts v1.19.3/go.mod h1:yVGZA1CPkmUhBdA039jXNJJG7/6t+G+EBWmFq23xqnY=
+github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8=
+github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY=
@@ -175,8 +201,8 @@ github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg
 github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
-github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
+github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/gocql/gocql v1.7.0 h1:O+7U7/1gSN7QTEAaMEsJc1Oq2QHXvCWoF3DFK9HDHus=
 github.com/gocql/gocql v1.7.0/go.mod h1:vnlvXyFZeLBF0Wy+RS8hrOdbn0UWsWtdg07XJnFxZ+4=
 github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
@@ -218,6 +244,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -406,60 +433,60 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
-github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.115.0 h1:sO4fPw0NRUibgBVvQVTqPBCBRFh0I+ODIr3HAwcWezI=
-github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.115.0/go.mod h1:HqzCXJ4rxXzWNYaUtCqJzXyTsCGEKSa/d+tHcyeRDY0=
-github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.115.0 h1:ERZZn6Z3/nQVyzIWCSfGSH8im5v+NS3eOjc+F24ljvs=
-github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.115.0/go.mod h1:PetcN/RbgdGEXdKy543/rwr/Vw1grrWJW1Fnf9szf6U=
-github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.115.0 h1:+chjfzq/LX6e5KLBoOH5cMH0abARKdZZAR4Esl6i/N4=
-github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.115.0/go.mod h1:e6VtbMpfBlKdpjAgwyP4AG9sG1k8JqpMyK7DOMHg5nU=
-github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.115.0 h1:ILTDH+jTKJ+G+BEq+GzW4/0IcC9SFxR8vLHWe5QHXfU=
-github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.115.0/go.mod h1:VsObvMuEQhu9mtiTVATKA4icfyBqNFzNlPaj8wu1KUE=
-github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.115.0 h1:4Ycg73pYVdiF+oq+BmUq7Dkg0WKeKvBSk9AOKvBe4LU=
-github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.115.0/go.mod h1:l2Q+MmYk2ZRDSbhX9GlJYvBXC51AqhDJAj2ne290Xik=
-github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.115.0 h1:vRQQFD4YpasQFUAdF030UWtaflSYFXK542bfWMGhOK0=
-github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.115.0/go.mod h1:BZ7DT+0VkKR7P3I9PGEDfVa0GdB0ty41eEcejIUXF9A=
-github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.115.0 h1:a36EJz/mb83f6ieX0v4fNDJ1jXqpeaM6DVQXeFDvdhw=
-github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.115.0/go.mod h1:r5/40YO1eSP5ZreOmRzVOUtDr7YG39ZIUcVjHd+9Izc=
-github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.115.0 h1:h6zEsBtuZalQu7lKYf6ZCcj8fTocT+zxdmuOou9515Q=
-github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.115.0/go.mod h1:6QU/K0dGCGYorkOvJmhbDFCspy4RPxRkFjf9I64y6I0=
-github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.115.0 h1:yXfwbXOAOEjaICnOb2raWD17jy9fwTXNoblS+3dBYZc=
-github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.115.0/go.mod h1:5kMXT8uFeGzsIIocU1PjfzYwakbCbQquiferXmkw38g=
-github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.115.0 h1:8A+iBT5G23zvBPqYx32Qh4800jHFo4X9T1fpQKVQ+4E=
-github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.115.0/go.mod h1:AhdPvwYKu7G8LKRWzHTNQYBq27RinsMm5qSanwSA/rU=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.115.0 h1:5mo0RdP0Hs3/QLoTwf9ilHc8x0CsfdQzGzMoGdDxiSQ=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.115.0/go.mod h1:iYgX5DFrPGvWSmKy4jOUanlsS3Rf/pV5vdX0jNFqs4s=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.115.0 h1:7wjWEkvtP1oU2TNZzjo+5sY3GRvwhMhOJ9zFAeGGgo8=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.115.0/go.mod h1:1q/L2R/28emNCz0EHfxEw853I6lPxTcHTqS+UrMea0k=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.115.0 h1:qdZ9EqmdM19pWhPoFA7VivBTdzP2HvNwXa3CCMHYoDQ=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.115.0/go.mod h1:mrL1MNrcg0zYAJ+aK9WtOH062dl2wN9DDG7mZk9H8v4=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.115.0 h1:MerLKMrkM4YoGF6Di0D9yMXO02yCX8mrZAi/+jJVVeI=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.115.0/go.mod h1:R8AkVWe9G5Q0oMOapvm9HNS076E3Min8SVlmhBL3QD0=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.115.0 h1:WEqcnWSy9dNSlGb8pYRBX7zhaz2ReyaeImlenbzNTB4=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.115.0/go.mod h1:6Mk71CakHUA3I6oM9hARDiyQypYyOolvb+4PFYyVEFg=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.115.0 h1:eoapW0JBablApkdv4C1RUuOKfz0U6SwuKMYYSAJH6fE=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.115.0/go.mod h1:hW2AaybTRcwxJySGLC3Fh1vd2VDaQhRBfa7O7w30NS8=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.115.0 h1:RbdY7wu/AHbIddZfkwU1EXJ1Im81Av1+qkcUvam7+pM=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.115.0/go.mod h1:a8Cj+3uH6foT0aEoPP2WT6o4YLWG4HoZ0+ljFBIpwUE=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.115.0 h1:PmYiiOKopMdXl/WA0SxBEZFTiJVBuIpZrmRi4xvDzHI=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.115.0/go.mod h1:qBPBqhO1kCBCCu05bTbWCxAUNDqzPn6oALLIrQyHmZE=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.115.0 h1:rrIm0dyEdaHmQo6udPK1V3opkzEKa0PrZzSdY5oGqmQ=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.115.0/go.mod h1:AMeisxL/9gs0bzozaymUqI1/EJ9GPvtnLh/BtqtjSF8=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.115.0 h1:KghgAubxdDqP4eUQ+d2GzHXUAwtFxpSDToqFVnax0XA=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.115.0/go.mod h1:cW/BaYE6Uo7ZYHbmT0wVBktHP0SfeLqGHMf0qks7rOE=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.115.0 h1:A9zqBtUJZ5J/0VI+B1dxuQhc2iVYpD9c54SgaKtFIN8=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.115.0/go.mod h1:hG7GOrBBux/cg1fAUzvSlzYY02ekxjF9IvH4ls/nGXA=
-github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.115.0 h1:hAsK9I081ShnSDSKPVEHB3TLawyOmbR6bPDiQEkgo2Y=
-github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.115.0/go.mod h1:z8XdvlhXSYVboxS3TPGembE9kfxLAYH2PxPLMvf8wTk=
-github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.115.0 h1:olyiml73slGYORDjZNViW3nKiysC+K+h5yPsSBjUxQ4=
-github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.115.0/go.mod h1:N00k1mTxzfS2clqxSP4Dxk7iX8GWbbuCq6LF8/ECk/M=
-github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.115.0 h1:hYNlyUj3F43cuv1ap19NlEEchQfs91vYeNoQ1+nswLo=
-github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.115.0/go.mod h1:1o6wF5HJdpb2hd2eGMoQhGuTKb4F2+j/IHBJJSPdM2w=
-github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.115.0 h1:satJaDP5SjwFKLPa5UxBg3MIUJQ2NQ+4bTO88n0SW0g=
-github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.115.0/go.mod h1:1NZE+dWHRux5kN0fI1w57AbHzqL4xVniD0X6HPeFwHU=
-github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.115.0 h1:GIyMUiud3T8nyCJP9KVhxVKvfcNQRBCde5uTCl6K/i0=
-github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.115.0/go.mod h1:x4hCznyUolxGt5cE/uXWRCckdIDrUYqH5hJddvdKZd4=
-github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.115.0 h1:h/HAHLIZnIyu85l8wOeggOyiI8z8citNAqxQktVKUpk=
-github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.115.0/go.mod h1:iEU0NA/i2sUREqD19JYmjKwrjMUTcddad/h1LGdSMHw=
+github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.116.0 h1:XFLkYR1xXwxapNuS0IrahYoHaaJxTyt5Kt3tHNCwHsc=
+github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.116.0/go.mod h1:1kppUKh6r44eoCCuNTTCz3o2HIZXAhDvBxSFvDs0kwo=
+github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.116.0 h1:4Pgj/AuFEW6r654llnTuZZwk09xiovGYcbMsYrumu+U=
+github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.116.0/go.mod h1:KZe8BzQcC+KNs4P//Dq2pg1gpuLC4NTsSPWdowIMo9E=
+github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.116.0 h1:/hnIwjg4gizoJPs1pCQbj42HmyH4VDAjydw0yNBsdXg=
+github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.116.0/go.mod h1:Yr4dwclf3Y5ZUvzcrIL5c8ZlH6QIIQwV1x4/3VZltpg=
+github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.116.0 h1:J4tlrS1dNTgD76pN0DM29SjqTksuXIiP9KWWNVbQ60M=
+github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.116.0/go.mod h1:Ng9eMrROScOvpphs3FI+CpWPKaObPjdpiUYscgpwAM4=
+github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.116.0 h1:0MkHxKsm35xWibXRs4hPdQldI7DOhr0pil4cbQ9rOkY=
+github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.116.0/go.mod h1:ueNOmFMNZYsp+o20TP/L92ieSmK88tyvmnAr5uEurhg=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.116.0 h1:va5jloH1Uwrnx8rymcG7ZqLJ49/zWGMz5Dy/iMm1JzI=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.116.0/go.mod h1:WXJuadNLluxAiVZts1bAJbhAVurBpogToBbjtFKzie8=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.116.0 h1:xDbf946Zm0rTzWcYEyUfU0Ft2KthhaH4xrNm303vpbI=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.116.0/go.mod h1:yuIyOGmQJOn37u6NVfG8yOCzVvwboqnt+pjOSTvDeLo=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.116.0 h1:5T7nt2K73pHYT131FTj9BjS6xdjIJZQ3fzp9nCB1dYo=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.116.0/go.mod h1:SY4FYy6K/cr63UY6ImhNSRy/1/WmK6fvSHsSpW+lT1Q=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.116.0 h1:sp2pcY/jJItuB14+omWqIm6ImSeZiKCtAm0MD+9Ex5w=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.116.0/go.mod h1:51jLoNTWbZ8wHqYU41IkGbNtlLaqAnBXEqpHleDhFY0=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.116.0 h1:DkrbPF5kPCtdoi2dDxgv3zT1fYQn4KbNxq1MBqgaJ9U=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.116.0/go.mod h1:oa6vnMIde7Mb5qNocvRaba6TAytPsRRjnV/Ja+1I67g=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.116.0 h1:Gdmg6Pr9X/h+HqTnRWCnH0tcLbCRymXJ9Lj1RGchs3M=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.116.0/go.mod h1:jJseeb/N41qHL1YOd+dzhgyEMR04s7cbkD6dsXKjoUk=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.116.0 h1:Oi6UZR5FNij7eifaFtjbBXFxfNXuPCH+37PODtZSu/o=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.116.0/go.mod h1:1q/L2R/28emNCz0EHfxEw853I6lPxTcHTqS+UrMea0k=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.116.0 h1:LCyHhStq7UbCHxCiTHIpGhhMWFv/mA1ecV6wduzicYw=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.116.0/go.mod h1:wpgb30Nj/PwrTBCRm4b1EQNHhk4P5uILvqogiKD2+2w=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.116.0 h1:RlEK9MbxWyBHbLel8EJ1L7DbYVLai9dZL6Ljl2cBgyA=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.116.0/go.mod h1:AVUEyIjPb+0ARr7mhIkZkdNg3fd0ZcRhzAi53oZhl1Q=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.116.0 h1:jwnZYRBuPJnsKXE5H6ZvTEm91bXW5VP8+tLewzl54eg=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.116.0/go.mod h1:NT3Ag+DdnIAZQfD7l7OHwlYqnaAJ19SoPZ0nhD9yx4s=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.116.0 h1:AOIAG3j3o1Ww8Gfw9SeFIhGqHftxH65ljeHODVMxwDE=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.116.0/go.mod h1:Sis11Z5mNhfyL27DQOz16mZApsYYWC3Fmt/+WM4glqs=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.116.0 h1:9kjAz4+wIdKL3CiBC90Al8COTcGcO2TDp4ppaVXz2/I=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.116.0/go.mod h1:tKA2kw5ylY/ytwBDj9P+gSlhe8WMQL+3lcmSXmIS7Z0=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.116.0 h1:QqlVh8hjFr+U1HDI8VeCXg0nJGKeKce4lemGhSqdteo=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.116.0/go.mod h1:GjaQr/5Atnc20NDg2YFa4A+Ly9pojsy3+Vi+BQ5DW/4=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.116.0 h1:wNQ51LBQjPIW7ptgZOMaJT60CnMoP1t3kxgldR7uv9Q=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.116.0/go.mod h1:lx+O1oAnKYPg5KaFW5Ss1Xh+zvCDKZPm73MDAFjPgak=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.116.0 h1:coTfhsM6coyLEEC+Q+mSL8HnmajFScFg8Ib8Zn9/o9U=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.116.0/go.mod h1:8awtHOYwTq5FF/TiFwA058Ok0rVIf1NjWkVe9P7xXTQ=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.116.0 h1:mEKOrQ6dqWkfPTVEND41Jsvgktdlnk774GZIeU0IZRE=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.116.0/go.mod h1:9TzKV3YvfXnz9PUoKluRG3iQkOVQMNZcUJy+CUnthkY=
+github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.116.0 h1:3qdGwEhZmRyepVnOwPTe4fk6WDKxUCivr6RHleX7hy4=
+github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.116.0/go.mod h1:FAuz4SFxKZwNgptL1BVarh6SEO4gQ1I7SclJScBBho4=
+github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.116.0 h1:q2Ug0KXJMDnUw1RCEEn6J07qQREWXD/KLBOa79DHJfM=
+github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.116.0/go.mod h1:CBQvNUdQxsDzmMmfgxhLRqbHWA9BEhWe3E2FIe/DT+s=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.116.0 h1:Rgqfcmb6+Bsb99UOPCpfnVrH8ytI/F0KU3lmx2tnNk4=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.116.0/go.mod h1:LQBflOCH8C1rrcW4iYWDe2InZx+U5jY4HLnShmi+jR8=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.116.0 h1:+YA1AlJv4CWSLun5O6RRIK/Eac+Wekw/6k+45xR5yXM=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.116.0/go.mod h1:WCbw0k2xv2RvMUzhrAT1sIAQPCvdnR7wr/6bW6aQJIE=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.116.0 h1:a++2CPNUqLJWafE6dYtcJRweSD4ayJCLToikrb1scwM=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.116.0/go.mod h1:HW4ytncy0SeUdm1tcOVHMRf8K7V3rQ9dptpQlFn4JXs=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.116.0 h1:M9nXu5HHi1Prf2h3o2W+nI2RXvXuVF0qh+hNP8p7pAI=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.116.0/go.mod h1:nbNJQEln1t8+0xyYK4E4ynUAvEv3QXaeMWIN2J+FWPI=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=

From 58ae7375ba2710c99837721b9287fcc3b30550b9 Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Date: Tue, 17 Dec 2024 13:43:09 -0400
Subject: [PATCH 40/59] [go.mod] Merge indirect groups into one (#6375)

## Which problem is this PR solving?
- Somehow meaningless separation is created by the bots

## Description of the changes
- Keep only one group for indirect deps

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
---
 go.mod | 49 +++++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/go.mod b/go.mod
index a9df79aaca3..d262d6c0671 100644
--- a/go.mod
+++ b/go.mod
@@ -102,9 +102,12 @@ require (
 )
 
 require (
+	github.com/IBM/sarama v1.43.3 // indirect
+	github.com/alecthomas/participle/v2 v2.1.1 // indirect
 	github.com/antchfx/xmlquery v1.4.2 // indirect
 	github.com/antchfx/xpath v1.3.2 // indirect
 	github.com/aws/aws-msk-iam-sasl-signer-go v1.0.0 // indirect
+	github.com/aws/aws-sdk-go v1.55.5 // indirect
 	github.com/aws/aws-sdk-go-v2 v1.19.0 // indirect
 	github.com/aws/aws-sdk-go-v2/config v1.18.28 // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.13.27 // indirect
@@ -117,44 +120,21 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.19.3 // indirect
 	github.com/aws/smithy-go v1.13.5 // indirect
-	github.com/dgraph-io/ristretto/v2 v2.0.0 // indirect
-	github.com/ebitengine/purego v0.8.1 // indirect
-	github.com/expr-lang/expr v1.16.9 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.116.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/collector/connector/connectortest v0.116.0 // indirect
-	go.opentelemetry.io/collector/connector/xconnector v0.116.0 // indirect
-	go.opentelemetry.io/collector/consumer/consumererror v0.116.0 // indirect
-	go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.116.0 // indirect
-	go.opentelemetry.io/collector/consumer/xconsumer v0.116.0 // indirect
-	go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.116.0 // indirect
-	go.opentelemetry.io/collector/exporter/xexporter v0.116.0 // indirect
-	go.opentelemetry.io/collector/internal/fanoutconsumer v0.116.0 // indirect
-	go.opentelemetry.io/collector/internal/memorylimiter v0.116.0 // indirect
-	go.opentelemetry.io/collector/internal/sharedcomponent v0.116.0 // indirect
-	go.opentelemetry.io/collector/pipeline/xpipeline v0.116.0 // indirect
-	go.opentelemetry.io/collector/processor/xprocessor v0.116.0 // indirect
-	go.opentelemetry.io/collector/receiver/receivertest v0.116.0 // indirect
-	go.opentelemetry.io/collector/receiver/xreceiver v0.116.0 // indirect
-	go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect
-)
-
-require (
-	github.com/IBM/sarama v1.43.3 // indirect
-	github.com/alecthomas/participle/v2 v2.1.1 // indirect
-	github.com/aws/aws-sdk-go v1.55.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/dgraph-io/ristretto/v2 v2.0.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/eapache/go-resiliency v1.7.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
+	github.com/ebitengine/purego v0.8.1 // indirect
 	github.com/elastic/elastic-transport-go/v8 v8.6.0 // indirect
 	github.com/elastic/go-grok v0.3.1 // indirect
 	github.com/elastic/lunes v0.1.0 // indirect
+	github.com/expr-lang/expr v1.16.9 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -214,6 +194,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.116.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.116.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.116.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.116.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.116.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.116.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.116.0 // indirect
@@ -247,6 +228,7 @@ require (
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/collector v0.116.0 // indirect
 	go.opentelemetry.io/collector/client v1.22.0 // indirect
 	go.opentelemetry.io/collector/config/configcompression v1.22.0 // indirect
@@ -254,15 +236,30 @@ require (
 	go.opentelemetry.io/collector/config/configopaque v1.22.0
 	go.opentelemetry.io/collector/config/configtelemetry v0.116.0 // indirect
 	go.opentelemetry.io/collector/config/internal v0.116.0 // indirect
+	go.opentelemetry.io/collector/connector/connectortest v0.116.0 // indirect
+	go.opentelemetry.io/collector/connector/xconnector v0.116.0 // indirect
+	go.opentelemetry.io/collector/consumer/consumererror v0.116.0 // indirect
+	go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.116.0 // indirect
+	go.opentelemetry.io/collector/consumer/xconsumer v0.116.0 // indirect
 	go.opentelemetry.io/collector/exporter/debugexporter v0.116.0
+	go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.116.0 // indirect
+	go.opentelemetry.io/collector/exporter/xexporter v0.116.0 // indirect
 	go.opentelemetry.io/collector/extension/auth v0.116.0 // indirect
 	go.opentelemetry.io/collector/extension/experimental/storage v0.116.0 // indirect
 	go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.0
 	go.opentelemetry.io/collector/featuregate v1.22.0 // indirect
+	go.opentelemetry.io/collector/internal/fanoutconsumer v0.116.0 // indirect
+	go.opentelemetry.io/collector/internal/memorylimiter v0.116.0 // indirect
+	go.opentelemetry.io/collector/internal/sharedcomponent v0.116.0 // indirect
 	go.opentelemetry.io/collector/pdata/pprofile v0.116.0 // indirect
 	go.opentelemetry.io/collector/pdata/testdata v0.116.0 // indirect
+	go.opentelemetry.io/collector/pipeline/xpipeline v0.116.0 // indirect
+	go.opentelemetry.io/collector/processor/xprocessor v0.116.0 // indirect
+	go.opentelemetry.io/collector/receiver/receivertest v0.116.0 // indirect
+	go.opentelemetry.io/collector/receiver/xreceiver v0.116.0 // indirect
 	go.opentelemetry.io/collector/semconv v0.116.0 // indirect
 	go.opentelemetry.io/collector/service v0.116.0 // indirect
+	go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect
 	go.opentelemetry.io/contrib/config v0.10.0 // indirect
 	go.opentelemetry.io/contrib/propagators/b3 v1.31.0 // indirect
 	go.opentelemetry.io/contrib/zpages v0.56.0 // indirect

From 34bf4090ad2a6aa6c5dd1be1dd7e1794da9eb3ca Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Tue, 17 Dec 2024 20:36:11 +0100
Subject: [PATCH 41/59] fix(deps): update module
 github.com/elastic/go-elasticsearch/v8 to v8.17.0 (#6380)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/elastic/go-elasticsearch/v8](https://redirect.github.com/elastic/go-elasticsearch)
| `v8.16.0` -> `v8.17.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2felastic%2fgo-elasticsearch%2fv8/v8.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2felastic%2fgo-elasticsearch%2fv8/v8.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2felastic%2fgo-elasticsearch%2fv8/v8.16.0/v8.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2felastic%2fgo-elasticsearch%2fv8/v8.16.0/v8.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>elastic/go-elasticsearch
(github.com/elastic/go-elasticsearch/v8)</summary>

###
[`v8.17.0`](https://redirect.github.com/elastic/go-elasticsearch/releases/tag/v8.17.0)

[Compare
Source](https://redirect.github.com/elastic/go-elasticsearch/compare/v8.16.0...v8.17.0)

- Expose BulkIndexer total flushed bytes metric
[#&#8203;914](https://redirect.github.com/elastic/go-elasticsearch/pull/914)
thanks to [@&#8203;aureleoules](https://redirect.github.com/aureleoules)

### API

Updated APIs to 8.17.0

### Typed API

Update APIs to latest [elasticsearch-specification
8.17](https://redirect.github.com/elastic/elasticsearch-specification/tree/2f823ff6fcaa7f3f0f9b990dc90512d8901e5d64)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS43Mi4yIiwidXBkYXRlZEluVmVyIjoiMzkuNzIuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index d262d6c0671..6b053f2933f 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/bsm/sarama-cluster v2.1.13+incompatible
 	github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b
 	github.com/dgraph-io/badger/v4 v4.5.0
-	github.com/elastic/go-elasticsearch/v8 v8.16.0
+	github.com/elastic/go-elasticsearch/v8 v8.17.0
 	github.com/fsnotify/fsnotify v1.8.0
 	github.com/go-logr/zapr v1.3.0
 	github.com/gocql/gocql v1.7.0
diff --git a/go.sum b/go.sum
index ae7caa88ed5..40e982cb029 100644
--- a/go.sum
+++ b/go.sum
@@ -140,8 +140,8 @@ github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/
 github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA=
 github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
-github.com/elastic/go-elasticsearch/v8 v8.16.0 h1:f7bR+iBz8GTAVhwyFO3hm4ixsz2eMaEy0QroYnXV3jE=
-github.com/elastic/go-elasticsearch/v8 v8.16.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64=
+github.com/elastic/go-elasticsearch/v8 v8.17.0 h1:e9cWksE/Fr7urDRmGPGp47Nsp4/mvNOrU8As1l2HQQ0=
+github.com/elastic/go-elasticsearch/v8 v8.17.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64=
 github.com/elastic/go-grok v0.3.1 h1:WEhUxe2KrwycMnlvMimJXvzRa7DoByJB4PVUIE1ZD/U=
 github.com/elastic/go-grok v0.3.1/go.mod h1:n38ls8ZgOboZRgKcjMY8eFeZFMmcL9n2lP0iHhIDk64=
 github.com/elastic/lunes v0.1.0 h1:amRtLPjwkWtzDF/RKzcEPMvSsSseLDLW+bnhfNSLRe4=

From 7fdb6e938df6e3dddf12981e526f839f8d39cdf9 Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Tue, 17 Dec 2024 21:37:18 -0500
Subject: [PATCH 42/59] [v2][adjuster] Add warning to span links adjuster
 (#6381)

## Which problem is this PR solving?
- Towards #6344

## Description of the changes
- Add a warning to the `SpanLinks` adjuster when there is a bad span
link to match the behaviour of the v1 adjuster
(https://github.com/jaegertracing/jaeger/blob/main/model/adjuster/bad_span_references.go#L40)

## How was this change tested?
- Updated unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/query/app/querysvc/adjuster/spanlinks.go  |  8 +++++
 .../app/querysvc/adjuster/spanlinks_test.go   | 33 ++++++++++++++-----
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/cmd/query/app/querysvc/adjuster/spanlinks.go b/cmd/query/app/querysvc/adjuster/spanlinks.go
index d58ad63ab39..b90f41900ac 100644
--- a/cmd/query/app/querysvc/adjuster/spanlinks.go
+++ b/cmd/query/app/querysvc/adjuster/spanlinks.go
@@ -5,6 +5,12 @@ package adjuster
 
 import (
 	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/internal/jptrace"
+)
+
+const (
+	invalidSpanLinkWarning = "Invalid span link removed"
 )
 
 // SpanLinks creates an adjuster that removes span links with empty trace IDs.
@@ -40,6 +46,8 @@ func (la LinksAdjuster) adjust(span ptrace.Span) {
 		if la.valid(link) {
 			newLink := validLinks.AppendEmpty()
 			link.CopyTo(newLink)
+		} else {
+			jptrace.AddWarning(span, invalidSpanLinkWarning)
 		}
 	}
 	validLinks.CopyTo(span.Links())
diff --git a/cmd/query/app/querysvc/adjuster/spanlinks_test.go b/cmd/query/app/querysvc/adjuster/spanlinks_test.go
index af687e50bc4..7dfaf0ac6a6 100644
--- a/cmd/query/app/querysvc/adjuster/spanlinks_test.go
+++ b/cmd/query/app/querysvc/adjuster/spanlinks_test.go
@@ -10,6 +10,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/internal/jptrace"
 )
 
 func TestLinksAdjuster(t *testing.T) {
@@ -21,19 +23,32 @@ func TestLinksAdjuster(t *testing.T) {
 	scopeSpans.Spans().AppendEmpty()
 
 	// span with empty traceID link
-	spanA := scopeSpans.Spans().AppendEmpty()
-	spanA.Links().AppendEmpty().SetTraceID(pcommon.NewTraceIDEmpty())
+	spanB := scopeSpans.Spans().AppendEmpty()
+	spanB.Links().AppendEmpty().SetTraceID(pcommon.NewTraceIDEmpty())
 
 	// span with 2 non-empty traceID links and 1 empty (or zero) traceID link
-	spanB := scopeSpans.Spans().AppendEmpty()
-	spanB.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}))
-	spanB.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}))
-	spanB.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}))
+	spanC := scopeSpans.Spans().AppendEmpty()
+	spanC.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}))
+	spanC.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}))
+	spanC.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}))
 
 	err := SpanLinks().Adjust(traces)
 	spans := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans()
 	require.NoError(t, err)
-	assert.Equal(t, 0, spans.At(0).Links().Len())
-	assert.Equal(t, 0, spans.At(1).Links().Len())
-	assert.Equal(t, 2, spans.At(2).Links().Len())
+
+	gotSpansA := spans.At(0)
+	assert.Equal(t, 0, gotSpansA.Links().Len())
+	assert.Empty(t, jptrace.GetWarnings(gotSpansA))
+
+	gotSpansB := spans.At(1)
+	assert.Equal(t, 0, gotSpansB.Links().Len())
+	spanBWarnings := jptrace.GetWarnings(gotSpansB)
+	assert.Len(t, spanBWarnings, 1)
+	assert.Equal(t, "Invalid span link removed", spanBWarnings[0])
+
+	gotSpansC := spans.At(2)
+	assert.Equal(t, 2, gotSpansC.Links().Len())
+	spanCWarnings := jptrace.GetWarnings(gotSpansC)
+	assert.Len(t, spanCWarnings, 1)
+	assert.Equal(t, "Invalid span link removed", spanCWarnings[0])
 }

From dd799a04f4a5b5f75f46e44f954964833a9f1d04 Mon Sep 17 00:00:00 2001
From: Zhang Xin <zhangxin@outlook.com>
Date: Wed, 18 Dec 2024 11:18:57 +0800
Subject: [PATCH 43/59] [api_v3] Add time window for GetTrace http_gateway
 (#6372)

## Which problem is this PR solving?
- Part of #4150

## Description of the changes
- Add optional time window for GetTrace http_gateway

## How was this change tested?
- unit test

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Zhang Xin <zhangxin@outlook.com>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
---
 cmd/query/app/apiv3/http_gateway.go      |  18 +++-
 cmd/query/app/apiv3/http_gateway_test.go | 113 ++++++++++++++++++++---
 2 files changed, 116 insertions(+), 15 deletions(-)

diff --git a/cmd/query/app/apiv3/http_gateway.go b/cmd/query/app/apiv3/http_gateway.go
index e4e8874d748..0c577183e9a 100644
--- a/cmd/query/app/apiv3/http_gateway.go
+++ b/cmd/query/app/apiv3/http_gateway.go
@@ -135,10 +135,26 @@ func (h *HTTPGateway) getTrace(w http.ResponseWriter, r *http.Request) {
 	if h.tryParamError(w, err, paramTraceID) {
 		return
 	}
-	// TODO: add start time & end time
 	request := spanstore.GetTraceParameters{
 		TraceID: traceID,
 	}
+	http_query := r.URL.Query()
+	startTime := http_query.Get(paramStartTime)
+	if startTime != "" {
+		timeParsed, err := time.Parse(time.RFC3339Nano, startTime)
+		if h.tryParamError(w, err, paramStartTime) {
+			return
+		}
+		request.StartTime = timeParsed.UTC()
+	}
+	endTime := http_query.Get(paramEndTime)
+	if endTime != "" {
+		timeParsed, err := time.Parse(time.RFC3339Nano, endTime)
+		if h.tryParamError(w, err, paramEndTime) {
+			return
+		}
+		request.EndTime = timeParsed.UTC()
+	}
 	trc, err := h.QueryService.GetTrace(r.Context(), request)
 	if h.tryHandleError(w, err, http.StatusInternalServerError) {
 		return
diff --git a/cmd/query/app/apiv3/http_gateway_test.go b/cmd/query/app/apiv3/http_gateway_test.go
index 66fda73ef17..90d00b3396a 100644
--- a/cmd/query/app/apiv3/http_gateway_test.go
+++ b/cmd/query/app/apiv3/http_gateway_test.go
@@ -18,6 +18,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
+	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
@@ -90,27 +91,111 @@ func TestHTTPGatewayTryHandleError(t *testing.T) {
 	assert.Contains(t, string(w.Body.String()), e, "writes error message to body")
 }
 
-func TestHTTPGatewayGetTraceErrors(t *testing.T) {
-	gw := setupHTTPGatewayNoServer(t, "")
+func TestHTTPGatewayGetTrace(t *testing.T) {
+	traceId, _ := model.TraceIDFromString("123")
+	testCases := []struct {
+		name          string
+		params        map[string]string
+		expectedQuery spanstore.GetTraceParameters
+	}{
+		{
+			name:   "TestGetTrace",
+			params: map[string]string{},
+			expectedQuery: spanstore.GetTraceParameters{
+				TraceID: traceId,
+			},
+		},
+		{
+			name: "TestGetTraceWithTimeWindow",
+			params: map[string]string{
+				"start_time": "2000-01-02T12:30:08.999999998Z",
+				"end_time":   "2000-04-05T21:55:16.999999992+08:00",
+			},
+			expectedQuery: spanstore.GetTraceParameters{
+				TraceID:   traceId,
+				StartTime: time.Date(2000, time.January, 0o2, 12, 30, 8, 999999998, time.UTC),
+				EndTime:   time.Date(2000, time.April, 0o5, 13, 55, 16, 999999992, time.UTC),
+			},
+		},
+	}
 
-	// malformed trace id
-	r, err := http.NewRequest(http.MethodGet, "/api/v3/traces/xyz", nil)
-	require.NoError(t, err)
-	w := httptest.NewRecorder()
-	gw.router.ServeHTTP(w, r)
-	assert.Contains(t, w.Body.String(), "malformed parameter trace_id")
+	testUri := "/api/v3/traces/123"
 
-	// error from span reader
-	const simErr = "simulated error"
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			gw := setupHTTPGatewayNoServer(t, "")
+			gw.reader.
+				On("GetTrace", matchContext, tc.expectedQuery).
+				Return(&model.Trace{}, nil).Once()
+
+			q := url.Values{}
+			for k, v := range tc.params {
+				q.Set(k, v)
+			}
+			testUrl := testUri
+			if len(tc.params) > 0 {
+				testUrl += "?" + q.Encode()
+			}
+
+			r, err := http.NewRequest(http.MethodGet, testUrl, nil)
+			require.NoError(t, err)
+			w := httptest.NewRecorder()
+			gw.router.ServeHTTP(w, r)
+			gw.reader.AssertCalled(t, "GetTrace", matchContext, tc.expectedQuery)
+		})
+	}
+}
+
+func TestHTTPGatewayGetTraceMalformedInputErrors(t *testing.T) {
+	testCases := []struct {
+		name          string
+		requestUrl    string
+		expectedError string
+	}{
+		{
+			name:          "TestGetTrace",
+			requestUrl:    "/api/v3/traces/xyz",
+			expectedError: "malformed parameter trace_id",
+		},
+		{
+			name:          "TestGetTraceWithInvalidStartTime",
+			requestUrl:    "/api/v3/traces/123?start_time=abc",
+			expectedError: "malformed parameter start_time",
+		},
+		{
+			name:          "TestGetTraceWithInvalidEndTime",
+			requestUrl:    "/api/v3/traces/123?end_time=xyz",
+			expectedError: "malformed parameter end_time",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			gw := setupHTTPGatewayNoServer(t, "")
+			gw.reader.
+				On("GetTrace", matchContext, matchGetTraceParameters).
+				Return(&model.Trace{}, nil).Once()
+
+			r, err := http.NewRequest(http.MethodGet, tc.requestUrl, nil)
+			require.NoError(t, err)
+			w := httptest.NewRecorder()
+			gw.router.ServeHTTP(w, r)
+			assert.Contains(t, w.Body.String(), tc.expectedError)
+		})
+	}
+}
+
+func TestHTTPGatewayGetTraceInternalErrors(t *testing.T) {
+	gw := setupHTTPGatewayNoServer(t, "")
 	gw.reader.
 		On("GetTrace", matchContext, matchGetTraceParameters).
-		Return(nil, errors.New(simErr)).Once()
+		Return(nil, assert.AnError).Once()
 
-	r, err = http.NewRequest(http.MethodGet, "/api/v3/traces/123", nil)
+	r, err := http.NewRequest(http.MethodGet, "/api/v3/traces/123", nil)
 	require.NoError(t, err)
-	w = httptest.NewRecorder()
+	w := httptest.NewRecorder()
 	gw.router.ServeHTTP(w, r)
-	assert.Contains(t, w.Body.String(), simErr)
+	assert.Contains(t, w.Body.String(), assert.AnError.Error())
 }
 
 func mockFindQueries() (url.Values, *spanstore.TraceQueryParameters) {

From 376061ef5cb2f696bf2c3c67d941fbe853af66ee Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Tue, 17 Dec 2024 22:30:00 -0500
Subject: [PATCH 44/59] [v2][adjuster] Implement span ID uniquifier adjuster to
 operate on otlp data model (#6367)

## Which problem is this PR solving?
- Towards #6344

## Description of the changes
- Implement the Span ID Uniquifier adjuster to operate on the OTLP data
model.

## How was this change tested?
- Unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/query/app/querysvc/adjuster/adjuster.go   |   8 +
 .../app/querysvc/adjuster/ipattribute.go      |   2 +
 .../querysvc/adjuster/resourceattributes.go   |   2 +
 .../app/querysvc/adjuster/spaniduniquifier.go | 155 ++++++++++++++++++
 .../adjuster/spaniduniquifier_test.go         | 104 ++++++++++++
 cmd/query/app/querysvc/adjuster/spanlinks.go  |   2 +
 6 files changed, 273 insertions(+)
 create mode 100644 cmd/query/app/querysvc/adjuster/spaniduniquifier.go
 create mode 100644 cmd/query/app/querysvc/adjuster/spaniduniquifier_test.go

diff --git a/cmd/query/app/querysvc/adjuster/adjuster.go b/cmd/query/app/querysvc/adjuster/adjuster.go
index 33b8de79d91..d03fe93103b 100644
--- a/cmd/query/app/querysvc/adjuster/adjuster.go
+++ b/cmd/query/app/querysvc/adjuster/adjuster.go
@@ -17,6 +17,14 @@ type Adjuster interface {
 	Adjust(ptrace.Traces) error
 }
 
+// Func is a type alias that wraps a function and makes an Adjuster from it.
+type Func func(traces ptrace.Traces) error
+
+// Adjust implements Adjuster interface for the Func alias.
+func (f Func) Adjust(traces ptrace.Traces) error {
+	return f(traces)
+}
+
 // Sequence creates an adjuster that combines a series of adjusters
 // applied in order. Errors from each step are accumulated and returned
 // in the end as a single wrapper error. Errors do not interrupt the
diff --git a/cmd/query/app/querysvc/adjuster/ipattribute.go b/cmd/query/app/querysvc/adjuster/ipattribute.go
index 4dcd70bd888..cd3b9bb1340 100644
--- a/cmd/query/app/querysvc/adjuster/ipattribute.go
+++ b/cmd/query/app/querysvc/adjuster/ipattribute.go
@@ -12,6 +12,8 @@ import (
 	"go.opentelemetry.io/collector/pdata/ptrace"
 )
 
+var _ Adjuster = (*IPAttributeAdjuster)(nil)
+
 var ipAttributesToCorrect = map[string]struct{}{
 	"ip":        {},
 	"peer.ipv4": {},
diff --git a/cmd/query/app/querysvc/adjuster/resourceattributes.go b/cmd/query/app/querysvc/adjuster/resourceattributes.go
index 356cd4f800f..e995088d101 100644
--- a/cmd/query/app/querysvc/adjuster/resourceattributes.go
+++ b/cmd/query/app/querysvc/adjuster/resourceattributes.go
@@ -11,6 +11,8 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/otelsemconv"
 )
 
+var _ Adjuster = (*ResourceAttributesAdjuster)(nil)
+
 var libraryKeys = map[string]struct{}{
 	string(otelsemconv.TelemetrySDKLanguageKey):   {},
 	string(otelsemconv.TelemetrySDKNameKey):       {},
diff --git a/cmd/query/app/querysvc/adjuster/spaniduniquifier.go b/cmd/query/app/querysvc/adjuster/spaniduniquifier.go
new file mode 100644
index 00000000000..1fa05ca5f95
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/spaniduniquifier.go
@@ -0,0 +1,155 @@
+// Copyright (c) 2019 The Jaeger Authors.
+// Copyright (c) 2017 Uber Technologies, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"errors"
+
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/internal/jptrace"
+)
+
+var errTooManySpans = errors.New("cannot assign unique span ID, too many spans in the trace")
+
+// SpanIDUniquifier returns an adjuster that changes span ids for server
+// spans (i.e. spans with tag: span.kind == server) if there is another
+// client span that shares the same span ID. This is needed to deal with
+// Zipkin-style clients that reuse the same span ID for both client and server
+// side of an RPC call. Jaeger UI expects all spans to have unique IDs.
+//
+// This adjuster never returns any errors. Instead it records any issues
+// it encounters in Span.Warnings.
+func SpanIDUniquifier() Adjuster {
+	return Func(func(traces ptrace.Traces) error {
+		adjuster := spanIDDeduper{
+			spansByID: make(map[pcommon.SpanID][]ptrace.Span),
+			maxUsedID: pcommon.NewSpanIDEmpty(),
+		}
+		return adjuster.adjust(traces)
+	})
+}
+
+type spanIDDeduper struct {
+	spansByID map[pcommon.SpanID][]ptrace.Span
+	maxUsedID pcommon.SpanID
+}
+
+func (d *spanIDDeduper) adjust(traces ptrace.Traces) error {
+	d.groupSpansByID(traces)
+	d.uniquifyServerSpanIDs(traces)
+	return nil
+}
+
+// groupSpansByID groups spans with the same ID returning a map id -> []Span
+func (d *spanIDDeduper) groupSpansByID(traces ptrace.Traces) {
+	resourceSpans := traces.ResourceSpans()
+	for i := 0; i < resourceSpans.Len(); i++ {
+		rs := resourceSpans.At(i)
+		scopeSpans := rs.ScopeSpans()
+		for j := 0; j < scopeSpans.Len(); j++ {
+			ss := scopeSpans.At(j)
+			spans := ss.Spans()
+			for k := 0; k < spans.Len(); k++ {
+				span := spans.At(k)
+				if spans, ok := d.spansByID[span.SpanID()]; ok {
+					d.spansByID[span.SpanID()] = append(spans, span)
+				} else {
+					d.spansByID[span.SpanID()] = []ptrace.Span{span}
+				}
+			}
+		}
+	}
+}
+
+func (d *spanIDDeduper) isSharedWithClientSpan(spanID pcommon.SpanID) bool {
+	spans := d.spansByID[spanID]
+	for _, span := range spans {
+		if span.Kind() == ptrace.SpanKindClient {
+			return true
+		}
+	}
+	return false
+}
+
+func (d *spanIDDeduper) uniquifyServerSpanIDs(traces ptrace.Traces) {
+	oldToNewSpanIDs := make(map[pcommon.SpanID]pcommon.SpanID)
+	resourceSpans := traces.ResourceSpans()
+	for i := 0; i < resourceSpans.Len(); i++ {
+		rs := resourceSpans.At(i)
+		scopeSpans := rs.ScopeSpans()
+		for j := 0; j < scopeSpans.Len(); j++ {
+			ss := scopeSpans.At(j)
+			spans := ss.Spans()
+			for k := 0; k < spans.Len(); k++ {
+				span := spans.At(k)
+				// only replace span IDs for server-side spans that share the ID with something else
+				if span.Kind() == ptrace.SpanKindServer && d.isSharedWithClientSpan(span.SpanID()) {
+					newID, err := d.makeUniqueSpanID()
+					if err != nil {
+						jptrace.AddWarning(span, err.Error())
+						continue
+					}
+					oldToNewSpanIDs[span.SpanID()] = newID
+					span.SetParentSpanID(span.SpanID()) // previously shared ID is the new parent
+					span.SetSpanID(newID)
+				}
+			}
+		}
+	}
+	d.swapParentIDs(traces, oldToNewSpanIDs)
+}
+
+// swapParentIDs corrects ParentSpanID of all spans that are children of the server
+// spans whose IDs we made unique.
+func (*spanIDDeduper) swapParentIDs(
+	traces ptrace.Traces,
+	oldToNewSpanIDs map[pcommon.SpanID]pcommon.SpanID,
+) {
+	resourceSpans := traces.ResourceSpans()
+	for i := 0; i < resourceSpans.Len(); i++ {
+		rs := resourceSpans.At(i)
+		scopeSpans := rs.ScopeSpans()
+		for j := 0; j < scopeSpans.Len(); j++ {
+			ss := scopeSpans.At(j)
+			spans := ss.Spans()
+			for k := 0; k < spans.Len(); k++ {
+				span := spans.At(k)
+				if parentID, ok := oldToNewSpanIDs[span.ParentSpanID()]; ok {
+					if span.SpanID() != parentID {
+						span.SetParentSpanID(parentID)
+					}
+				}
+			}
+		}
+	}
+}
+
+// makeUniqueSpanID returns a new ID that is not used in the trace,
+// or an error if such ID cannot be generated, which is unlikely,
+// given that the whole space of span IDs is 2^64.
+func (d *spanIDDeduper) makeUniqueSpanID() (pcommon.SpanID, error) {
+	id := incrementSpanID(d.maxUsedID)
+	for id != pcommon.NewSpanIDEmpty() {
+		if _, exists := d.spansByID[id]; !exists {
+			d.maxUsedID = id
+			return id, nil
+		}
+		id = incrementSpanID(id)
+	}
+	return pcommon.NewSpanIDEmpty(), errTooManySpans
+}
+
+func incrementSpanID(spanID pcommon.SpanID) pcommon.SpanID {
+	newID := spanID
+	for i := len(newID) - 1; i >= 0; i-- {
+		newID[i]++
+		if newID[i] != 0 {
+			break
+		}
+	}
+	return newID
+}
diff --git a/cmd/query/app/querysvc/adjuster/spaniduniquifier_test.go b/cmd/query/app/querysvc/adjuster/spaniduniquifier_test.go
new file mode 100644
index 00000000000..564c8c85baa
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/spaniduniquifier_test.go
@@ -0,0 +1,104 @@
+// Copyright (c) 2019 The Jaeger Authors.
+// Copyright (c) 2017 Uber Technologies, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/internal/jptrace"
+)
+
+var (
+	clientSpanID  = pcommon.SpanID([]byte{0, 0, 0, 0, 0, 0, 0, 1})
+	anotherSpanID = pcommon.SpanID([]byte{1, 0, 0, 0, 0, 0, 0, 0})
+)
+
+func makeTraces() ptrace.Traces {
+	traceID := pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 3})
+
+	traces := ptrace.NewTraces()
+	spans := traces.ResourceSpans().AppendEmpty().ScopeSpans().AppendEmpty().Spans()
+
+	clientSpan := spans.AppendEmpty()
+	clientSpan.SetTraceID(traceID)
+	clientSpan.SetSpanID(clientSpanID)
+	clientSpan.SetKind(ptrace.SpanKindClient)
+
+	serverSpan := spans.AppendEmpty()
+	serverSpan.SetTraceID(traceID)
+	serverSpan.SetSpanID(clientSpanID) // shared span ID
+	serverSpan.SetKind(ptrace.SpanKindServer)
+
+	anotherSpan := spans.AppendEmpty()
+	anotherSpan.SetTraceID(traceID)
+	anotherSpan.SetSpanID(anotherSpanID)
+	anotherSpan.SetParentSpanID(clientSpanID)
+
+	return traces
+}
+
+func TestSpanIDUniquifierTriggered(t *testing.T) {
+	traces := makeTraces()
+	deduper := SpanIDUniquifier()
+	require.NoError(t, deduper.Adjust(traces))
+
+	spans := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans()
+
+	clientSpan := spans.At(0)
+	assert.Equal(t, clientSpanID, clientSpan.SpanID(), "client span ID should not change")
+
+	serverSpan := spans.At(1)
+	assert.EqualValues(t, []byte{0, 0, 0, 0, 0, 0, 0, 2}, serverSpan.SpanID(), "server span ID should be reassigned")
+	assert.EqualValues(t, clientSpanID, serverSpan.ParentSpanID(), "next server span should be this server span's parent")
+
+	thirdSpan := spans.At(2)
+	assert.Equal(t, anotherSpanID, thirdSpan.SpanID(), "3rd span ID should not change")
+	assert.Equal(t, serverSpan.SpanID(), thirdSpan.ParentSpanID(), "parent of 3rd span should change to new spanID")
+}
+
+func TestSpanIDUniquifierNotTriggered(t *testing.T) {
+	traces := makeTraces()
+	spans := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans()
+
+	// only copy server span and random span
+	newSpans := ptrace.NewSpanSlice()
+	spans.At(1).CopyTo(newSpans.AppendEmpty())
+	spans.At(2).CopyTo(newSpans.AppendEmpty())
+	newSpans.CopyTo(spans)
+
+	deduper := SpanIDUniquifier()
+	require.NoError(t, deduper.Adjust(traces))
+
+	gotSpans := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans()
+
+	serverSpanID := clientSpanID // for better readability
+	serverSpan := gotSpans.At(0)
+	assert.Equal(t, serverSpanID, serverSpan.SpanID(), "server span ID should be unchanged")
+
+	thirdSpan := gotSpans.At(1)
+	assert.Equal(t, anotherSpanID, thirdSpan.SpanID(), "3rd span ID should not change")
+}
+
+func TestSpanIDUniquifierError(t *testing.T) {
+	traces := makeTraces()
+
+	maxID := pcommon.SpanID([8]byte{255, 255, 255, 255, 255, 255, 255, 255})
+
+	deduper := &spanIDDeduper{
+		spansByID: make(map[pcommon.SpanID][]ptrace.Span),
+		// instead of 0 start at the last possible value to cause an error
+		maxUsedID: maxID,
+	}
+	require.NoError(t, deduper.adjust(traces))
+
+	span := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(1)
+	warnings := jptrace.GetWarnings(span)
+	require.Equal(t, []string{"cannot assign unique span ID, too many spans in the trace"}, warnings)
+}
diff --git a/cmd/query/app/querysvc/adjuster/spanlinks.go b/cmd/query/app/querysvc/adjuster/spanlinks.go
index b90f41900ac..cac09ec592d 100644
--- a/cmd/query/app/querysvc/adjuster/spanlinks.go
+++ b/cmd/query/app/querysvc/adjuster/spanlinks.go
@@ -13,6 +13,8 @@ const (
 	invalidSpanLinkWarning = "Invalid span link removed"
 )
 
+var _ Adjuster = (*LinksAdjuster)(nil)
+
 // SpanLinks creates an adjuster that removes span links with empty trace IDs.
 func SpanLinks() LinksAdjuster {
 	return LinksAdjuster{}

From ebf84c11154b1509e0033efbbdf05c4e051aa818 Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Tue, 17 Dec 2024 22:44:08 -0500
Subject: [PATCH 45/59] [fix][query] Filter out tracing for access to static UI
 assets (#6374)

## Which problem is this PR solving?
- Fixes #6265

## Description of the changes
- Adds a filter from `xconfighttp` to ignore accesses to static UI
assets at `/static/*`

## Testing
I ran the monitor example and accessed the Jaeger UI to test that the
traces were getting recorded on main but not in this PR.

### On main
```
curl -s "http://localhost:16686/api/traces?service=jaeger" | jq -r '.data[].spans[] | select(.operationName | startswith("/static")) | .operationName'
/static/jaeger-logo-CNZsoUdk.svg
/static/index-bzTJ6oK_.css
/static/index-BDRwFQ_z.js
```
### This PR
```
curl -s "http://localhost:16686/api/traces?service=jaeger" | jq -r '.data[].spans[] | select(.operationName | startswith("/static")) | .operationName'
```

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/query/app/server.go |  9 +++++++++
 go.mod                  |  5 +++--
 go.sum                  | 10 ++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/cmd/query/app/server.go b/cmd/query/app/server.go
index 1047355acfd..5880dd83596 100644
--- a/cmd/query/app/server.go
+++ b/cmd/query/app/server.go
@@ -10,6 +10,7 @@ import (
 	"io"
 	"net"
 	"net/http"
+	"path"
 	"strings"
 	"sync"
 
@@ -17,6 +18,8 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componentstatus"
 	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/confighttp/xconfighttp"
+	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health"
@@ -219,6 +222,12 @@ func createHTTPServer(
 			MeterProvider:  telset.MeterProvider,
 		},
 		handler,
+		xconfighttp.WithOtelHTTPOptions(
+			otelhttp.WithFilter(func(r *http.Request) bool {
+				ignorePath := path.Join("/", queryOpts.BasePath, "static")
+				return !strings.HasPrefix(r.URL.Path, ignorePath)
+			}),
+		),
 	)
 	if err != nil {
 		return nil, errors.Join(err, staticHandlerCloser.Close())
diff --git a/go.mod b/go.mod
index 6b053f2933f..96dcd4f8aeb 100644
--- a/go.mod
+++ b/go.mod
@@ -50,6 +50,7 @@ require (
 	go.opentelemetry.io/collector/config/configauth v0.116.0
 	go.opentelemetry.io/collector/config/configgrpc v0.116.0
 	go.opentelemetry.io/collector/config/confighttp v0.116.0
+	go.opentelemetry.io/collector/config/confighttp/xconfighttp v0.116.0
 	go.opentelemetry.io/collector/config/configretry v1.22.0
 	go.opentelemetry.io/collector/config/configtls v1.22.0
 	go.opentelemetry.io/collector/confmap v1.22.0
@@ -202,7 +203,7 @@ require (
 	github.com/openzipkin/zipkin-go v0.4.3 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
-	github.com/pierrec/lz4/v4 v4.1.21 // indirect
+	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
@@ -278,7 +279,7 @@ require (
 	golang.org/x/text v0.21.0 // indirect
 	gonum.org/v1/gonum v0.15.1 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index 40e982cb029..1212a79c5eb 100644
--- a/go.sum
+++ b/go.sum
@@ -501,8 +501,8 @@ github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=
 github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
-github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
+github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -635,6 +635,8 @@ go.opentelemetry.io/collector/config/configgrpc v0.116.0 h1:O8Y1X9wDH5dDdqDJ9kqo
 go.opentelemetry.io/collector/config/configgrpc v0.116.0/go.mod h1:RPrSQrr6xhIaAK2DdcECi142NjSo0npQfVQB3nommSo=
 go.opentelemetry.io/collector/config/confighttp v0.116.0 h1:MLI88LmGzlN5D4pH6nFMg5hU3UCeTZb72iVx1lWb0c8=
 go.opentelemetry.io/collector/config/confighttp v0.116.0/go.mod h1:iJzNYVOiE1V3lpOIZIkR3JJk3aX/RGp9+SEssJMJ/bY=
+go.opentelemetry.io/collector/config/confighttp/xconfighttp v0.116.0 h1:0s7Z7cHx50M6OJdWt9PgXklImUkAF2MVmWiClnj/zB8=
+go.opentelemetry.io/collector/config/confighttp/xconfighttp v0.116.0/go.mod h1:FYunjrmzqrTQ53Z3VGbZ9xcR3ewbRWEupp8151T1CQI=
 go.opentelemetry.io/collector/config/confignet v1.22.0 h1:SBEMHJZWD8J4qgFw1O+BEkXW9AWldDi6Fz5YeDeoU58=
 go.opentelemetry.io/collector/config/confignet v1.22.0/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc=
 go.opentelemetry.io/collector/config/configopaque v1.22.0 h1:CJgsm/Ynr2JE5Y66hYJBdybjHs20ywHtBHiV1jlI4yE=
@@ -944,8 +946,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
 google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 h1:Z7FRVJPSMaHQxD0uXU8WdgFh8PseLM8Q8NzhnpMrBhQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=

From 3b0a68be4713a826a2dd0bc9b81489cc8e5d9e0c Mon Sep 17 00:00:00 2001
From: Manik Mehta <mehtamanik96@gmail.com>
Date: Thu, 19 Dec 2024 00:15:47 +0530
Subject: [PATCH 46/59] Add go leak checks to ES/OS tests (#6339)

## Which problem is this PR solving?
- Fixes a part of #5006

## Description of the changes
- This is a better version of `elasticsearch_test` reducing the number
of leaks from 50 to less than 10. Unfortunately we can't fix all the
leakages because there is no way to close the v8 client of ES leading to
some unclosed http transports. If the changes looks good then we can
merge without embedding `goleak` (as it will lead to failure of test)

## How was this change tested?
- By running the integration tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
---
 pkg/testutils/leakcheck.go                    | 35 ++++++++++++++-
 .../storage/integration/elasticsearch_test.go | 36 ++++++++++-----
 .../integration/es_index_cleaner_test.go      | 45 +++++++++++++++----
 .../integration/es_index_rollover_test.go     | 14 ++++--
 plugin/storage/integration/package_test.go    | 19 ++++++++
 scripts/check-goleak-files.sh                 | 20 +++++++--
 6 files changed, 143 insertions(+), 26 deletions(-)
 create mode 100644 plugin/storage/integration/package_test.go

diff --git a/pkg/testutils/leakcheck.go b/pkg/testutils/leakcheck.go
index fd03e0f7c21..7f2db13cf01 100644
--- a/pkg/testutils/leakcheck.go
+++ b/pkg/testutils/leakcheck.go
@@ -34,10 +34,31 @@ func IgnoreGoMetricsMeterLeak() goleak.Option {
 	return goleak.IgnoreTopFunction("github.com/rcrowley/go-metrics.(*meterArbiter).tick")
 }
 
+// Don't use this in any other method other than leaks for ElasticSearch and OpenSearch
+// These leaks are from olivere client not from the jaeger
+// See this PR for context: https://github.com/jaegertracing/jaeger/pull/6339
+func ignoreHttpTransportWriteLoopLeak() goleak.Option {
+	return goleak.IgnoreTopFunction("net/http.(*persistConn).writeLoop")
+}
+
+// Don't use this in any other method other than leaks for ElasticSearch and OpenSearch
+// These leaks are from olivere client not from the jaeger
+// See this PR for context: https://github.com/jaegertracing/jaeger/pull/6339
+func ignoreHttpTransportPollRuntimeLeak() goleak.Option {
+	return goleak.IgnoreTopFunction("internal/poll.runtime_pollWait")
+}
+
+// Don't use this in any other method other than leaks for ElasticSearch and OpenSearch
+// These leaks are from olivere client not from the jaeger
+// See this PR for context: https://github.com/jaegertracing/jaeger/pull/6339
+func ignoreHttpTransportReadLoopLeak() goleak.Option {
+	return goleak.IgnoreTopFunction("net/http.(*persistConn).readLoop")
+}
+
 // VerifyGoLeaks verifies that unit tests do not leak any goroutines.
 // It should be called in TestMain.
 func VerifyGoLeaks(m *testing.M) {
-	goleak.VerifyTestMain(m, IgnoreGlogFlushDaemonLeak(), IgnoreOpenCensusWorkerLeak())
+	goleak.VerifyTestMain(m, IgnoreGlogFlushDaemonLeak(), IgnoreOpenCensusWorkerLeak(), IgnoreGoMetricsMeterLeak())
 }
 
 // VerifyGoLeaksOnce verifies that a given unit test does not leak any goroutines.
@@ -49,3 +70,15 @@ func VerifyGoLeaks(m *testing.M) {
 func VerifyGoLeaksOnce(t *testing.T) {
 	goleak.VerifyNone(t, IgnoreGlogFlushDaemonLeak(), IgnoreOpenCensusWorkerLeak(), IgnoreGoMetricsMeterLeak())
 }
+
+// VerifyGoLeaksOnceForES is go leak check for ElasticSearch integration tests (v1)
+// This must not be used anywhere else other than integration package for v1
+func VerifyGoLeaksOnceForES(t *testing.T) {
+	goleak.VerifyNone(t, ignoreHttpTransportWriteLoopLeak(), ignoreHttpTransportPollRuntimeLeak(), ignoreHttpTransportReadLoopLeak())
+}
+
+// VerifyGoLeaksForES is go leak check for integration package in ElasticSearch Environment
+// This must not be used anywhere else other than integration package in ES environment for v1
+func VerifyGoLeaksForES(m *testing.M) {
+	goleak.VerifyTestMain(m, ignoreHttpTransportWriteLoopLeak(), ignoreHttpTransportPollRuntimeLeak(), ignoreHttpTransportReadLoopLeak())
+}
diff --git a/plugin/storage/integration/elasticsearch_test.go b/plugin/storage/integration/elasticsearch_test.go
index 5aae3614262..cd5cfe47464 100644
--- a/plugin/storage/integration/elasticsearch_test.go
+++ b/plugin/storage/integration/elasticsearch_test.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/plugin/storage/es"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 )
@@ -71,16 +72,20 @@ func (s *ESStorageIntegration) getVersion() (uint, error) {
 	return uint(esVersion), nil
 }
 
-func (s *ESStorageIntegration) initializeES(t *testing.T, allTagsAsFields bool) {
+func (s *ESStorageIntegration) initializeES(t *testing.T, c *http.Client, allTagsAsFields bool) {
 	rawClient, err := elastic.NewClient(
 		elastic.SetURL(queryURL),
-		elastic.SetSniff(false))
+		elastic.SetSniff(false),
+		elastic.SetHttpClient(c))
 	require.NoError(t, err)
-
+	t.Cleanup(func() {
+		rawClient.Stop()
+	})
 	s.client = rawClient
 	s.v8Client, err = elasticsearch8.NewClient(elasticsearch8.Config{
 		Addresses:            []string{queryURL},
 		DiscoverNodesOnStart: false,
+		Transport:            c.Transport,
 	})
 	require.NoError(t, err)
 
@@ -144,10 +149,10 @@ func (s *ESStorageIntegration) initSpanstore(t *testing.T, allTagsAsFields bool)
 	require.NoError(t, err)
 }
 
-func healthCheck() error {
+func healthCheck(c *http.Client) error {
 	for i := 0; i < 200; i++ {
-		if _, err := http.Get(queryURL); err == nil {
-			return nil
+		if resp, err := c.Get(queryURL); err == nil {
+			return resp.Body.Close()
 		}
 		time.Sleep(100 * time.Millisecond)
 	}
@@ -156,7 +161,8 @@ func healthCheck() error {
 
 func testElasticsearchStorage(t *testing.T, allTagsAsFields bool) {
 	SkipUnlessEnv(t, "elasticsearch", "opensearch")
-	require.NoError(t, healthCheck())
+	c := getESHttpClient(t)
+	require.NoError(t, healthCheck(c))
 	s := &ESStorageIntegration{
 		StorageIntegration: StorageIntegration{
 			Fixtures:        LoadAndParseQueryTestCases(t, "fixtures/queries_es.json"),
@@ -166,23 +172,33 @@ func testElasticsearchStorage(t *testing.T, allTagsAsFields bool) {
 			GetOperationsMissingSpanKind: true,
 		},
 	}
-	s.initializeES(t, allTagsAsFields)
+	s.initializeES(t, c, allTagsAsFields)
 	s.RunAll(t)
 }
 
 func TestElasticsearchStorage(t *testing.T) {
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnceForES(t)
+	})
 	testElasticsearchStorage(t, false)
 }
 
 func TestElasticsearchStorage_AllTagsAsObjectFields(t *testing.T) {
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnceForES(t)
+	})
 	testElasticsearchStorage(t, true)
 }
 
 func TestElasticsearchStorage_IndexTemplates(t *testing.T) {
 	SkipUnlessEnv(t, "elasticsearch", "opensearch")
-	require.NoError(t, healthCheck())
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnceForES(t)
+	})
+	c := getESHttpClient(t)
+	require.NoError(t, healthCheck(c))
 	s := &ESStorageIntegration{}
-	s.initializeES(t, true)
+	s.initializeES(t, c, true)
 	esVersion, err := s.getVersion()
 	require.NoError(t, err)
 	// TODO abstract this into pkg/es/client.IndexManagementLifecycleAPI
diff --git a/plugin/storage/integration/es_index_cleaner_test.go b/plugin/storage/integration/es_index_cleaner_test.go
index 48ae48d5c12..3dd7e83d2c8 100644
--- a/plugin/storage/integration/es_index_cleaner_test.go
+++ b/plugin/storage/integration/es_index_cleaner_test.go
@@ -6,6 +6,7 @@ package integration
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"os/exec"
 	"testing"
 
@@ -13,6 +14,8 @@ import (
 	"github.com/olivere/elastic"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/jaegertracing/jaeger/pkg/testutils"
 )
 
 const (
@@ -28,7 +31,10 @@ const (
 
 func TestIndexCleaner_doNotFailOnEmptyStorage(t *testing.T) {
 	SkipUnlessEnv(t, "elasticsearch", "opensearch")
-	client, err := createESClient()
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnceForES(t)
+	})
+	client, err := createESClient(t, getESHttpClient(t))
 	require.NoError(t, err)
 	_, err = client.DeleteIndex("*").Do(context.Background())
 	require.NoError(t, err)
@@ -48,7 +54,10 @@ func TestIndexCleaner_doNotFailOnEmptyStorage(t *testing.T) {
 
 func TestIndexCleaner_doNotFailOnFullStorage(t *testing.T) {
 	SkipUnlessEnv(t, "elasticsearch", "opensearch")
-	client, err := createESClient()
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnceForES(t)
+	})
+	client, err := createESClient(t, getESHttpClient(t))
 	require.NoError(t, err)
 	tests := []struct {
 		envs []string
@@ -70,9 +79,13 @@ func TestIndexCleaner_doNotFailOnFullStorage(t *testing.T) {
 
 func TestIndexCleaner(t *testing.T) {
 	SkipUnlessEnv(t, "elasticsearch", "opensearch")
-	client, err := createESClient()
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnceForES(t)
+	})
+	hcl := getESHttpClient(t)
+	client, err := createESClient(t, hcl)
 	require.NoError(t, err)
-	v8Client, err := createESV8Client()
+	v8Client, err := createESV8Client(hcl.Transport)
 	require.NoError(t, err)
 
 	tests := []struct {
@@ -223,16 +236,24 @@ func runEsRollover(action string, envs []string, adaptiveSampling bool) error {
 	return err
 }
 
-func createESClient() (*elastic.Client, error) {
-	return elastic.NewClient(
+func createESClient(t *testing.T, hcl *http.Client) (*elastic.Client, error) {
+	cl, err := elastic.NewClient(
 		elastic.SetURL(queryURL),
-		elastic.SetSniff(false))
+		elastic.SetSniff(false),
+		elastic.SetHttpClient(hcl),
+	)
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		cl.Stop()
+	})
+	return cl, nil
 }
 
-func createESV8Client() (*elasticsearch8.Client, error) {
+func createESV8Client(tr http.RoundTripper) (*elasticsearch8.Client, error) {
 	return elasticsearch8.NewClient(elasticsearch8.Config{
 		Addresses:            []string{queryURL},
 		DiscoverNodesOnStart: false,
+		Transport:            tr,
 	})
 }
 
@@ -243,3 +264,11 @@ func cleanESIndexTemplates(t *testing.T, client *elastic.Client, v8Client *elast
 	}
 	s.cleanESIndexTemplates(t, prefix)
 }
+
+func getESHttpClient(t *testing.T) *http.Client {
+	tr := &http.Transport{}
+	t.Cleanup(func() {
+		tr.CloseIdleConnections()
+	})
+	return &http.Client{Transport: tr}
+}
diff --git a/plugin/storage/integration/es_index_rollover_test.go b/plugin/storage/integration/es_index_rollover_test.go
index 9a2ce48192c..aa7a6694e4a 100644
--- a/plugin/storage/integration/es_index_rollover_test.go
+++ b/plugin/storage/integration/es_index_rollover_test.go
@@ -11,6 +11,8 @@ import (
 	"github.com/olivere/elastic"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/jaegertracing/jaeger/pkg/testutils"
 )
 
 const (
@@ -19,7 +21,10 @@ const (
 
 func TestIndexRollover_FailIfILMNotPresent(t *testing.T) {
 	SkipUnlessEnv(t, "elasticsearch", "opensearch")
-	client, err := createESClient()
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnceForES(t)
+	})
+	client, err := createESClient(t, getESHttpClient(t))
 	require.NoError(t, err)
 	require.NoError(t, err)
 	// make sure ES is clean
@@ -35,6 +40,9 @@ func TestIndexRollover_FailIfILMNotPresent(t *testing.T) {
 
 func TestIndexRollover_CreateIndicesWithILM(t *testing.T) {
 	SkipUnlessEnv(t, "elasticsearch", "opensearch")
+	t.Cleanup(func() {
+		testutils.VerifyGoLeaksOnceForES(t)
+	})
 	// Test using the default ILM Policy Name, i.e. do not pass the ES_ILM_POLICY_NAME env var to the rollover script.
 	t.Run("DefaultPolicyName", func(t *testing.T) {
 		runCreateIndicesWithILM(t, defaultILMPolicyName)
@@ -47,7 +55,7 @@ func TestIndexRollover_CreateIndicesWithILM(t *testing.T) {
 }
 
 func runCreateIndicesWithILM(t *testing.T, ilmPolicyName string) {
-	client, err := createESClient()
+	client, err := createESClient(t, getESHttpClient(t))
 	require.NoError(t, err)
 	esVersion, err := getVersion(client)
 	require.NoError(t, err)
@@ -82,7 +90,7 @@ func runIndexRolloverWithILMTest(t *testing.T, client *elastic.Client, prefix st
 	}
 	// make sure ES is cleaned before test
 	cleanES(t, client, ilmPolicyName)
-	v8Client, err := createESV8Client()
+	v8Client, err := createESV8Client(getESHttpClient(t).Transport)
 	require.NoError(t, err)
 	// make sure ES is cleaned after test
 	defer cleanES(t, client, ilmPolicyName)
diff --git a/plugin/storage/integration/package_test.go b/plugin/storage/integration/package_test.go
new file mode 100644
index 00000000000..bf7665a5329
--- /dev/null
+++ b/plugin/storage/integration/package_test.go
@@ -0,0 +1,19 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package integration
+
+import (
+	"os"
+	"testing"
+
+	"github.com/jaegertracing/jaeger/pkg/testutils"
+)
+
+func TestMain(m *testing.M) {
+	if os.Getenv("STORAGE") == "elasticsearch" || os.Getenv("STORAGE") == "opensearch" {
+		testutils.VerifyGoLeaksForES(m)
+	} else {
+		testutils.VerifyGoLeaks(m)
+	}
+}
diff --git a/scripts/check-goleak-files.sh b/scripts/check-goleak-files.sh
index 7e97bcba81b..3a001d0b4fd 100755
--- a/scripts/check-goleak-files.sh
+++ b/scripts/check-goleak-files.sh
@@ -8,6 +8,7 @@ set -euo pipefail
 bad_pkgs=0
 total_pkgs=0
 failed_pkgs=0
+invalid_use_pkgs=0
 
 # shellcheck disable=SC2048
 for dir in $*; do
@@ -20,18 +21,25 @@ for dir in $*; do
     continue
   fi
   good=0
+  invalid=0
   for test in ${testFiles}; do
     if grep -q "TestMain" "${test}" && grep -q "testutils.VerifyGoLeaks" "${test}"; then
+      if [ "${dir}" != "./plugin/storage/integration/" ] &&  grep -q "testutils.VerifyGoLeaksForES" "${test}"; then
+          invalid=1
+          break
+      fi
       good=1
       break
     fi
   done
+
   if ((good == 0)); then
-    echo "Error(check-goleak): no goleak check in package ${dir}"
-    ((bad_pkgs+=1))
-    if [[ "${dir}" == "./cmd/jaeger/internal/integration/" || "${dir}" == "./plugin/storage/integration/" ]]; then
-      echo "	... this package is temporarily allowed and will not cause linter failure"
+    if ((invalid == 1)); then
+      echo "Error(check-goleak): VerifyGoLeaksForES should only be used in integration package but it is used in ${dir} also"
+      ((invalid_use_pkgs+=1))
     else
+      echo "Error(check-goleak): no goleak check in package ${dir}"
+      ((bad_pkgs+=1))
       ((failed_pkgs+=1))
     fi
   fi
@@ -45,6 +53,10 @@ if ((failed_pkgs > 0)); then
   echo "⛔ Fatal(check-goleak): no goleak check in ${bad_pkgs} package(s), ${failed_pkgs} of which not allowed."
   help
   exit 1
+elif ((invalid_use_pkgs > 0)); then
+  echo "⛔ Fatal(check-goleak): use of VerifyGoLeaksForES in package(s) ${invalid_use_pkgs} which is not allowed"
+  help
+  exit 1
 elif ((bad_pkgs > 0)); then
   echo "🐞 Warning(check-goleak): no goleak check in ${bad_pkgs} package(s)."
   help

From 9ddc9a46c5811f5bcfd84848f021fd3ee7c06bfc Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 18 Dec 2024 19:58:31 +0100
Subject: [PATCH 47/59] fix(deps): update module google.golang.org/grpc to
 v1.69.2 (#6382)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [google.golang.org/grpc](https://redirect.github.com/grpc/grpc-go) |
`v1.69.0` -> `v1.69.2` |
[![age](https://developer.mend.io/api/mc/badges/age/go/google.golang.org%2fgrpc/v1.69.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/google.golang.org%2fgrpc/v1.69.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/google.golang.org%2fgrpc/v1.69.0/v1.69.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/google.golang.org%2fgrpc/v1.69.0/v1.69.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>grpc/grpc-go (google.golang.org/grpc)</summary>

###
[`v1.69.2`](https://redirect.github.com/grpc/grpc-go/releases/tag/v1.69.2):
Release 1.69.2

### Bug Fixes

- stats/experimental: add type aliases for symbols (`Metrics`/etc) that
were moved to the stats package
([#&#8203;7929](https://redirect.github.com/grpc/grpc-go/issues/7929)).
-   client: set user-agent string to the correct version.

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS43Mi41IiwidXBkYXRlZEluVmVyIjoiMzkuNzIuNSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 96dcd4f8aeb..d514f33b5fa 100644
--- a/go.mod
+++ b/go.mod
@@ -97,7 +97,7 @@ require (
 	go.uber.org/zap v1.27.0
 	golang.org/x/net v0.32.0
 	golang.org/x/sys v0.28.0
-	google.golang.org/grpc v1.69.0
+	google.golang.org/grpc v1.69.2
 	google.golang.org/protobuf v1.36.0
 	gopkg.in/yaml.v3 v3.0.1
 )
diff --git a/go.sum b/go.sum
index 1212a79c5eb..13f007c6669 100644
--- a/go.sum
+++ b/go.sum
@@ -953,8 +953,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.69.0 h1:quSiOM1GJPmPH5XtU+BCoVXcDVJJAzNcoyfC2cCjGkI=
-google.golang.org/grpc v1.69.0/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
+google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
+google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

From 7537fe915563b4432a39597a6ac5cdbf4b23a3fb Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Wed, 18 Dec 2024 16:26:31 -0500
Subject: [PATCH 48/59] [v2][adjuster] Remove error return from adjuster
 interface (#6383)

## Which problem is this PR solving?
- Towards #6344

## Description of the changes
- This PR removes the `error` return value from the v2 adjuster
interface as none of the adjusters return any errors and errors instead
recorded on the spans as warnings.

## How was this change tested?
- CI

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/query/app/querysvc/adjuster/adjuster.go   | 29 +++--------
 .../app/querysvc/adjuster/adjuster_test.go    | 51 ++++---------------
 .../app/querysvc/adjuster/ipattribute.go      |  3 +-
 .../app/querysvc/adjuster/ipattribute_test.go |  3 +-
 .../querysvc/adjuster/resourceattributes.go   |  3 +-
 .../adjuster/resourceattributes_test.go       |  8 +--
 .../app/querysvc/adjuster/spaniduniquifier.go | 11 ++--
 .../adjuster/spaniduniquifier_test.go         |  6 +--
 cmd/query/app/querysvc/adjuster/spanlinks.go  |  3 +-
 .../app/querysvc/adjuster/spanlinks_test.go   |  4 +-
 10 files changed, 32 insertions(+), 89 deletions(-)

diff --git a/cmd/query/app/querysvc/adjuster/adjuster.go b/cmd/query/app/querysvc/adjuster/adjuster.go
index d03fe93103b..fbe9689ca96 100644
--- a/cmd/query/app/querysvc/adjuster/adjuster.go
+++ b/cmd/query/app/querysvc/adjuster/adjuster.go
@@ -4,8 +4,6 @@
 package adjuster
 
 import (
-	"errors"
-
 	"go.opentelemetry.io/collector/pdata/ptrace"
 )
 
@@ -14,15 +12,15 @@ import (
 // The caller must ensure that all spans in the ptrace.Traces argument
 // belong to the same trace and represent the complete trace.
 type Adjuster interface {
-	Adjust(ptrace.Traces) error
+	Adjust(ptrace.Traces)
 }
 
 // Func is a type alias that wraps a function and makes an Adjuster from it.
-type Func func(traces ptrace.Traces) error
+type Func func(traces ptrace.Traces)
 
 // Adjust implements Adjuster interface for the Func alias.
-func (f Func) Adjust(traces ptrace.Traces) error {
-	return f(traces)
+func (f Func) Adjust(traces ptrace.Traces) {
+	f(traces)
 }
 
 // Sequence creates an adjuster that combines a series of adjusters
@@ -33,27 +31,12 @@ func Sequence(adjusters ...Adjuster) Adjuster {
 	return sequence{adjusters: adjusters}
 }
 
-// FailFastSequence is similar to Sequence() but returns immediately
-// if any adjuster returns an error.
-func FailFastSequence(adjusters ...Adjuster) Adjuster {
-	return sequence{adjusters: adjusters, failFast: true}
-}
-
 type sequence struct {
 	adjusters []Adjuster
-	failFast  bool
 }
 
-func (c sequence) Adjust(traces ptrace.Traces) error {
-	var errs []error
+func (c sequence) Adjust(traces ptrace.Traces) {
 	for _, adjuster := range c.adjusters {
-		err := adjuster.Adjust(traces)
-		if err != nil {
-			if c.failFast {
-				return err
-			}
-			errs = append(errs, err)
-		}
+		adjuster.Adjust(traces)
 	}
-	return errors.Join(errs...)
 }
diff --git a/cmd/query/app/querysvc/adjuster/adjuster_test.go b/cmd/query/app/querysvc/adjuster/adjuster_test.go
index fbc5804ed9e..42cb3007261 100644
--- a/cmd/query/app/querysvc/adjuster/adjuster_test.go
+++ b/cmd/query/app/querysvc/adjuster/adjuster_test.go
@@ -4,12 +4,9 @@
 package adjuster_test
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc/adjuster"
@@ -17,53 +14,23 @@ import (
 
 type mockAdjuster struct{}
 
-func (mockAdjuster) Adjust(traces ptrace.Traces) error {
+func (mockAdjuster) Adjust(traces ptrace.Traces) {
 	span := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
 	spanId := span.SpanID()
 	spanId[7]++
 	span.SetSpanID(spanId)
-	return nil
-}
-
-type mockAdjusterError struct{}
-
-func (mockAdjusterError) Adjust(ptrace.Traces) error {
-	return assert.AnError
 }
 
 func TestSequences(t *testing.T) {
-	tests := []struct {
-		name       string
-		adjuster   adjuster.Adjuster
-		err        string
-		lastSpanID pcommon.SpanID
-	}{
-		{
-			name:       "normal sequence",
-			adjuster:   adjuster.Sequence(mockAdjuster{}, mockAdjusterError{}, mockAdjuster{}, mockAdjusterError{}),
-			err:        fmt.Sprintf("%s\n%s", assert.AnError, assert.AnError),
-			lastSpanID: [8]byte{0, 0, 0, 0, 0, 0, 0, 2},
-		},
-		{
-			name:       "fail fast sequence",
-			adjuster:   adjuster.FailFastSequence(mockAdjuster{}, mockAdjusterError{}, mockAdjuster{}, mockAdjusterError{}),
-			err:        assert.AnError.Error(),
-			lastSpanID: [8]byte{0, 0, 0, 0, 0, 0, 0, 1},
-		},
-	}
+	trace := ptrace.NewTraces()
+	span := trace.ResourceSpans().AppendEmpty().ScopeSpans().AppendEmpty().Spans().AppendEmpty()
+	span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 0})
 
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			trace := ptrace.NewTraces()
-			span := trace.ResourceSpans().AppendEmpty().ScopeSpans().AppendEmpty().Spans().AppendEmpty()
-			span.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 0})
+	a := adjuster.Sequence(mockAdjuster{}, mockAdjuster{})
 
-			err := test.adjuster.Adjust(trace)
-			require.EqualError(t, err, test.err)
+	a.Adjust(trace)
 
-			adjTraceSpan := trace.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
-			assert.Equal(t, span, adjTraceSpan)
-			assert.EqualValues(t, test.lastSpanID, span.SpanID())
-		})
-	}
+	adjTraceSpan := trace.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
+	assert.Equal(t, span, adjTraceSpan)
+	assert.EqualValues(t, [8]byte{0, 0, 0, 0, 0, 0, 0, 2}, span.SpanID())
 }
diff --git a/cmd/query/app/querysvc/adjuster/ipattribute.go b/cmd/query/app/querysvc/adjuster/ipattribute.go
index cd3b9bb1340..a00f93b3254 100644
--- a/cmd/query/app/querysvc/adjuster/ipattribute.go
+++ b/cmd/query/app/querysvc/adjuster/ipattribute.go
@@ -28,7 +28,7 @@ func IPAttribute() IPAttributeAdjuster {
 
 type IPAttributeAdjuster struct{}
 
-func (ia IPAttributeAdjuster) Adjust(traces ptrace.Traces) error {
+func (ia IPAttributeAdjuster) Adjust(traces ptrace.Traces) {
 	resourceSpans := traces.ResourceSpans()
 	for i := 0; i < resourceSpans.Len(); i++ {
 		rs := resourceSpans.At(i)
@@ -43,7 +43,6 @@ func (ia IPAttributeAdjuster) Adjust(traces ptrace.Traces) error {
 			}
 		}
 	}
-	return nil
 }
 
 func (IPAttributeAdjuster) adjustAttributes(attributes pcommon.Map) {
diff --git a/cmd/query/app/querysvc/adjuster/ipattribute_test.go b/cmd/query/app/querysvc/adjuster/ipattribute_test.go
index e55a9dd8bdc..d97f1bf35ed 100644
--- a/cmd/query/app/querysvc/adjuster/ipattribute_test.go
+++ b/cmd/query/app/querysvc/adjuster/ipattribute_test.go
@@ -58,8 +58,7 @@ func TestIPAttributeAdjuster(t *testing.T) {
 		}
 	}
 
-	err := IPAttribute().Adjust(traces)
-	require.NoError(t, err)
+	IPAttribute().Adjust(traces)
 
 	resourceSpan := traces.ResourceSpans().At(0)
 	assert.Equal(t, 3, resourceSpan.Resource().Attributes().Len())
diff --git a/cmd/query/app/querysvc/adjuster/resourceattributes.go b/cmd/query/app/querysvc/adjuster/resourceattributes.go
index e995088d101..6bedd4ff4e9 100644
--- a/cmd/query/app/querysvc/adjuster/resourceattributes.go
+++ b/cmd/query/app/querysvc/adjuster/resourceattributes.go
@@ -31,7 +31,7 @@ func ResourceAttributes() ResourceAttributesAdjuster {
 
 type ResourceAttributesAdjuster struct{}
 
-func (o ResourceAttributesAdjuster) Adjust(traces ptrace.Traces) error {
+func (o ResourceAttributesAdjuster) Adjust(traces ptrace.Traces) {
 	resourceSpans := traces.ResourceSpans()
 	for i := 0; i < resourceSpans.Len(); i++ {
 		rs := resourceSpans.At(i)
@@ -46,7 +46,6 @@ func (o ResourceAttributesAdjuster) Adjust(traces ptrace.Traces) error {
 			}
 		}
 	}
-	return nil
 }
 
 func (ResourceAttributesAdjuster) moveAttributes(span ptrace.Span, resource pcommon.Resource) {
diff --git a/cmd/query/app/querysvc/adjuster/resourceattributes_test.go b/cmd/query/app/querysvc/adjuster/resourceattributes_test.go
index 5dc5c438133..591820db4a2 100644
--- a/cmd/query/app/querysvc/adjuster/resourceattributes_test.go
+++ b/cmd/query/app/querysvc/adjuster/resourceattributes_test.go
@@ -26,7 +26,7 @@ func TestResourceAttributesAdjuster_SpanWithLibraryAttributes(t *testing.T) {
 	span.Attributes().PutStr("another_key", "another_value")
 
 	adjuster := ResourceAttributes()
-	require.NoError(t, adjuster.Adjust(traces))
+	adjuster.Adjust(traces)
 
 	resultSpanAttributes := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
 	require.Equal(t, 2, resultSpanAttributes.Len())
@@ -68,7 +68,7 @@ func TestResourceAttributesAdjuster_SpanWithoutLibraryAttributes(t *testing.T) {
 	span.Attributes().PutStr("random_key", "random_value")
 
 	adjuster := ResourceAttributes()
-	require.NoError(t, adjuster.Adjust(traces))
+	adjuster.Adjust(traces)
 
 	resultSpanAttributes := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
 	require.Equal(t, 1, resultSpanAttributes.Len())
@@ -86,7 +86,7 @@ func TestResourceAttributesAdjuster_SpanWithConflictingLibraryAttributes(t *test
 	span.Attributes().PutStr(string(otelsemconv.TelemetrySDKLanguageKey), "Java")
 
 	adjuster := ResourceAttributes()
-	require.NoError(t, adjuster.Adjust(traces))
+	adjuster.Adjust(traces)
 
 	resultSpan := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
 	resultSpanAttributes := resultSpan.Attributes()
@@ -120,7 +120,7 @@ func TestResourceAttributesAdjuster_SpanWithNonConflictingLibraryAttributes(t *t
 	span.Attributes().PutStr(string(otelsemconv.TelemetrySDKLanguageKey), "Go")
 
 	adjuster := ResourceAttributes()
-	require.NoError(t, adjuster.Adjust(traces))
+	adjuster.Adjust(traces)
 
 	resultSpanAttributes := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0).Attributes()
 	require.Equal(t, 1, resultSpanAttributes.Len())
diff --git a/cmd/query/app/querysvc/adjuster/spaniduniquifier.go b/cmd/query/app/querysvc/adjuster/spaniduniquifier.go
index 1fa05ca5f95..b21ba7eeb6d 100644
--- a/cmd/query/app/querysvc/adjuster/spaniduniquifier.go
+++ b/cmd/query/app/querysvc/adjuster/spaniduniquifier.go
@@ -21,15 +21,15 @@ var errTooManySpans = errors.New("cannot assign unique span ID, too many spans i
 // Zipkin-style clients that reuse the same span ID for both client and server
 // side of an RPC call. Jaeger UI expects all spans to have unique IDs.
 //
-// This adjuster never returns any errors. Instead it records any issues
-// it encounters in Span.Warnings.
+// Any issues encountered during adjustment are recorded as warnings in the
+// span.
 func SpanIDUniquifier() Adjuster {
-	return Func(func(traces ptrace.Traces) error {
+	return Func(func(traces ptrace.Traces) {
 		adjuster := spanIDDeduper{
 			spansByID: make(map[pcommon.SpanID][]ptrace.Span),
 			maxUsedID: pcommon.NewSpanIDEmpty(),
 		}
-		return adjuster.adjust(traces)
+		adjuster.adjust(traces)
 	})
 }
 
@@ -38,10 +38,9 @@ type spanIDDeduper struct {
 	maxUsedID pcommon.SpanID
 }
 
-func (d *spanIDDeduper) adjust(traces ptrace.Traces) error {
+func (d *spanIDDeduper) adjust(traces ptrace.Traces) {
 	d.groupSpansByID(traces)
 	d.uniquifyServerSpanIDs(traces)
-	return nil
 }
 
 // groupSpansByID groups spans with the same ID returning a map id -> []Span
diff --git a/cmd/query/app/querysvc/adjuster/spaniduniquifier_test.go b/cmd/query/app/querysvc/adjuster/spaniduniquifier_test.go
index 564c8c85baa..5ad6868f443 100644
--- a/cmd/query/app/querysvc/adjuster/spaniduniquifier_test.go
+++ b/cmd/query/app/querysvc/adjuster/spaniduniquifier_test.go
@@ -47,7 +47,7 @@ func makeTraces() ptrace.Traces {
 func TestSpanIDUniquifierTriggered(t *testing.T) {
 	traces := makeTraces()
 	deduper := SpanIDUniquifier()
-	require.NoError(t, deduper.Adjust(traces))
+	deduper.Adjust(traces)
 
 	spans := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans()
 
@@ -74,7 +74,7 @@ func TestSpanIDUniquifierNotTriggered(t *testing.T) {
 	newSpans.CopyTo(spans)
 
 	deduper := SpanIDUniquifier()
-	require.NoError(t, deduper.Adjust(traces))
+	deduper.Adjust(traces)
 
 	gotSpans := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans()
 
@@ -96,7 +96,7 @@ func TestSpanIDUniquifierError(t *testing.T) {
 		// instead of 0 start at the last possible value to cause an error
 		maxUsedID: maxID,
 	}
-	require.NoError(t, deduper.adjust(traces))
+	deduper.adjust(traces)
 
 	span := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(1)
 	warnings := jptrace.GetWarnings(span)
diff --git a/cmd/query/app/querysvc/adjuster/spanlinks.go b/cmd/query/app/querysvc/adjuster/spanlinks.go
index cac09ec592d..60730fa5ecf 100644
--- a/cmd/query/app/querysvc/adjuster/spanlinks.go
+++ b/cmd/query/app/querysvc/adjuster/spanlinks.go
@@ -22,7 +22,7 @@ func SpanLinks() LinksAdjuster {
 
 type LinksAdjuster struct{}
 
-func (la LinksAdjuster) Adjust(traces ptrace.Traces) error {
+func (la LinksAdjuster) Adjust(traces ptrace.Traces) {
 	resourceSpans := traces.ResourceSpans()
 	for i := 0; i < resourceSpans.Len(); i++ {
 		rs := resourceSpans.At(i)
@@ -36,7 +36,6 @@ func (la LinksAdjuster) Adjust(traces ptrace.Traces) error {
 			}
 		}
 	}
-	return nil
 }
 
 // adjust removes invalid links from a span.
diff --git a/cmd/query/app/querysvc/adjuster/spanlinks_test.go b/cmd/query/app/querysvc/adjuster/spanlinks_test.go
index 7dfaf0ac6a6..33a8a5a78a6 100644
--- a/cmd/query/app/querysvc/adjuster/spanlinks_test.go
+++ b/cmd/query/app/querysvc/adjuster/spanlinks_test.go
@@ -7,7 +7,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
@@ -32,9 +31,8 @@ func TestLinksAdjuster(t *testing.T) {
 	spanC.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}))
 	spanC.Links().AppendEmpty().SetTraceID(pcommon.TraceID([]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}))
 
-	err := SpanLinks().Adjust(traces)
+	SpanLinks().Adjust(traces)
 	spans := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans()
-	require.NoError(t, err)
 
 	gotSpansA := spans.At(0)
 	assert.Equal(t, 0, gotSpansA.Links().Len())

From d6677a96860a85f795806997d61b62e16413bfc8 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 18 Dec 2024 23:31:10 +0100
Subject: [PATCH 49/59] fix(deps): update module github.com/go-delve/delve to
 v1.24.0 (#6384)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/go-delve/delve](https://redirect.github.com/go-delve/delve)
| `v1.23.1` -> `v1.24.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fgo-delve%2fdelve/v1.24.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fgo-delve%2fdelve/v1.24.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fgo-delve%2fdelve/v1.23.1/v1.24.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fgo-delve%2fdelve/v1.23.1/v1.24.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>go-delve/delve (github.com/go-delve/delve)</summary>

###
[`v1.24.0`](https://redirect.github.com/go-delve/delve/releases/tag/v1.24.0)

[Compare
Source](https://redirect.github.com/go-delve/delve/compare/v1.23.1...v1.24.0)

Curated CHANGELOG:
https://github.com/go-delve/delve/blob/master/CHANGELOG.md#1240-2024-12-18

#### What's Changed

- proc: step into coroutine by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3791](https://redirect.github.com/go-delve/delve/pull/3791)
- Documentation: Add dape to list of plugins by
[@&#8203;jgarte](https://redirect.github.com/jgarte) in
[https://github.com/go-delve/delve/pull/3817](https://redirect.github.com/go-delve/delve/pull/3817)
- cmds/commands: Update 'client-addr' to support Unix domain sockets by
[@&#8203;n1lesh](https://redirect.github.com/n1lesh) in
[https://github.com/go-delve/delve/pull/3819](https://redirect.github.com/go-delve/delve/pull/3819)
- pkg/proc: simplify tests by using errors.As by
[@&#8203;alexandear](https://redirect.github.com/alexandear) in
[https://github.com/go-delve/delve/pull/3818](https://redirect.github.com/go-delve/delve/pull/3818)
- \*: replace uses of uniq with slices.Compact by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3821](https://redirect.github.com/go-delve/delve/pull/3821)
- tests: disable TestGeneratedDoc on 1.24 (tip) by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3820](https://redirect.github.com/go-delve/delve/pull/3820)
- terminal,service: add raw examinemem dump by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3721](https://redirect.github.com/go-delve/delve/pull/3721)
- proc: adds pointer pinning to call injection by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3787](https://redirect.github.com/go-delve/delve/pull/3787)
- update golang.org/x/arch to v0.11.0 by
[@&#8203;yelvens](https://redirect.github.com/yelvens) in
[https://github.com/go-delve/delve/pull/3826](https://redirect.github.com/go-delve/delve/pull/3826)
- delve: add linux-riscv64 support by
[@&#8203;lrzlin](https://redirect.github.com/lrzlin) in
[https://github.com/go-delve/delve/pull/3785](https://redirect.github.com/go-delve/delve/pull/3785)
- \*: mark riscv64 port as experimental by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3835](https://redirect.github.com/go-delve/delve/pull/3835)
- pkg/proc/core: Clean up some repetitive code by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3834](https://redirect.github.com/go-delve/delve/pull/3834)
- goversion: parse version for development builds by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3837](https://redirect.github.com/go-delve/delve/pull/3837)
- Documentation: fix autogenerated markdown documentation by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3836](https://redirect.github.com/go-delve/delve/pull/3836)
- proc: use CPUID to determine ZMM_Hi256 region offset by
[@&#8203;jiegec](https://redirect.github.com/jiegec) in
[https://github.com/go-delve/delve/pull/3831](https://redirect.github.com/go-delve/delve/pull/3831)
- \_scripts: update staticcheck version by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3839](https://redirect.github.com/go-delve/delve/pull/3839)
- TeamCity: move riscv64 backend testing to tip by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3842](https://redirect.github.com/go-delve/delve/pull/3842)
- all: import go telemetry and enable crash reporting by
[@&#8203;hyangah](https://redirect.github.com/hyangah) in
[https://github.com/go-delve/delve/pull/3841](https://redirect.github.com/go-delve/delve/pull/3841)
- service/rpc2: correct ExamineMemory length error message by
[@&#8203;prattmic](https://redirect.github.com/prattmic) in
[https://github.com/go-delve/delve/pull/3846](https://redirect.github.com/go-delve/delve/pull/3846)
- service,terminal,cmd/dlv: automatically guessing substitute-path
config by [@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3781](https://redirect.github.com/go-delve/delve/pull/3781)
- proc: fix rangeFuncStackTrace with inlined functions by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3849](https://redirect.github.com/go-delve/delve/pull/3849)
- proc: run gofmt by
[@&#8203;alexandear](https://redirect.github.com/alexandear) in
[https://github.com/go-delve/delve/pull/3851](https://redirect.github.com/go-delve/delve/pull/3851)
- proc: fix typos in errors, tests, and comments by
[@&#8203;alexandear](https://redirect.github.com/alexandear) in
[https://github.com/go-delve/delve/pull/3852](https://redirect.github.com/go-delve/delve/pull/3852)
- Documentation: using `go install` is preferable by
[@&#8203;alexandear](https://redirect.github.com/alexandear) in
[https://github.com/go-delve/delve/pull/3853](https://redirect.github.com/go-delve/delve/pull/3853)
- proc: do not ignore error return of funcCallEvalFuncExpr by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3850](https://redirect.github.com/go-delve/delve/pull/3850)
- tests: calling os.Exit in TestMain is not required by
[@&#8203;alexandear](https://redirect.github.com/alexandear) in
[https://github.com/go-delve/delve/pull/3856](https://redirect.github.com/go-delve/delve/pull/3856)
- all: remove redundant err declarations by
[@&#8203;alexandear](https://redirect.github.com/alexandear) in
[https://github.com/go-delve/delve/pull/3855](https://redirect.github.com/go-delve/delve/pull/3855)
- go.mod: sync
golang.org/x/telemetry@[`58a1122`](https://redirect.github.com/go-delve/delve/commit/58a1122356f5)
by [@&#8203;hyangah](https://redirect.github.com/hyangah) in
[https://github.com/go-delve/delve/pull/3857](https://redirect.github.com/go-delve/delve/pull/3857)
- pkg/proc/native,pkg/proc/amd64util: xsave decoding cleanup by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3840](https://redirect.github.com/go-delve/delve/pull/3840)
- proc/core/minidump: remove newlines from minidump logs by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3869](https://redirect.github.com/go-delve/delve/pull/3869)
- proc: fix issue on Windows when launching process while detached by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3867](https://redirect.github.com/go-delve/delve/pull/3867)
- feat: print a message when the debugee process exits by
[@&#8203;jakejx](https://redirect.github.com/jakejx) in
[https://github.com/go-delve/delve/pull/3870](https://redirect.github.com/go-delve/delve/pull/3870)
- proc: allow accessing captured variable as if they were struct fields
by [@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3866](https://redirect.github.com/go-delve/delve/pull/3866)
- pkg/proc,service/debugger: do not disable unsatisfiable breakpoints by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3868](https://redirect.github.com/go-delve/delve/pull/3868)
- terminal/starbind: allow modification of structs returned by API by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3872](https://redirect.github.com/go-delve/delve/pull/3872)
- pkg/proc: support swiss table map implementation by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3838](https://redirect.github.com/go-delve/delve/pull/3838)
- tests: removing of dlvbin is not needed by
[@&#8203;alexandear](https://redirect.github.com/alexandear) in
[https://github.com/go-delve/delve/pull/3875](https://redirect.github.com/go-delve/delve/pull/3875)
- service/rpc1: delete APIv1 by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3881](https://redirect.github.com/go-delve/delve/pull/3881)
- proc: fix loading goroutine labels on Go 1.24 by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3879](https://redirect.github.com/go-delve/delve/pull/3879)
- goversion,proc_test: add go1.24 compatiblity, disable broken test by
[@&#8203;aarzilli](https://redirect.github.com/aarzilli) in
[https://github.com/go-delve/delve/pull/3882](https://redirect.github.com/go-delve/delve/pull/3882)
- \*: v1.24.0 by
[@&#8203;derekparker](https://redirect.github.com/derekparker) in
[https://github.com/go-delve/delve/pull/3883](https://redirect.github.com/go-delve/delve/pull/3883)

#### New Contributors

- [@&#8203;jgarte](https://redirect.github.com/jgarte) made their first
contribution in
[https://github.com/go-delve/delve/pull/3817](https://redirect.github.com/go-delve/delve/pull/3817)
- [@&#8203;n1lesh](https://redirect.github.com/n1lesh) made their first
contribution in
[https://github.com/go-delve/delve/pull/3819](https://redirect.github.com/go-delve/delve/pull/3819)
- [@&#8203;yelvens](https://redirect.github.com/yelvens) made their
first contribution in
[https://github.com/go-delve/delve/pull/3826](https://redirect.github.com/go-delve/delve/pull/3826)
- [@&#8203;lrzlin](https://redirect.github.com/lrzlin) made their first
contribution in
[https://github.com/go-delve/delve/pull/3785](https://redirect.github.com/go-delve/delve/pull/3785)
- [@&#8203;jiegec](https://redirect.github.com/jiegec) made their first
contribution in
[https://github.com/go-delve/delve/pull/3831](https://redirect.github.com/go-delve/delve/pull/3831)
- [@&#8203;jakejx](https://redirect.github.com/jakejx) made their first
contribution in
[https://github.com/go-delve/delve/pull/3870](https://redirect.github.com/go-delve/delve/pull/3870)

**Full Changelog**:
https://github.com/go-delve/delve/compare/v1.23.1...v1.24.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS43Mi41IiwidXBkYXRlZEluVmVyIjoiMzkuNzIuNSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
---
 docker/debug/go.mod |  8 +++++---
 docker/debug/go.sum | 20 ++++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/docker/debug/go.mod b/docker/debug/go.mod
index 361459705d6..89fc6996e3f 100644
--- a/docker/debug/go.mod
+++ b/docker/debug/go.mod
@@ -2,7 +2,7 @@ module debug-delve
 
 go 1.23.0
 
-require github.com/go-delve/delve v1.23.1
+require github.com/go-delve/delve v1.24.0
 
 require (
 	github.com/cilium/ebpf v0.11.0 // indirect
@@ -22,8 +22,10 @@ require (
 	github.com/spf13/cobra v1.7.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.starlark.net v0.0.0-20231101134539-556fd59b42f6 // indirect
-	golang.org/x/arch v0.6.0 // indirect
+	golang.org/x/arch v0.11.0 // indirect
 	golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
-	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/telemetry v0.0.0-20241106142447-58a1122356f5 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/docker/debug/go.sum b/docker/debug/go.sum
index 16a1ff2edf3..17a1ea28975 100644
--- a/docker/debug/go.sum
+++ b/docker/debug/go.sum
@@ -13,8 +13,8 @@ github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d h1:hUWoLdw5kvo2xC
 github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d/go.mod h1:C7Es+DLenIpPc9J6IYw4jrK0h7S9bKj4DNl8+KxGEXU=
 github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
 github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/go-delve/delve v1.23.1 h1:MtZ13ppptttkqSuvVnwJ5CPhIAzDiOwRrYuCk3ES7fU=
-github.com/go-delve/delve v1.23.1/go.mod h1:S3SLuEE2mn7wipKilTvk1p9HdTMnXXElcEpiZ+VcuqU=
+github.com/go-delve/delve v1.24.0 h1:M1auuI7kyfXZm5LMDQEqhqr4koKWOzGKhCgwMxsLQfo=
+github.com/go-delve/delve v1.24.0/go.mod h1:yNWXOuo4yslMOOj7O8gIRrf/trDBrFy5ZXwJL4ZzOos=
 github.com/go-delve/liner v1.2.3-0.20231231155935-4726ab1d7f62 h1:IGtvsNyIuRjl04XAOFGACozgUD7A82UffYxZt4DWbvA=
 github.com/go-delve/liner v1.2.3-0.20231231155935-4726ab1d7f62/go.mod h1:biJCRbqp51wS+I92HMqn5H8/A0PAhxn2vyOT+JqhiGI=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
@@ -57,18 +57,22 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 go.starlark.net v0.0.0-20231101134539-556fd59b42f6 h1:+eC0F/k4aBLC4szgOcjd7bDTEnpxADJyWJE0yowgM3E=
 go.starlark.net v0.0.0-20231101134539-556fd59b42f6/go.mod h1:LcLNIzVOMp4oV+uusnpk+VU+SzXaJakUuBjoCSWH5dM=
-golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc=
-golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4=
+golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI=
 golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
+golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/telemetry v0.0.0-20241106142447-58a1122356f5 h1:TCDqnvbBsFapViksHcHySl/sW4+rTGNIAoJJesHRuMM=
+golang.org/x/telemetry v0.0.0-20241106142447-58a1122356f5/go.mod h1:8nZWdGp9pq73ZI//QJyckMQab3yq7hoWi7SI0UIusVI=
 golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
 golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=

From cb36a514d49428842c058caf5a855e75a58acd3a Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 18 Dec 2024 23:41:54 +0100
Subject: [PATCH 50/59] fix(deps): update module golang.org/x/net to v0.33.0
 [security] (#6387)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| golang.org/x/net | `v0.32.0` -> `v0.33.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/golang.org%2fx%2fnet/v0.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/golang.org%2fx%2fnet/v0.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/golang.org%2fx%2fnet/v0.32.0/v0.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/golang.org%2fx%2fnet/v0.32.0/v0.33.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

### GitHub Vulnerability Alerts

#### [CVE-2024-45338](https://nvd.nist.gov/vuln/detail/CVE-2024-45338)

An attacker can craft an input to the Parse functions that would be
processed non-linearly with respect to its length, resulting in
extremely slow parsing. This could cause a denial of service.

---

### Configuration

📅 **Schedule**: Branch creation - "" (UTC), Automerge - At any time (no
schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS43Mi41IiwidXBkYXRlZEluVmVyIjoiMzkuNzIuNSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index d514f33b5fa..762d0f365f4 100644
--- a/go.mod
+++ b/go.mod
@@ -95,7 +95,7 @@ require (
 	go.uber.org/automaxprocs v1.6.0
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/net v0.32.0
+	golang.org/x/net v0.33.0
 	golang.org/x/sys v0.28.0
 	google.golang.org/grpc v1.69.2
 	google.golang.org/protobuf v1.36.0
diff --git a/go.sum b/go.sum
index 13f007c6669..5d8e67a5e7a 100644
--- a/go.sum
+++ b/go.sum
@@ -859,8 +859,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.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
 golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=

From 86f2305d7eea9a7a5c170ee92de2845be632e81f Mon Sep 17 00:00:00 2001
From: Alok Kumar Singh <62210712+akstron@users.noreply.github.com>
Date: Thu, 19 Dec 2024 06:23:03 +0530
Subject: [PATCH 51/59] Support extra custom query parameters in requests to
 Prometheus backend (#6360)

## Which problem is this PR solving?
- Resolves #4221

## Description of the changes
- Wrapped the client in `promClient` to decorate url with additional
parameters

## How was this change tested?
- `TestCreatePromClientWithAdditionalParameters`

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com>
Signed-off-by: Alok Kumar Singh <62210712+akstron@users.noreply.github.com>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
---
 pkg/prometheus/config/config.go               |  3 ++
 .../prometheus/metricstore/reader.go          | 44 ++++++++++++++++---
 .../prometheus/metricstore/reader_test.go     | 39 +++++++++++++---
 3 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/pkg/prometheus/config/config.go b/pkg/prometheus/config/config.go
index 0c8c21baf07..d015bfcf93c 100644
--- a/pkg/prometheus/config/config.go
+++ b/pkg/prometheus/config/config.go
@@ -23,6 +23,9 @@ type Configuration struct {
 	LatencyUnit       string `mapstructure:"latency_unit"`
 	NormalizeCalls    bool   `mapstructure:"normalize_calls"`
 	NormalizeDuration bool   `mapstructure:"normalize_duration"`
+	// ExtraQueryParams is used to provide extra parameters to be appended
+	// to the URL of queries going out to the metrics backend.
+	ExtraQueryParams map[string]string `mapstructure:"extra_query_parameters"`
 }
 
 func (c *Configuration) Validate() error {
diff --git a/plugin/metricstore/prometheus/metricstore/reader.go b/plugin/metricstore/prometheus/metricstore/reader.go
index 122ed3f52d2..bf2c957314c 100644
--- a/plugin/metricstore/prometheus/metricstore/reader.go
+++ b/plugin/metricstore/prometheus/metricstore/reader.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
@@ -60,16 +61,32 @@ type (
 		metricDesc        string
 		buildPromQuery    func(p promQueryParams) string
 	}
+
+	promClient struct {
+		api.Client
+		extraParams map[string]string
+	}
 )
 
-// NewMetricsReader returns a new MetricsReader.
-func NewMetricsReader(cfg config.Configuration, logger *zap.Logger, tracer trace.TracerProvider) (*MetricsReader, error) {
-	logger.Info("Creating metrics reader", zap.Any("configuration", cfg))
+// URL decorator enables adding additional query parameters to the request sent to prometheus backend
+func (p promClient) URL(ep string, args map[string]string) *url.URL {
+	u := p.Client.URL(ep, args)
+
+	query := u.Query()
+	for k, v := range p.extraParams {
+		query.Add(k, v)
+	}
+	u.RawQuery = query.Encode()
+
+	return u
+}
 
-	roundTripper, err := getHTTPRoundTripper(&cfg, logger)
+func createPromClient(cfg config.Configuration) (api.Client, error) {
+	roundTripper, err := getHTTPRoundTripper(&cfg)
 	if err != nil {
 		return nil, err
 	}
+
 	client, err := api.NewClient(api.Config{
 		Address:      cfg.ServerURL,
 		RoundTripper: roundTripper,
@@ -78,10 +95,25 @@ func NewMetricsReader(cfg config.Configuration, logger *zap.Logger, tracer trace
 		return nil, fmt.Errorf("failed to initialize prometheus client: %w", err)
 	}
 
+	customClient := promClient{
+		Client:      client,
+		extraParams: cfg.ExtraQueryParams,
+	}
+
+	return customClient, nil
+}
+
+// NewMetricsReader returns a new MetricsReader.
+func NewMetricsReader(cfg config.Configuration, logger *zap.Logger, tracer trace.TracerProvider) (*MetricsReader, error) {
 	const operationLabel = "span_name"
 
+	promClient, err := createPromClient(cfg)
+	if err != nil {
+		return nil, err
+	}
+
 	mr := &MetricsReader{
-		client: promapi.NewAPI(client),
+		client: promapi.NewAPI(promClient),
 		logger: logger,
 		tracer: tracer.Tracer("prom-metrics-reader"),
 
@@ -314,7 +346,7 @@ func logErrorToSpan(span trace.Span, err error) {
 	span.SetStatus(codes.Error, err.Error())
 }
 
-func getHTTPRoundTripper(c *config.Configuration, _ *zap.Logger) (rt http.RoundTripper, err error) {
+func getHTTPRoundTripper(c *config.Configuration) (rt http.RoundTripper, err error) {
 	ctlsConfig, err := c.TLS.LoadTLSConfig(context.Background())
 	if err != nil {
 		return nil, err
diff --git a/plugin/metricstore/prometheus/metricstore/reader_test.go b/plugin/metricstore/prometheus/metricstore/reader_test.go
index 046da949a2b..d569da37de5 100644
--- a/plugin/metricstore/prometheus/metricstore/reader_test.go
+++ b/plugin/metricstore/prometheus/metricstore/reader_test.go
@@ -11,6 +11,7 @@ import (
 	"net/http/httptest"
 	"net/url"
 	"os"
+	"sort"
 	"strings"
 	"sync/atomic"
 	"testing"
@@ -737,13 +738,12 @@ func TestGetRoundTripperTLSConfig(t *testing.T) {
 		{"tls disabled", false},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			logger := zap.NewNop()
 			config := &config.Configuration{
 				ConnectTimeout:           9 * time.Millisecond,
 				TLS:                      configtls.ClientConfig{},
 				TokenOverrideFromContext: true,
 			}
-			rt, err := getHTTPRoundTripper(config, logger)
+			rt, err := getHTTPRoundTripper(config)
 			require.NoError(t, err)
 
 			server := newFakePromServer(t)
@@ -781,7 +781,7 @@ func TestGetRoundTripperTokenFile(t *testing.T) {
 		ConnectTimeout:           time.Second,
 		TokenFilePath:            file.Name(),
 		TokenOverrideFromContext: false,
-	}, nil)
+	})
 	require.NoError(t, err)
 
 	server := newFakePromServer(t)
@@ -815,7 +815,7 @@ func TestGetRoundTripperTokenFromContext(t *testing.T) {
 		ConnectTimeout:           time.Second,
 		TokenFilePath:            file.Name(),
 		TokenOverrideFromContext: true,
-	}, nil)
+	})
 	require.NoError(t, err)
 
 	server := newFakePromServer(t)
@@ -842,7 +842,7 @@ func TestGetRoundTripperTokenError(t *testing.T) {
 
 	_, err := getHTTPRoundTripper(&config.Configuration{
 		TokenFilePath: tokenFilePath,
-	}, nil)
+	})
 	assert.ErrorContains(t, err, "failed to get token from file")
 }
 
@@ -863,6 +863,35 @@ func TestInvalidCertFile(t *testing.T) {
 	assert.Nil(t, reader)
 }
 
+func TestCreatePromClientWithExtraQueryParameters(t *testing.T) {
+	extraParams := map[string]string{
+		"param1": "value1",
+		"param2": "value2",
+	}
+
+	cfg := config.Configuration{
+		ServerURL:        "http://localhost:1234?param1=value0",
+		ExtraQueryParams: extraParams,
+	}
+
+	expParams := map[string][]string{
+		"param1": {"value0", "value1"},
+		"param2": {"value2"},
+	}
+
+	customClient, err := createPromClient(cfg)
+	require.NoError(t, err)
+
+	u := customClient.URL("", nil)
+
+	q := u.Query()
+
+	for k, v := range expParams {
+		sort.Strings(q[k])
+		require.Equal(t, v, q[k])
+	}
+}
+
 func startMockPrometheusServer(t *testing.T, wantPromQlQuery string, wantWarnings []string) *httptest.Server {
 	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if len(wantWarnings) > 0 {

From 5ab3d26efcaf07901f4180367031989f2e757994 Mon Sep 17 00:00:00 2001
From: Jonah Kowall <jkowall@kowall.net>
Date: Thu, 19 Dec 2024 07:48:31 -0500
Subject: [PATCH 52/59] Document maintainer actions (#6386)

## Which problem is this PR solving?

Fixes #6370

## Description of the changes
Adding a section in the document on onboarding, offboarding and other
activities.

## Checklist
- [X] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [X] I have signed all commits

---------

Signed-off-by: Jonah Kowall <jkowall@kowall.net>
Signed-off-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
---
 MAINTAINERS.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 40afdccf85e..43deef6bbd5 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -22,3 +22,25 @@ We are grateful to our former maintainers for their contributions to the Jaeger
 * [@objectiser](https://github.com/objectiser)
 * [@tiffon](https://github.com/tiffon)
 * [@vprithvi](https://github.com/vprithvi)
+
+### Maintainer Onboarding
+
+Upon approval, the following steps should be taken to onboard the new maintainer:
+
+*   **1. Update Project Documentation**
+    *   **`MAINTAINERS.md` File:** Merge the PR to add the new maintainer to the `MAINTAINERS.md` file(s) in the relevant Jaeger repositories.
+*   **2. Grant Permissions**
+    *   **GitHub:** Add the new maintainer to the `@jaegertracing/jaeger-maintainers` GitHub team. This grants them write access to the Jaeger repositories.
+    *   **CNCF Mailing List:** Add the new maintainer to the `cncf-jaeger-maintainers@lists.cncf.io` mailing list (and any other relevant Jaeger mailing lists). Contact the existing `cncf-jaeger-maintainers` to find out the precise process for adding to the mailing list, it will likely involve getting in touch with the CNCF.
+    *   **CNCF Maintainer Registry:**
+        *   Create a PR against the `cncf/foundation` repository to add the new maintainer's information to the `project-maintainers.csv` file. The following fields are required:
+        *   Reference the PR in the `cncf-jaeger-maintainers` mailing list.
+    *   **Signing Keys:**
+        *   Jaeger uses a GPG key for encrypted emails sent to the maintainers for security reports along with access to the `maintainers-only` GitHub repository. This key is stored in our 1password repository. 
+    *   **1Password:** Connect with an existing maintainer to be added to our jaegertracing 1Password team.
+*   **3. Announcement**
+    *   Announce the new maintainer to the Jaeger community through the mailing list, blog, or other appropriate channels.
+
+### Maintainer Offboarding
+
+The process for removing a maintainer is similar to adding one. A maintainer can step down voluntarily or be removed by a vote of the other maintainers if they are no longer fulfilling their responsibilities or are violating the project's Code of Conduct. A supermajority vote is needed to remove a maintainer. Their access should be revoked from all relevant tools, and the project documentation updated accordingly.

From 6032db99a51341bf326c791838939e3f632cb9e9 Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Thu, 19 Dec 2024 20:44:11 -0500
Subject: [PATCH 53/59] [v2][adjuster] Implement adjuster for sorting
 attributes and events (#6389)

## Which problem is this PR solving?
- Towards #6344

## Description of the changes
- Implemented an adjuster to sort attributes and events that operates
natively on the OTLP data format. This is analogous to the
`SortTagsAndLogFields` adjuster in v1.

## How was this change tested?
- Added a unit test

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/query/app/querysvc/adjuster/sort.go      | 81 ++++++++++++++++
 cmd/query/app/querysvc/adjuster/sort_test.go | 97 ++++++++++++++++++++
 2 files changed, 178 insertions(+)
 create mode 100644 cmd/query/app/querysvc/adjuster/sort.go
 create mode 100644 cmd/query/app/querysvc/adjuster/sort_test.go

diff --git a/cmd/query/app/querysvc/adjuster/sort.go b/cmd/query/app/querysvc/adjuster/sort.go
new file mode 100644
index 00000000000..6ca367710b5
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/sort.go
@@ -0,0 +1,81 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"sort"
+
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+)
+
+var _ Adjuster = (*SortAttributesAndEventsAdjuster)(nil)
+
+// SortAttributesAndEvents creates an adjuster that standardizes trace data by sorting elements:
+// - Resource attributes are sorted lexicographically by their keys.
+// - Span attributes are sorted lexicographically by their keys.
+// - Span events are sorted lexicographically by their names.
+// - Attributes within each span event are sorted lexicographically by their keys.
+func SortAttributesAndEvents() SortAttributesAndEventsAdjuster {
+	return SortAttributesAndEventsAdjuster{}
+}
+
+type SortAttributesAndEventsAdjuster struct{}
+
+func (s SortAttributesAndEventsAdjuster) Adjust(traces ptrace.Traces) {
+	resourceSpans := traces.ResourceSpans()
+	for i := 0; i < resourceSpans.Len(); i++ {
+		rs := resourceSpans.At(i)
+		resource := rs.Resource()
+		s.sortAttributes(resource.Attributes())
+		scopeSpans := rs.ScopeSpans()
+		for j := 0; j < scopeSpans.Len(); j++ {
+			ss := scopeSpans.At(j)
+			s.sortAttributes(ss.Scope().Attributes())
+			spans := ss.Spans()
+			for k := 0; k < spans.Len(); k++ {
+				span := spans.At(k)
+				s.sortAttributes(span.Attributes())
+				s.sortEvents(span.Events())
+				links := span.Links()
+				for l := 0; l < links.Len(); l++ {
+					link := links.At(l)
+					s.sortAttributes(link.Attributes())
+				}
+			}
+		}
+	}
+}
+
+func (SortAttributesAndEventsAdjuster) sortAttributes(attributes pcommon.Map) {
+	entries := make([]struct {
+		key   string
+		value pcommon.Value
+	}, 0, attributes.Len())
+	attributes.Range(func(k string, v pcommon.Value) bool {
+		entries = append(entries, struct {
+			key   string
+			value pcommon.Value
+		}{key: k, value: v})
+		return true
+	})
+	sort.Slice(entries, func(i, j int) bool {
+		return entries[i].key < entries[j].key
+	})
+	newAttributes := pcommon.NewMap()
+	for _, entry := range entries {
+		entry.value.CopyTo(newAttributes.PutEmpty(entry.key))
+	}
+	newAttributes.CopyTo(attributes)
+}
+
+func (s SortAttributesAndEventsAdjuster) sortEvents(events ptrace.SpanEventSlice) {
+	events.Sort(func(a, b ptrace.SpanEvent) bool {
+		return a.Name() < b.Name()
+	})
+	for i := 0; i < events.Len(); i++ {
+		event := events.At(i)
+		s.sortAttributes(event.Attributes())
+	}
+}
diff --git a/cmd/query/app/querysvc/adjuster/sort_test.go b/cmd/query/app/querysvc/adjuster/sort_test.go
new file mode 100644
index 00000000000..d9bef8baa37
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/sort_test.go
@@ -0,0 +1,97 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+)
+
+func TestSortAttributesAndEventsAdjuster(t *testing.T) {
+	adjuster := SortAttributesAndEvents()
+	input := func() ptrace.Traces {
+		traces := ptrace.NewTraces()
+		rs := traces.ResourceSpans().AppendEmpty()
+
+		resource := rs.Resource()
+		resource.Attributes().PutStr("attributeZ", "valA")
+		resource.Attributes().PutStr("attributeA", "valB")
+		resource.Attributes().PutInt("attributeY", 1)
+		resource.Attributes().PutStr("attributeX", "valC")
+
+		ss := rs.ScopeSpans().AppendEmpty()
+		ss.Scope().Attributes().PutStr("attributeH", "valI")
+		ss.Scope().Attributes().PutStr("attributeF", "valG")
+
+		span := ss.Spans().AppendEmpty()
+		span.Attributes().PutStr("attributeW", "valD")
+		span.Attributes().PutStr("attributeB", "valZ")
+		span.Attributes().PutInt("attributeV", 2)
+
+		event2 := span.Events().AppendEmpty()
+		event2.SetName("event2")
+		event2.Attributes().PutStr("attributeU", "valE")
+		event2.Attributes().PutStr("attributeT", "valF")
+
+		event1 := span.Events().AppendEmpty()
+		event1.SetName("event1")
+		event1.Attributes().PutStr("attributeR", "valE")
+		event1.Attributes().PutStr("attributeS", "valF")
+
+		link1 := span.Links().AppendEmpty()
+		link1.Attributes().PutStr("attributeA", "valB")
+		link1.Attributes().PutStr("attributeB", "valC")
+
+		link2 := span.Links().AppendEmpty()
+		link2.Attributes().PutStr("attributeD", "valE")
+		link2.Attributes().PutStr("attributeC", "valD")
+
+		return traces
+	}
+	expected := func() ptrace.Traces {
+		traces := ptrace.NewTraces()
+		rs := traces.ResourceSpans().AppendEmpty()
+
+		resource := rs.Resource()
+		resource.Attributes().PutStr("attributeA", "valB")
+		resource.Attributes().PutStr("attributeX", "valC")
+		resource.Attributes().PutInt("attributeY", 1)
+		resource.Attributes().PutStr("attributeZ", "valA")
+
+		ss := rs.ScopeSpans().AppendEmpty()
+		ss.Scope().Attributes().PutStr("attributeF", "valG")
+		ss.Scope().Attributes().PutStr("attributeH", "valI")
+
+		span := ss.Spans().AppendEmpty()
+		span.Attributes().PutStr("attributeB", "valZ")
+		span.Attributes().PutInt("attributeV", 2)
+		span.Attributes().PutStr("attributeW", "valD")
+
+		event1 := span.Events().AppendEmpty()
+		event1.SetName("event1")
+		event1.Attributes().PutStr("attributeR", "valE")
+		event1.Attributes().PutStr("attributeS", "valF")
+
+		event2 := span.Events().AppendEmpty()
+		event2.SetName("event2")
+		event2.Attributes().PutStr("attributeT", "valF")
+		event2.Attributes().PutStr("attributeU", "valE")
+
+		link1 := span.Links().AppendEmpty()
+		link1.Attributes().PutStr("attributeA", "valB")
+		link1.Attributes().PutStr("attributeB", "valC")
+
+		link2 := span.Links().AppendEmpty()
+		link2.Attributes().PutStr("attributeC", "valD")
+		link2.Attributes().PutStr("attributeD", "valE")
+
+		return traces
+	}
+
+	i := input()
+	adjuster.Adjust(i)
+	assert.Equal(t, expected(), i)
+}

From 42a20f02b41b9b243317b4c8c4d73b2b0b087e5c Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Date: Thu, 19 Dec 2024 22:11:17 -0400
Subject: [PATCH 54/59] [refactor] Clean up span.kind tag handling (#6390)

## Description of the changes
- Introduce strongly typed constants and keys for some standard tags

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
---
 cmd/agent/app/reporter/grpc/reporter_test.go  |  2 +-
 cmd/anonymizer/app/anonymizer/anonymizer.go   | 12 +++---
 cmd/anonymizer/app/uiconv/extractor_test.go   |  2 +-
 cmd/anonymizer/app/uiconv/module_test.go      |  4 +-
 cmd/query/app/apiv3/gateway_test.go           |  2 +-
 model/adjuster/span_hash_deduper_test.go      |  7 ++--
 .../adjuster/zipkin_span_id_uniquify_test.go  |  6 +--
 model/converter/thrift/zipkin/to_domain.go    |  7 ++--
 .../converter/thrift/zipkin/to_domain_test.go | 25 ++++++------
 model/keyvalue.go                             | 24 ++++++++++++
 model/keyvalues_test.go                       | 23 +++++++++++
 model/span.go                                 | 39 +++++++------------
 model/span_test.go                            | 10 ++---
 plugin/storage/cassandra/spanstore/writer.go  |  4 +-
 .../cassandra/spanstore/writer_test.go        |  2 +-
 plugin/storage/integration/integration.go     |  2 +-
 plugin/storage/memory/memory.go               |  4 +-
 plugin/storage/memory/memory_test.go          |  6 +--
 18 files changed, 107 insertions(+), 74 deletions(-)

diff --git a/cmd/agent/app/reporter/grpc/reporter_test.go b/cmd/agent/app/reporter/grpc/reporter_test.go
index 32ed9253033..e5f89dd3266 100644
--- a/cmd/agent/app/reporter/grpc/reporter_test.go
+++ b/cmd/agent/app/reporter/grpc/reporter_test.go
@@ -67,7 +67,7 @@ func TestReporter_EmitZipkinBatch(t *testing.T) {
 			expected: model.Batch{
 				Spans: []*model.Span{{
 					TraceID: model.NewTraceID(0, 1), SpanID: model.NewSpanID(2), OperationName: "jonatan", Duration: time.Microsecond * 1,
-					Tags:    model.KeyValues{{Key: "span.kind", VStr: "client", VType: model.StringType}},
+					Tags:    model.KeyValues{model.SpanKindTag(model.SpanKindClient)},
 					Process: &model.Process{ServiceName: "spring"}, StartTime: tm.UTC(),
 				}},
 			},
diff --git a/cmd/anonymizer/app/anonymizer/anonymizer.go b/cmd/anonymizer/app/anonymizer/anonymizer.go
index 1a9a5a8305c..9d22f5e6cd3 100644
--- a/cmd/anonymizer/app/anonymizer/anonymizer.go
+++ b/cmd/anonymizer/app/anonymizer/anonymizer.go
@@ -21,12 +21,12 @@ import (
 )
 
 var allowedTags = map[string]bool{
-	"error":            true,
-	"span.kind":        true,
-	"http.method":      true,
-	"http.status_code": true,
-	"sampler.type":     true,
-	"sampler.param":    true,
+	"error":               true,
+	"http.method":         true,
+	"http.status_code":    true,
+	model.SpanKindKey:     true,
+	model.SamplerTypeKey:  true,
+	model.SamplerParamKey: true,
 }
 
 const PermUserRW = 0o600 // Read-write for owner only
diff --git a/cmd/anonymizer/app/uiconv/extractor_test.go b/cmd/anonymizer/app/uiconv/extractor_test.go
index 5f06f338462..9588850a9cd 100644
--- a/cmd/anonymizer/app/uiconv/extractor_test.go
+++ b/cmd/anonymizer/app/uiconv/extractor_test.go
@@ -43,7 +43,7 @@ func TestExtractorTraceSuccess(t *testing.T) {
 
 	for i := range trace.Data {
 		for j := range trace.Data[i].Spans {
-			assert.Equal(t, "span.kind", trace.Data[i].Spans[j].Tags[0].Key)
+			assert.Equal(t, model.SpanKindKey, trace.Data[i].Spans[j].Tags[0].Key)
 		}
 	}
 }
diff --git a/cmd/anonymizer/app/uiconv/module_test.go b/cmd/anonymizer/app/uiconv/module_test.go
index 02b541cfb3c..0bdbe78a7d4 100644
--- a/cmd/anonymizer/app/uiconv/module_test.go
+++ b/cmd/anonymizer/app/uiconv/module_test.go
@@ -10,6 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
+
+	"github.com/jaegertracing/jaeger/model"
 )
 
 func TestModule_TraceSuccess(t *testing.T) {
@@ -30,7 +32,7 @@ func TestModule_TraceSuccess(t *testing.T) {
 
 	for i := range trace.Data {
 		for j := range trace.Data[i].Spans {
-			assert.Equal(t, "span.kind", trace.Data[i].Spans[j].Tags[0].Key)
+			assert.Equal(t, model.SpanKindKey, trace.Data[i].Spans[j].Tags[0].Key)
 		}
 	}
 }
diff --git a/cmd/query/app/apiv3/gateway_test.go b/cmd/query/app/apiv3/gateway_test.go
index 22a08dc2641..64d71fa73cf 100644
--- a/cmd/query/app/apiv3/gateway_test.go
+++ b/cmd/query/app/apiv3/gateway_test.go
@@ -90,7 +90,7 @@ func makeTestTrace() (*model.Trace, spanstore.GetTraceParameters) {
 				SpanID:        model.NewSpanID(180),
 				OperationName: "foobar",
 				Tags: []model.KeyValue{
-					model.String("span.kind", "server"),
+					model.SpanKindTag(model.SpanKindServer),
 					model.Bool("error", true),
 				},
 			},
diff --git a/model/adjuster/span_hash_deduper_test.go b/model/adjuster/span_hash_deduper_test.go
index 6fd898d264a..d8bffd5bf82 100644
--- a/model/adjuster/span_hash_deduper_test.go
+++ b/model/adjuster/span_hash_deduper_test.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel/trace"
 
 	"github.com/jaegertracing/jaeger/model"
 )
@@ -22,7 +21,7 @@ func newDuplicatedSpansTrace() *model.Trace {
 				SpanID:  clientSpanID,
 				Tags: model.KeyValues{
 					// span.kind = server
-					model.String(keySpanKind, trace.SpanKindServer.String()),
+					model.SpanKindTag(model.SpanKindServer),
 				},
 			},
 			{
@@ -30,7 +29,7 @@ func newDuplicatedSpansTrace() *model.Trace {
 				SpanID:  clientSpanID, // shared span ID
 				Tags: model.KeyValues{
 					// span.kind = server
-					model.String(keySpanKind, trace.SpanKindServer.String()),
+					model.SpanKindTag(model.SpanKindServer),
 				},
 			},
 			{
@@ -52,7 +51,7 @@ func newUniqueSpansTrace() *model.Trace {
 				SpanID:  anotherSpanID,
 				Tags: model.KeyValues{
 					// span.kind = server
-					model.String(keySpanKind, trace.SpanKindServer.String()),
+					model.SpanKindTag(model.SpanKindServer),
 				},
 			},
 			{
diff --git a/model/adjuster/zipkin_span_id_uniquify_test.go b/model/adjuster/zipkin_span_id_uniquify_test.go
index 13a2114ebc5..c0b92799c21 100644
--- a/model/adjuster/zipkin_span_id_uniquify_test.go
+++ b/model/adjuster/zipkin_span_id_uniquify_test.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel/trace"
 
 	"github.com/jaegertracing/jaeger/model"
 )
@@ -17,7 +16,6 @@ import (
 var (
 	clientSpanID  = model.NewSpanID(1)
 	anotherSpanID = model.NewSpanID(11)
-	keySpanKind   = "span.kind"
 )
 
 func newZipkinTrace() *model.Trace {
@@ -30,7 +28,7 @@ func newZipkinTrace() *model.Trace {
 				SpanID:  clientSpanID,
 				Tags: model.KeyValues{
 					// span.kind = client
-					model.String(keySpanKind, trace.SpanKindClient.String()),
+					model.SpanKindTag(model.SpanKindClient),
 				},
 			},
 			{
@@ -39,7 +37,7 @@ func newZipkinTrace() *model.Trace {
 				SpanID:  clientSpanID, // shared span ID
 				Tags: model.KeyValues{
 					// span.kind = server
-					model.String(keySpanKind, trace.SpanKindServer.String()),
+					model.SpanKindTag(model.SpanKindServer),
 				},
 			},
 			{
diff --git a/model/converter/thrift/zipkin/to_domain.go b/model/converter/thrift/zipkin/to_domain.go
index c287d958c1a..00ca20408fd 100644
--- a/model/converter/thrift/zipkin/to_domain.go
+++ b/model/converter/thrift/zipkin/to_domain.go
@@ -21,7 +21,6 @@ import (
 const (
 	// UnknownServiceName is serviceName we give to model.Process if we cannot find it anywhere in a Zipkin span
 	UnknownServiceName = "unknown-service-name"
-	keySpanKind        = "span.kind"
 	component          = "component"
 	peerservice        = "peer.service"
 	peerHostIPv4       = "peer.ipv4"
@@ -166,7 +165,7 @@ func (td toDomain) transformSpan(zSpan *zipkincore.Span) []*model.Span {
 		}
 		// if the first span is a client span we create server span and vice-versa.
 		if result[0].IsRPCClient() {
-			s.Tags = []model.KeyValue{model.String(keySpanKind, trace.SpanKindServer.String())}
+			s.Tags = []model.KeyValue{model.SpanKindTag(model.SpanKindServer)}
 			//nolint: gosec // G115
 			s.StartTime = model.EpochMicrosecondsAsTime(uint64(sr.Timestamp))
 			if ss := td.findAnnotation(zSpan, zipkincore.SERVER_SEND); ss != nil {
@@ -174,7 +173,7 @@ func (td toDomain) transformSpan(zSpan *zipkincore.Span) []*model.Span {
 				s.Duration = model.MicrosecondsAsDuration(uint64(ss.Timestamp - sr.Timestamp))
 			}
 		} else {
-			s.Tags = []model.KeyValue{model.String(keySpanKind, trace.SpanKindClient.String())}
+			s.Tags = []model.KeyValue{model.SpanKindTag(model.SpanKindClient)}
 			//nolint: gosec // G115
 			s.StartTime = model.EpochMicrosecondsAsTime(uint64(cs.Timestamp))
 			if cr := td.findAnnotation(zSpan, zipkincore.CLIENT_RECV); cr != nil {
@@ -393,7 +392,7 @@ func (toDomain) getLogFields(annotation *zipkincore.Annotation) []model.KeyValue
 func (toDomain) getSpanKindTag(annotations []*zipkincore.Annotation) (model.KeyValue, bool) {
 	for _, a := range annotations {
 		if spanKind, ok := coreAnnotations[a.Value]; ok {
-			return model.String(keySpanKind, spanKind), true
+			return model.SpanKindTag(model.SpanKind(spanKind)), true
 		}
 	}
 	return model.KeyValue{}, false
diff --git a/model/converter/thrift/zipkin/to_domain_test.go b/model/converter/thrift/zipkin/to_domain_test.go
index d70f24e09c2..316a3a8c8ed 100644
--- a/model/converter/thrift/zipkin/to_domain_test.go
+++ b/model/converter/thrift/zipkin/to_domain_test.go
@@ -20,7 +20,6 @@ import (
 	"github.com/kr/pretty"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel/trace"
 
 	"github.com/jaegertracing/jaeger/model"
 	z "github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
@@ -107,8 +106,8 @@ func TestToDomainMultipleSpanKinds(t *testing.T) {
 		json         string
 		tagFirstKey  string
 		tagSecondKey string
-		tagFirstVal  trace.SpanKind
-		tagSecondVal trace.SpanKind
+		tagFirstVal  model.SpanKind
+		tagSecondVal model.SpanKind
 	}{
 		{
 			json: `[{ "trace_id": -1, "id": 31, "annotations": [
@@ -116,10 +115,10 @@ func TestToDomainMultipleSpanKinds(t *testing.T) {
 		{"value": "sr", "timestamp": 1, "host": {"service_name": "bar", "ipv4": 23456}},
 		{"value": "ss", "timestamp": 2, "host": {"service_name": "bar", "ipv4": 23456}}
 		]}]`,
-			tagFirstKey:  keySpanKind,
-			tagSecondKey: keySpanKind,
-			tagFirstVal:  trace.SpanKindClient,
-			tagSecondVal: trace.SpanKindServer,
+			tagFirstKey:  model.SpanKindKey,
+			tagSecondKey: model.SpanKindKey,
+			tagFirstVal:  model.SpanKindClient,
+			tagSecondVal: model.SpanKindServer,
 		},
 		{
 			json: `[{ "trace_id": -1, "id": 31, "annotations": [
@@ -127,10 +126,10 @@ func TestToDomainMultipleSpanKinds(t *testing.T) {
 		{"value": "cs", "timestamp": 1, "host": {"service_name": "bar", "ipv4": 23456}},
 		{"value": "cr", "timestamp": 2, "host": {"service_name": "bar", "ipv4": 23456}}
 		]}]`,
-			tagFirstKey:  keySpanKind,
-			tagSecondKey: keySpanKind,
-			tagFirstVal:  trace.SpanKindServer,
-			tagSecondVal: trace.SpanKindClient,
+			tagFirstKey:  model.SpanKindKey,
+			tagSecondKey: model.SpanKindKey,
+			tagFirstVal:  model.SpanKindServer,
+			tagSecondVal: model.SpanKindClient,
 		},
 	}
 
@@ -141,12 +140,12 @@ func TestToDomainMultipleSpanKinds(t *testing.T) {
 		assert.Len(t, trc.Spans, 2)
 		assert.Len(t, trc.Spans[0].Tags, 1)
 		assert.Equal(t, test.tagFirstKey, trc.Spans[0].Tags[0].Key)
-		assert.Equal(t, test.tagFirstVal.String(), trc.Spans[0].Tags[0].VStr)
+		assert.EqualValues(t, test.tagFirstVal, trc.Spans[0].Tags[0].VStr)
 
 		assert.Len(t, trc.Spans[1].Tags, 1)
 		assert.Equal(t, test.tagSecondKey, trc.Spans[1].Tags[0].Key)
 		assert.Equal(t, time.Duration(1000), trc.Spans[1].Duration)
-		assert.Equal(t, test.tagSecondVal.String(), trc.Spans[1].Tags[0].VStr)
+		assert.EqualValues(t, test.tagSecondVal, trc.Spans[1].Tags[0].VStr)
 	}
 }
 
diff --git a/model/keyvalue.go b/model/keyvalue.go
index 68fc91ea3a4..72304eeee91 100644
--- a/model/keyvalue.go
+++ b/model/keyvalue.go
@@ -25,8 +25,32 @@ const (
 	Float64Type = ValueType_FLOAT64
 	// BinaryType indicates the value is binary blob stored as a byte array
 	BinaryType = ValueType_BINARY
+
+	SpanKindKey     = "span.kind"
+	SamplerTypeKey  = "sampler.type"
+	SamplerParamKey = "sampler.param"
+)
+
+type SpanKind string
+
+const (
+	SpanKindClient      SpanKind = "client"
+	SpanKindServer      SpanKind = "server"
+	SpanKindProducer    SpanKind = "producer"
+	SpanKindConsumer    SpanKind = "consumer"
+	SpanKindInternal    SpanKind = "internal"
+	SpanKindUnspecified SpanKind = ""
 )
 
+func SpanKindFromString(kind string) (SpanKind, error) {
+	switch SpanKind(kind) {
+	case SpanKindClient, SpanKindServer, SpanKindProducer, SpanKindConsumer, SpanKindInternal, SpanKindUnspecified:
+		return SpanKind(kind), nil
+	default:
+		return SpanKindUnspecified, fmt.Errorf("unknown span kind %q", kind)
+	}
+}
+
 // KeyValues is a type alias that exposes convenience functions like Sort, FindByKey.
 type KeyValues []KeyValue
 
diff --git a/model/keyvalues_test.go b/model/keyvalues_test.go
index fefda5353ed..0c8e71f6187 100644
--- a/model/keyvalues_test.go
+++ b/model/keyvalues_test.go
@@ -40,6 +40,29 @@ func TestKeyValuesSort(t *testing.T) {
 	assert.Equal(t, expected, input)
 }
 
+func TestSpanKindFromString(t *testing.T) {
+	testCases := []struct {
+		input  string
+		output model.SpanKind
+		err    string
+	}{
+		{input: "client", output: model.SpanKindClient},
+		{input: "", output: model.SpanKindUnspecified},
+		{input: "foobar", output: model.SpanKindUnspecified, err: "unknown span kind"},
+	}
+	for _, test := range testCases {
+		t.Run(fmt.Sprintf("%+v", test), func(t *testing.T) {
+			v, err := model.SpanKindFromString(test.input)
+			if test.err != "" {
+				require.ErrorContains(t, err, test.err)
+			} else {
+				require.NoError(t, err)
+			}
+			assert.Equal(t, test.output, v)
+		})
+	}
+}
+
 func TestKeyValuesFindByKey(t *testing.T) {
 	input := model.KeyValues{
 		model.String("x", "z"),
diff --git a/model/span.go b/model/span.go
index 51d96cae40a..3ec5a9431a2 100644
--- a/model/span.go
+++ b/model/span.go
@@ -9,7 +9,6 @@ import (
 	"io"
 	"strconv"
 
-	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 )
 
@@ -28,23 +27,11 @@ const (
 	DebugFlag = Flags(2)
 	// FirehoseFlag is the bit in Flags in order to define a span as a firehose span
 	FirehoseFlag = Flags(8)
-
-	keySamplerType  = "sampler.type"
-	keySpanKind     = "span.kind"
-	keySamplerParam = "sampler.param"
 )
 
 // Flags is a bit map of flags for a span
 type Flags uint32
 
-var toSpanKind = map[string]trace.SpanKind{
-	"client":   trace.SpanKindClient,
-	"server":   trace.SpanKindServer,
-	"producer": trace.SpanKindProducer,
-	"consumer": trace.SpanKindConsumer,
-	"internal": trace.SpanKindInternal,
-}
-
 var toSamplerType = map[string]SamplerType{
 	"unrecognized":  SamplerTypeUnrecognized,
 	"probabilistic": SamplerTypeProbabilistic,
@@ -70,6 +57,10 @@ func (s SamplerType) String() string {
 	}
 }
 
+func SpanKindTag(kind SpanKind) KeyValue {
+	return String(SpanKindKey, string(kind))
+}
+
 // Hash implements Hash from Hashable.
 func (s *Span) Hash(w io.Writer) (err error) {
 	// gob is not the most efficient way, but it ensures we don't miss any fields.
@@ -79,27 +70,27 @@ func (s *Span) Hash(w io.Writer) (err error) {
 }
 
 // HasSpanKind returns true if the span has a `span.kind` tag set to `kind`.
-func (s *Span) HasSpanKind(kind trace.SpanKind) bool {
-	if tag, ok := KeyValues(s.Tags).FindByKey(keySpanKind); ok {
-		return tag.AsString() == kind.String()
+func (s *Span) HasSpanKind(kind SpanKind) bool {
+	if tag, ok := KeyValues(s.Tags).FindByKey(SpanKindKey); ok {
+		return tag.AsString() == string(kind)
 	}
 	return false
 }
 
 // GetSpanKind returns value of `span.kind` tag and whether the tag can be found
-func (s *Span) GetSpanKind() (spanKind trace.SpanKind, found bool) {
-	if tag, ok := KeyValues(s.Tags).FindByKey(keySpanKind); ok {
-		if kind, ok := toSpanKind[tag.AsString()]; ok {
+func (s *Span) GetSpanKind() (spanKind SpanKind, found bool) {
+	if tag, ok := KeyValues(s.Tags).FindByKey(SpanKindKey); ok {
+		if kind, err := SpanKindFromString(tag.AsString()); err == nil {
 			return kind, true
 		}
 	}
-	return trace.SpanKindUnspecified, false
+	return SpanKindUnspecified, false
 }
 
 // GetSamplerType returns the sampler type for span
 func (s *Span) GetSamplerType() SamplerType {
 	// There's no corresponding opentelemetry tag label corresponding to sampler.type
-	if tag, ok := KeyValues(s.Tags).FindByKey(keySamplerType); ok {
+	if tag, ok := KeyValues(s.Tags).FindByKey(SamplerTypeKey); ok {
 		if s, ok := toSamplerType[tag.VStr]; ok {
 			return s
 		}
@@ -110,13 +101,13 @@ func (s *Span) GetSamplerType() SamplerType {
 // IsRPCClient returns true if the span represents a client side of an RPC,
 // as indicated by the `span.kind` tag set to `client`.
 func (s *Span) IsRPCClient() bool {
-	return s.HasSpanKind(trace.SpanKindClient)
+	return s.HasSpanKind(SpanKindClient)
 }
 
 // IsRPCServer returns true if the span represents a server side of an RPC,
 // as indicated by the `span.kind` tag set to `server`.
 func (s *Span) IsRPCServer() bool {
-	return s.HasSpanKind(trace.SpanKindServer)
+	return s.HasSpanKind(SpanKindServer)
 }
 
 // NormalizeTimestamps changes all timestamps in this span to UTC.
@@ -168,7 +159,7 @@ func (s *Span) GetSamplerParams(logger *zap.Logger) (SamplerType, float64) {
 	if samplerType == SamplerTypeUnrecognized {
 		return SamplerTypeUnrecognized, 0
 	}
-	tag, ok := KeyValues(s.Tags).FindByKey(keySamplerParam)
+	tag, ok := KeyValues(s.Tags).FindByKey(SamplerParamKey)
 	if !ok {
 		return SamplerTypeUnrecognized, 0
 	}
diff --git a/model/span_test.go b/model/span_test.go
index 1c86746df42..3f8ba3e6b18 100644
--- a/model/span_test.go
+++ b/model/span_test.go
@@ -106,8 +106,6 @@ var (
 	}
 )
 
-const keySpanKind = "span.kind"
-
 func TestSpanIDMarshalJSON(t *testing.T) {
 	for _, testCase := range testCasesSpanID {
 		expected := fmt.Sprintf(`{"traceId":"AAAAAAAAAAAAAAAAAAAAAA==","spanId":"%s"}`, testCase.b64)
@@ -167,7 +165,7 @@ func TestSpanIDUnmarshalJSONErrors(t *testing.T) {
 func TestIsRPCClientServer(t *testing.T) {
 	span1 := &model.Span{
 		Tags: model.KeyValues{
-			model.String(keySpanKind, trace.SpanKindClient.String()),
+			model.String(model.SpanKindKey, trace.SpanKindClient.String()),
 		},
 	}
 	assert.True(t, span1.IsRPCClient())
@@ -206,12 +204,12 @@ func TestIsFirehoseEnabled(t *testing.T) {
 func TestGetSpanKind(t *testing.T) {
 	span := makeSpan(model.String("sampler.type", "lowerbound"))
 	spanKind, found := span.GetSpanKind()
-	assert.Equal(t, "unspecified", spanKind.String())
+	assert.Equal(t, model.SpanKindUnspecified, spanKind)
 	assert.False(t, found)
 
-	span = makeSpan(model.String("span.kind", "client"))
+	span = makeSpan(model.SpanKindTag("client"))
 	spanKind, found = span.GetSpanKind()
-	assert.Equal(t, "client", spanKind.String())
+	assert.Equal(t, model.SpanKindClient, spanKind)
 	assert.True(t, found)
 }
 
diff --git a/plugin/storage/cassandra/spanstore/writer.go b/plugin/storage/cassandra/spanstore/writer.go
index 24bfd58062b..1dc201ef306 100644
--- a/plugin/storage/cassandra/spanstore/writer.go
+++ b/plugin/storage/cassandra/spanstore/writer.go
@@ -168,10 +168,10 @@ func (s *SpanWriter) writeSpan(_ *model.Span, ds *dbmodel.Span) error {
 }
 
 func (s *SpanWriter) writeIndexes(span *model.Span, ds *dbmodel.Span) error {
-	spanKind, _ := span.GetSpanKind()
+	spanKind, _ := span.GetSpanKind() // if not found it returns ""
 	if err := s.saveServiceNameAndOperationName(dbmodel.Operation{
 		ServiceName:   ds.ServiceName,
-		SpanKind:      spanKind.String(),
+		SpanKind:      string(spanKind),
 		OperationName: ds.OperationName,
 	}); err != nil {
 		// should this be a soft failure?
diff --git a/plugin/storage/cassandra/spanstore/writer_test.go b/plugin/storage/cassandra/spanstore/writer_test.go
index f447d2fdc13..d6cc3eae056 100644
--- a/plugin/storage/cassandra/spanstore/writer_test.go
+++ b/plugin/storage/cassandra/spanstore/writer_test.go
@@ -422,7 +422,7 @@ func TestStorageMode_IndexOnly_FirehoseSpan(t *testing.T) {
 		assert.Equal(t, "planet-express", *serviceWritten.Load())
 		assert.Equal(t, dbmodel.Operation{
 			ServiceName:   "planet-express",
-			SpanKind:      "unspecified",
+			SpanKind:      "",
 			OperationName: "package-delivery",
 		}, *operationWritten.Load())
 	}, StoreIndexesOnly())
diff --git a/plugin/storage/integration/integration.go b/plugin/storage/integration/integration.go
index 35f7c6e6025..c03c6fb911c 100644
--- a/plugin/storage/integration/integration.go
+++ b/plugin/storage/integration/integration.go
@@ -251,7 +251,7 @@ func (s *StorageIntegration) testGetOperations(t *testing.T) {
 		}
 	} else {
 		expected = []spanstore.Operation{
-			{Name: "example-operation-1", SpanKind: "unspecified"},
+			{Name: "example-operation-1", SpanKind: ""},
 			{Name: "example-operation-3", SpanKind: "server"},
 			{Name: "example-operation-4", SpanKind: "client"},
 		}
diff --git a/plugin/storage/memory/memory.go b/plugin/storage/memory/memory.go
index a20e1a5afc6..23ec0bd2d39 100644
--- a/plugin/storage/memory/memory.go
+++ b/plugin/storage/memory/memory.go
@@ -147,10 +147,10 @@ func (st *Store) WriteSpan(ctx context.Context, span *model.Span) error {
 		m.operations[span.Process.ServiceName] = map[spanstore.Operation]struct{}{}
 	}
 
-	spanKind, _ := span.GetSpanKind()
+	spanKind, _ := span.GetSpanKind() // if not found it returns Unspecified
 	operation := spanstore.Operation{
 		Name:     span.OperationName,
-		SpanKind: spanKind.String(),
+		SpanKind: string(spanKind),
 	}
 
 	if _, ok := m.operations[span.Process.ServiceName][operation]; !ok {
diff --git a/plugin/storage/memory/memory_test.go b/plugin/storage/memory/memory_test.go
index af130edd566..480c934b9e1 100644
--- a/plugin/storage/memory/memory_test.go
+++ b/plugin/storage/memory/memory_test.go
@@ -38,7 +38,7 @@ var childSpan1 = &model.Span{
 	OperationName: "childOperationName",
 	Tags: model.KeyValues{
 		model.String("tagKey", "tagValue"),
-		model.String("span.kind", "server"),
+		model.SpanKindTag(model.SpanKindServer),
 	},
 	Logs: []model.Log{
 		{
@@ -63,7 +63,7 @@ var childSpan2 = &model.Span{
 	OperationName: "childOperationName",
 	Tags: model.KeyValues{
 		model.String("tagKey", "tagValue"),
-		model.String("span.kind", "internal"),
+		model.SpanKindTag(model.SpanKindInternal),
 	},
 	Logs: []model.Log{
 		{
@@ -504,7 +504,7 @@ func makeTestingSpan(traceID model.TraceID, suffix string) *model.Span {
 		OperationName: "operationName" + suffix,
 		Tags: model.KeyValues{
 			model.String("tagKey", "tagValue"+suffix),
-			model.String("span.kind", "client"+suffix),
+			model.SpanKindTag(model.SpanKindClient),
 		},
 		Logs: []model.Log{
 			{

From 9fc9d75c318ea1aca866e9490a873cf8013f8639 Mon Sep 17 00:00:00 2001
From: Zhang Xin <zhangxin@outlook.com>
Date: Sun, 22 Dec 2024 10:30:10 +0800
Subject: [PATCH 55/59] Add optional time window for GetTrace & SearchTrace of
 http_handler (#6159)

## Which problem is this PR solving?
Resolves #4150

## Description of the changes
- add optional time window when fetching trace by id

## How was this change tested?
- unittest

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Zhang Xin <zhangxin@outlook.com>
---
 cmd/query/app/handler_archive_test.go |  51 ++++++++++++
 cmd/query/app/http_handler.go         |  58 +++++++++----
 cmd/query/app/http_handler_test.go    | 113 ++++++++++++++++++++++++++
 3 files changed, 208 insertions(+), 14 deletions(-)

diff --git a/cmd/query/app/handler_archive_test.go b/cmd/query/app/handler_archive_test.go
index 87ae3e304b2..45db5ea90ce 100644
--- a/cmd/query/app/handler_archive_test.go
+++ b/cmd/query/app/handler_archive_test.go
@@ -7,6 +7,7 @@ package app
 import (
 	"errors"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -114,6 +115,24 @@ func TestArchiveTrace_Success(t *testing.T) {
 	}, querysvc.QueryServiceOptions{ArchiveSpanWriter: mockWriter})
 }
 
+func TestArchiveTrace_SucessWithTimeWindow(t *testing.T) {
+	mockWriter := &spanstoremocks.Writer{}
+	mockWriter.On("WriteSpan", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*model.Span")).
+		Return(nil).Times(2)
+	withTestServer(t, func(ts *testServer) {
+		expectedQuery := spanstore.GetTraceParameters{
+			TraceID:   mockTraceID,
+			StartTime: time.UnixMicro(1),
+			EndTime:   time.UnixMicro(2),
+		}
+		ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), expectedQuery).
+			Return(mockTrace, nil).Once()
+		var response structuredTraceResponse
+		err := postJSON(ts.server.URL+"/api/archive/"+mockTraceID.String()+"?start=1&end=2", []string{}, &response)
+		require.NoError(t, err)
+	}, querysvc.QueryServiceOptions{ArchiveSpanWriter: mockWriter})
+}
+
 func TestArchiveTrace_WriteErrors(t *testing.T) {
 	mockWriter := &spanstoremocks.Writer{}
 	mockWriter.On("WriteSpan", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*model.Span")).
@@ -126,3 +145,35 @@ func TestArchiveTrace_WriteErrors(t *testing.T) {
 		require.EqualError(t, err, `500 error from server: {"data":null,"total":0,"limit":0,"offset":0,"errors":[{"code":500,"msg":"cannot save\ncannot save"}]}`+"\n")
 	}, querysvc.QueryServiceOptions{ArchiveSpanWriter: mockWriter})
 }
+
+func TestArchiveTrace_BadTimeWindow(t *testing.T) {
+	testCases := []struct {
+		name  string
+		query string
+	}{
+		{
+			name:  "Bad start time",
+			query: "start=a",
+		},
+		{
+			name:  "Bad end time",
+			query: "end=b",
+		},
+	}
+	mockWriter := &spanstoremocks.Writer{}
+	mockWriter.On("WriteSpan", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*model.Span")).
+		Return(nil).Times(2 * len(testCases))
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			withTestServer(t, func(ts *testServer) {
+				ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).
+					Return(mockTrace, nil).Once()
+				var response structuredTraceResponse
+				err := postJSON(ts.server.URL+"/api/archive/"+mockTraceID.String()+"?"+tc.query, []string{}, &response)
+				require.Error(t, err)
+				require.ErrorContains(t, err, "400 error from server")
+				require.ErrorContains(t, err, "unable to parse param")
+			}, querysvc.QueryServiceOptions{ArchiveSpanWriter: mockWriter})
+		})
+	}
+}
diff --git a/cmd/query/app/http_handler.go b/cmd/query/app/http_handler.go
index 157fc398626..02ed05c059f 100644
--- a/cmd/query/app/http_handler.go
+++ b/cmd/query/app/http_handler.go
@@ -231,7 +231,12 @@ func (aH *APIHandler) search(w http.ResponseWriter, r *http.Request) {
 	var uiErrors []structuredError
 	var tracesFromStorage []*model.Trace
 	if len(tQuery.traceIDs) > 0 {
-		tracesFromStorage, uiErrors, err = aH.tracesByIDs(r.Context(), tQuery.traceIDs)
+		tracesFromStorage, uiErrors, err = aH.tracesByIDs(
+			r.Context(),
+			tQuery.traceIDs,
+			tQuery.StartTimeMin,
+			tQuery.StartTimeMax,
+		)
 		if aH.handleError(w, err, http.StatusInternalServerError) {
 			return
 		}
@@ -262,13 +267,14 @@ func (aH *APIHandler) tracesToResponse(traces []*model.Trace, adjust bool, uiErr
 	}
 }
 
-func (aH *APIHandler) tracesByIDs(ctx context.Context, traceIDs []model.TraceID) ([]*model.Trace, []structuredError, error) {
+func (aH *APIHandler) tracesByIDs(ctx context.Context, traceIDs []model.TraceID, startTime time.Time, endTime time.Time) ([]*model.Trace, []structuredError, error) {
 	var traceErrors []structuredError
 	retMe := make([]*model.Trace, 0, len(traceIDs))
 	for _, traceID := range traceIDs {
-		// TODO: add start time & end time
 		query := spanstore.GetTraceParameters{
-			TraceID: traceID,
+			TraceID:   traceID,
+			StartTime: startTime,
+			EndTime:   endTime,
 		}
 		if trc, err := aH.queryService.GetTrace(ctx, query); err != nil {
 			if !errors.Is(err, spanstore.ErrTraceNotFound) {
@@ -425,18 +431,46 @@ func (aH *APIHandler) parseTraceID(w http.ResponseWriter, r *http.Request) (mode
 	return traceID, true
 }
 
+func (aH *APIHandler) parseMicroseconds(w http.ResponseWriter, r *http.Request, timeKey string) (time.Time, bool) {
+	if timeString := r.FormValue(timeKey); timeString != "" {
+		t, err := aH.queryParser.parseTime(r, timeKey, time.Microsecond)
+		if aH.handleError(w, err, http.StatusBadRequest) {
+			return time.Time{}, false
+		}
+		return t, true
+	}
+	// It's OK if no time is specified, since it's optional
+	return time.Time{}, true
+}
+
+func (aH *APIHandler) parseGetTraceParameters(w http.ResponseWriter, r *http.Request) (spanstore.GetTraceParameters, bool) {
+	query := spanstore.GetTraceParameters{}
+	traceID, ok := aH.parseTraceID(w, r)
+	if !ok {
+		return query, false
+	}
+	startTime, ok := aH.parseMicroseconds(w, r, startTimeParam)
+	if !ok {
+		return query, false
+	}
+	endTime, ok := aH.parseMicroseconds(w, r, endTimeParam)
+	if !ok {
+		return query, false
+	}
+	query.TraceID = traceID
+	query.StartTime = startTime
+	query.EndTime = endTime
+	return query, true
+}
+
 // getTrace implements the REST API /traces/{trace-id}
 // It parses trace ID from the path, fetches the trace from QueryService,
 // formats it in the UI JSON format, and responds to the client.
 func (aH *APIHandler) getTrace(w http.ResponseWriter, r *http.Request) {
-	traceID, ok := aH.parseTraceID(w, r)
+	query, ok := aH.parseGetTraceParameters(w, r)
 	if !ok {
 		return
 	}
-	// TODO: add start time & end time
-	query := spanstore.GetTraceParameters{
-		TraceID: traceID,
-	}
 	trc, err := aH.queryService.GetTrace(r.Context(), query)
 	if errors.Is(err, spanstore.ErrTraceNotFound) {
 		aH.handleError(w, err, http.StatusNotFound)
@@ -460,16 +494,12 @@ func shouldAdjust(r *http.Request) bool {
 // archiveTrace implements the REST API POST:/archive/{trace-id}.
 // It passes the traceID to queryService.ArchiveTrace for writing.
 func (aH *APIHandler) archiveTrace(w http.ResponseWriter, r *http.Request) {
-	traceID, ok := aH.parseTraceID(w, r)
+	query, ok := aH.parseGetTraceParameters(w, r)
 	if !ok {
 		return
 	}
 
 	// QueryService.ArchiveTrace can now archive this traceID.
-	// TODO: add start time & end time
-	query := spanstore.GetTraceParameters{
-		TraceID: traceID,
-	}
 	err := aH.queryService.ArchiveTrace(r.Context(), query)
 	if errors.Is(err, spanstore.ErrTraceNotFound) {
 		aH.handleError(w, err, http.StatusNotFound)
diff --git a/cmd/query/app/http_handler_test.go b/cmd/query/app/http_handler_test.go
index 126e4c194bb..479466d0da0 100644
--- a/cmd/query/app/http_handler_test.go
+++ b/cmd/query/app/http_handler_test.go
@@ -198,6 +198,20 @@ func TestGetTraceDedupeSuccess(t *testing.T) {
 	}
 }
 
+func TestGetTraceWithTimeWindowSuccess(t *testing.T) {
+	ts := initializeTestServer(t)
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), spanstore.GetTraceParameters{
+		TraceID:   mockTraceID,
+		StartTime: time.UnixMicro(1),
+		EndTime:   time.UnixMicro(2),
+	}).Return(mockTrace, nil).Once()
+
+	var response structuredResponse
+	err := getJSON(ts.server.URL+`/api/traces/`+mockTraceID.String()+`?start=1&end=2`, &response)
+	require.NoError(t, err)
+	assert.Empty(t, response.Errors)
+}
+
 func TestLogOnServerError(t *testing.T) {
 	zapCore, logs := observer.New(zap.InfoLevel)
 	logger := zap.New(zapCore)
@@ -388,6 +402,32 @@ func TestGetTraceBadTraceID(t *testing.T) {
 	require.Error(t, err)
 }
 
+func TestGetTraceBadTimeWindow(t *testing.T) {
+	testCases := []struct {
+		name  string
+		query string
+	}{
+		{
+			name:  "Bad start time",
+			query: "start=a",
+		},
+		{
+			name:  "Bad end time",
+			query: "end=b",
+		},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			ts := initializeTestServer(t)
+			var response structuredResponse
+			err := getJSON(ts.server.URL+`/api/traces/123456?`+tc.query, &response)
+			require.Error(t, err)
+			require.ErrorContains(t, err, "400 error from server")
+			require.ErrorContains(t, err, "unable to parse param")
+		})
+	}
+}
+
 func TestSearchSuccess(t *testing.T) {
 	ts := initializeTestServer(t)
 	ts.spanReader.On("FindTraces", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*spanstore.TraceQueryParameters")).
@@ -411,6 +451,57 @@ func TestSearchByTraceIDSuccess(t *testing.T) {
 	assert.Len(t, response.Data, 2)
 }
 
+func TestSearchByTraceIDWithTimeWindowSuccess(t *testing.T) {
+	ts := initializeTestServer(t)
+	expectedQuery1 := spanstore.GetTraceParameters{
+		TraceID:   mockTraceID,
+		StartTime: time.UnixMicro(1),
+		EndTime:   time.UnixMicro(2),
+	}
+	traceId2 := model.NewTraceID(0, 456789)
+	expectedQuery2 := spanstore.GetTraceParameters{
+		TraceID:   traceId2,
+		StartTime: time.UnixMicro(1),
+		EndTime:   time.UnixMicro(2),
+	}
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), expectedQuery1).
+		Return(mockTrace, nil)
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), expectedQuery2).
+		Return(mockTrace, nil)
+
+	var response structuredResponse
+	err := getJSON(ts.server.URL+`/api/traces?traceID=`+mockTraceID.String()+`&traceID=`+traceId2.String()+`&start=1&end=2`, &response)
+	require.NoError(t, err)
+	assert.Empty(t, response.Errors)
+	assert.Len(t, response.Data, 2)
+}
+
+func TestSearchTraceBadTimeWindow(t *testing.T) {
+	testCases := []struct {
+		name  string
+		query string
+	}{
+		{
+			name:  "Bad start time",
+			query: "start=a",
+		},
+		{
+			name:  "Bad end time",
+			query: "end=b",
+		},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			ts := initializeTestServer(t)
+			var response structuredResponse
+			err := getJSON(ts.server.URL+`/api/traces?traceID=1&traceID=2&`+tc.query, &response)
+			require.Error(t, err)
+			require.ErrorContains(t, err, "400 error from server")
+			require.ErrorContains(t, err, "unable to parse param")
+		})
+	}
+}
+
 func TestSearchByTraceIDSuccessWithArchive(t *testing.T) {
 	archiveReadMock := &spanstoremocks.Reader{}
 	ts := initializeTestServerWithOptions(t, &tenancy.Manager{}, querysvc.QueryServiceOptions{
@@ -428,6 +519,28 @@ func TestSearchByTraceIDSuccessWithArchive(t *testing.T) {
 	assert.Len(t, response.Data, 2)
 }
 
+func TestSearchByTraceIDSuccessWithArchiveAndTimeWindow(t *testing.T) {
+	archiveReadMock := &spanstoremocks.Reader{}
+	ts := initializeTestServerWithOptions(t, &tenancy.Manager{}, querysvc.QueryServiceOptions{
+		ArchiveSpanReader: archiveReadMock,
+	})
+	expectedQuery := spanstore.GetTraceParameters{
+		TraceID:   mockTraceID,
+		StartTime: time.UnixMicro(1),
+		EndTime:   time.UnixMicro(2),
+	}
+	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), expectedQuery).
+		Return(nil, spanstore.ErrTraceNotFound)
+	archiveReadMock.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), expectedQuery).
+		Return(mockTrace, nil)
+
+	var response structuredResponse
+	err := getJSON(ts.server.URL+`/api/traces?traceID=`+mockTraceID.String()+`&start=1&end=2`, &response)
+	require.NoError(t, err)
+	assert.Empty(t, response.Errors)
+	assert.Len(t, response.Data, 1)
+}
+
 func TestSearchByTraceIDNotFound(t *testing.T) {
 	ts := initializeTestServer(t)
 	ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("spanstore.GetTraceParameters")).

From 54ceda2214578ff33155987771e7376d458653de Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Sun, 22 Dec 2024 09:53:46 -0500
Subject: [PATCH 56/59] [v2][adjuster] Implement adjuster for deduplicating
 spans (#6391)

## Which problem is this PR solving?
- Towards #6344

## Description of the changes
- Implemented an adjuster to deduplicate spans.
- The span deduplication is done by marshalling each span into protobuf
bytes and applying the FNV hash algorithm to it.

## How was this change tested?
- Added unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/query/app/querysvc/adjuster/hash.go      |  83 +++++
 cmd/query/app/querysvc/adjuster/hash_test.go | 320 +++++++++++++++++++
 cmd/query/app/querysvc/adjuster/sort.go      |   2 +
 3 files changed, 405 insertions(+)
 create mode 100644 cmd/query/app/querysvc/adjuster/hash.go
 create mode 100644 cmd/query/app/querysvc/adjuster/hash_test.go

diff --git a/cmd/query/app/querysvc/adjuster/hash.go b/cmd/query/app/querysvc/adjuster/hash.go
new file mode 100644
index 00000000000..25afbbc1621
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/hash.go
@@ -0,0 +1,83 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"fmt"
+	"hash/fnv"
+
+	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/internal/jptrace"
+)
+
+var _ Adjuster = (*SpanHashDeduper)(nil)
+
+// SpanHash creates an adjuster that deduplicates spans by removing all but one span
+// with the same hash code. This is particularly useful for scenarios where spans
+// may be duplicated during archival, such as with ElasticSearch archival.
+//
+// The hash code is generated by serializing the span into protobuf bytes and applying
+// the FNV hashing algorithm to the serialized data.
+//
+// To ensure consistent hash codes, this adjuster should be executed after
+// SortAttributesAndEvents, which normalizes the order of collections within the span.
+func SpanHash() SpanHashDeduper {
+	return SpanHashDeduper{
+		marshaler: &ptrace.ProtoMarshaler{},
+	}
+}
+
+type SpanHashDeduper struct {
+	marshaler ptrace.Marshaler
+}
+
+func (s *SpanHashDeduper) Adjust(traces ptrace.Traces) {
+	spansByHash := make(map[uint64]ptrace.Span)
+	resourceSpans := traces.ResourceSpans()
+	for i := 0; i < resourceSpans.Len(); i++ {
+		rs := resourceSpans.At(i)
+		scopeSpans := rs.ScopeSpans()
+		hashTrace := ptrace.NewTraces()
+		hashResourceSpan := hashTrace.ResourceSpans().AppendEmpty()
+		hashScopeSpan := hashResourceSpan.ScopeSpans().AppendEmpty()
+		hashSpan := hashScopeSpan.Spans().AppendEmpty()
+		rs.Resource().Attributes().CopyTo(hashResourceSpan.Resource().Attributes())
+		for j := 0; j < scopeSpans.Len(); j++ {
+			ss := scopeSpans.At(j)
+			spans := ss.Spans()
+			ss.Scope().Attributes().CopyTo(hashScopeSpan.Scope().Attributes())
+			dedupedSpans := ptrace.NewSpanSlice()
+			for k := 0; k < spans.Len(); k++ {
+				span := spans.At(k)
+				span.CopyTo(hashSpan)
+				h, err := s.computeHashCode(
+					hashTrace,
+				)
+				if err != nil {
+					jptrace.AddWarning(span, fmt.Sprintf("failed to compute hash code: %v", err))
+					span.CopyTo(dedupedSpans.AppendEmpty())
+					continue
+				}
+				if _, ok := spansByHash[h]; !ok {
+					spansByHash[h] = span
+					span.CopyTo(dedupedSpans.AppendEmpty())
+				}
+			}
+			dedupedSpans.CopyTo(spans)
+		}
+	}
+}
+
+func (s *SpanHashDeduper) computeHashCode(
+	hashTrace ptrace.Traces,
+) (uint64, error) {
+	b, err := s.marshaler.MarshalTraces(hashTrace)
+	if err != nil {
+		return 0, err
+	}
+	hasher := fnv.New64a()
+	hasher.Write(b) // the writer in the Hash interface never returns an error
+	return hasher.Sum64(), nil
+}
diff --git a/cmd/query/app/querysvc/adjuster/hash_test.go b/cmd/query/app/querysvc/adjuster/hash_test.go
new file mode 100644
index 00000000000..dd90d7ab1a3
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/hash_test.go
@@ -0,0 +1,320 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/internal/jptrace"
+)
+
+func TestSpanHash_EmptySpans(t *testing.T) {
+	adjuster := SpanHash()
+	input := ptrace.NewTraces()
+	expected := ptrace.NewTraces()
+	adjuster.Adjust(input)
+	assert.Equal(t, expected, input)
+}
+
+func TestSpanHash_RemovesDuplicateSpans(t *testing.T) {
+	adjuster := SpanHash()
+	input := func() ptrace.Traces {
+		traces := ptrace.NewTraces()
+
+		rs := traces.ResourceSpans().AppendEmpty()
+		rs.Resource().Attributes().PutStr("key1", "value1")
+
+		ss := rs.ScopeSpans().AppendEmpty()
+		ss.Scope().Attributes().PutStr("key2", "value2")
+
+		spans := ss.Spans()
+
+		span1 := spans.AppendEmpty()
+		span1.SetName("span1")
+		span1.SetTraceID([16]byte{1})
+		span1.SetSpanID([8]byte{1})
+
+		span2 := spans.AppendEmpty()
+		span2.SetName("span2")
+		span2.SetTraceID([16]byte{1})
+		span2.SetSpanID([8]byte{2})
+
+		span3 := spans.AppendEmpty()
+		span3.SetName("span1")
+		span3.SetTraceID([16]byte{1})
+		span3.SetSpanID([8]byte{1})
+
+		span4 := spans.AppendEmpty()
+		span4.SetName("span2")
+		span4.SetTraceID([16]byte{1})
+		span4.SetSpanID([8]byte{2})
+
+		span5 := spans.AppendEmpty()
+		span5.SetName("span3")
+		span5.SetTraceID([16]byte{3})
+		span5.SetSpanID([8]byte{4})
+
+		rs2 := traces.ResourceSpans().AppendEmpty()
+		rs2.Resource().Attributes().PutStr("key1", "value1")
+
+		ss2 := rs2.ScopeSpans().AppendEmpty()
+		ss2.Scope().Attributes().PutStr("key2", "value2")
+
+		spans2 := ss2.Spans()
+
+		span6 := spans2.AppendEmpty()
+		span6.SetName("span4")
+		span6.SetTraceID([16]byte{5})
+		span6.SetSpanID([8]byte{6})
+
+		span7 := spans2.AppendEmpty()
+		span7.SetName("span3")
+		span7.SetTraceID([16]byte{3})
+		span7.SetSpanID([8]byte{4})
+
+		return traces
+	}
+	expected := func() ptrace.Traces {
+		traces := ptrace.NewTraces()
+
+		rs := traces.ResourceSpans().AppendEmpty()
+		rs.Resource().Attributes().PutStr("key1", "value1")
+
+		ss := rs.ScopeSpans().AppendEmpty()
+		ss.Scope().Attributes().PutStr("key2", "value2")
+
+		spans := ss.Spans()
+
+		span1 := spans.AppendEmpty()
+		span1.SetName("span1")
+		span1.SetTraceID([16]byte{1})
+		span1.SetSpanID([8]byte{1})
+
+		span2 := spans.AppendEmpty()
+		span2.SetName("span2")
+		span2.SetTraceID([16]byte{1})
+		span2.SetSpanID([8]byte{2})
+
+		span3 := spans.AppendEmpty()
+		span3.SetName("span3")
+		span3.SetTraceID([16]byte{3})
+		span3.SetSpanID([8]byte{4})
+
+		rs2 := traces.ResourceSpans().AppendEmpty()
+		rs2.Resource().Attributes().PutStr("key1", "value1")
+
+		ss2 := rs2.ScopeSpans().AppendEmpty()
+		ss2.Scope().Attributes().PutStr("key2", "value2")
+
+		spans2 := ss2.Spans()
+
+		span4 := spans2.AppendEmpty()
+		span4.SetName("span4")
+		span4.SetTraceID([16]byte{5})
+		span4.SetSpanID([8]byte{6})
+
+		return traces
+	}
+
+	i := input()
+	adjuster.Adjust(i)
+	assert.Equal(t, expected(), i)
+}
+
+func TestSpanHash_NoDuplicateSpans(t *testing.T) {
+	adjuster := SpanHash()
+	input := func() ptrace.Traces {
+		traces := ptrace.NewTraces()
+		rs := traces.ResourceSpans().AppendEmpty()
+		ss := rs.ScopeSpans().AppendEmpty()
+		spans := ss.Spans()
+
+		span1 := spans.AppendEmpty()
+		span1.SetName("span1")
+		span1.SetTraceID([16]byte{1})
+		span1.SetSpanID([8]byte{1})
+
+		span2 := spans.AppendEmpty()
+		span2.SetName("span2")
+		span2.SetTraceID([16]byte{1})
+		span2.SetSpanID([8]byte{2})
+
+		span3 := spans.AppendEmpty()
+		span3.SetName("span3")
+		span3.SetTraceID([16]byte{3})
+		span3.SetSpanID([8]byte{4})
+
+		return traces
+	}
+	expected := func() ptrace.Traces {
+		traces := ptrace.NewTraces()
+		rs := traces.ResourceSpans().AppendEmpty()
+		ss := rs.ScopeSpans().AppendEmpty()
+		spans := ss.Spans()
+
+		span1 := spans.AppendEmpty()
+		span1.SetName("span1")
+		span1.SetTraceID([16]byte{1})
+		span1.SetSpanID([8]byte{1})
+
+		span2 := spans.AppendEmpty()
+		span2.SetName("span2")
+		span2.SetTraceID([16]byte{1})
+		span2.SetSpanID([8]byte{2})
+
+		span3 := spans.AppendEmpty()
+		span3.SetName("span3")
+		span3.SetTraceID([16]byte{3})
+		span3.SetSpanID([8]byte{4})
+
+		return traces
+	}
+
+	i := input()
+	adjuster.Adjust(i)
+	assert.Equal(t, expected(), i)
+}
+
+func TestSpanHash_DuplicateSpansDifferentScopeAttributes(t *testing.T) {
+	adjuster := SpanHash()
+	input := func() ptrace.Traces {
+		traces := ptrace.NewTraces()
+		rs := traces.ResourceSpans().AppendEmpty()
+		ss := rs.ScopeSpans().AppendEmpty()
+		ss.Scope().Attributes().PutStr("key", "value1")
+		spans := ss.Spans()
+
+		span1 := spans.AppendEmpty()
+		span1.SetName("span1")
+		span1.SetTraceID([16]byte{1})
+		span1.SetSpanID([8]byte{1})
+
+		ss2 := rs.ScopeSpans().AppendEmpty()
+		ss2.Scope().Attributes().PutStr("key", "value2")
+		spans2 := ss2.Spans()
+
+		span2 := spans2.AppendEmpty()
+		span2.SetName("span1")
+		span2.SetTraceID([16]byte{1})
+		span2.SetSpanID([8]byte{1})
+
+		return traces
+	}
+	expected := func() ptrace.Traces {
+		traces := ptrace.NewTraces()
+		rs := traces.ResourceSpans().AppendEmpty()
+		ss := rs.ScopeSpans().AppendEmpty()
+		ss.Scope().Attributes().PutStr("key", "value1")
+		spans := ss.Spans()
+
+		span1 := spans.AppendEmpty()
+		span1.SetName("span1")
+		span1.SetTraceID([16]byte{1})
+		span1.SetSpanID([8]byte{1})
+
+		ss2 := rs.ScopeSpans().AppendEmpty()
+		ss2.Scope().Attributes().PutStr("key", "value2")
+		spans2 := ss2.Spans()
+
+		span2 := spans2.AppendEmpty()
+		span2.SetName("span1")
+		span2.SetTraceID([16]byte{1})
+		span2.SetSpanID([8]byte{1})
+
+		return traces
+	}
+
+	i := input()
+	adjuster.Adjust(i)
+	assert.Equal(t, expected(), i)
+}
+
+func TestSpanHash_DuplicateSpansDifferentResourceAttributes(t *testing.T) {
+	adjuster := SpanHash()
+	input := func() ptrace.Traces {
+		traces := ptrace.NewTraces()
+		rs := traces.ResourceSpans().AppendEmpty()
+		rs.Resource().Attributes().PutStr("key", "value1")
+		ss := rs.ScopeSpans().AppendEmpty()
+		spans := ss.Spans()
+
+		span1 := spans.AppendEmpty()
+		span1.SetName("span1")
+		span1.SetTraceID([16]byte{1})
+		span1.SetSpanID([8]byte{1})
+
+		rs2 := traces.ResourceSpans().AppendEmpty()
+		rs2.Resource().Attributes().PutStr("key", "value2")
+		ss2 := rs2.ScopeSpans().AppendEmpty()
+		spans2 := ss2.Spans()
+
+		span2 := spans2.AppendEmpty()
+		span2.SetName("span1")
+		span2.SetTraceID([16]byte{1})
+		span2.SetSpanID([8]byte{1})
+
+		return traces
+	}
+	expected := func() ptrace.Traces {
+		traces := ptrace.NewTraces()
+		rs := traces.ResourceSpans().AppendEmpty()
+		rs.Resource().Attributes().PutStr("key", "value1")
+		ss := rs.ScopeSpans().AppendEmpty()
+		spans := ss.Spans()
+
+		span1 := spans.AppendEmpty()
+		span1.SetName("span1")
+		span1.SetTraceID([16]byte{1})
+		span1.SetSpanID([8]byte{1})
+
+		rs2 := traces.ResourceSpans().AppendEmpty()
+		rs2.Resource().Attributes().PutStr("key", "value2")
+		ss2 := rs2.ScopeSpans().AppendEmpty()
+		spans2 := ss2.Spans()
+
+		span2 := spans2.AppendEmpty()
+		span2.SetName("span1")
+		span2.SetTraceID([16]byte{1})
+		span2.SetSpanID([8]byte{1})
+
+		return traces
+	}
+
+	i := input()
+	adjuster.Adjust(i)
+	assert.Equal(t, expected(), i)
+}
+
+type errorMarshaler struct{}
+
+func (*errorMarshaler) MarshalTraces(ptrace.Traces) ([]byte, error) {
+	return nil, assert.AnError
+}
+
+func TestSpanHash_ErrorInMarshaler(t *testing.T) {
+	adjuster := SpanHashDeduper{
+		marshaler: &errorMarshaler{},
+	}
+
+	traces := ptrace.NewTraces()
+	rs := traces.ResourceSpans().AppendEmpty()
+	ss := rs.ScopeSpans().AppendEmpty()
+	spans := ss.Spans()
+
+	span := spans.AppendEmpty()
+	span.SetName("span1")
+
+	adjuster.Adjust(traces)
+
+	gotSpan := traces.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
+	assert.Equal(t, "span1", gotSpan.Name())
+
+	warnings := jptrace.GetWarnings(gotSpan)
+	assert.Len(t, warnings, 1)
+	assert.Contains(t, warnings[0], "failed to compute hash code")
+	assert.Contains(t, warnings[0], assert.AnError.Error())
+}
diff --git a/cmd/query/app/querysvc/adjuster/sort.go b/cmd/query/app/querysvc/adjuster/sort.go
index 6ca367710b5..0ed38af3286 100644
--- a/cmd/query/app/querysvc/adjuster/sort.go
+++ b/cmd/query/app/querysvc/adjuster/sort.go
@@ -14,9 +14,11 @@ var _ Adjuster = (*SortAttributesAndEventsAdjuster)(nil)
 
 // SortAttributesAndEvents creates an adjuster that standardizes trace data by sorting elements:
 // - Resource attributes are sorted lexicographically by their keys.
+// - Scope attributes are sorted lexicographically by their keys.
 // - Span attributes are sorted lexicographically by their keys.
 // - Span events are sorted lexicographically by their names.
 // - Attributes within each span event are sorted lexicographically by their keys.
+// - Attributes within each span link are sorted lexicographically by their keys.
 func SortAttributesAndEvents() SortAttributesAndEventsAdjuster {
 	return SortAttributesAndEventsAdjuster{}
 }

From e39609ec675bb4ce12524d1ede6decce44db2bc9 Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Sun, 22 Dec 2024 21:47:16 -0500
Subject: [PATCH 57/59] [v2][adjuster] Implement adjuster for correct
 timestamps for clockskew (#6392)

## Which problem is this PR solving?
- Towards #6344

## Description of the changes
- Implemented an adjuster to correct timestamps for clockskew.

## How was this change tested?
- Added unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 cmd/query/app/querysvc/adjuster/clockskew.go  | 207 +++++++++++++
 .../app/querysvc/adjuster/clockskew_test.go   | 292 ++++++++++++++++++
 pkg/otelsemconv/semconv.go                    |   4 +
 3 files changed, 503 insertions(+)
 create mode 100644 cmd/query/app/querysvc/adjuster/clockskew.go
 create mode 100644 cmd/query/app/querysvc/adjuster/clockskew_test.go

diff --git a/cmd/query/app/querysvc/adjuster/clockskew.go b/cmd/query/app/querysvc/adjuster/clockskew.go
new file mode 100644
index 00000000000..0f0bbc40e63
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/clockskew.go
@@ -0,0 +1,207 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"fmt"
+	"time"
+
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/internal/jptrace"
+	"github.com/jaegertracing/jaeger/pkg/otelsemconv"
+)
+
+const (
+	warningDuplicateSpanID     = "duplicate span IDs; skipping clock skew adjustment"
+	warningMissingParentSpanID = "parent span ID=%s is not in the trace; skipping clock skew adjustment"
+	warningMaxDeltaExceeded    = "max clock skew adjustment delta of %v exceeded; not applying calculated delta of %v"
+	warningSkewAdjustDisabled  = "clock skew adjustment disabled; not applying calculated delta of %v"
+)
+
+// ClockSkew returns an Adjuster that corrects span timestamps for clock skew.
+//
+// This adjuster modifies the start and log timestamps of child spans that are
+// inconsistent with their parent spans due to clock differences between hosts.
+// It assumes all spans have unique IDs and should be used after SpanIDUniquifier.
+//
+// The adjuster determines if two spans belong to the same source by deriving a
+// unique string representation of a host based on resource attributes,
+// such as `host.id`, `host.ip`, or `host.name`.
+// If two spans have the same host key, they are considered to be from
+// the same source, and no clock skew adjustment is expected between them.
+//
+// Parameters:
+//   - maxDelta: The maximum allowable time adjustment. Adjustments exceeding
+//     this value will be ignored.
+func ClockSkew(maxDelta time.Duration) Adjuster {
+	return Func(func(traces ptrace.Traces) {
+		adjuster := &clockSkewAdjuster{
+			traces:   traces,
+			maxDelta: maxDelta,
+		}
+		adjuster.buildNodesMap()
+		adjuster.buildSubGraphs()
+		for _, root := range adjuster.roots {
+			skew := clockSkew{hostKey: root.hostKey}
+			adjuster.adjustNode(root, nil, skew)
+		}
+	})
+}
+
+type clockSkewAdjuster struct {
+	traces   ptrace.Traces
+	maxDelta time.Duration
+	spans    map[pcommon.SpanID]*node
+	roots    map[pcommon.SpanID]*node
+}
+
+type clockSkew struct {
+	delta   time.Duration
+	hostKey string
+}
+
+type node struct {
+	span     ptrace.Span
+	children []*node
+	hostKey  string
+}
+
+// hostKey derives a unique string representation of a host based on resource attributes.
+// This is used to determine if two spans are from the same host.
+func hostKey(resource ptrace.ResourceSpans) string {
+	if attr, ok := resource.Resource().Attributes().Get(string(otelsemconv.HostIDKey)); ok {
+		return attr.Str()
+	}
+	if attr, ok := resource.Resource().Attributes().Get(string(otelsemconv.HostIPKey)); ok {
+		if attr.Type() == pcommon.ValueTypeStr {
+			return attr.Str()
+		} else if attr.Type() == pcommon.ValueTypeSlice {
+			ips := attr.Slice()
+			if ips.Len() > 0 {
+				return ips.At(0).AsString()
+			}
+		}
+	}
+	if attr, ok := resource.Resource().Attributes().Get(string(otelsemconv.HostNameKey)); ok {
+		return attr.Str()
+	}
+	return ""
+}
+
+// buildNodesMap creates a mapping of span IDs to their corresponding nodes.
+func (a *clockSkewAdjuster) buildNodesMap() {
+	a.spans = make(map[pcommon.SpanID]*node)
+	resources := a.traces.ResourceSpans()
+	for i := 0; i < resources.Len(); i++ {
+		resource := resources.At(i)
+		hk := hostKey(resource)
+		scopes := resource.ScopeSpans()
+		for j := 0; j < scopes.Len(); j++ {
+			spans := scopes.At(j).Spans()
+			for k := 0; k < spans.Len(); k++ {
+				span := spans.At(k)
+				if _, exists := a.spans[span.SpanID()]; exists {
+					jptrace.AddWarning(span, warningDuplicateSpanID)
+				} else {
+					a.spans[span.SpanID()] = &node{
+						span:    span,
+						hostKey: hk,
+					}
+				}
+			}
+		}
+	}
+}
+
+// finds all spans that have no parent, i.e. where parentID is either 0
+// or points to an ID for which there is no span.
+func (a *clockSkewAdjuster) buildSubGraphs() {
+	a.roots = make(map[pcommon.SpanID]*node)
+	for _, n := range a.spans {
+		if n.span.ParentSpanID() == pcommon.NewSpanIDEmpty() {
+			a.roots[n.span.SpanID()] = n
+			continue
+		}
+		if p, ok := a.spans[n.span.ParentSpanID()]; ok {
+			p.children = append(p.children, n)
+		} else {
+			warning := fmt.Sprintf(warningMissingParentSpanID, n.span.ParentSpanID())
+			jptrace.AddWarning(n.span, warning)
+			// treat spans with invalid parent ID as root spans
+			a.roots[n.span.SpanID()] = n
+		}
+	}
+}
+
+func (a *clockSkewAdjuster) adjustNode(n *node, parent *node, skew clockSkew) {
+	if (n.hostKey != skew.hostKey || n.hostKey == "") && parent != nil {
+		// Node n is from a different host. The parent has already been adjusted,
+		// so we can compare this node's timestamps against the parent.
+		skew = clockSkew{
+			hostKey: n.hostKey,
+			delta:   a.calculateSkew(n, parent),
+		}
+	}
+	a.adjustTimestamps(n, skew)
+	for _, child := range n.children {
+		a.adjustNode(child, n, skew)
+	}
+}
+
+func (*clockSkewAdjuster) calculateSkew(child *node, parent *node) time.Duration {
+	parentStartTime := parent.span.StartTimestamp().AsTime()
+	childStartTime := child.span.StartTimestamp().AsTime()
+	parentEndTime := parent.span.EndTimestamp().AsTime()
+	childEndTime := child.span.EndTimestamp().AsTime()
+	parentDuration := parentEndTime.Sub(parentStartTime)
+	childDuration := childEndTime.Sub(childStartTime)
+
+	if childDuration > parentDuration {
+		// When the child lasted longer than the parent, it was either
+		// async or the parent may have timed out before child responded.
+		// The only reasonable adjustment we can do in this case is to make
+		// sure the child does not start before parent.
+		if childStartTime.Before(parentStartTime) {
+			return parentStartTime.Sub(childStartTime)
+		}
+		return 0
+	}
+	if !childStartTime.Before(parentStartTime) && !childEndTime.After(parentEndTime) {
+		// child already fits within the parent span, do not adjust
+		return 0
+	}
+	// Assume that network latency is equally split between req and res.
+	latency := (parentDuration - childDuration) / 2
+	// Goal: parentStartTime + latency = childStartTime + adjustment
+	return parentStartTime.Add(latency).Sub(childStartTime)
+}
+
+func (a *clockSkewAdjuster) adjustTimestamps(n *node, skew clockSkew) {
+	if skew.delta == 0 {
+		return
+	}
+	if absDuration(skew.delta) > a.maxDelta {
+		if a.maxDelta == 0 {
+			jptrace.AddWarning(n.span, fmt.Sprintf(warningSkewAdjustDisabled, skew.delta))
+			return
+		}
+		jptrace.AddWarning(n.span, fmt.Sprintf(warningMaxDeltaExceeded, a.maxDelta, skew.delta))
+		return
+	}
+	n.span.SetStartTimestamp(pcommon.NewTimestampFromTime(n.span.StartTimestamp().AsTime().Add(skew.delta)))
+	jptrace.AddWarning(n.span, fmt.Sprintf("This span's timestamps were adjusted by %v", skew.delta))
+	for i := 0; i < n.span.Events().Len(); i++ {
+		event := n.span.Events().At(i)
+		event.SetTimestamp(pcommon.NewTimestampFromTime(event.Timestamp().AsTime().Add(skew.delta)))
+	}
+}
+
+func absDuration(d time.Duration) time.Duration {
+	if d < 0 {
+		return -1 * d
+	}
+	return d
+}
diff --git a/cmd/query/app/querysvc/adjuster/clockskew_test.go b/cmd/query/app/querysvc/adjuster/clockskew_test.go
new file mode 100644
index 00000000000..26c1a8347ce
--- /dev/null
+++ b/cmd/query/app/querysvc/adjuster/clockskew_test.go
@@ -0,0 +1,292 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package adjuster
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/internal/jptrace"
+)
+
+func TestClockSkewAdjuster(t *testing.T) {
+	type testSpan struct {
+		id, parent          [8]byte
+		startTime, duration int
+		events              []int // timestamps for logs
+		host                string
+		adjusted            int   // start time after adjustment
+		adjustedEvents      []int // adjusted log timestamps
+	}
+
+	toTime := func(t int) time.Time {
+		return time.Unix(0, (time.Duration(t) * time.Millisecond).Nanoseconds())
+	}
+
+	// helper function that constructs a trace from a list of span prototypes
+	makeTrace := func(spanPrototypes []testSpan) ptrace.Traces {
+		trace := ptrace.NewTraces()
+		for _, spanProto := range spanPrototypes {
+			traceID := pcommon.TraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 1})
+			span := ptrace.NewSpan()
+			span.SetTraceID(traceID)
+			span.SetSpanID(spanProto.id)
+			span.SetParentSpanID(spanProto.parent)
+			span.SetStartTimestamp(pcommon.NewTimestampFromTime(toTime(spanProto.startTime)))
+			span.SetEndTimestamp(pcommon.NewTimestampFromTime(toTime(spanProto.startTime + spanProto.duration)))
+
+			events := ptrace.NewSpanEventSlice()
+			for _, log := range spanProto.events {
+				event := events.AppendEmpty()
+				event.SetTimestamp(pcommon.NewTimestampFromTime(toTime(log)))
+				event.Attributes().PutStr("event", "some event")
+			}
+			events.CopyTo(span.Events())
+
+			resource := ptrace.NewResourceSpans()
+			resource.Resource().Attributes().PutEmptySlice("host.ip").AppendEmpty().SetStr(spanProto.host)
+
+			span.CopyTo(resource.ScopeSpans().AppendEmpty().Spans().AppendEmpty())
+			resource.CopyTo(trace.ResourceSpans().AppendEmpty())
+		}
+		return trace
+	}
+
+	testCases := []struct {
+		description string
+		trace       []testSpan
+		err         string
+		maxAdjust   time.Duration
+	}{
+		{
+			description: "single span with bad parent",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0, 0, 0, 0, 0, 0, 0, 99}, startTime: 0, duration: 100, host: "a", adjusted: 0},
+			},
+			err: "parent span ID=0000000000000063 is not in the trace; skipping clock skew adjustment", // 99 == 0x63
+		},
+		{
+			description: "single span with empty host key",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 0, duration: 100, adjusted: 0},
+			},
+		},
+		{
+			description: "two spans with the same ID",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 0, duration: 100, host: "a", adjusted: 0},
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 0, duration: 100, host: "a", adjusted: 0},
+			},
+			err: "duplicate span IDs; skipping clock skew adjustment",
+		},
+		{
+			description: "parent-child on the same host",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 0, duration: 100, host: "a", adjusted: 0},
+				{id: [8]byte{2}, parent: [8]byte{1}, startTime: 10, duration: 50, host: "a", adjusted: 10},
+			},
+		},
+		{
+			description: "do not adjust parent-child on the same host",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 10, duration: 100, host: "a", adjusted: 10},
+				{id: [8]byte{2}, parent: [8]byte{1}, startTime: 0, duration: 50, host: "a", adjusted: 0},
+			},
+		},
+		{
+			description: "do not adjust child that fits inside parent",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 10, duration: 100, host: "a", adjusted: 10},
+				{id: [8]byte{2}, parent: [8]byte{1}, startTime: 20, duration: 50, host: "b", adjusted: 20},
+			},
+		},
+		{
+			description: "do not adjust child that is longer than parent",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 10, duration: 100, host: "a", adjusted: 10},
+				{id: [8]byte{2}, parent: [8]byte{1}, startTime: 20, duration: 150, host: "b", adjusted: 20},
+			},
+		},
+		{
+			description: "do not apply positive adjustment due to max skew adjustment",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 10, duration: 100, host: "a", adjusted: 10},
+				{id: [8]byte{2}, parent: [8]byte{1}, startTime: 0, duration: 50, host: "b", adjusted: 0},
+			},
+			maxAdjust: 10 * time.Millisecond,
+			err:       "max clock skew adjustment delta of 10ms exceeded; not applying calculated delta of 35ms",
+		},
+		{
+			description: "do not apply negative adjustment due to max skew adjustment",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 10, duration: 100, host: "a", adjusted: 10},
+				{id: [8]byte{2}, parent: [8]byte{1}, startTime: 80, duration: 50, host: "b", adjusted: 80},
+			},
+			maxAdjust: 10 * time.Millisecond,
+			err:       "max clock skew adjustment delta of 10ms exceeded; not applying calculated delta of -45ms",
+		},
+		{
+			description: "do not apply adjustment due to disabled adjustment",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 10, duration: 100, host: "a", adjusted: 10},
+				{id: [8]byte{2}, parent: [8]byte{1}, startTime: 0, duration: 50, host: "b", adjusted: 0},
+			},
+			err: "clock skew adjustment disabled; not applying calculated delta of 35ms",
+		},
+		{
+			description: "adjust child starting before parent",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 10, duration: 100, host: "a", adjusted: 10},
+				// latency = (100-50) / 2 = 25
+				// delta = (10 - 0) + latency = 35
+				{
+					id: [8]byte{2}, parent: [8]byte{1}, startTime: 0, duration: 50, host: "b", adjusted: 35,
+					events: []int{5, 10}, adjustedEvents: []int{40, 45},
+				},
+			},
+			maxAdjust: time.Second,
+		},
+		{
+			description: "adjust child starting before parent even if it is longer",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 10, duration: 100, host: "a", adjusted: 10},
+				{id: [8]byte{2}, parent: [8]byte{1}, startTime: 0, duration: 150, host: "b", adjusted: 10},
+			},
+			maxAdjust: time.Second,
+		},
+		{
+			description: "adjust child ending after parent but being shorter",
+			trace: []testSpan{
+				{id: [8]byte{1}, parent: [8]byte{0}, startTime: 10, duration: 100, host: "a", adjusted: 10},
+				// latency: (100 - 70) / 2 = 15
+				// new child start time: 10 + latency = 25, delta = -25
+				{id: [8]byte{2}, parent: [8]byte{1}, startTime: 50, duration: 70, host: "b", adjusted: 25},
+				// same host 'b', so same delta = -25
+				// new start time: 60 + delta = 35
+				{
+					id: [8]byte{3}, parent: [8]byte{2}, startTime: 60, duration: 20, host: "b", adjusted: 35,
+					events: []int{65, 70}, adjustedEvents: []int{40, 45},
+				},
+			},
+			maxAdjust: time.Second,
+		},
+	}
+
+	for _, tt := range testCases {
+		testCase := tt // capture loop var
+		t.Run(testCase.description, func(t *testing.T) {
+			trace := makeTrace(testCase.trace)
+			adjuster := ClockSkew(tt.maxAdjust)
+			adjuster.Adjust(trace)
+
+			var gotErr string
+			for i, proto := range testCase.trace {
+				id := proto.id
+				span := trace.ResourceSpans().At(i).ScopeSpans().At(0).Spans().At(0)
+				require.EqualValues(t, proto.id, span.SpanID(), "expecting span with span ID = %d", id)
+
+				warnings := jptrace.GetWarnings(span)
+				if testCase.err == "" {
+					if proto.adjusted == proto.startTime {
+						assert.Empty(t, warnings, "no warnings in span %s", span.SpanID)
+					} else {
+						assert.Len(t, warnings, 1, "warning about adjutment added to span %s", span.SpanID)
+					}
+				} else {
+					if len(warnings) > 0 {
+						gotErr = warnings[0]
+					}
+				}
+
+				// compare values as int because assert.Equal prints uint64 as hex
+				assert.Equal(
+					t, toTime(proto.adjusted).UTC(), span.StartTimestamp().AsTime(),
+					"adjusted start time of span[ID = %d]", id)
+				for i, logTs := range proto.adjustedEvents {
+					assert.Equal(
+						t, toTime(logTs).UTC(), span.Events().At(i).Timestamp().AsTime(),
+						"adjusted log timestamp of span[ID = %d], log[%d]", id, i)
+				}
+			}
+			assert.Equal(t, testCase.err, gotErr)
+		})
+	}
+}
+
+func TestHostKey(t *testing.T) {
+	tests := []struct {
+		name     string
+		resource ptrace.ResourceSpans
+		expected string
+	}{
+		{
+			name: "host.id attribute",
+			resource: func() ptrace.ResourceSpans {
+				rs := ptrace.NewResourceSpans()
+				rs.Resource().Attributes().PutStr("host.id", "host-123")
+				return rs
+			}(),
+			expected: "host-123",
+		},
+		{
+			name: "string host.ip attribute",
+			resource: func() ptrace.ResourceSpans {
+				rs := ptrace.NewResourceSpans()
+				rs.Resource().Attributes().PutStr("host.ip", "192.168.1.1")
+				return rs
+			}(),
+			expected: "192.168.1.1",
+		},
+		{
+			name: "slice host.ip attribute",
+			resource: func() ptrace.ResourceSpans {
+				rs := ptrace.NewResourceSpans()
+				addresses := rs.Resource().Attributes().PutEmptySlice("host.ip")
+				addresses.AppendEmpty().SetStr("192.168.1.1")
+				addresses.AppendEmpty().SetStr("192.168.1.2")
+				return rs
+			}(),
+			expected: "192.168.1.1",
+		},
+		{
+			name: "empty host.ip attribute slice",
+			resource: func() ptrace.ResourceSpans {
+				rs := ptrace.NewResourceSpans()
+				rs.Resource().Attributes().PutEmptySlice("host.ip")
+				return rs
+			}(),
+			expected: "",
+		},
+		{
+			name: "host.name attribute",
+			resource: func() ptrace.ResourceSpans {
+				rs := ptrace.NewResourceSpans()
+				rs.Resource().Attributes().PutStr("host.name", "hostname")
+				return rs
+			}(),
+			expected: "hostname",
+		},
+		{
+			name: "no relevant attributes",
+			resource: func() ptrace.ResourceSpans {
+				rs := ptrace.NewResourceSpans()
+				rs.Resource().Attributes().PutStr("service.name", "service-123")
+				return rs
+			}(),
+			expected: "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := hostKey(tt.resource)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}
diff --git a/pkg/otelsemconv/semconv.go b/pkg/otelsemconv/semconv.go
index 9acb3b88e2c..5427dbfcc26 100644
--- a/pkg/otelsemconv/semconv.go
+++ b/pkg/otelsemconv/semconv.go
@@ -24,6 +24,10 @@ const (
 	DBSystemKey               = semconv.DBSystemKey
 	PeerServiceKey            = semconv.PeerServiceKey
 	HTTPResponseStatusCodeKey = semconv.HTTPResponseStatusCodeKey
+
+	HostIDKey   = semconv.HostIDKey
+	HostIPKey   = semconv.HostIPKey
+	HostNameKey = semconv.HostNameKey
 )
 
 var HTTPResponseStatusCode = semconv.HTTPResponseStatusCode

From 6bec1ad06b58b394ad4f621d087fd5f71ca08a2b Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 23 Dec 2024 14:55:08 +0100
Subject: [PATCH 58/59] fix(deps): update module google.golang.org/protobuf to
 v1.36.1 (#6395)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[google.golang.org/protobuf](https://redirect.github.com/protocolbuffers/protobuf-go)
| `v1.36.0` -> `v1.36.1` |
[![age](https://developer.mend.io/api/mc/badges/age/go/google.golang.org%2fprotobuf/v1.36.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/google.golang.org%2fprotobuf/v1.36.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/google.golang.org%2fprotobuf/v1.36.0/v1.36.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/google.golang.org%2fprotobuf/v1.36.0/v1.36.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>protocolbuffers/protobuf-go
(google.golang.org/protobuf)</summary>

###
[`v1.36.1`](https://redirect.github.com/protocolbuffers/protobuf-go/releases/tag/v1.36.1)

[Compare
Source](https://redirect.github.com/protocolbuffers/protobuf-go/compare/v1.36.0...v1.36.1)

**Full Changelog**:
https://github.com/protocolbuffers/protobuf-go/compare/v1.36.0...v1.36.1

Bug fixes:
[CL/638495](https://go-review.googlesource.com/c/protobuf/+/638495):
internal/impl: revert IsSynthetic() check to fix panic

Maintenance:
[CL/637475](https://go-review.googlesource.com/c/protobuf/+/637475):
internal/errors: delete compatibility code for Go before 1.13

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/jaegertracing/jaeger).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS44MC4wIiwidXBkYXRlZEluVmVyIjoiMzkuODAuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==-->

Signed-off-by: Mend Renovate <bot@renovateapp.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 762d0f365f4..a7eafab345e 100644
--- a/go.mod
+++ b/go.mod
@@ -98,7 +98,7 @@ require (
 	golang.org/x/net v0.33.0
 	golang.org/x/sys v0.28.0
 	google.golang.org/grpc v1.69.2
-	google.golang.org/protobuf v1.36.0
+	google.golang.org/protobuf v1.36.1
 	gopkg.in/yaml.v3 v3.0.1
 )
 
diff --git a/go.sum b/go.sum
index 5d8e67a5e7a..d694e4003f1 100644
--- a/go.sum
+++ b/go.sum
@@ -964,8 +964,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
-google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
+google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

From 4ecb0860ce7ae901f8d77261b4022e5030288073 Mon Sep 17 00:00:00 2001
From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com>
Date: Mon, 23 Dec 2024 12:00:46 -0500
Subject: [PATCH 59/59] [v2][adjuster] Implement otlp to model translator with
 post processing (#6394)

## Which problem is this PR solving?
- Towards #6344

## Description of the changes
- Implemented a translator in `jptrace` with a function
`ProtoFromTraces` that is a wrapper of the upstream `ProtoFromTraces` in
opentelemetry-collector-contrib jaeger translator. This function appends
the warnings in `jaeger.internal.warnings` to the corresponding warnings
field in the proto model.

## How was this change tested?
- Added unit tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
---
 .golangci.yml                                 |  8 +++
 cmd/collector/app/handler/otlp_receiver.go    |  4 +-
 .../processors/adaptivesampling/processor.go  |  4 +-
 cmd/query/app/otlp_translator.go              |  4 +-
 internal/jptrace/translator.go                | 58 +++++++++++++++++++
 internal/jptrace/translator_test.go           | 55 ++++++++++++++++++
 model/ids.go                                  | 16 +++++
 model/ids_test.go                             | 52 +++++++++++++++++
 storage_v2/v1adapter/writer.go                |  4 +-
 9 files changed, 197 insertions(+), 8 deletions(-)
 create mode 100644 internal/jptrace/translator.go
 create mode 100644 internal/jptrace/translator_test.go

diff --git a/.golangci.yml b/.golangci.yml
index 5427041391e..2cca15f1d14 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -139,6 +139,14 @@ linters-settings:
         files:
           - "**_test.go"
 
+      # TODO: enable after import is not used anywhere
+      # disallow-otel-contrib-translator:
+      #   deny:
+      #     - pkg: github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger
+      #       desc: "Use jptrace package instead of opentelemetry-collector-contrib/pkg/translator/jaeger"
+      #   files:
+      #     - "!**/jptrace/**"
+
   goimports:
     local-prefixes: github.com/jaegertracing/jaeger
   gosec:
diff --git a/cmd/collector/app/handler/otlp_receiver.go b/cmd/collector/app/handler/otlp_receiver.go
index ba450e4a298..ebde8d2ba38 100644
--- a/cmd/collector/app/handler/otlp_receiver.go
+++ b/cmd/collector/app/handler/otlp_receiver.go
@@ -7,7 +7,6 @@ import (
 	"context"
 	"fmt"
 
-	otlp2jaeger "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componentstatus"
 	"go.opentelemetry.io/collector/config/confignet"
@@ -23,6 +22,7 @@ import (
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
 	"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
+	"github.com/jaegertracing/jaeger/internal/jptrace"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 )
 
@@ -108,7 +108,7 @@ type consumerDelegate struct {
 }
 
 func (c *consumerDelegate) consume(ctx context.Context, td ptrace.Traces) error {
-	batches := otlp2jaeger.ProtoFromTraces(td)
+	batches := jptrace.ProtoFromTraces(td)
 	for _, batch := range batches {
 		err := c.batchConsumer.consume(ctx, batch)
 		if err != nil {
diff --git a/cmd/jaeger/internal/processors/adaptivesampling/processor.go b/cmd/jaeger/internal/processors/adaptivesampling/processor.go
index 4d14f7f99c4..7a0ca2a0641 100644
--- a/cmd/jaeger/internal/processors/adaptivesampling/processor.go
+++ b/cmd/jaeger/internal/processors/adaptivesampling/processor.go
@@ -7,12 +7,12 @@ import (
 	"context"
 	"fmt"
 
-	otlp2jaeger "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/sampling/samplingstrategy"
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/remotesampling"
+	"github.com/jaegertracing/jaeger/internal/jptrace"
 	"github.com/jaegertracing/jaeger/internal/metrics/otelmetrics"
 	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/adaptive"
 )
@@ -65,7 +65,7 @@ func (tp *traceProcessor) close(context.Context) error {
 }
 
 func (tp *traceProcessor) processTraces(_ context.Context, td ptrace.Traces) (ptrace.Traces, error) {
-	batches := otlp2jaeger.ProtoFromTraces(td)
+	batches := jptrace.ProtoFromTraces(td)
 	for _, batch := range batches {
 		for _, span := range batch.Spans {
 			if span.Process == nil {
diff --git a/cmd/query/app/otlp_translator.go b/cmd/query/app/otlp_translator.go
index 06f7c63e440..daaaabf2aeb 100644
--- a/cmd/query/app/otlp_translator.go
+++ b/cmd/query/app/otlp_translator.go
@@ -6,9 +6,9 @@ package app
 import (
 	"fmt"
 
-	model2otel "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
+	"github.com/jaegertracing/jaeger/internal/jptrace"
 	"github.com/jaegertracing/jaeger/model"
 )
 
@@ -18,7 +18,7 @@ func otlp2traces(otlpSpans []byte) ([]*model.Trace, error) {
 	if err != nil {
 		return nil, fmt.Errorf("cannot unmarshal OTLP : %w", err)
 	}
-	jaegerBatches := model2otel.ProtoFromTraces(otlpTraces)
+	jaegerBatches := jptrace.ProtoFromTraces(otlpTraces)
 	var traces []*model.Trace
 	traceMap := make(map[model.TraceID]*model.Trace)
 	for _, batch := range jaegerBatches {
diff --git a/internal/jptrace/translator.go b/internal/jptrace/translator.go
new file mode 100644
index 00000000000..7480b2b5075
--- /dev/null
+++ b/internal/jptrace/translator.go
@@ -0,0 +1,58 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package jptrace
+
+import (
+	jaegerTranslator "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/model"
+)
+
+// ProtoFromTraces converts OpenTelemetry traces (ptrace.Traces)
+// to Jaeger model batches ([]*model.Batch).
+func ProtoFromTraces(traces ptrace.Traces) []*model.Batch {
+	batches := jaegerTranslator.ProtoFromTraces(traces)
+	spanMap := createSpanMapFromBatches(batches)
+	transferWarnings(traces, spanMap)
+	return batches
+}
+
+func createSpanMapFromBatches(batches []*model.Batch) map[model.SpanID]*model.Span {
+	spanMap := make(map[model.SpanID]*model.Span)
+	for _, batch := range batches {
+		for _, span := range batch.Spans {
+			spanMap[span.SpanID] = span
+		}
+	}
+	return spanMap
+}
+
+func transferWarnings(traces ptrace.Traces, spanMap map[model.SpanID]*model.Span) {
+	resources := traces.ResourceSpans()
+	for i := 0; i < resources.Len(); i++ {
+		scopes := resources.At(i).ScopeSpans()
+		for j := 0; j < scopes.Len(); j++ {
+			spans := scopes.At(j).Spans()
+			for k := 0; k < spans.Len(); k++ {
+				otelSpan := spans.At(k)
+				warnings := GetWarnings(otelSpan)
+				span := spanMap[model.SpanIDFromOTEL(otelSpan.SpanID())]
+				span.Warnings = append(span.Warnings, warnings...)
+				// filter out the warning tag
+				span.Tags = filterTags(span.Tags, warningsAttribute)
+			}
+		}
+	}
+}
+
+func filterTags(tags []model.KeyValue, keyToRemove string) []model.KeyValue {
+	var filteredTags []model.KeyValue
+	for _, tag := range tags {
+		if tag.Key != keyToRemove {
+			filteredTags = append(filteredTags, tag)
+		}
+	}
+	return filteredTags
+}
diff --git a/internal/jptrace/translator_test.go b/internal/jptrace/translator_test.go
new file mode 100644
index 00000000000..5ff3129a00f
--- /dev/null
+++ b/internal/jptrace/translator_test.go
@@ -0,0 +1,55 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package jptrace
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/ptrace"
+
+	"github.com/jaegertracing/jaeger/model"
+)
+
+func TestProtoFromTraces_AddsWarnings(t *testing.T) {
+	traces := ptrace.NewTraces()
+	rs1 := traces.ResourceSpans().AppendEmpty()
+	ss1 := rs1.ScopeSpans().AppendEmpty()
+	span1 := ss1.Spans().AppendEmpty()
+	span1.SetName("test-span-1")
+	span1.SetSpanID(pcommon.SpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}))
+	AddWarning(span1, "test-warning-1")
+	AddWarning(span1, "test-warning-2")
+	span1.Attributes().PutStr("key", "value")
+
+	ss2 := rs1.ScopeSpans().AppendEmpty()
+	span2 := ss2.Spans().AppendEmpty()
+	span2.SetName("test-span-2")
+	span2.SetSpanID(pcommon.SpanID([8]byte{9, 10, 11, 12, 13, 14, 15, 16}))
+
+	rs2 := traces.ResourceSpans().AppendEmpty()
+	ss3 := rs2.ScopeSpans().AppendEmpty()
+	span3 := ss3.Spans().AppendEmpty()
+	span3.SetName("test-span-3")
+	span3.SetSpanID(pcommon.SpanID([8]byte{17, 18, 19, 20, 21, 22, 23, 24}))
+	AddWarning(span3, "test-warning-3")
+
+	batches := ProtoFromTraces(traces)
+
+	assert.Len(t, batches, 2)
+
+	assert.Len(t, batches[0].Spans, 2)
+	assert.Equal(t, "test-span-1", batches[0].Spans[0].OperationName)
+	assert.Equal(t, []string{"test-warning-1", "test-warning-2"}, batches[0].Spans[0].Warnings)
+	assert.Equal(t, []model.KeyValue{{Key: "key", VStr: "value"}}, batches[0].Spans[0].Tags)
+	assert.Equal(t, "test-span-2", batches[0].Spans[1].OperationName)
+	assert.Empty(t, batches[0].Spans[1].Warnings)
+	assert.Empty(t, batches[0].Spans[1].Tags)
+
+	assert.Len(t, batches[1].Spans, 1)
+	assert.Equal(t, "test-span-3", batches[1].Spans[0].OperationName)
+	assert.Equal(t, []string{"test-warning-3"}, batches[1].Spans[0].Warnings)
+	assert.Empty(t, batches[1].Spans[0].Tags)
+}
diff --git a/model/ids.go b/model/ids.go
index 5bf93dc43be..4c7b77c6aa9 100644
--- a/model/ids.go
+++ b/model/ids.go
@@ -261,3 +261,19 @@ func (s *SpanID) UnmarshalJSON(data []byte) error {
 func (s *SpanID) UnmarshalJSONPB(_ *jsonpb.Unmarshaler, b []byte) error {
 	return s.UnmarshalJSON(b)
 }
+
+// ToOTELSpanID converts the SpanID to OTEL's representation of a span identitfier.
+// This was taken from
+// https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/internal/coreinternal/idutils/big_endian_converter.go.
+func (s SpanID) ToOTELSpanID() pcommon.SpanID {
+	spanID := [8]byte{}
+	binary.BigEndian.PutUint64(spanID[:], uint64(s))
+	return pcommon.SpanID(spanID)
+}
+
+// ToOTELSpanID converts OTEL's SpanID to the model representation of a span identitfier.
+// This was taken from
+// https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/internal/coreinternal/idutils/big_endian_converter.go.
+func SpanIDFromOTEL(spanID pcommon.SpanID) SpanID {
+	return SpanID(binary.BigEndian.Uint64(spanID[:]))
+}
diff --git a/model/ids_test.go b/model/ids_test.go
index 40c6f801a5c..ef2a9a65beb 100644
--- a/model/ids_test.go
+++ b/model/ids_test.go
@@ -137,3 +137,55 @@ func TestTraceIDFromOTEL(t *testing.T) {
 	}
 	require.Equal(t, expected, model.TraceIDFromOTEL(otelTraceID))
 }
+
+func TestToOTELSpanID(t *testing.T) {
+	tests := []struct {
+		name     string
+		spanID   model.SpanID
+		expected pcommon.SpanID
+	}{
+		{
+			name:     "zero span ID",
+			spanID:   model.NewSpanID(0),
+			expected: pcommon.NewSpanIDEmpty(),
+		},
+		{
+			name:     "non-zero span ID",
+			spanID:   model.NewSpanID(1),
+			expected: pcommon.SpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}),
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			actual := test.spanID.ToOTELSpanID()
+			assert.Equal(t, test.expected, actual)
+		})
+	}
+}
+
+func TestSpanIDFromOTEL(t *testing.T) {
+	tests := []struct {
+		name       string
+		otelSpanID pcommon.SpanID
+		expected   model.SpanID
+	}{
+		{
+			name:       "zero span ID",
+			otelSpanID: pcommon.NewSpanIDEmpty(),
+			expected:   model.NewSpanID(0),
+		},
+		{
+			name:       "non-zero span ID",
+			otelSpanID: pcommon.SpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}),
+			expected:   model.NewSpanID(1),
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			actual := model.SpanIDFromOTEL(test.otelSpanID)
+			assert.Equal(t, test.expected, actual)
+		})
+	}
+}
diff --git a/storage_v2/v1adapter/writer.go b/storage_v2/v1adapter/writer.go
index c0a9d4ced99..b16b54ed43e 100644
--- a/storage_v2/v1adapter/writer.go
+++ b/storage_v2/v1adapter/writer.go
@@ -7,9 +7,9 @@ import (
 	"context"
 	"errors"
 
-	otlp2jaeger "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
+	"github.com/jaegertracing/jaeger/internal/jptrace"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	"github.com/jaegertracing/jaeger/storage_v2/tracestore"
 )
@@ -26,7 +26,7 @@ func NewTraceWriter(spanWriter spanstore.Writer) tracestore.Writer {
 
 // WriteTraces implements tracestore.Writer.
 func (t *TraceWriter) WriteTraces(ctx context.Context, td ptrace.Traces) error {
-	batches := otlp2jaeger.ProtoFromTraces(td)
+	batches := jptrace.ProtoFromTraces(td)
 	var errs []error
 	for _, batch := range batches {
 		for _, span := range batch.Spans {