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

Add exporter type config option with Zipkin and OTLP #52

Merged
merged 2 commits into from
Feb 23, 2021
Merged

Add exporter type config option with Zipkin and OTLP #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc25738
Add exporter type config option
pavolloffay Feb 23, 2021
a1f1147
Use enum
pavolloffay Feb 23, 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
2 changes: 1 addition & 1 deletion ENV_VARS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ Agents can be configured using environment variables:
| HT_DATA_CAPTURE_BODY_MAX_SIZE_BYTES | Maximum size of captured body in bytes. Default should be 131_072 (128 KiB). |
| HT_PROPAGATION_FORMATS | List the supported propagation formats e.g. `HT_PROPAGATION_FORMATS="B3,TRACECONTEXT"`. |
| HT_ENABLED | When `false`, disables the agent |
| HT_JAVAAGENT_FILTER_JAR_PATHS | Is the list of path to filter jars, separated by `,` |
| HT_JAVAAGENT_FILTER_JAR_PATHS | Is the list of path to filter jars, separated by `,`. |
Copy link
Member Author

Choose a reason for hiding this comment

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

@jcchavezs it seems that the generator did not work for reporter type

7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: default help
.PHONY: default help lint generate-env-vars init-git-submodule

default: help

Expand All @@ -8,11 +8,14 @@ help: ## Prints this help.
lint: ## Lints the proto files.
protolint config.proto

generate-env-vars: ## Generates the ENV_VARS.md with all environment variables.
generate-env-vars: init-git-submodule ## Generates the ENV_VARS.md with all environment variables.
docker build -t hypertrace/agent-config/env-vars-generator tools/env-vars-generator
docker run \
-v $(PWD)/ENV_VARS.md:/usr/local/ENV_VARS.md \
-v $(PWD)/config.proto:/usr/local/config.proto \
hypertrace/agent-config/env-vars-generator \
-o /usr/local/ENV_VARS.md \
/usr/local/config.proto

init-git-submodule:
git submodule update --init
14 changes: 14 additions & 0 deletions config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ message Reporting {

// opa describes the setting related to the Open Policy Agent
Opa opa = 4;

// reporter type. Defaults to zipkin, in the future it will change to otlp.
TraceReporterType trace_reporter_type = 5;
}

// Opa covers the options related to the mechanics for getting Open Policy Agent configuration file.
Expand Down Expand Up @@ -99,6 +102,17 @@ enum PropagationFormat {
TRACECONTEXT = 1;
}

// TraceReporterType represents the reporting format for trace data.
enum TraceReporterType {
// Zipkin protobuf reporting format.
// see https://github.com/openzipkin/zipkin-api
ZIPKIN = 0;

// OpenTelemetry protobuf reporting format.
// see https://github.com/open-telemetry/opentelemetry-proto
OTLP = 1;
}

// JavaAgent has the configs specific to javaagent
message JavaAgent {
// filter_jar_paths is the list of path to filter jars, separated by `,`
Expand Down