From 0d8d33fb8b56febdad5b5a71f19c19055eb1706e Mon Sep 17 00:00:00 2001 From: Shashank Patidar Date: Fri, 5 Feb 2021 18:33:09 +0530 Subject: [PATCH 1/3] adding javaagent config --- ENV_VARS.md | 1 + config.proto | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/ENV_VARS.md b/ENV_VARS.md index b6537d0..f9761dd 100644 --- a/ENV_VARS.md +++ b/ENV_VARS.md @@ -24,3 +24,4 @@ Agents can be configured using environment variables: | HT_DATA_CAPTURE_RPC_BODY_RESPONSE | When `false` it disables the capture for the response in a client/request operation | | HT_DATA_CAPTURE_BODY_MAX_SIZE_BYTES | Maximum size of captured body in bytes. Default should be 131_072 (128 KiB). | | HT_ENABLED | When `false`, disables the agent | +| HT_JAVAAGENT_OPA_EVALUATOR_JAR_PATH | Is the path to opa evaluator jar | diff --git a/config.proto b/config.proto index a37a117..fd3c3c6 100644 --- a/config.proto +++ b/config.proto @@ -27,6 +27,9 @@ message AgentConfig { // when `false`, disables the agent google.protobuf.BoolValue enabled = 5; + + // javaagent has the configs specific to javaagent + JavaAgent javaagent = 6; } // Reporting covers the options related to the mechanics for sending data to the @@ -95,3 +98,9 @@ enum PropagationFormat { // see https://www.w3.org/TR/trace-context/ TRACECONTEXT = 1; } + +// JavaAgent has the configs specific to javaagent +message JavaAgent { + // opa_evaluator_jar_path is the path to opa evaluator jar + google.protobuf.StringValue opa_evaluator_jar_path = 1; +} From e70cd92c30cda33ac387e5257fbfa70074583b0e Mon Sep 17 00:00:00 2001 From: Shashank Patidar Date: Mon, 8 Feb 2021 10:51:53 +0530 Subject: [PATCH 2/3] updating javaagent filter jar paths config --- ENV_VARS.md | 2 +- config.proto | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ENV_VARS.md b/ENV_VARS.md index f9761dd..a6a8960 100644 --- a/ENV_VARS.md +++ b/ENV_VARS.md @@ -24,4 +24,4 @@ Agents can be configured using environment variables: | HT_DATA_CAPTURE_RPC_BODY_RESPONSE | When `false` it disables the capture for the response in a client/request operation | | HT_DATA_CAPTURE_BODY_MAX_SIZE_BYTES | Maximum size of captured body in bytes. Default should be 131_072 (128 KiB). | | HT_ENABLED | When `false`, disables the agent | -| HT_JAVAAGENT_OPA_EVALUATOR_JAR_PATH | Is the path to opa evaluator jar | +| HT_JAVAAGENT_FILTER_JAR_PATHS | Is the list of path to opa filter jars, separated by `,` | diff --git a/config.proto b/config.proto index fd3c3c6..0f977a6 100644 --- a/config.proto +++ b/config.proto @@ -101,6 +101,6 @@ enum PropagationFormat { // JavaAgent has the configs specific to javaagent message JavaAgent { - // opa_evaluator_jar_path is the path to opa evaluator jar - google.protobuf.StringValue opa_evaluator_jar_path = 1; + // filter_jar_paths is the list of path to opa filter jars, separated by `,` + repeated google.protobuf.StringValue filter_jar_paths = 1; } From ad8854b5b28ff9691186139277def990061df88e Mon Sep 17 00:00:00 2001 From: Shashank Patidar Date: Tue, 9 Feb 2021 16:05:23 +0530 Subject: [PATCH 3/3] fixing comment --- ENV_VARS.md | 2 +- config.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ENV_VARS.md b/ENV_VARS.md index a6a8960..7c5fd51 100644 --- a/ENV_VARS.md +++ b/ENV_VARS.md @@ -24,4 +24,4 @@ Agents can be configured using environment variables: | HT_DATA_CAPTURE_RPC_BODY_RESPONSE | When `false` it disables the capture for the response in a client/request operation | | HT_DATA_CAPTURE_BODY_MAX_SIZE_BYTES | Maximum size of captured body in bytes. Default should be 131_072 (128 KiB). | | HT_ENABLED | When `false`, disables the agent | -| HT_JAVAAGENT_FILTER_JAR_PATHS | Is the list of path to opa filter jars, separated by `,` | +| HT_JAVAAGENT_FILTER_JAR_PATHS | Is the list of path to filter jars, separated by `,` | diff --git a/config.proto b/config.proto index 0f977a6..602628a 100644 --- a/config.proto +++ b/config.proto @@ -101,6 +101,6 @@ enum PropagationFormat { // JavaAgent has the configs specific to javaagent message JavaAgent { - // filter_jar_paths is the list of path to opa filter jars, separated by `,` + // filter_jar_paths is the list of path to filter jars, separated by `,` repeated google.protobuf.StringValue filter_jar_paths = 1; }