Skip to content

Commit 413ec6d

Browse files
committed
pr feedback
1 parent fb4f3dc commit 413ec6d

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/InstrumentationConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@ default List<String> getList(String name) {
124124
*
125125
* @param node the name of the instrumentation (e.g. "log4j"), the vendor name (e.g. "google"), or
126126
* "common" for common Java settings that don't apply to other languages.
127-
* @return the declarative configuration properties for the given node name, or {@code null} if
128-
* declarative configuration is <b>not used at all</b>.
127+
* @return the declarative configuration properties for the given node name
129128
* @throws IllegalStateException if {@link #isDeclarative()} returns {@code false}
130129
*/
131130
DeclarativeConfigProperties getDeclarativeConfig(String node);

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridge.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646
* common:
4747
* string_key: value
4848
* </pre>
49-
*
50-
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
51-
* at any time.
5249
*/
5350
final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
5451

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigPropertiesBridge.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,6 @@ public boolean isDeclarative() {
118118

119119
@Override
120120
public DeclarativeConfigProperties getDeclarativeConfig(String node) {
121-
if (!isDeclarative()) {
122-
throw new IllegalStateException("Declarative configuration is not supported");
123-
}
124-
125121
DeclarativeConfigProperties config =
126122
InstrumentationConfigUtil.javaInstrumentationConfig(configProvider, node);
127123
if (config == null) {

0 commit comments

Comments
 (0)