Skip to content

Declarative Config schema updated to 1.1 #2962

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 1 commit into
base: main
Choose a base branch
from
Open

Declarative Config schema updated to 1.1 #2962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion custom/src/test/java/com/splunk/opentelemetry/appd/AppdBeforeAgentListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ...test/java/com/splunk/opentelemetry/appd/AppdBonusConfigurationCustomizerProviderTest.java
View file
Open in desktop
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"
file_format: "1.1"
instrumentation/development:
java:
cisco:
Expand All @@ -53,7 +53,7 @@ void shouldAddAppdPropagatorWithDefaultPropagatorsAndSpanProcessorWhenFeatureIsE
void shouldAddAppdPropagatorToExistingListAndSpanProcessorWhenFeatureIsEnabled() {
var yaml =
"""
file_format: "1.0"
file_format: "1.1"
propagator:
composite_list: "b3"
instrumentation/development:
Expand All @@ -79,7 +79,7 @@ void shouldAddAppdPropagatorToExistingListAndSpanProcessorWhenFeatureIsEnabled()
void shouldNotAddPropagatorAndSpanProcessorWhenFeatureIsDisabled() {
var yaml =
"""
file_format: "1.0"
file_format: "1.1"
instrumentation/development:
java:
cisco:
Expand All @@ -99,7 +99,7 @@ void shouldNotAddPropagatorAndSpanProcessorWhenFeatureIsDisabled() {
void shouldNotAddPropagatorAndSpanProcessorWhenFeaturePropertyIsMissing() {
var yaml =
"""
file_format: "1.0"
file_format: "1.1"
instrumentation/development:
java:
""";
Expand Down
2 changes: 1 addition & 1 deletion custom/src/test/java/com/splunk/opentelemetry/servicename/ServiceNameCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> warnings = new ArrayList<>();

new ServiceNameChecker(warnings::add).beforeAgent(autoConfiguredSdk);
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/splunk/opentelemetry/webengine/WebengineSpanProcessorCustomizerProviderTest.java
View file
Open in desktop
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"
file_format: "1.1"
tracer_provider:
processors:
- simple:
Expand Down
6 changes: 3 additions & 3 deletions .../src/test/java/com/splunk/opentelemetry/instrumentation/nocode/NocodeInitializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void throwExceptionWhenRulesFileAndEmbeddedRulesAreDefined(@TempDir Path tempDir
// given
String yaml =
"""
file_format: "1.0"
file_format: "1.1"
instrumentation/development:
java:
splunk:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...testing/src/test/java/com/splunk/opentelemetry/instrumentation/nocode/YamlParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ void shouldParseFromDeclarativeConfigYaml() {
// given
var yaml =
"""
file_format: "1.0"
file_format: "1.1"
instrumentation/development:
java:
splunk:
Expand Down
4 changes: 2 additions & 2 deletions opamp/src/test/java/com/splunk/opentelemetry/opamp/OpampClientConfigurationFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions ...splunk/opentelemetry/opamp/effectiveconfig/DeclarativeEffectiveConfigFileFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -173,7 +173,7 @@ void usesDefaultHttpEndpointsWhenEndpointsAreOmitted() throws Exception {
OpenTelemetryConfigurationModel model =
parseModel(
"""
file_format: 1.0
file_format: 1.1
tracer_provider:
processors:
- batch:
Expand Down Expand Up @@ -226,7 +226,7 @@ void usesDefaultGrpcEndpointsWhenEndpointsAreOmitted() throws Exception {
OpenTelemetryConfigurationModel model =
parseModel(
"""
file_format: 1.0
file_format: 1.1
tracer_provider:
processors:
- batch:
Expand Down Expand Up @@ -279,7 +279,7 @@ void supportsMultipleEndpointsDefined() throws Exception {
OpenTelemetryConfigurationModel model =
parseModel(
"""
file_format: 1.0
file_format: 1.1
tracer_provider:
processors:
- batch:
Expand Down Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions profiler/src/test/java/com/splunk/opentelemetry/profiler/JfrAgentListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -142,21 +142,21 @@ ProfilingSupervisor makeProfilingSupervisor(AutoConfiguredOpenTelemetrySdk sdk)

private List<Arguments> 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:
Expand Down
10 changes: 5 additions & 5 deletions profiler/src/test/java/com/splunk/opentelemetry/profiler/LogExporterBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ void shouldCreateHttpExporter() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand All @@ -192,7 +192,7 @@ void shouldCreateGrpcExporter() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand All @@ -216,7 +216,7 @@ void shouldCreateHttpExporter_defaultEndpoint() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand All @@ -239,7 +239,7 @@ void shouldCreateGrpcExporter_defaultEndpoint() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand Down Expand Up @@ -292,7 +292,7 @@ void shouldThrowExceptionForInvalidProtocol() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand Down
4 changes: 2 additions & 2 deletions ...t/java/com/splunk/opentelemetry/profiler/ProfilerDeclarativeConfigurationFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void shouldMapYamlToConfiguration() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand Down Expand Up @@ -78,7 +78,7 @@ void shouldDisableProfilerWhenAlwaysOnIsMissing() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand Down
8 changes: 4 additions & 4 deletions ...opentelemetry/profiler/snapshot/SnapshotProfilingConfigurationCustomizerProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void shouldDoNothingIfProfilerIsNotEnabled(@TempDir Path tempDir) throws IOExcep
// given
String yaml =
"""
file_format: "1.0"
file_format: "1.1"
""";

// when
Expand All @@ -68,7 +68,7 @@ void shouldKeepPropagatorsDefinedInCompositeList() {
// given
String yaml =
"""
file_format: "1.0"
file_format: "1.1"
propagator:
composite_list: "propagator1,propagator2"
distribution:
Expand All @@ -90,7 +90,7 @@ void shouldAddSpanProcessors() {
// given
String yaml =
"""
file_format: "1.0"
file_format: "1.1"
tracer_provider:
processors:
- batch:
Expand Down Expand Up @@ -126,7 +126,7 @@ void shouldInitializeActiveSpansTracking() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand Down
10 changes: 5 additions & 5 deletions ...opentelemetry/profiler/snapshot/SnapshotProfilingDeclarativeConfigurationFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void shouldMapYamlToConfiguration() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand Down Expand Up @@ -65,7 +65,7 @@ void shouldEnableSnapshotProfilingWithDefaults() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand Down Expand Up @@ -93,7 +93,7 @@ void shouldDisableSnapshotProfiling() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand All @@ -115,7 +115,7 @@ void shouldReturnValidSelectionInterval_aboveMax() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand All @@ -140,7 +140,7 @@ void shouldReturnValidSelectionInterval_tooLow() {
OpenTelemetryConfigurationModel model =
DeclarativeConfigTestUtil.parse(
"""
file_format: "1.0"
file_format: "1.1"
distribution:
splunk:
profiling:
Expand Down
2 changes: 1 addition & 1 deletion smoke-tests/src/test/resources/declarative_config_file.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
file_format: "1.0"
file_format: "1.1"

resource:
attributes:
Expand Down
Loading