Skip to content

SnapshotProfilingConfiguration refactoring to be consistent with ProfilerConfiguration #2931

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

Open
robsunday wants to merge 4 commits into
base: main
Choose a base branch
from
Open

SnapshotProfilingConfiguration refactoring to be consistent with ProfilerConfiguration #2931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf44697
Snapshot Profiler Configuration refactoring
robsunday Jul 7, 2026
5c93e2b
Fix for missing nodes in profiler exporter config
robsunday Jul 7, 2026
efcacf6
Fix for missing nodes in profiler exporter config
robsunday Jul 7, 2026
eff6544
Code review followup
robsunday Jul 8, 2026
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
3 changes: 1 addition & 2 deletions ...com/splunk/opentelemetry/opamp/effectiveconfig/DeclarativeEffectiveConfigFileFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.splunk.opentelemetry.opamp.DeclarativeConfigurationInterceptor;
import com.splunk.opentelemetry.profiler.ProfilerConfiguration;
import com.splunk.opentelemetry.profiler.snapshot.SnapshotProfilingConfiguration;
import com.splunk.opentelemetry.profiler.snapshot.SnapshotProfilingDeclarativeConfiguration;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LoggerProviderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel;
Expand Down Expand Up @@ -71,7 +70,7 @@ public String createEffectiveConfigContent() {
}
ProfilerConfiguration profilerConfiguration = ProfilerConfiguration.SUPPLIER.get();
SnapshotProfilingConfiguration snapshotConfiguration =
SnapshotProfilingDeclarativeConfiguration.SUPPLIER.get();
SnapshotProfilingConfiguration.SUPPLIER.get();

return processModel(model, profilerConfiguration, snapshotConfiguration);
}
Expand Down
3 changes: 1 addition & 2 deletions ...ava/com/splunk/opentelemetry/opamp/effectiveconfig/EnvVarsEffectiveConfigFileFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import com.splunk.opentelemetry.profiler.ProfilerConfiguration;
import com.splunk.opentelemetry.profiler.snapshot.SnapshotProfilingConfiguration;
import com.splunk.opentelemetry.profiler.snapshot.SnapshotProfilingEnvVarsConfiguration;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;

class EnvVarsEffectiveConfigFileFactory implements EffectiveConfigFactory {
Expand Down Expand Up @@ -50,7 +49,7 @@ public String createEffectiveConfigContent() {
private void addSplunkEnvVars(EffectiveConfigBuilder builder) {
ProfilerConfiguration profilerConfiguration = ProfilerConfiguration.SUPPLIER.get();
SnapshotProfilingConfiguration snapshotConfiguration =
new SnapshotProfilingEnvVarsConfiguration(config);
SnapshotProfilingConfiguration.SUPPLIER.get();

builder
.add("SPLUNK_PROFILER_ENABLED", profilerConfiguration.isEnabled())
Expand Down
8 changes: 4 additions & 4 deletions ...splunk/opentelemetry/opamp/effectiveconfig/DeclarativeEffectiveConfigFileFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import com.splunk.opentelemetry.profiler.ProfilerConfiguration;
import com.splunk.opentelemetry.profiler.ProfilerDeclarativeConfigurationFactory;
import com.splunk.opentelemetry.profiler.snapshot.SnapshotProfilingConfiguration;
import com.splunk.opentelemetry.profiler.snapshot.SnapshotProfilingDeclarativeConfiguration;
import com.splunk.opentelemetry.profiler.snapshot.SnapshotProfilingDeclarativeConfigurationFactory;
import com.splunk.opentelemetry.testing.declarativeconfig.DeclarativeConfigTestUtil;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
Expand Down Expand Up @@ -58,7 +58,7 @@ class DeclarativeEffectiveConfigFileFactoryTest {
void afterEach() {
DeclarativeConfigurationInterceptor.reset();
ProfilerConfiguration.SUPPLIER.reset();
SnapshotProfilingDeclarativeConfiguration.SUPPLIER.reset();
SnapshotProfilingConfiguration.SUPPLIER.reset();
}

@Test
Expand Down Expand Up @@ -399,8 +399,8 @@ public static void main(String[] args) throws Exception {
getDistributionConfig(model).getStructured("profiling", empty());
ProfilerConfiguration.SUPPLIER.configure(
ProfilerDeclarativeConfigurationFactory.create(profilingConfig));
SnapshotProfilingDeclarativeConfiguration.SUPPLIER.configure(
new SnapshotProfilingDeclarativeConfiguration(profilingConfig));
SnapshotProfilingConfiguration.SUPPLIER.configure(
SnapshotProfilingDeclarativeConfigurationFactory.create(profilingConfig));

DeclarativeConfigurationBuilder builder = new DeclarativeConfigurationBuilder();
new DeclarativeConfigurationInterceptor().customize(builder);
Expand Down
5 changes: 5 additions & 0 deletions ...com/splunk/opentelemetry/opamp/effectiveconfig/EnvVarsEffectiveConfigFileFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

import com.splunk.opentelemetry.profiler.ProfilerConfiguration;
import com.splunk.opentelemetry.profiler.ProfilerEnvVarsConfigurationFactory;
import com.splunk.opentelemetry.profiler.snapshot.SnapshotProfilingConfiguration;
import com.splunk.opentelemetry.profiler.snapshot.SnapshotProfilingEnvVarsConfigurationFactory;
import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
import java.io.IOException;
import java.io.StringReader;
Expand All @@ -33,6 +35,7 @@ class EnvVarsEffectiveConfigFileFactoryTest {
@AfterEach
void tearDown() {
ProfilerConfiguration.SUPPLIER.reset();
SnapshotProfilingConfiguration.SUPPLIER.reset();
}

@Test
Expand Down Expand Up @@ -163,6 +166,8 @@ void buildFileContent_usesSignalSpecificProtocolWhenResolvingEndpoints() throws
private static Properties createFileContent(Map<String, String> configMap) throws IOException {
DefaultConfigProperties config = DefaultConfigProperties.createFromMap(configMap);
ProfilerConfiguration.SUPPLIER.configure(ProfilerEnvVarsConfigurationFactory.create(config));
SnapshotProfilingConfiguration.SUPPLIER.configure(
SnapshotProfilingEnvVarsConfigurationFactory.create(config));
String fileContent =
new EnvVarsEffectiveConfigFileFactory(config).createEffectiveConfigContent();

Expand Down
14 changes: 7 additions & 7 deletions profiler/src/main/java/com/splunk/opentelemetry/profiler/LogExporterBuilder.java
View file
Open in desktop

@robsunday robsunday Jul 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

[for reviewer] Changes in this file are needed to correctly create default profiler exporter

Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.splunk.opentelemetry.profiler;

import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
import static io.opentelemetry.exporter.otlp.internal.OtlpConfigUtil.DATA_TYPE_LOGS;

import com.google.common.annotations.VisibleForTesting;
import com.splunk.opentelemetry.profiler.util.DeclarativeConfigPropertiesUtil;
import io.opentelemetry.api.incubator.config.ConfigProvider;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.common.ComponentLoader;
Expand All @@ -30,7 +30,6 @@
import io.opentelemetry.exporter.otlp.internal.OtlpHttpLogRecordExporterComponentProvider;
import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporter;
import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporterBuilder;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.YamlDeclarativeConfigProperties;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
import io.opentelemetry.sdk.autoconfigure.spi.internal.ExtendedDeclarativeConfigProperties;
Expand Down Expand Up @@ -61,15 +60,17 @@ static LogRecordExporter fromDeclarativeConfig(

if (propertyKeys.contains("otlp_log_http")) {
DeclarativeConfigProperties otlpHttp =
exporterConfigProperties.getStructured("otlp_log_http", empty());
DeclarativeConfigPropertiesUtil.getStructuredOrEmpty(
exporterConfigProperties, "otlp_log_http");
OtlpHttpLogRecordExporterComponentProvider provider =
new OtlpHttpLogRecordExporterComponentProvider();
return provider.create(toExtended(otlpHttp));
}

if (propertyKeys.contains("otlp_log_grpc")) {
DeclarativeConfigProperties otlpGrpc =
exporterConfigProperties.getStructured("otlp_log_grpc", empty());
DeclarativeConfigPropertiesUtil.getStructuredOrEmpty(
exporterConfigProperties, "otlp_log_grpc");
OtlpGrpcLogRecordExporterComponentProvider provider =
new OtlpGrpcLogRecordExporterComponentProvider();
return provider.create(toExtended(otlpGrpc));
Expand All @@ -84,9 +85,8 @@ private static DeclarativeConfigProperties defaultOtlpHttpConfig(
Map<String, Object> properties = new HashMap<>();
properties.put("endpoint", DEFAULT_HTTP_LOG_ENDPOINT);
properties.put("encoding", "protobuf");
// Keep the original component loader so OTLP sender providers remain discoverable.
return YamlDeclarativeConfigProperties.create(
properties, exporterConfigProperties.getComponentLoader());
return DeclarativeConfigPropertiesUtil.createPreservingLoader(
exporterConfigProperties, properties);
}

static LogRecordExporter fromEnvironmentConfig() {
Expand Down
18 changes: 3 additions & 15 deletions ...iler/src/main/java/com/splunk/opentelemetry/profiler/PeriodicRecordingFlusherFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import com.splunk.opentelemetry.profiler.context.SpanContextualizer;
import com.splunk.opentelemetry.profiler.exporter.CpuEventExporter;
import com.splunk.opentelemetry.profiler.exporter.PprofCpuEventExporter;
import com.splunk.opentelemetry.profiler.util.DeclarativeConfigPropertiesUtil;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.YamlDeclarativeConfigProperties;
import io.opentelemetry.sdk.logs.LogRecordProcessor;
import io.opentelemetry.sdk.logs.SdkLoggerProvider;
import io.opentelemetry.sdk.logs.export.LogRecordExporter;
Expand All @@ -35,7 +35,6 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.Collections;
import java.util.Map;

class PeriodicRecordingFlusherFactory {
Expand Down Expand Up @@ -147,24 +146,13 @@ private StackTraceFilter buildStackTraceFilter(
private static LogRecordExporter createLogRecordExporter(Object configProperties) {
if (configProperties instanceof DeclarativeConfigProperties) {
DeclarativeConfigProperties exporterConfig =
getExporterConfig((DeclarativeConfigProperties) configProperties);
DeclarativeConfigPropertiesUtil.getStructuredOrEmpty(
(DeclarativeConfigProperties) configProperties, "exporter");
return LogExporterBuilder.fromDeclarativeConfig(exporterConfig);
}
return LogExporterBuilder.fromEnvironmentConfig();
}

private static DeclarativeConfigProperties getExporterConfig(
DeclarativeConfigProperties configProperties) {
DeclarativeConfigProperties exporterConfig = configProperties.getStructured("exporter");
if (exporterConfig != null) {
return exporterConfig;
}
// DeclarativeConfigProperties.empty() is not used because it does not preserve the original
// component loader that is used later when creating default exporter
return YamlDeclarativeConfigProperties.create(
Collections.emptyMap(), configProperties.getComponentLoader());
}

private boolean checkOutputDir(Path outputDir) {
if (!Files.exists(outputDir)) {
// Try creating the directory for the user...
Expand Down
37 changes: 17 additions & 20 deletions profiler/src/main/java/com/splunk/opentelemetry/profiler/ProfilerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,23 @@ public static Builder builder() {
}

public Builder toBuilder() {
return new Builder(this);
return new Builder()
.setEnabled(enabled)
.setIngestUrl(ingestUrl)
.setOtlpProtocol(otlpProtocol)
.setMemoryEnabled(memoryEnabled)
.setMemoryEventRateLimitEnabled(memoryEventRateLimitEnabled)
.setMemoryEventRate(memoryEventRate)
.setUseAllocationSampleEvent(useAllocationSampleEvent)
.setCallStackInterval(callStackInterval)
.setIncludeAgentInternalStacks(includeAgentInternalStacks)
.setIncludeJvmInternalStacks(includeJvmInternalStacks)
.setTracingStacksOnly(tracingStacksOnly)
.setStackDepth(stackDepth)
.setKeepFiles(keepFiles)
.setProfilerDirectory(profilerDirectory)
.setRecordingDuration(recordingDuration)
.setConfigProperties(configProperties);
}

public boolean isEnabled() {
Expand Down Expand Up @@ -246,25 +262,6 @@ public static class Builder {

private Builder() {}

private Builder(ProfilerConfiguration config) {
enabled = config.enabled;
ingestUrl = config.ingestUrl;
otlpProtocol = config.otlpProtocol;
memoryEnabled = config.memoryEnabled;
memoryEventRateLimitEnabled = config.memoryEventRateLimitEnabled;
memoryEventRate = config.memoryEventRate;
useAllocationSampleEvent = config.useAllocationSampleEvent;
callStackInterval = config.callStackInterval;
includeAgentInternalStacks = config.includeAgentInternalStacks;
includeJvmInternalStacks = config.includeJvmInternalStacks;
tracingStacksOnly = config.tracingStacksOnly;
stackDepth = config.stackDepth;
keepFiles = config.keepFiles;
profilerDirectory = config.profilerDirectory;
recordingDuration = config.recordingDuration;
configProperties = config.configProperties;
}

public ProfilerConfiguration build() {
return new ProfilerConfiguration(this);
}
Expand Down
17 changes: 3 additions & 14 deletions ...ler/src/main/java/com/splunk/opentelemetry/profiler/ProfilerConfigurationInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
package com.splunk.opentelemetry.profiler;

import com.google.auto.service.AutoService;
import com.splunk.opentelemetry.profiler.util.DeclarativeConfigPropertiesUtil;
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
import io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizerProvider;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.YamlDeclarativeConfigProperties;
import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
import java.util.Collections;
Expand All @@ -44,7 +44,8 @@ public void customize(DeclarativeConfigurationCustomizer configurationCustomizer
(model) -> {
DeclarativeConfigProperties distributionConfig =
AutoConfigureUtil.getDistributionConfig(model);
DeclarativeConfigProperties profilingConfig = getProfilingConfig(distributionConfig);
DeclarativeConfigProperties profilingConfig =
DeclarativeConfigPropertiesUtil.getStructuredOrEmpty(distributionConfig, "profiling");

ProfilerConfiguration.SUPPLIER.configure(
ProfilerDeclarativeConfigurationFactory.create(profilingConfig));
Expand All @@ -68,16 +69,4 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
public int order() {
return Integer.MAX_VALUE;
}

private static DeclarativeConfigProperties getProfilingConfig(
DeclarativeConfigProperties distributionConfig) {
DeclarativeConfigProperties profilingConfig = distributionConfig.getStructured("profiling");
if (profilingConfig != null) {
return profilingConfig;
}
// DeclarativeConfigProperties.empty() is not used because it does not preserve the original
// component loader that is used later when creating default exporter
return YamlDeclarativeConfigProperties.create(
Collections.emptyMap(), distributionConfig.getComponentLoader());
}
}
Loading
Loading