Skip to content

Commit 80da2ab

Browse files
authored
show the wrong file format (#7498)
1 parent 29a7fe8 commit 80da2ab

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public OpenTelemetrySdk create(
3434
String fileFormat = model.getFileFormat();
3535
if (fileFormat == null || !SUPPORTED_FILE_FORMATS.matcher(fileFormat).matches()) {
3636
throw new DeclarativeConfigException(
37-
"Unsupported file format. Supported formats include 0.4, 1.0*");
37+
"Unsupported file format '" + fileFormat + "'. Supported formats include 0.4, 1.0*");
3838
}
3939
// TODO(jack-berg): log warning if version is not exact match, which may result in unexpected
4040
// behavior for experimental properties.

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ void create_FileFormat(String fileFormat, boolean isValid) {
9292
assertThatThrownBy(
9393
() -> OpenTelemetryConfigurationFactory.getInstance().create(model, context))
9494
.isInstanceOf(DeclarativeConfigException.class)
95-
.hasMessage("Unsupported file format. Supported formats include 0.4, 1.0*");
95+
.hasMessageMatching(
96+
"Unsupported file format '.+'\\. Supported formats include 0\\.4, 1\\.0\\*");
9697
}
9798
}
9899

0 commit comments

Comments
 (0)