Skip to content

Commit 51757fc

Browse files
committed
pr review
1 parent a762df5 commit 51757fc

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,10 @@ default List<String> getList(String name) {
119119
*
120120
* @param node the name of the instrumentation (e.g. "log4j"), the vendor name (e.g. "google"), or
121121
* "common" for common Java settings that don't apply to other languages.
122-
* @return the declarative configuration properties for the given node name, or {@code * null} if
122+
* @return the declarative configuration properties for the given node name, or {@code null} if
123123
* declarative configuration is <b>not used at all</b>.
124124
*/
125+
@Nullable
125126
DeclarativeConfigProperties getDeclarativeConfig(String node);
126127

127128
/**

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/ConfigPropertiesBridge.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public DeclarativeConfigProperties getDeclarativeConfig(String node) {
121121
@Nullable
122122
@Override
123123
public ConfigProvider getConfigProvider() {
124-
// create a spring boot bridge for DeclarativeConfigProperties
124+
// create a spring boot bridge for ConfigProvider
125125
return null;
126126
}
127127
}

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,4 @@ private static String[] getSegments(String property) {
197197
// Split the remainder of the property on "."
198198
return property.replace('-', '_').split("\\.");
199199
}
200-
201-
static String yamlPath(String property) {
202-
String[] segments = getSegments(property);
203-
if (segments.length == 0) {
204-
throw new IllegalArgumentException("Invalid property: " + property);
205-
}
206-
207-
return "'instrumentation/development' / 'java' / '" + String.join("' / '", segments) + "'";
208-
}
209200
}

0 commit comments

Comments
 (0)