diff --git a/custom/src/test/java/com/splunk/opentelemetry/appd/AppdBeforeAgentListenerTest.java b/custom/src/test/java/com/splunk/opentelemetry/appd/AppdBeforeAgentListenerTest.java index 4a9e848b9..6c0c863bc 100644 --- a/custom/src/test/java/com/splunk/opentelemetry/appd/AppdBeforeAgentListenerTest.java +++ b/custom/src/test/java/com/splunk/opentelemetry/appd/AppdBeforeAgentListenerTest.java @@ -51,7 +51,7 @@ void shouldSetPropagatorProperties_declarativeConfig(@TempDir Path tempDir) thro AppdBeforeAgentListener agentListener = new AppdBeforeAgentListener(); var yaml = """ - file_format: "1.0" + file_format: "1.1" resource: attributes: - name: service.name diff --git a/custom/src/test/java/com/splunk/opentelemetry/appd/AppdBonusConfigurationCustomizerProviderTest.java b/custom/src/test/java/com/splunk/opentelemetry/appd/AppdBonusConfigurationCustomizerProviderTest.java index 43969f685..1d19ff73b 100644 --- a/custom/src/test/java/com/splunk/opentelemetry/appd/AppdBonusConfigurationCustomizerProviderTest.java +++ b/custom/src/test/java/com/splunk/opentelemetry/appd/AppdBonusConfigurationCustomizerProviderTest.java @@ -28,7 +28,7 @@ class AppdBonusConfigurationCustomizerProviderTest { void shouldAddAppdPropagatorWithDefaultPropagatorsAndSpanProcessorWhenFeatureIsEnabled() { var yaml = """ - file_format: "1.0" + file_format: "1.1" instrumentation/development: java: cisco: @@ -53,7 +53,7 @@ void shouldAddAppdPropagatorWithDefaultPropagatorsAndSpanProcessorWhenFeatureIsE void shouldAddAppdPropagatorToExistingListAndSpanProcessorWhenFeatureIsEnabled() { var yaml = """ - file_format: "1.0" + file_format: "1.1" propagator: composite_list: "b3" instrumentation/development: @@ -79,7 +79,7 @@ void shouldAddAppdPropagatorToExistingListAndSpanProcessorWhenFeatureIsEnabled() void shouldNotAddPropagatorAndSpanProcessorWhenFeatureIsDisabled() { var yaml = """ - file_format: "1.0" + file_format: "1.1" instrumentation/development: java: cisco: @@ -99,7 +99,7 @@ void shouldNotAddPropagatorAndSpanProcessorWhenFeatureIsDisabled() { void shouldNotAddPropagatorAndSpanProcessorWhenFeaturePropertyIsMissing() { var yaml = """ - file_format: "1.0" + file_format: "1.1" instrumentation/development: java: """; diff --git a/custom/src/test/java/com/splunk/opentelemetry/servicename/ServiceNameCheckerTest.java b/custom/src/test/java/com/splunk/opentelemetry/servicename/ServiceNameCheckerTest.java index e65a0b43d..e1ae10429 100644 --- a/custom/src/test/java/com/splunk/opentelemetry/servicename/ServiceNameCheckerTest.java +++ b/custom/src/test/java/com/splunk/opentelemetry/servicename/ServiceNameCheckerTest.java @@ -60,7 +60,7 @@ void shouldLogWarnWhenEnvVarConfigDoesNotDefineServiceName() { void shouldLogWarnWhenDeclarativeConfigDoesNotDefineServiceName(@TempDir Path tempDir) throws IOException { AutoConfiguredOpenTelemetrySdk autoConfiguredSdk = - createAutoConfiguredSdk("file_format: \"1.0\"", tempDir, autoCleanup); + createAutoConfiguredSdk("file_format: \"1.1\"", tempDir, autoCleanup); List warnings = new ArrayList<>(); new ServiceNameChecker(warnings::add).beforeAgent(autoConfiguredSdk); diff --git a/custom/src/test/java/com/splunk/opentelemetry/webengine/WebengineSpanProcessorCustomizerProviderTest.java b/custom/src/test/java/com/splunk/opentelemetry/webengine/WebengineSpanProcessorCustomizerProviderTest.java index 1257d5eec..e25f89b99 100644 --- a/custom/src/test/java/com/splunk/opentelemetry/webengine/WebengineSpanProcessorCustomizerProviderTest.java +++ b/custom/src/test/java/com/splunk/opentelemetry/webengine/WebengineSpanProcessorCustomizerProviderTest.java @@ -28,7 +28,7 @@ class WebengineSpanProcessorCustomizerProviderTest { void shouldAddWebengineSpanProcessor() { String yaml = """ - file_format: "1.0" + file_format: "1.1" tracer_provider: processors: - simple: diff --git a/instrumentation/nocode-testing/src/test/java/com/splunk/opentelemetry/instrumentation/nocode/NocodeInitializerTest.java b/instrumentation/nocode-testing/src/test/java/com/splunk/opentelemetry/instrumentation/nocode/NocodeInitializerTest.java index c460c4d49..a9c2488f1 100644 --- a/instrumentation/nocode-testing/src/test/java/com/splunk/opentelemetry/instrumentation/nocode/NocodeInitializerTest.java +++ b/instrumentation/nocode-testing/src/test/java/com/splunk/opentelemetry/instrumentation/nocode/NocodeInitializerTest.java @@ -128,7 +128,7 @@ void throwExceptionWhenRulesFileAndEmbeddedRulesAreDefined(@TempDir Path tempDir // given String yaml = """ - file_format: "1.0" + file_format: "1.1" instrumentation/development: java: splunk: @@ -153,7 +153,7 @@ void processRulesFromRulesFile(@TempDir Path tempDir) throws IOException { String yaml = """ - file_format: "1.0" + file_format: "1.1" instrumentation/development: java: splunk: @@ -176,7 +176,7 @@ void processRulesFromDeclarativeConfiguration(@TempDir Path tempDir) throws IOEx // given String yaml = """ - file_format: "1.0" + file_format: "1.1" instrumentation/development: java: splunk: diff --git a/instrumentation/nocode-testing/src/test/java/com/splunk/opentelemetry/instrumentation/nocode/YamlParserTest.java b/instrumentation/nocode-testing/src/test/java/com/splunk/opentelemetry/instrumentation/nocode/YamlParserTest.java index fdc17b448..0a5878bef 100644 --- a/instrumentation/nocode-testing/src/test/java/com/splunk/opentelemetry/instrumentation/nocode/YamlParserTest.java +++ b/instrumentation/nocode-testing/src/test/java/com/splunk/opentelemetry/instrumentation/nocode/YamlParserTest.java @@ -143,7 +143,7 @@ void shouldParseFromDeclarativeConfigYaml() { // given var yaml = """ - file_format: "1.0" + file_format: "1.1" instrumentation/development: java: splunk: diff --git a/opamp/src/test/java/com/splunk/opentelemetry/opamp/OpampClientConfigurationFactoryTest.java b/opamp/src/test/java/com/splunk/opentelemetry/opamp/OpampClientConfigurationFactoryTest.java index e588a6a74..25077b78e 100644 --- a/opamp/src/test/java/com/splunk/opentelemetry/opamp/OpampClientConfigurationFactoryTest.java +++ b/opamp/src/test/java/com/splunk/opentelemetry/opamp/OpampClientConfigurationFactoryTest.java @@ -65,7 +65,7 @@ void shouldCreateConfigurationFromDeclarativeConfig(@TempDir Path tempDir) throw // given String yaml = """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: opamp/development: @@ -91,7 +91,7 @@ void shouldEnableRemoteControlFromDeclarativeConfig(@TempDir Path tempDir) throw // given String yaml = """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: opamp/development: diff --git a/opamp/src/test/java/com/splunk/opentelemetry/opamp/effectiveconfig/DeclarativeEffectiveConfigFileFactoryTest.java b/opamp/src/test/java/com/splunk/opentelemetry/opamp/effectiveconfig/DeclarativeEffectiveConfigFileFactoryTest.java index 43ed0936e..6b6ab1608 100644 --- a/opamp/src/test/java/com/splunk/opentelemetry/opamp/effectiveconfig/DeclarativeEffectiveConfigFileFactoryTest.java +++ b/opamp/src/test/java/com/splunk/opentelemetry/opamp/effectiveconfig/DeclarativeEffectiveConfigFileFactoryTest.java @@ -65,7 +65,7 @@ void afterEach() { void buildFileContent_handleRealConfigPaths(@TempDir Path tempDir) throws Exception { // given Path configFile = tempDir.resolve("declarative-config.yaml"); - Files.writeString(configFile, "file_format: 1.0", UTF_8); + Files.writeString(configFile, "file_format: 1.1", UTF_8); ProcessBuilder processBuilder = new ProcessBuilder( @@ -99,7 +99,7 @@ void handlesDistributionConfig(@TempDir Path tempDir) throws Exception { // given String configurationYaml = """ - file_format: 1.0 + file_format: 1.1 distribution: splunk: profiling: @@ -136,7 +136,7 @@ void handlesDistributionConfig(@TempDir Path tempDir) throws Exception { @Test void handlesBlankConfig() throws Exception { - OpenTelemetryConfigurationModel model = parseModel("file_format: 1.0"); + OpenTelemetryConfigurationModel model = parseModel("file_format: 1.1"); String yaml = new DeclarativeEffectiveConfigFileFactory() @@ -173,7 +173,7 @@ void usesDefaultHttpEndpointsWhenEndpointsAreOmitted() throws Exception { OpenTelemetryConfigurationModel model = parseModel( """ - file_format: 1.0 + file_format: 1.1 tracer_provider: processors: - batch: @@ -226,7 +226,7 @@ void usesDefaultGrpcEndpointsWhenEndpointsAreOmitted() throws Exception { OpenTelemetryConfigurationModel model = parseModel( """ - file_format: 1.0 + file_format: 1.1 tracer_provider: processors: - batch: @@ -279,7 +279,7 @@ void supportsMultipleEndpointsDefined() throws Exception { OpenTelemetryConfigurationModel model = parseModel( """ - file_format: 1.0 + file_format: 1.1 tracer_provider: processors: - batch: @@ -361,7 +361,7 @@ void supportsMultipleEndpointsDefined() throws Exception { @Test void supportsAlwaysOnProfiler() throws Exception { - OpenTelemetryConfigurationModel model = parseModel("file_format: 1.0"); + OpenTelemetryConfigurationModel model = parseModel("file_format: 1.1"); when(mockProfilerConfiguration.isEnabled()).thenReturn(true); when(mockProfilerConfiguration.getCallStackInterval()).thenReturn(Duration.ofMillis(1410)); when(mockProfilerConfiguration.getMemoryEnabled()).thenReturn(true); diff --git a/profiler/src/test/java/com/splunk/opentelemetry/profiler/JfrAgentListenerTest.java b/profiler/src/test/java/com/splunk/opentelemetry/profiler/JfrAgentListenerTest.java index 2db8bc81a..b2510be3c 100644 --- a/profiler/src/test/java/com/splunk/opentelemetry/profiler/JfrAgentListenerTest.java +++ b/profiler/src/test/java/com/splunk/opentelemetry/profiler/JfrAgentListenerTest.java @@ -52,7 +52,7 @@ void shouldActivateJfrRecording(@TempDir Path tempDir) throws IOException { // given String yaml = """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: @@ -86,7 +86,7 @@ void shouldNotActivateJfrRecording_JfrNotAvailable(@TempDir Path tempDir) throws // given String yaml = """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: @@ -142,21 +142,21 @@ ProfilingSupervisor makeProfilingSupervisor(AutoConfiguredOpenTelemetrySdk sdk) private List generateNoProfilerYamlStrings() { return List.of( - Arguments.of("file_format: \"1.0\""), + Arguments.of("file_format: \"1.1\""), Arguments.of( """ - file_format: "1.0" + file_format: "1.1" distribution: """), Arguments.of( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: """), Arguments.of( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: something: diff --git a/profiler/src/test/java/com/splunk/opentelemetry/profiler/LogExporterBuilderTest.java b/profiler/src/test/java/com/splunk/opentelemetry/profiler/LogExporterBuilderTest.java index 528162070..e02414d65 100644 --- a/profiler/src/test/java/com/splunk/opentelemetry/profiler/LogExporterBuilderTest.java +++ b/profiler/src/test/java/com/splunk/opentelemetry/profiler/LogExporterBuilderTest.java @@ -168,7 +168,7 @@ void shouldCreateHttpExporter() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: @@ -192,7 +192,7 @@ void shouldCreateGrpcExporter() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: @@ -216,7 +216,7 @@ void shouldCreateHttpExporter_defaultEndpoint() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: @@ -239,7 +239,7 @@ void shouldCreateGrpcExporter_defaultEndpoint() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: @@ -292,7 +292,7 @@ void shouldThrowExceptionForInvalidProtocol() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: diff --git a/profiler/src/test/java/com/splunk/opentelemetry/profiler/ProfilerDeclarativeConfigurationFactoryTest.java b/profiler/src/test/java/com/splunk/opentelemetry/profiler/ProfilerDeclarativeConfigurationFactoryTest.java index a80b4a767..b27e95971 100644 --- a/profiler/src/test/java/com/splunk/opentelemetry/profiler/ProfilerDeclarativeConfigurationFactoryTest.java +++ b/profiler/src/test/java/com/splunk/opentelemetry/profiler/ProfilerDeclarativeConfigurationFactoryTest.java @@ -32,7 +32,7 @@ void shouldMapYamlToConfiguration() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: @@ -78,7 +78,7 @@ void shouldDisableProfilerWhenAlwaysOnIsMissing() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: diff --git a/profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotProfilingConfigurationCustomizerProviderTest.java b/profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotProfilingConfigurationCustomizerProviderTest.java index ecb07ab81..fa6050154 100644 --- a/profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotProfilingConfigurationCustomizerProviderTest.java +++ b/profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotProfilingConfigurationCustomizerProviderTest.java @@ -51,7 +51,7 @@ void shouldDoNothingIfProfilerIsNotEnabled(@TempDir Path tempDir) throws IOExcep // given String yaml = """ - file_format: "1.0" + file_format: "1.1" """; // when @@ -68,7 +68,7 @@ void shouldKeepPropagatorsDefinedInCompositeList() { // given String yaml = """ - file_format: "1.0" + file_format: "1.1" propagator: composite_list: "propagator1,propagator2" distribution: @@ -90,7 +90,7 @@ void shouldAddSpanProcessors() { // given String yaml = """ - file_format: "1.0" + file_format: "1.1" tracer_provider: processors: - batch: @@ -126,7 +126,7 @@ void shouldInitializeActiveSpansTracking() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: diff --git a/profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotProfilingDeclarativeConfigurationFactoryTest.java b/profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotProfilingDeclarativeConfigurationFactoryTest.java index afcf10f9b..46317711c 100644 --- a/profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotProfilingDeclarativeConfigurationFactoryTest.java +++ b/profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotProfilingDeclarativeConfigurationFactoryTest.java @@ -32,7 +32,7 @@ void shouldMapYamlToConfiguration() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: @@ -65,7 +65,7 @@ void shouldEnableSnapshotProfilingWithDefaults() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: @@ -93,7 +93,7 @@ void shouldDisableSnapshotProfiling() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: @@ -115,7 +115,7 @@ void shouldReturnValidSelectionInterval_aboveMax() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: @@ -140,7 +140,7 @@ void shouldReturnValidSelectionInterval_tooLow() { OpenTelemetryConfigurationModel model = DeclarativeConfigTestUtil.parse( """ - file_format: "1.0" + file_format: "1.1" distribution: splunk: profiling: diff --git a/smoke-tests/src/test/resources/declarative_config_file.yaml b/smoke-tests/src/test/resources/declarative_config_file.yaml index 31d1bfa05..0a35719e4 100644 --- a/smoke-tests/src/test/resources/declarative_config_file.yaml +++ b/smoke-tests/src/test/resources/declarative_config_file.yaml @@ -1,4 +1,4 @@ -file_format: "1.0" +file_format: "1.1" resource: attributes: