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

[apm] peer.service aggregation for trace stats, option to compute stats based on span.kind #16103

Merged
merged 53 commits into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
df3e63f
[apm] initial commit; add peer.service to stats
jdgumz Mar 7, 2023
8cda026
[apm] re-generate msgpack to account for peer.service
jdgumz Mar 7, 2023
d0e1321
[apm] add tests for peer.service aggregation
jdgumz Mar 14, 2023
f940919
[apm] add comment to explain peer_service in proto
jdgumz Mar 14, 2023
fb95f5c
[apm] comment revision
jdgumz Mar 14, 2023
2ad214f
[apm] add release notes
jdgumz Mar 14, 2023
af0f5f6
Update pkg/trace/stats/aggregation.go
jdgumz Mar 15, 2023
bfaa1e2
Update pkg/trace/stats/aggregation.go
jdgumz Mar 15, 2023
1593a31
Merge branch 'apm/peer-service-aggregation-for-trace-stats' of github…
jdgumz Mar 21, 2023
27c1a02
[apm] add consideration of span.kind == INTERNAL for calculating stats
jdgumz Mar 21, 2023
1e74f07
[apm] consider CLIENT/PRODUCER specifically rather than INTERNAL for …
jdgumz Mar 21, 2023
2e80bb4
[apm] remove incorrect comment
jdgumz Mar 21, 2023
0353e82
[apm] correct tests, update release notes
jdgumz Mar 21, 2023
4eb1a0a
[apm] RemoteOutbound -> RemoteOutgoing
jdgumz Mar 21, 2023
dcfe044
[apm] remove unnecessary newlines
jdgumz Mar 21, 2023
a776a46
[apm] update peer.service test to use a more realistic example for it…
jdgumz Mar 21, 2023
b0a39d6
Update pkg/trace/stats/concentrator.go
jdgumz Mar 21, 2023
59129de
Update releasenotes/notes/add-peer-service-for-trace-stats-225f1b90c9…
jdgumz Mar 21, 2023
66f690d
Update releasenotes/notes/add-peer-service-for-trace-stats-225f1b90c9…
jdgumz Mar 21, 2023
a405615
[apm] fix bug from remote commit
jdgumz Mar 21, 2023
ba3ad76
[apm] remove consideration of span.kind for trace stats computation
jdgumz Mar 24, 2023
588a0ec
[apm] add normalization for peer.service
jdgumz Mar 24, 2023
2586730
[apm] add concentrator configuration to enable/disable peer.service s…
jdgumz Mar 24, 2023
e7222b9
[apm] ensure peer.service is exported from client stats aggregator as…
jdgumz Mar 24, 2023
11cfffb
[apm] update config_template.yaml
jdgumz Mar 24, 2023
90c0b09
[apm] further clarify effect of disabling peer.service stats aggregation
jdgumz Mar 24, 2023
45758c6
[apm] fix test failures
jdgumz Mar 25, 2023
c7c7e51
[apm] rework configuration of peer.service, add back extra aggregator…
jdgumz Mar 29, 2023
394c33b
[apm] set peer service aggregation to false by default, ensure config…
jdgumz Mar 29, 2023
4fa25f1
[apm] revise variable name to be consistent, add check for peer servi…
jdgumz Mar 29, 2023
0986d4f
[apm] add logic to compute stats based on specific span.kind values
jdgumz Mar 29, 2023
2e68665
[apm] add config for option to enable stats computation by span.kind
jdgumz Mar 30, 2023
2c1f694
[apm] update documentation and release notes
jdgumz Mar 30, 2023
0cf26cc
Update cmd/trace-agent/config/config.go
jdgumz Mar 30, 2023
63c572a
Update pkg/trace/traceutil/span.go
jdgumz Mar 30, 2023
6dc94ad
[apm] rename peer service aggregation config field
jdgumz Mar 30, 2023
ffd0975
[apm] add more test cases to ensure case insensitivity for span.kind …
jdgumz Mar 30, 2023
cee986d
[apm] move span.kind check func implementation to concentrator.go
jdgumz Mar 30, 2023
c4ea367
Update pkg/trace/stats/concentrator.go
jdgumz Mar 30, 2023
d6a545c
[apm] finish move of span.kind check func
jdgumz Mar 30, 2023
1a07963
[apm] go back to setting a bool flag for peer.service in concentrator
jdgumz Mar 30, 2023
1454017
[apm] add back ExtraAggregators for info test case
jdgumz Mar 30, 2023
76957f4
[apm] fix testutil fixture BucketWithSpans
jdgumz Mar 30, 2023
1f8c1e3
[apm] move peer.service aggregation check back into NewAggregationFro…
jdgumz Mar 30, 2023
01156fc
[apm] change CSA to use bool for peer svc aggregation as well
jdgumz Mar 30, 2023
98136a2
[apm] remove unused const
jdgumz Mar 30, 2023
ecdeaa4
[apm] update guidance on new config options
jdgumz Mar 31, 2023
c65f007
[apm] add small test for bucket aggregation key creation and peer.ser…
jdgumz Mar 31, 2023
b4bdba1
[apm] remove unused field
jdgumz Apr 3, 2023
4450bb5
[apm] fix fuzz test
jdgumz Apr 3, 2023
29f9320
[apm] fix stats info tests
jdgumz Apr 3, 2023
94886e0
Merge branch 'main' into apm/peer-service-aggregation-for-trace-stats
jdgumz Apr 4, 2023
8ad14ae
Merge branch 'main' into apm/peer-service-aggregation-for-trace-stats
jdgumz Apr 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
354 changes: 247 additions & 107 deletions pkg/trace/pb/stats.pb.go

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pkg/trace/pb/stats.proto
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@ message ClientGroupedStats {
bytes errorSummary = 11; // ddsketch summary of error spans latencies encoded in protobuf
bool synthetics = 12; // set to true on spans generated by synthetics traffic
uint64 topLevelHits = 13; // count of top level spans aggregated in the groupedstats
string peer_service = 14; // name of the remote service that the `service` communicated with
}
Loading