Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v2] Ensure similar naming for query service metrics #5785

Merged
merged 5 commits into from
Jul 31, 2024

Conversation

Wise-Wizard
Copy link
Contributor

Which problem is this PR solving?

This PR addresses a part of the issue #5633

Description of the changes
This is a Draft PR to achieve Observability Parity between V1 and V2 components by configuring OTEL Collector config files to initialise internal tracer and metrics
How was this change tested?

The changes were tested by running the following command:

make test
CI actions

Checklist

  • I have read 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: Wise-Wizard <saransh.shankar@gmail.com>
@Wise-Wizard Wise-Wizard requested a review from a team as a code owner July 29, 2024 04:25
Copy link

codecov bot commented Jul 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.65%. Comparing base (12f8fbb) to head (3f5c5ce).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5785   +/-   ##
=======================================
  Coverage   96.65%   96.65%           
=======================================
  Files         342      342           
  Lines       16519    16520    +1     
=======================================
+ Hits        15966    15967    +1     
  Misses        363      363           
  Partials      190      190           
Flag Coverage Δ
badger_v1 8.05% <ø> (ø)
badger_v2 1.81% <ø> (ø)
cassandra-3.x-v1 16.61% <ø> (ø)
cassandra-3.x-v2 1.74% <ø> (ø)
cassandra-4.x-v1 16.61% <ø> (ø)
cassandra-4.x-v2 1.74% <ø> (ø)
elasticsearch-6.x-v1 18.78% <ø> (+0.01%) ⬆️
elasticsearch-7.x-v1 18.83% <ø> (ø)
elasticsearch-8.x-v1 19.02% <ø> (-0.02%) ⬇️
elasticsearch-8.x-v2 1.80% <ø> (ø)
grpc_v1 9.52% <ø> (+0.01%) ⬆️
grpc_v2 7.14% <ø> (+0.01%) ⬆️
kafka-v1 9.74% <ø> (ø)
kafka-v2 1.81% <ø> (ø)
memory_v2 1.81% <ø> (+0.01%) ⬆️
opensearch-1.x-v1 18.88% <ø> (ø)
opensearch-2.x-v1 18.89% <ø> (+0.01%) ⬆️
opensearch-2.x-v2 1.80% <ø> (ø)
unittests 95.07% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Wise-Wizard and others added 3 commits July 29, 2024 19:46
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
@yurishkuro
Copy link
Member

can you generate the metrics diff and link her (you can upload it to https://gist.github.com/)

@Wise-Wizard
Copy link
Contributor Author

can you generate the metrics diff and link her (you can upload it to https://gist.github.com/)

https://gist.github.com/Wise-Wizard/d8a9399566e2131dc722b8698a994f95

@yurishkuro
Copy link
Member

any idea why this one shows in v1 only, while the other two jaeger_query_xxx metrics show in common? It seems all three would be produced by the same code.

        "jaeger_query_requests_total": {
            "operation": "find_trace_ids",
            "result": "err"
        },

@Wise-Wizard
Copy link
Contributor Author

any idea why this one shows in v1 only, while the other two jaeger_query_xxx metrics show in common? It seems all three would be produced by the same code.

        "jaeger_query_requests_total": {
            "operation": "find_trace_ids",
            "result": "err"
        },

It has the total suffix attached to it for some reason.

@yurishkuro
Copy link
Member

What about storage metrics emitted by the collector?

@Wise-Wizard
Copy link
Contributor Author

collector

Which metrics exactly?

@yurishkuro
Copy link
Member

storage metrics. E.g. we have decorator for SpanReader interface, so when collector saves spans to storage it emits the metrics - we expect to see those from v2 as well.

@Wise-Wizard
Copy link
Contributor Author

storage metrics. E.g. we have decorator for SpanReader interface, so when collector saves spans to storage it emits the metrics - we expect to see those from v2 as well.

Yes, I wrapped the span reader initialized in Query V2 with the decorator, and those are the jaeger_query_metrics which are seen on :8888

@yurishkuro yurishkuro added the changelog:exprimental Change to an experimental part of the code label Jul 31, 2024
@yurishkuro yurishkuro changed the title Achieve parity of metrics in V2 [v2] Ensure similar naming for query service metrics Jul 31, 2024
@yurishkuro yurishkuro merged commit 77333cc into jaegertracing:main Jul 31, 2024
45 of 46 checks passed
JaredTan95 pushed a commit to JaredTan95/jaeger that referenced this pull request Aug 1, 2024
)

**Which problem is this PR solving?**

This PR addresses a part of the issue [jaegertracing#5633
](jaegertracing#5633)

**Description of the changes**
This is a Draft PR to achieve Observability Parity between V1 and V2
components by configuring OTEL Collector config files to initialise
internal tracer and metrics
**How was this change tested?**

The changes were tested by running the following command:

```bash
make test
```
```bash
CI actions
```
**Checklist**

- [x] I have read
[CONTRIBUTING_GUIDELINES.md](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: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Jared Tan <jian.tan@daocloud.io>
JaredTan95 pushed a commit to JaredTan95/jaeger that referenced this pull request Aug 7, 2024
)

**Which problem is this PR solving?**

This PR addresses a part of the issue [jaegertracing#5633
](jaegertracing#5633)

**Description of the changes**
This is a Draft PR to achieve Observability Parity between V1 and V2
components by configuring OTEL Collector config files to initialise
internal tracer and metrics
**How was this change tested?**

The changes were tested by running the following command:

```bash
make test
```
```bash
CI actions
```
**Checklist**

- [x] I have read
[CONTRIBUTING_GUIDELINES.md](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: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Jared Tan <jian.tan@daocloud.io>
JaredTan95 pushed a commit to JaredTan95/jaeger that referenced this pull request Aug 8, 2024
)

**Which problem is this PR solving?**

This PR addresses a part of the issue [jaegertracing#5633
](jaegertracing#5633)

**Description of the changes**
This is a Draft PR to achieve Observability Parity between V1 and V2
components by configuring OTEL Collector config files to initialise
internal tracer and metrics
**How was this change tested?**

The changes were tested by running the following command:

```bash
make test
```
```bash
CI actions
```
**Checklist**

- [x] I have read
[CONTRIBUTING_GUIDELINES.md](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: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Jared Tan <jian.tan@daocloud.io>
JaredTan95 pushed a commit to JaredTan95/jaeger that referenced this pull request Aug 13, 2024
)

**Which problem is this PR solving?**

This PR addresses a part of the issue [jaegertracing#5633
](jaegertracing#5633)

**Description of the changes**
This is a Draft PR to achieve Observability Parity between V1 and V2
components by configuring OTEL Collector config files to initialise
internal tracer and metrics
**How was this change tested?**

The changes were tested by running the following command:

```bash
make test
```
```bash
CI actions
```
**Checklist**

- [x] I have read
[CONTRIBUTING_GUIDELINES.md](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: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Jared Tan <jian.tan@daocloud.io>
JaredTan95 pushed a commit to JaredTan95/jaeger that referenced this pull request Aug 14, 2024
)

**Which problem is this PR solving?**

This PR addresses a part of the issue [jaegertracing#5633
](jaegertracing#5633)

**Description of the changes**
This is a Draft PR to achieve Observability Parity between V1 and V2
components by configuring OTEL Collector config files to initialise
internal tracer and metrics
**How was this change tested?**

The changes were tested by running the following command:

```bash
make test
```
```bash
CI actions
```
**Checklist**

- [x] I have read
[CONTRIBUTING_GUIDELINES.md](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: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Jared Tan <jian.tan@daocloud.io>
JaredTan95 pushed a commit to JaredTan95/jaeger that referenced this pull request Aug 28, 2024
)

**Which problem is this PR solving?**

This PR addresses a part of the issue [jaegertracing#5633
](jaegertracing#5633)

**Description of the changes**
This is a Draft PR to achieve Observability Parity between V1 and V2
components by configuring OTEL Collector config files to initialise
internal tracer and metrics
**How was this change tested?**

The changes were tested by running the following command:

```bash
make test
```
```bash
CI actions
```
**Checklist**

- [x] I have read
[CONTRIBUTING_GUIDELINES.md](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: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Jared Tan <jian.tan@daocloud.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/otel changelog:exprimental Change to an experimental part of the code v2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants