Skip to content

Fix SSLSocket instrumentation ForTypeHierarchy filter#5102

Merged
val06 merged 3 commits into
masterfrom
valeri.pliskin/USMO-354-fix-SSLSocket-TypeHierarchy
May 1, 2023
Merged

Fix SSLSocket instrumentation ForTypeHierarchy filter#5102
val06 merged 3 commits into
masterfrom
valeri.pliskin/USMO-354-fix-SSLSocket-TypeHierarchy

Conversation

@val06

@val06 val06 commented Apr 24, 2023

Copy link
Copy Markdown
Contributor

Avoid instrumenting abstract BaseSSLSocketImpl

What Does This Do

added additional condition to hierarchyMatcher function

Motivation

Additional Notes

@val06
val06 requested a review from a team as a code owner April 24, 2023 12:18
@val06 val06 changed the title [USM] - Fix SSLSocket instrumentation TypeHierarchyFilter [USM] - Fix SSLSocket instrumentation ForTypeHierarchy filter Apr 24, 2023
@mcculls

mcculls commented Apr 27, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

Just a heads up I have an unrelated change in #5120 which would cause a merge conflict, so if this is ready to merge I'd suggest you do that now and then I'll fix up my PR (otherwise if I merge first then you'll need to fix up this PR...)

I went ahead and merged my other PR and updated this PR to resolve the merge conflict

@mcculls
mcculls force-pushed the valeri.pliskin/USMO-354-fix-SSLSocket-TypeHierarchy branch from 2214faf to 1e136fb Compare April 28, 2023 10:05
@pr-commenter

pr-commenter Bot commented Apr 28, 2023

Copy link
Copy Markdown

Benchmarks

Parameters

Baseline Candidate
commit 1.13.0-SNAPSHOT~a39f5ec82d 1.13.0-SNAPSHOT~1e136fbe09
config baseline candidate
See matching parameters
Baseline Candidate
module Agent Agent
parent None None

Summary

Found 0 performance improvements and 0 performance regressions! Performance is the same for 22 cases.

See unchanged results
scenario Δ mean execution_time
scenario:Startup-base-Agent same
scenario:Startup-base-Agent.start same
scenario:Startup-base-BytebuddyAgent same
scenario:Startup-base-GlobalTracer same
scenario:Startup-base-AppSec same
scenario:Startup-base-Remote Config same
scenario:Startup-base-Telemetry same
scenario:Startup-iast-Agent same
scenario:Startup-iast-Agent.start same
scenario:Startup-iast-BytebuddyAgent same
scenario:Startup-iast-GlobalTracer same
scenario:Startup-iast-AppSec same
scenario:Startup-iast-IAST unsure
[+0.020ms; +0.190ms] or [+0.183%; +1.705%]
scenario:Startup-iast-Remote Config same
scenario:Startup-iast-Telemetry same
scenario:Startup-waf-Agent same
scenario:Startup-waf-Agent.start same
scenario:Startup-waf-BytebuddyAgent same
scenario:Startup-waf-GlobalTracer same
scenario:Startup-waf-AppSec same
scenario:Startup-waf-Remote Config same
scenario:Startup-waf-Telemetry same

@val06
val06 merged commit c5389db into master May 1, 2023
@val06
val06 deleted the valeri.pliskin/USMO-354-fix-SSLSocket-TypeHierarchy branch May 1, 2023 06:59
@github-actions github-actions Bot added this to the 1.13.0 milestone May 1, 2023
@richardstartin richardstartin added the comp: universal service monitoring Universal Service Monitoring label May 2, 2023
@richardstartin richardstartin changed the title [USM] - Fix SSLSocket instrumentation ForTypeHierarchy filter Fix SSLSocket instrumentation ForTypeHierarchy filter May 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PerfectSlayer PerfectSlayer PerfectSlayer approved these changes

Assignees

No one assigned

Labels

comp: universal service monitoring Universal Service Monitoring

Projects

None yet

Milestone

1.13.0

Development

Successfully merging this pull request may close these issues.

4 participants

@val06 @mcculls @PerfectSlayer @richardstartin