Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3a1d6b2
Support for distribution node in YAML
robsunday Dec 5, 2025
e0f2eec
Spotless
robsunday Dec 5, 2025
da19a8e
Comments updated
robsunday Dec 5, 2025
85861c7
Comments updated
robsunday Dec 8, 2025
1bd5046
Tests updated
robsunday Dec 8, 2025
786afa1
Spotless
robsunday Dec 8, 2025
e06e9f7
Update profiler/src/main/java/com/splunk/opentelemetry/profiler/JfrAc…
robsunday Dec 10, 2025
a85a0cc
Code review followup
robsunday Dec 10, 2025
825d939
GDI spec changes applied
robsunday Dec 12, 2025
0bffa0d
Merge branch 'main' into fbc-vendor-node-support
robsunday Dec 12, 2025
c2b4bbc
Merge branch 'main' into fbc-vendor-node-support
robsunday Dec 19, 2025
3ba5dc3
Snapshot profiling configuration refactored to use instance methods.
robsunday Jan 9, 2026
c826d32
Merge branch 'main' into fbc-vendor-node-support
robsunday Jan 9, 2026
3c4cb1e
Spotless apply
robsunday Jan 9, 2026
af2ecaf
StackTraceInitializer refactoring
robsunday Jan 9, 2026
d0df429
Fixed YAMLs in some unit tests
robsunday Jan 9, 2026
b95828b
isDeclarativeConfig fix
robsunday Jan 9, 2026
ad5bf03
spotless
robsunday Jan 9, 2026
9a100f3
Merge branch 'main' into fbc-vendor-node-support
robsunday Jan 12, 2026
971f598
Grpc profiler log exporter fixed
robsunday Jan 13, 2026
58c0e59
Merge branch 'main' into fbc-vendor-node-support
robsunday Jan 13, 2026
2623404
After merge followup
robsunday Jan 13, 2026
ad9a91c
After merge followup
robsunday Jan 14, 2026
5baaa91
Defaults moved to the interface
robsunday Jan 14, 2026
e8382ad
Merge branch 'main' into fbc-vendor-node-support
robsunday Jan 14, 2026
a930e46
Declarative config schema updated tp 1.0-rc.3
robsunday Jan 14, 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
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void shouldSetPropagatorProperties(@TempDir Path tempDir) throws IOException {
AppdBeforeAgentListener agentListener = new AppdBeforeAgentListener();
var yaml =
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
resource:
attributes:
- name: service.name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class AppdBonusConfigurationCustomizerProviderTest {
void shouldAddAppdPropagatorWithDefaultPropagatorsAndSpanProcessorWhenFeatureIsEnabled() {
var yaml =
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
cisco:
Expand All @@ -53,7 +53,7 @@ void shouldAddAppdPropagatorWithDefaultPropagatorsAndSpanProcessorWhenFeatureIsE
void shouldAddAppdPropagatorToExistingListAndSpanProcessorWhenFeatureIsEnabled() {
var yaml =
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
propagator:
composite_list: "b3"
instrumentation/development:
Expand All @@ -79,7 +79,7 @@ void shouldAddAppdPropagatorToExistingListAndSpanProcessorWhenFeatureIsEnabled()
void shouldNotAddPropagatorAndSpanProcessorWhenFeatureIsDisabled() {
var yaml =
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
cisco:
Expand All @@ -99,7 +99,7 @@ void shouldNotAddPropagatorAndSpanProcessorWhenFeatureIsDisabled() {
void shouldNotAddPropagatorAndSpanProcessorWhenFeaturePropertyIsMissing() {
var yaml =
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
""";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class WebengineSpanProcessorCustomizerProviderTest {
void shouldAddWebengineSpanProcessor() {
String yaml =
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
tracer_provider:
processors:
- simple:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void shouldActivateJfrRecording(@TempDir Path tempDir) throws IOException {
// given
String yaml =
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
distribution:
Expand Down Expand Up @@ -74,7 +74,7 @@ void shouldNotActivateJfrRecording_JfrNotAvailable(@TempDir Path tempDir) throws
// given
String yaml =
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
distribution:
Expand Down Expand Up @@ -105,7 +105,7 @@ void shouldNotActivateJfrRecording_profilerDisabled(@TempDir Path tempDir) throw

// given
String yaml =
toYamlString("file_format: \"1.0-rc.2\"", "instrumentation/development:", " java:");
toYamlString("file_format: \"1.0-rc.3\"", "instrumentation/development:", " java:");
AutoConfiguredOpenTelemetrySdk sdk = createAutoConfiguredSdk(yaml, tempDir);

var jfrMock = mock(JFR.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ void shouldCreateHttpExporter() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
distribution:
Expand All @@ -187,7 +187,7 @@ void shouldCreateGrpcExporter() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
distribution:
Expand All @@ -213,7 +213,7 @@ void shouldThrowExceptionForInvalidProtocol() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
distribution:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ void shouldMapYamlToConfiguration() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
distribution:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class SnapshotProfilingConfigurationCustomizerProviderTest {
void shouldDoNothingIfProfilerIsNotEnabled(@TempDir Path tempDir) throws IOException {
// given
String yaml =
toYamlString("file_format: \"1.0-rc.2\"", "instrumentation/development:", " java:");
toYamlString("file_format: \"1.0-rc.3\"", "instrumentation/development:", " java:");

// when
OpenTelemetryConfigurationModel model = getCustomizedModel(yaml);
Expand All @@ -53,7 +53,7 @@ void shouldAddShutdownHookSpanProcessor() {
// given
String yaml =
toYamlString(
"file_format: \"1.0-rc.2\"",
"file_format: \"1.0-rc.3\"",
"instrumentation/development:",
" java:",
" distribution:",
Expand All @@ -78,7 +78,7 @@ void shouldInitialize() {
// given
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"file_format: \"1.0-rc.2\"",
"file_format: \"1.0-rc.3\"",
"instrumentation/development:",
" java:",
" distribution:",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void shouldMapYamlToConfiguration() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
distribution:
Expand Down Expand Up @@ -71,7 +71,7 @@ void shouldEnableSnapshotProfilingWithDefaults() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
distribution:
Expand Down Expand Up @@ -101,7 +101,7 @@ void shouldDisableSnapshotProfiling() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
distribution:
Expand All @@ -125,7 +125,7 @@ void shouldReturnValidSelectionInterval_aboveMax() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
distribution:
Expand All @@ -152,7 +152,7 @@ void shouldReturnValidSelectionInterval_tooLow() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
instrumentation/development:
java:
distribution:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void shouldCreatePropagatorWithDefaultSelectionProbabilityWhenNotProvided() {
// given
var yaml =
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
propagator:
composite:
- splunk_snapshot_volume:
Expand All @@ -55,7 +55,7 @@ void shouldCreatePropagatorWithProvidedValidSelectionProbability() {
// given
var yaml =
"""
file_format: "1.0-rc.2"
file_format: "1.0-rc.3"
propagator:
composite:
- splunk_snapshot_volume:
Expand Down