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.

Sign up for GitHub

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

Jump to bottom

Pass real MeterProvider to components #6173

Merged
merged 10 commits into from
Nov 17, 2024
Merged

Pass real MeterProvider to components #6173

merged 10 commits into from
Nov 17, 2024

Conversation

chahatsagarmain
Copy link
Contributor

Which problem is this PR solving?

How was this change tested?

  • make lint test

Checklist

@chahatsagarmain
Implemented LeveledMeterProvider
3a1a4f7 
Signed-off-by: chahatsagarmain <chahatsagar2003@gmail.com>
@chahatsagarmain chahatsagarmain requested a review from a team as a code owner November 7, 2024 03:35
@codecov Codecov
Copy link

codecov bot commented Nov 7, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.49%. Comparing base (47e1ee6) to head (1245dce).
Report is 1 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #6173      +/-   ##
==========================================
- Coverage   96.51%   96.49%   -0.02%     
==========================================
  Files         354      354              
  Lines       20127    20134       +7     
==========================================
+ Hits        19425    19428       +3     
- Misses        518      522       +4     
  Partials      184      184
Flag Coverage Δ
badger_v1 8.31% <0.00%> (ø)
badger_v2 1.67% <0.00%> (-0.01%) ⬇️
cassandra-4.x-v1 14.39% <0.00%> (ø)
cassandra-4.x-v2 1.61% <0.00%> (-0.01%) ⬇️
cassandra-5.x-v1 14.39% <0.00%> (ø)
cassandra-5.x-v2 1.61% <0.00%> (-0.01%) ⬇️
elasticsearch-6.x-v1 18.60% <0.00%> (-0.06%) ⬇️
elasticsearch-7.x-v1 18.67% <0.00%> (ø)
elasticsearch-8.x-v1 18.85% <0.00%> (+<0.01%) ⬆️
elasticsearch-8.x-v2 1.67% <0.00%> (-0.01%) ⬇️
grpc_v1 9.47% <57.14%> (-0.01%) ⬇️
grpc_v2 7.00% <0.00%> (-0.01%) ⬇️
kafka-v1 8.88% <0.00%> (ø)
kafka-v2 1.67% <0.00%> (-0.01%) ⬇️
memory_v2 1.67% <0.00%> (-0.01%) ⬇️
opensearch-1.x-v1 18.73% <0.00%> (+<0.01%) ⬆️
opensearch-2.x-v1 18.73% <0.00%> (+<0.01%) ⬆️
opensearch-2.x-v2 1.66% <0.00%> (-0.02%) ⬇️
tailsampling-processor 0.46% <0.00%> (-0.01%) ⬇️
unittests 95.40% <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.

@chahatsagarmain
Copy link
Contributor Author

@mahadzaryab1 how will i propogate leveledmeterprovider where telset is not part of function arguement ? Do i just use noop meterprovider there ?

@mahadzaryab1
Copy link
Collaborator

@mahadzaryab1 how will i propogate leveledmeterprovider where telset is not part of function arguement ? Do i just use noop meterprovider there ?

Yes, it will not be available in the context of v1 so a noop provider can be used there.

mahadzaryab1
mahadzaryab1 reviewed Nov 7, 2024
View reviewed changes
Copy link
Collaborator

@mahadzaryab1 mahadzaryab1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice work - just a couple of nits

cmd/jaeger/internal/extension/jaegerquery/server.go Outdated Show resolved Hide resolved
pkg/telemetery/settings.go Outdated Show resolved Hide resolved
@chahatsagarmain
minor changes
8dfaecb 
Signed-off-by: chahatsagarmain <chahatsagar2003@gmail.com>
mahadzaryab1
mahadzaryab1 reviewed Nov 7, 2024
View reviewed changes
Copy link
Collaborator

@mahadzaryab1 mahadzaryab1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm but need to wait for @yurishkuro's approval

@yurishkuro
Copy link
Member

yurishkuro commented Nov 8, 2024 •
edited
Loading

I don't think this is addressing all places

$ rg otel/metric/noop
cmd/query/app/server.go
22:	"go.opentelemetry.io/otel/metric/noop"

plugin/storage/grpc/factory.go
21:	noopmetric "go.opentelemetry.io/otel/metric/noop"

cmd/collector/app/handler/otlp_receiver.go
24:	noopmetric "go.opentelemetry.io/otel/metric/noop"

cmd/collector/app/handler/zipkin_receiver.go
16:	noopmetric "go.opentelemetry.io/otel/metric/noop"

@mahadzaryab1
Copy link
Collaborator

mahadzaryab1 commented Nov 8, 2024 •
edited
Loading

@yurishkuro (1) looks to be addressed in this PR. (3) and (4) are v1 components so we're passing in noop (https://github.com/jaegertracing/jaeger/blob/main/cmd/collector/app/handler/otlp_receiver.go#L71-L81). Is there anything else we can do for that?

@chahatsagarmain for (2) We can pass the meter provider down from this constructor and into the grpc factory.

@chahatsagarmain
added meter provider to storage grpc factory
199ec2a 
Signed-off-by: chahatsagarmain <chahatsagar2003@gmail.com>
@chahatsagarmain
minor change
9c4913f 
Signed-off-by: chahatsagarmain <chahatsagar2003@gmail.com>
mahadzaryab1
mahadzaryab1 reviewed Nov 13, 2024
View reviewed changes
Copy link
Collaborator

@mahadzaryab1 mahadzaryab1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just one more comment

plugin/storage/grpc/factory.go Show resolved Hide resolved
chahatsagarmain and others added 3 commits November 14, 2024 21:12
@chahatsagarmain
Merge branch 'main' into meter
79e6146 
Signed-off-by: chahat sagar <109112505+chahatsagarmain@users.noreply.github.com>
@chahatsagarmain @yurishkuro
Update pkg/telemetery/settings.go
516dfe7 
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: chahat sagar <109112505+chahatsagarmain@users.noreply.github.com>
@chahatsagarmain
minor changes
70280ea 
Signed-off-by: chahatsagarmain <chahatsagar2003@gmail.com>
@chahatsagarmain
use telemetery.Setting
1604786 
Signed-off-by: chahatsagarmain <chahatsagar2003@gmail.com>
@chahatsagarmain
Copy link
Contributor Author

@yurishkuro spm test is failing for recent prs

@mahadzaryab1
Copy link
Collaborator

@yurishkuro spm test is failing for recent prs

Opened a PR for the fix: #6217

@yurishkuro yurishkuro changed the title Added LeveledMeterProvider to telemetry setting Pass real MeterProvider to components Nov 17, 2024
@yurishkuro yurishkuro merged commit f88262c into jaegertracing:main Nov 17, 2024
50 checks passed
@yurishkuro
Copy link
Member

Thanks

@yurishkuro yurishkuro mentioned this pull request Dec 23, 2024
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mahadzaryab1 mahadzaryab1 mahadzaryab1 left review comments

@yurishkuro yurishkuro yurishkuro approved these changes

@jkowall jkowall Awaiting requested review from jkowall jkowall is a code owner automatically assigned from jaegertracing/jaeger-maintainers

Assignees
No one assigned
Labels
changelog:bugfix-or-minor-feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[jaeger-v2] Add Meter Provider To Telemetry Settings
3 participants
@chahatsagarmain @mahadzaryab1 @yurishkuro