Remove legacy traceable config (#28)

pavolloffay · web-flow · commit 32dc0a1e5433 · 2020-10-16T13:45:30.000+02:00
Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;
diff --git a/README.md b/README.md
@@ -29,24 +29,10 @@ The final artifact is in `javaagent/build/libs/hypertrace-agent-<version>-all.ja
 OTEL_EXPORTER=zipkin java -javaagent:javaagent/build/libs/hypertrace-agent-0.0.1-all.jar -jar app.jar
 ```
 
-### Run with Traceable.ai config
-
-The precedence order of different configuration 
+The configuration precedence order 
 1. OpenTelemetry Agent's trace config file `OTEL_TRACE_CONFIG`/`otel.trace.config`
-2. Traceable.ai configuration file
 3. OpenTelemetry system properties and env variables
 
-Follows and example of using Traceable.ai config file (`example-config.json`):
-
-```bash
-java -javaagent:javaagent/build/libs/hypertrace-agent-0.0.1-all.jar=traceableConfigFile=example-config.json -jar app.jar
-```
-
-Supported agent arguments:
-
-* `traceableConfigFile` - path to traceable config file
-* `traceableServiceName` - service name of the monitored process
-
 ### Disable request/response body capture
 
 Request and response body capture can be disabled by `-Dotel.integration.body.enabled=false` or
diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts
@@ -8,7 +8,6 @@ dependencies {
     // update the dependencies also in the instrumentations sub-projects
     // https://oss.jfrog.org/artifactory/oss-snapshot-local/io/opentelemetry/instrumentation/auto/
     implementation("io.opentelemetry.instrumentation.auto", "opentelemetry-javaagent", version = "0.9.0-20201008.091003-73", classifier = "all")
-    implementation("ai.traceable.agent", "agent-config", version = "0.2.4")
 }
 
 base.archivesBaseName = "hypertrace-agent"
diff --git a/javaagent/src/main/java/org/hypertrace/agent/HypertraceAgent.java b/javaagent/src/main/java/org/hypertrace/agent/HypertraceAgent.java
@@ -16,8 +16,6 @@
 
 package org.hypertrace.agent;
 
-import ai.traceable.agent.agentconfig.InstrumentationAgentConfig;
-import ai.traceable.agent.agentconfig.Reporting;
 import io.opentelemetry.javaagent.OpenTelemetryAgent;
 import java.lang.instrument.Instrumentation;
 
@@ -36,40 +34,6 @@ public static void premain(String agentArgs, Instrumentation inst) {
   }
 
   public static void agentmain(String agentArgs, Instrumentation inst) {
-    configureOTELWithTraceableConfig(agentArgs);
     OpenTelemetryAgent.premain(agentArgs, inst);
   }
-
-  private static void configureOTELWithTraceableConfig(String agentArgs) {
-    // The properties from traceable config file are set as default to OTEL config.
-    InstrumentationAgentConfig traceableConfig = TraceableConfig.loadConfigFile(agentArgs);
-    if (traceableConfig == null) {
-      return;
-    }
-
-    if (traceableConfig.getLogging() != null && traceableConfig.getLogging().getLevel() != null) {
-      OpenTelemetryConfig.setDefault(
-          OTEL_DEFAULT_LOG_LEVEL, traceableConfig.getLogging().getLevel());
-    }
-
-    // set reporter to Zipkin because OpenTelemetry supports only Jaeger gRPC
-    // which is not supported by OC collector in Hypertrace
-    OpenTelemetryConfig.setDefault(OTEL_EXPORTER, "zipkin");
-
-    // TODO retry and backoff are not in OTEL. Maybe gRPC exporter does retry automatically?
-    Reporting reporting = traceableConfig.getReporting();
-    if (reporting != null) {
-      if (reporting != null && reporting.getTracesAddress() != null) {
-        OpenTelemetryConfig.setDefault(OTEL_EXPORTER_ZIPKIN_ENDPOINT, reporting.getTracesAddress());
-      }
-      if (reporting.getQueueSize() != null) {
-        OpenTelemetryConfig.setDefault(
-            OTEL_PROCESSOR_BATCH_MAX_QUEUE, Integer.toString(reporting.getQueueSize()));
-      }
-    }
-    if (traceableConfig.getServiceName() != null) {
-      OpenTelemetryConfig.setDefault(
-          OTEL_EXPORTER_ZIPKIN_SERVICE_NAME, traceableConfig.getServiceName());
-    }
-  }
 }
diff --git a/javaagent/src/main/java/org/hypertrace/agent/TraceableConfig.java b/javaagent/src/main/java/org/hypertrace/agent/TraceableConfig.java

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ dependencies {`
`8`	`8`	`// update the dependencies also in the instrumentations sub-projects`
`9`	`9`	`// https://oss.jfrog.org/artifactory/oss-snapshot-local/io/opentelemetry/instrumentation/auto/`
`10`	`10`	`implementation("io.opentelemetry.instrumentation.auto", "opentelemetry-javaagent", version = "0.9.0-20201008.091003-73", classifier = "all")`
`11`		`- implementation("ai.traceable.agent", "agent-config", version = "0.2.4")`
`12`	`11`	`}`
`13`	`12`
`14`	`13`	`base.archivesBaseName = "hypertrace-agent"`