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

DO NOT MERGE : Update as per new config #301

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

DO NOT MERGE : Update as per new config #301

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9aa407a
Merge pull request #2 from hypertrace/main
shashank11p Feb 3, 2021
06e14c8
Merge pull request #3 from hypertrace/main
shashank11p Feb 4, 2021
1a71a72
Merge pull request #4 from hypertrace/main
shashank11p Feb 5, 2021
5f5c930
Merge pull request #5 from hypertrace/main
shashank11p Feb 10, 2021
bb29758
Merge pull request #6 from hypertrace/main
shashank11p Feb 16, 2021
c60b348
Merge remote-tracking branch 'upstream/main' into main
shashank11p Mar 30, 2021
d9766a3
Merge remote-tracking branch 'upstream/main' into main
shashank11p Apr 1, 2021
46025b4
Merge remote-tracking branch 'upstream/main' into main
shashank11p Apr 9, 2021
8086713
updating HypertraceConfig as per new data capture config
shashank11p Apr 9, 2021
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
32 changes: 20 additions & 12 deletions javaagent-core/src/main/java/org/hypertrace/agent/core/config/HypertraceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,25 @@ public static AgentConfig get() {
return agentConfig;
}

public static boolean isInstrumentationEnabled(String primaryName, String[] otherNames) {
public static boolean isInstrumentationEnabled(String primaryName, String[] otherNames, String path) {
// the instNames is not used because the config does not support it at the moment.

AgentConfig agentConfig = get();
// disabled if all is disabled
if (!agentConfig.getDataCapture().getHttpBody().getRequest().getValue()
&& !agentConfig.getDataCapture().getHttpBody().getResponse().getValue()
&& !agentConfig.getDataCapture().getHttpHeaders().getRequest().getValue()
&& !agentConfig.getDataCapture().getHttpHeaders().getResponse().getValue()
&& !agentConfig.getDataCapture().getRpcMetadata().getRequest().getValue()
&& !agentConfig.getDataCapture().getRpcMetadata().getResponse().getValue()) {
return false;

for (DataCapture dataCapture : agentConfig.getDataCaptureList()) {
// If data capture does not have pathPattern, that means it is the default rule
if (!dataCapture.hasPathPattern() || path.matches(dataCapture.getPathPattern().getValue())) {
// disabled if all is disabled
if (!dataCapture.getHttpBody().getRequest().getValue()
&& !dataCapture.getHttpBody().getResponse().getValue()
&& !dataCapture.getHttpHeaders().getRequest().getValue()
&& !dataCapture.getHttpHeaders().getResponse().getValue()
&& !dataCapture.getRpcMetadata().getRequest().getValue()
&& !dataCapture.getRpcMetadata().getResponse().getValue()) {
return false;
}
return true;
}
}
return true;
}
Expand Down Expand Up @@ -174,9 +181,10 @@ private static AgentConfig.Builder applyDefaults(AgentConfig.Builder configBuild
applyReportingDefaults(configBuilder.getReporting().toBuilder());
configBuilder.setReporting(reportingBuilder);

DataCapture.Builder dataCaptureBuilder =
setDefaultsToDataCapture(configBuilder.getDataCapture().toBuilder());
configBuilder.setDataCapture(dataCaptureBuilder);
// If dataCapture list is empty or if the default dataCapture rule is not set as last entry in list add a default
if (configBuilder.getDataCaptureList().isEmpty() || configBuilder.getDataCapture(configBuilder.getDataCaptureCount()-1).hasPathPattern()) {
configBuilder.addDataCapture(setDefaultsToDataCapture(DataCapture.newBuilder()));
}

if (configBuilder.getPropagationFormatsList().isEmpty()) {
configBuilder.addPropagationFormats(PropagationFormat.TRACECONTEXT);
Expand Down