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

Crossdock sampling redirection to collector #6115

Merged
merged 5 commits into from
Nov 2, 2024

Conversation

chahatsagarmain
Copy link
Contributor

Which problem is this PR solving?

Description of the changes

How was this change tested?

  • make test

Checklist

Signed-off-by: chahatsagarmain <[email protected]>
@chahatsagarmain chahatsagarmain requested a review from a team as a code owner October 23, 2024 20:00
@chahatsagarmain chahatsagarmain marked this pull request as draft October 23, 2024 20:00
Copy link

codecov bot commented Oct 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.47%. Comparing base (37d1fc1) to head (54e0f66).
Report is 27 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff            @@
##             main    #6115    +/-   ##
========================================
  Coverage   96.46%   96.47%            
========================================
  Files         352      353     +1     
  Lines       19985    20113   +128     
========================================
+ Hits        19279    19404   +125     
- Misses        522      524     +2     
- Partials      184      185     +1     
Flag Coverage Δ
badger_v1 8.32% <ø> (-0.10%) ⬇️
badger_v2 1.68% <ø> (-0.03%) ⬇️
cassandra-4.x-v1 14.40% <ø> (-0.17%) ⬇️
cassandra-4.x-v2 1.62% <ø> (-0.03%) ⬇️
cassandra-5.x-v1 14.40% <ø> (-0.17%) ⬇️
cassandra-5.x-v2 1.62% <ø> (-0.03%) ⬇️
elasticsearch-6.x-v1 18.53% <ø> (-0.21%) ⬇️
elasticsearch-7.x-v1 18.60% <ø> (-0.22%) ⬇️
elasticsearch-8.x-v1 18.78% <ø> (-0.20%) ⬇️
elasticsearch-8.x-v2 1.68% <ø> (-0.02%) ⬇️
grpc_v1 9.50% <ø> (+0.72%) ⬆️
grpc_v2 7.01% <ø> (+0.29%) ⬆️
kafka-v1 8.89% <ø> (-0.11%) ⬇️
kafka-v2 1.68% <ø> (-0.03%) ⬇️
memory_v2 1.67% <ø> (-0.04%) ⬇️
opensearch-1.x-v1 18.65% <ø> (-0.22%) ⬇️
opensearch-2.x-v1 18.65% <ø> (-0.21%) ⬇️
opensearch-2.x-v2 1.67% <ø> (-0.04%) ⬇️
tailsampling-processor 0.47% <ø> (-0.02%) ⬇️
unittests 95.38% <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.

crossdock/main.go Show resolved Hide resolved
crossdock/main.go Outdated Show resolved Hide resolved
@@ -44,7 +44,7 @@ type clientHandler struct {
}

func main() {
agentHostPort = getEnv(envAgentHostPort, "jaeger-agent:5778")
Copy link
Member

Choose a reason for hiding this comment

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

I am unclear how this even works before this change. There is no jaeger-agent anymore in crossdock/jaeger-docker-compose.yml. Is this code even being executed? Can we add some logging so that we can see it in the runs?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have added logs , but nothing new pops up when running the build and test script for this .

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ERROR: failed to solve: failed to compute cache key: failed to calculate checksum of ref gy29m51xhvo6f6bjl06qu1w8m::sc4007cgbnhy890gx6i98pld0: "/agent-linux-amd64": not found
This seems to be error from the DockerFile when running build and test script .

Copy link
Member

Choose a reason for hiding this comment

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

what do you mean - are you running something manually?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Its from crossdock ci test

Copy link
Contributor Author

@chahatsagarmain chahatsagarmain Oct 30, 2024

Choose a reason for hiding this comment

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

I checked the docker compose logs , got the log for initialization of agent service(crossdock) but no log for fetching sampling rate by the agent (GetSamplingRate method) .

Signed-off-by: chahatsagarmain <[email protected]>
Signed-off-by: chahatsagarmain <[email protected]>
crossdock/main.go Outdated Show resolved Hide resolved
Signed-off-by: chahatsagarmain <[email protected]>
Signed-off-by: chahatsagarmain <[email protected]>
@chahatsagarmain
Copy link
Contributor Author

@mahadzaryab1 how should i further remove "agent" related code ?

@mahadzaryab1
Copy link
Collaborator

@mahadzaryab1 how should i further remove "agent" related code ?

@chahatsagarmain I would recommend doing this in a separate PR. The only dependency remaining on the jaeger-agent is crossdock. Once this PR is in and has removed the dependency on the agent, we can just remove the agent from jaeger altogether (see #4739 for more details).

@yurishkuro yurishkuro added the changelog:test Change that's adding missing tests or correcting existing tests label Nov 2, 2024
Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

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

I realized what the problem is - the function func (h *TraceHandler) AdaptiveSamplingTest(t crossdock.T) is never called by anything. It was added in #230 but apparently never actually hooked up into the runtime.

@yurishkuro yurishkuro marked this pull request as ready for review November 2, 2024 17:36
@yurishkuro yurishkuro merged commit 9c1c3ce into jaegertracing:main Nov 2, 2024
51 of 52 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/sampling changelog:test Change that's adding missing tests or correcting existing tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[crossdock] Replace sampling calls to agent with calls to collector
3 participants