Enable sending traces directly to ingest

Author: Mateusz Rzeszutek

README.md

@@ -89,11 +89,12 @@ System property values take priority over corresponding environment variables.
 
 A simple wrapper for the Jaeger exporter of opentelemetry-java. gRPC is currently the only supported communications protocol.
 
-| System property                   | Environment variable              | Description                                                                                            |
-|-----------------------------------|-----------------------------------|----------------------------------------------------------------------------------------------------|
-| otel.exporter=jaeger              | OTEL_EXPORTER=jaeger              | Select the Jaeger exporter                                                                          |
-| otel.exporter.jaeger.endpoint     | OTEL_EXPORTER_JAEGER_ENDPOINT     | The Jaeger endpoint to connect to. Default is `localhost:14250`. Currently only gRPC is supported. |
-| otel.exporter.jaeger.service.name | OTEL_EXPORTER_JAEGER_SERVICE_NAME | The service name of this JVM instance. Default is `unknown`.                                       |
+| System property                   | Environment variable              | Description                                                                                                         |
+|-----------------------------------|-----------------------------------|---------------------------------------------------------------------------------------------------------------------|
+| otel.exporter=jaeger              | OTEL_EXPORTER=jaeger              | Select the Jaeger exporter                                                                                          |
+| otel.exporter.jaeger.endpoint     | OTEL_EXPORTER_JAEGER_ENDPOINT     | The Jaeger endpoint to connect to. Default is `localhost:14250`. Currently only gRPC is supported.                  |
+| otel.exporter.jaeger.service.name | OTEL_EXPORTER_JAEGER_SERVICE_NAME | The service name of this JVM instance. Default is `unknown`.                                                        |
+| signalfx.auth.token               | SIGNALFX_AUTH_TOKEN               | Auth token allowing to communicate directly with the Splunk cloud, passed as `X-SF-TOKEN` header. Default is empty. |
 
 ### Trace configuration
 

agent/src/main/java/com/splunk/opentelemetry/SplunkAgent.java

@@ -28,7 +28,7 @@ public static void premain(final String agentArgs, final Instrumentation inst) {
   }
 
   public static void agentmain(final String agentArgs, final Instrumentation inst) {
-    setDefaultConfig("otel.exporter", "jaeger-thrift");
+    setDefaultConfig("otel.exporter", "jaeger-thrift-splunk");
     // http://localhost:9080/v1/trace is the default endpoint for SmartAgent
     // http://localhost:14268/api/traces is the default endpoint for otel-collector
     setDefaultConfig("otel.exporter.jaeger.endpoint", "http://localhost:9080/v1/trace");

custom/build.gradle.kts

@@ -9,6 +9,7 @@ dependencies {
   implementation("io.opentelemetry:opentelemetry-sdk:${versions["opentelemetry"]}")
   implementation("io.opentelemetry:opentelemetry-exporter-jaeger-thrift:${versions["opentelemetry"]}")
   implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-spi:${versions["opentelemetryJavaagent"]}")
+  implementation("io.jaegertracing:jaeger-client:1.5.0")
 }
 
 tasks {

custom/src/main/java/com/splunk/opentelemetry/jaeger/AuthTokenInterceptor.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright Splunk Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.splunk.opentelemetry.jaeger;
+
+import static java.util.Objects.requireNonNull;
+
+import java.io.IOException;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+
+class AuthTokenInterceptor implements Interceptor {
+  static final String TOKEN_HEADER = "X-SF-TOKEN";
+
+  private final String signalfxAuthToken;
+
+  AuthTokenInterceptor(String token) {
+    this.signalfxAuthToken = requireNonNull(token);
+  }
+
+  @Override
+  public Response intercept(Chain chain) throws IOException {
+    Request request = chain.request();
+    request = request.newBuilder().addHeader(TOKEN_HEADER, signalfxAuthToken).build();
+    return chain.proceed(request);
+  }
+}

custom/src/main/java/com/splunk/opentelemetry/jaeger/JaegerThriftSpanExporterFactory.java

@@ -16,23 +16,47 @@
 
 package com.splunk.opentelemetry.jaeger;
 
+import io.jaegertracing.thrift.internal.senders.HttpSender;
 import io.opentelemetry.exporter.jaeger.thrift.JaegerThriftSpanExporter;
 import io.opentelemetry.javaagent.spi.exporter.SpanExporterFactory;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import java.util.Collections;
 import java.util.Properties;
 import java.util.Set;
+import okhttp3.OkHttpClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-// TODO remove when https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/1609
-// is implemented
 public class JaegerThriftSpanExporterFactory implements SpanExporterFactory {
+  private static final Logger log = LoggerFactory.getLogger(JaegerThriftSpanExporterFactory.class);
+
+  static final String SIGNALFX_AUTH_TOKEN = "signalfx.auth.token";
+  static final String OTEL_EXPORTER_JAEGER_ENDPOINT = "otel.exporter.jaeger.endpoint";
+
   @Override
   public SpanExporter fromConfig(Properties config) {
-    return JaegerThriftSpanExporter.builder().readProperties(config).build();
+    JaegerThriftSpanExporter.Builder builder =
+        JaegerThriftSpanExporter.builder().readProperties(config);
+
+    String token = config.getProperty(SIGNALFX_AUTH_TOKEN, "");
+    if (!token.isEmpty()) {
+      log.debug("Using authenticated jaeger-thrift exporter");
+      builder.setThriftSender(
+          new HttpSender.Builder(config.getProperty(OTEL_EXPORTER_JAEGER_ENDPOINT))
+              .withClient(
+                  new OkHttpClient.Builder()
+                      .addInterceptor(new AuthTokenInterceptor(token))
+                      .build())
+              .build());
+    } else {
+      log.debug("Using jaeger-thrift exporter without authentication");
+    }
+
+    return builder.build();
   }
 
   @Override
   public Set<String> getNames() {
-    return Collections.singleton("jaeger-thrift");
+    return Collections.singleton("jaeger-thrift-splunk");
   }
 }

custom/src/test/java/com/splunk/opentelemetry/jaeger/AuthTokenInterceptorTest.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright Splunk Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.splunk.opentelemetry.jaeger;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
+
+import java.io.IOException;
+import okhttp3.Interceptor;
+import okhttp3.Interceptor.Chain;
+import okhttp3.Request;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class AuthTokenInterceptorTest {
+  @Mock Chain chain;
+  @Captor ArgumentCaptor<Request> requestCaptor;
+
+  Interceptor interceptor = new AuthTokenInterceptor("token");
+
+  @Test
+  void shouldAddSignalFxToken() throws IOException {
+    // given
+    var request = new Request.Builder().url("http://test").build();
+    given(chain.request()).willReturn(request);
+
+    // when
+    interceptor.intercept(chain);
+
+    // then
+    then(chain).should().proceed(requestCaptor.capture());
+    assertEquals("token", requestCaptor.getValue().header(AuthTokenInterceptor.TOKEN_HEADER));
+  }
+}