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.

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

Remove jaeger exporter support #1342

Merged
merged 2 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.

## Unreleased

- Remove deprecated Jaeger exporter support.

## v1.25.0 - 2023-06-15

### General
Expand Down
12 changes: 0 additions & 12 deletions custom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@ dependencies {

implementation("io.opentelemetry.contrib:opentelemetry-samplers")
implementation("io.opentelemetry.contrib:opentelemetry-resource-providers")
implementation("io.opentelemetry:opentelemetry-exporter-jaeger-thrift") {
exclude("io.opentelemetry", "opentelemetry-sdk")
// exclude unwanted dependency
// https://issues.apache.org/jira/browse/THRIFT-5375
exclude("org.apache.tomcat.embed", "tomcat-embed-core")
}
implementation("io.jaegertracing:jaeger-client") {
// exclude unwanted dependency
// https://issues.apache.org/jira/browse/THRIFT-5375
exclude("org.apache.tomcat.embed", "tomcat-embed-core")
exclude("com.google.code.gson", "gson")
}

compileOnly("io.micrometer:micrometer-core")
implementation("io.micrometer:micrometer-registry-signalfx") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public class SplunkConfiguration implements AutoConfigurationCustomizerProvider
private static final Logger logger = Logger.getLogger(SplunkConfiguration.class.getName());

public static final String SPLUNK_ACCESS_TOKEN = "splunk.access.token";
public static final String OTEL_EXPORTER_JAEGER_ENDPOINT = "otel.exporter.jaeger.endpoint";
public static final String PROFILER_ENABLED_PROPERTY = "splunk.profiler.enabled";
public static final String PROFILER_MEMORY_ENABLED_PROPERTY = "splunk.profiler.memory.enabled";
public static final String SPLUNK_REALM_PROPERTY = "splunk.realm";
Expand Down Expand Up @@ -160,20 +159,12 @@ Map<String, String> customize(ConfigProperties config) {
}

String realm = config.getString(SPLUNK_REALM_PROPERTY, SPLUNK_REALM_NONE);
if (SPLUNK_REALM_NONE.equals(realm)) {
addIfAbsent(
customized, config, OTEL_EXPORTER_JAEGER_ENDPOINT, "http://localhost:9080/v1/trace");
} else {
if (!SPLUNK_REALM_NONE.equals(realm)) {
addIfAbsent(
customized,
config,
"otel.exporter.otlp.endpoint",
"https://ingest." + realm + ".signalfx.com");
addIfAbsent(
customized,
config,
OTEL_EXPORTER_JAEGER_ENDPOINT,
"https://ingest." + realm + ".signalfx.com/v2/trace");

// metrics ingest doesn't currently accept grpc
addIfAbsent(customized, config, "otel.exporter.otlp.metrics.protocol", "http/protobuf");
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import static com.splunk.opentelemetry.SplunkConfiguration.METRICS_ENABLED_PROPERTY;
import static com.splunk.opentelemetry.SplunkConfiguration.METRICS_IMPLEMENTATION;
import static com.splunk.opentelemetry.SplunkConfiguration.OTEL_EXPORTER_JAEGER_ENDPOINT;
import static com.splunk.opentelemetry.SplunkConfiguration.PROFILER_MEMORY_ENABLED_PROPERTY;
import static com.splunk.opentelemetry.SplunkConfiguration.SPLUNK_REALM_NONE;
import static java.util.Arrays.asList;
Expand All @@ -38,8 +37,6 @@ class SplunkConfigurationTest {
void usesLocalIngestIfNoRealmIsConfigured() {
ConfigProperties config = configuration();

assertThat(config.getString(OTEL_EXPORTER_JAEGER_ENDPOINT))
.isEqualTo("http://localhost:9080/v1/trace");
assertThat(config.getString(OTLP_ENDPOINT)).isNull();
}

Expand All @@ -48,17 +45,13 @@ void usesLocalIngestIfRealmIsNone() {
ConfigProperties config =
configuration(() -> Map.of(SplunkConfiguration.SPLUNK_REALM_PROPERTY, SPLUNK_REALM_NONE));

assertThat(config.getString(OTEL_EXPORTER_JAEGER_ENDPOINT))
.isEqualTo("http://localhost:9080/v1/trace");
assertThat(config.getString(OTLP_ENDPOINT)).isNull();
}

@Test
void realmIsNotHardcoded() {
var config = configuration(() -> Map.of(SplunkConfiguration.SPLUNK_REALM_PROPERTY, "test1"));

assertThat(config.getString(OTEL_EXPORTER_JAEGER_ENDPOINT))
.isEqualTo("https://ingest.test1.signalfx.com/v2/trace");
assertThat(config.getString(OTLP_ENDPOINT)).isEqualTo("https://ingest.test1.signalfx.com");
}

Expand Down

This file was deleted.

This file was deleted.

Loading