Skip to content

Commit 8a5fb10

Browse files
zeitlingerzeitlinger
committed
fix rebase
1 parent 6f45f71 commit 8a5fb10

File tree

10 files changed

+45
-43
lines changed

10 files changed

+45
-43
lines changed

‎docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.19.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.18.1.jar
2-
No changes.
2+
=== UNCHANGED CLASS: PUBLIC io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
--- REMOVED ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties
5+
--- REMOVED ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelSpringProperties (-)

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
import io.opentelemetry.api.OpenTelemetry;
1010
import io.opentelemetry.api.incubator.config.ConfigProvider;
1111
import io.opentelemetry.api.trace.TracerProvider;
12+
import io.opentelemetry.common.ComponentLoader;
1213
import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
1314
import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
14-
import io.opentelemetry.instrumentation.sdk.DeclarativeConfigPropertiesBridge;
15+
import io.opentelemetry.instrumentation.sdk.internal.DeclarativeConfigPropertiesBridgeBuilder;
1516
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.DeclarativeConfigDisabled;
1617
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.DeclarativeConfigEnabled;
1718
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.OtelDisabled;
@@ -27,7 +28,6 @@
2728
import io.opentelemetry.sdk.OpenTelemetrySdk;
2829
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
2930
import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
30-
import io.opentelemetry.sdk.autoconfigure.internal.ComponentLoader;
3131
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
3232
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
3333
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
@@ -107,17 +107,12 @@ public AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk(
107107
OtelSpringProperties otelSpringProperties,
108108
ApplicationContext applicationContext) {
109109

110-
return AutoConfigureUtil.setComponentLoader(
111-
AutoConfigureUtil.setConfigPropertiesCustomizer(
112-
AutoConfiguredOpenTelemetrySdk.builder(),
113-
c ->
114-
SpringConfigProperties.create(
115-
env,
116-
otlpExporterProperties,
117-
resourceProperties,
118-
otelSpringProperties,
119-
c)),
120-
new OpenTelemetrySdkComponentLoader(applicationContext))
110+
return AutoConfigureUtil.setConfigPropertiesCustomizer(
111+
AutoConfiguredOpenTelemetrySdk.builder()
112+
.setComponentLoader(new OpenTelemetrySdkComponentLoader(applicationContext)),
113+
c ->
114+
SpringConfigProperties.create(
115+
env, otlpExporterProperties, resourceProperties, otelSpringProperties, c))
121116
.build();
122117
}
123118

@@ -191,9 +186,9 @@ public ConfigProvider configProvider(OpenTelemetryConfigurationModel model) {
191186
* integrate with spring boot properties.
192187
*/
193188
@Bean
194-
public ConfigProperties otelProperties(
195-
OpenTelemetryConfigurationModel model, ConfigProvider configProvider) {
196-
return new DeclarativeConfigPropertiesBridge(configProvider, model.getLogLevel());
189+
public ConfigProperties otelProperties(ConfigProvider configProvider) {
190+
return new DeclarativeConfigPropertiesBridgeBuilder()
191+
.buildFromInstrumentationConfig(configProvider.getInstrumentationConfig());
197192
}
198193
}
199194
}
@@ -248,8 +243,9 @@ OtelMapConverter otelMapConverter() {
248243
@ConditionalOnMissingBean({ConfigProperties.class})
249244
static class FallbackConfigProperties {
250245
@Bean
251-
public ConfigProperties otelProperties() {
252-
return DefaultConfigProperties.create(Collections.emptyMap());
246+
public ConfigProperties otelProperties(ApplicationContext applicationContext) {
247+
return DefaultConfigProperties.create(
248+
Collections.emptyMap(), new OpenTelemetrySdkComponentLoader(applicationContext));
253249
}
254250
}
255251

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/jdbc/DataSourcePostProcessor.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
1111
import io.opentelemetry.instrumentation.jdbc.datasource.JdbcTelemetry;
1212
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.InstrumentationConfigUtil;
13-
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1413
import java.io.PrintWriter;
1514
import java.sql.Connection;
1615
import java.sql.SQLException;
@@ -60,17 +59,16 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
6059
DataSource dataSource = (DataSource) bean;
6160
InstrumentationConfig config = configProvider.getObject();
6261
DataSource otelDataSource =
63-
JdbcTelemetry.builder(openTelemetryProvider.getObject())
62+
JdbcTelemetry.builder(openTelemetryProvider.getObject())
6463
.setStatementSanitizationEnabled(
6564
InstrumentationConfigUtil.isStatementSanitizationEnabled(
66-
config, "otel.instrumentation.jdbc.statement-sanitizer.enabled"))
65+
config, "otel.instrumentation.jdbc.statement-sanitizer.enabled"))
6766
.setCaptureQueryParameters(
68-
config.getBoolean(
69-
"otel.instrumentation.jdbc.experimental.capture-query-parameters", false))
70-
.setTransactionInstrumenterEnabled(
7167
config.getBoolean(
72-
73-
"otel.instrumentation.jdbc.experimental.transaction.enabled", false))
68+
"otel.instrumentation.jdbc.experimental.capture-query-parameters", false))
69+
.setTransactionInstrumenterEnabled(
70+
config.getBoolean(
71+
"otel.instrumentation.jdbc.experimental.transaction.enabled", false))
7472
.build()
7573
.wrap(dataSource);
7674

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
package io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties;
77

8+
import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
9+
810
import io.opentelemetry.api.incubator.config.ConfigProvider;
911
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
1012
import io.opentelemetry.api.incubator.config.InstrumentationConfigUtil;
@@ -121,20 +123,25 @@ public Map<String, String> getMap(String name, Map<String, String> defaultValue)
121123

122124
@Override
123125
public boolean isDeclarative() {
124-
return false;
126+
return configProvider != null;
125127
}
126128

127129
@Override
128130
public DeclarativeConfigProperties getDeclarativeConfig(String node) {
129-
throw new IllegalStateException(
130-
"Declarative configuration is not supported in spring boot autoconfigure yet");
131+
DeclarativeConfigProperties config =
132+
InstrumentationConfigUtil.javaInstrumentationConfig(configProvider, node);
133+
if (config == null) {
134+
// there is no declarative config for this node
135+
// this needs to be a different value than null to avoid confusion with
136+
// the case when declarative config is not supported at all
137+
return empty();
138+
}
139+
return config;
131140
}
132141

133142
@Nullable
134143
@Override
135-
public DeclarativeConfigProperties getDeclarativeConfig(String instrumentationName) {
136-
return configProvider != null
137-
? InstrumentationConfigUtil.javaInstrumentationConfig(configProvider, instrumentationName)
138-
: null;
144+
public ConfigProvider getConfigProvider() {
145+
return configProvider;
139146
}
140147
}

‎javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java‎

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

88
import io.opentelemetry.api.incubator.config.ConfigProvider;
9+
import io.opentelemetry.instrumentation.sdk.internal.DeclarativeConfigPropertiesBridgeBuilder;
910
import io.opentelemetry.javaagent.bootstrap.OpenTelemetrySdkAccess;
10-
import io.opentelemetry.javaagent.extension.internal.DeclarativeConfigPropertiesBridgeBuilder;
1111
import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig;
1212
import io.opentelemetry.sdk.OpenTelemetrySdk;
1313
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;

‎sdk-bridge/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ plugins {
66
group = "io.opentelemetry.instrumentation"
77

88
dependencies {
9+
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
910
implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
1011
implementation("io.opentelemetry:opentelemetry-api-incubator")
1112

1213
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
14+
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
1315

1416
compileOnly("com.google.code.findbugs:annotations")
1517
testCompileOnly("com.google.code.findbugs:annotations")

‎javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridge.java‎ renamed to ‎sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/internal/DeclarativeConfigPropertiesBridge.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.extension.internal;
6+
package io.opentelemetry.instrumentation.sdk.internal;
77

88
import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
99

‎javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridgeBuilder.java‎ renamed to ‎sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/internal/DeclarativeConfigPropertiesBridgeBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.extension.internal;
6+
package io.opentelemetry.instrumentation.sdk.internal;
77

88
import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
99

‎javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridgeBuilderTest.java‎ renamed to ‎sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/internal/DeclarativeConfigPropertiesBridgeBuilderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.extension.internal;
6+
package io.opentelemetry.instrumentation.sdk.internal;
77

88
import static org.assertj.core.api.Assertions.assertThat;
99
import static org.mockito.ArgumentMatchers.any;

‎javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridgeTest.java‎ renamed to ‎sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/internal/DeclarativeConfigPropertiesBridgeTest.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
<<<<<<<< HEAD:javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridgeTest.java
7-
package io.opentelemetry.javaagent.extension.internal;
8-
========
9-
package io.opentelemetry.instrumentation.sdk;
10-
>>>>>>>> 2451dc4f6d (move properties bridge to separate project):sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridgeTest.java
6+
package io.opentelemetry.instrumentation.sdk.internal;
117

128
import static org.assertj.core.api.Assertions.assertThat;
139

0 commit comments

Comments
 (0)