Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -69,23 +69,25 @@ Map<String, String> customize(ConfigProperties config) {
customized,
config,
"otel.exporter.otlp.endpoint",
"https://ingest." + realm + ".signalfx.com");
"https://ingest." + realm + ".observability.splunkcloud.com");

// metrics ingest doesn't currently accept grpc
addIfAbsent(customized, config, "otel.exporter.otlp.metrics.protocol", "http/protobuf");
addIfAbsent(
customized,
config,
"otel.exporter.otlp.metrics.endpoint",
"https://ingest." + realm + ".signalfx.com/v2/datapoint/otlp");
"https://ingest." + realm + ".observability.splunkcloud.com/v2/datapoint/otlp");

if (config.getString("otel.exporter.otlp.logs.endpoint") == null) {
String logsEndpoint = getDefaultLogsEndpoint(config);
logger.log(
WARNING,
"Logs can not be sent to {0}, using {1} instead. "
+ "You can override it by setting otel.exporter.otlp.logs.endpoint",
new Object[] {"https://ingest." + realm + ".signalfx.com", logsEndpoint});
new Object[] {
"https://ingest." + realm + ".observability.splunkcloud.com", logsEndpoint
});

addIfAbsent(customized, config, "otel.exporter.otlp.logs.endpoint", logsEndpoint);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ void usesLocalIngestIfRealmIsNone() {
void realmIsNotHardcoded() {
var config = configuration(() -> Map.of(SplunkConfiguration.SPLUNK_REALM_PROPERTY, "test1"));

assertThat(config.getString(OTLP_ENDPOINT)).isEqualTo("https://ingest.test1.signalfx.com");
assertThat(config.getString(OTLP_ENDPOINT))
.isEqualTo("https://ingest.test1.observability.splunkcloud.com");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ public String getIngestUrl() {
String defaultIngestUrl = getDefaultLogsEndpoint();
ingestUrl = config.getString(CONFIG_KEY_OTEL_OTLP_URL, defaultIngestUrl);

if (ingestUrl.startsWith("https://ingest.") && ingestUrl.endsWith(".signalfx.com")) {
if (ingestUrl.startsWith("https://ingest.")
&& ingestUrl.endsWith(".observability.splunkcloud.com")) {
logger.log(
WARNING,
"Profiling data can not be sent to {0}, using {1} instead. "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ void getIngestUrlSplunkRealm() {
ProfilerEnvVarsConfiguration profilerConfiguration = new ProfilerEnvVarsConfiguration(config);
when(config.getString(ProfilerEnvVarsConfiguration.CONFIG_KEY_INGEST_URL)).thenReturn(null);
when(config.getString(eq(ProfilerEnvVarsConfiguration.CONFIG_KEY_OTEL_OTLP_URL), anyString()))
.thenReturn("https://ingest.us0.signalfx.com");
.thenReturn("https://ingest.us0.observability.splunkcloud.com");
when(config.getString(
eq(ProfilerEnvVarsConfiguration.CONFIG_KEY_PROFILER_OTLP_PROTOCOL), any()))
.thenReturn("http/protobuf");
Expand Down
Loading