Skip to content

Commit 0a6765c

Browse files
committed
null check
1 parent 7dcf66e commit 0a6765c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties;
77

88
import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
9+
import static java.util.Objects.requireNonNull;
910

1011
import io.opentelemetry.api.incubator.config.ConfigProvider;
1112
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
@@ -129,7 +130,7 @@ public boolean isDeclarative() {
129130
@Override
130131
public DeclarativeConfigProperties getDeclarativeConfig(String node) {
131132
DeclarativeConfigProperties config =
132-
InstrumentationConfigUtil.javaInstrumentationConfig(configProvider, node);
133+
InstrumentationConfigUtil.javaInstrumentationConfig(requireNonNull(configProvider), node);
133134
if (config == null) {
134135
// there is no declarative config for this node
135136
return empty();

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.javaagent.tooling.config;
77

88
import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
9+
import static java.util.Objects.requireNonNull;
910

1011
import io.opentelemetry.api.incubator.config.ConfigProvider;
1112
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
@@ -119,7 +120,7 @@ public boolean isDeclarative() {
119120
@Override
120121
public DeclarativeConfigProperties getDeclarativeConfig(String node) {
121122
DeclarativeConfigProperties config =
122-
InstrumentationConfigUtil.javaInstrumentationConfig(configProvider, node);
123+
InstrumentationConfigUtil.javaInstrumentationConfig(requireNonNull(configProvider), node);
123124
if (config == null) {
124125
// there is no declarative config for this node
125126
return empty();

0 commit comments

Comments
 (0)