Skip to content

Commit f0d84c7

Browse files
hilmarfhilmarf
committed
Merge remote-tracking branch 'otel/main' into AuditLog
Signed-off-by: Hilmar Falkenberg <[email protected]>
2 parents 11384e1 + 2a92794 commit f0d84c7

File tree

16 files changed

+307
-61
lines changed

16 files changed

+307
-61
lines changed

‎buildSrc/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ repositories {
5050
}
5151

5252
dependencies {
53-
implementation(enforcedPlatform("com.squareup.wire:wire-bom:5.3.11"))
53+
implementation(enforcedPlatform("com.squareup.wire:wire-bom:5.4.0"))
5454
implementation("com.google.auto.value:auto-value-annotations:1.11.0")
5555
// When updating, update above in plugins too
5656
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")

‎dependencyManagement/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ val mockitoVersion = "4.11.0"
1616
val slf4jVersion = "2.0.17"
1717
val opencensusVersion = "0.31.1"
1818
val prometheusServerVersion = "1.3.10"
19-
val armeriaVersion = "1.33.1"
19+
val armeriaVersion = "1.33.2"
2020
val junitVersion = "5.13.4"
2121
val okhttpVersion = "5.1.0"
2222

@@ -26,13 +26,13 @@ val DEPENDENCY_BOMS = listOf(
2626
// (which is EPL licensed) or armeria bom (which is Apache licensed but is getting flagged
2727
// by FOSSA for containing EPL-licensed)
2828

29-
"com.fasterxml.jackson:jackson-bom:2.19.2",
29+
"com.fasterxml.jackson:jackson-bom:2.20.0",
3030
"com.google.guava:guava-bom:33.4.8-jre",
3131
"com.google.protobuf:protobuf-bom:4.32.0",
3232
"com.squareup.okhttp3:okhttp-bom:$okhttpVersion",
3333
"com.squareup.okio:okio-bom:3.16.0", // applies to transitive dependencies of okhttp
3434
"io.grpc:grpc-bom:1.75.0",
35-
"io.netty:netty-bom:4.2.4.Final",
35+
"io.netty:netty-bom:4.2.5.Final",
3636
"io.zipkin.brave:brave-bom:6.3.0",
3737
"io.zipkin.reporter2:zipkin-reporter-bom:3.5.1",
3838
"org.assertj:assertj-bom:3.27.4",
@@ -81,7 +81,7 @@ val DEPENDENCIES = listOf(
8181
"io.github.netmikey.logunit:logunit-jul:2.0.0",
8282
"io.jaegertracing:jaeger-client:1.8.1",
8383
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.49.0-alpha",
84-
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.36.0-alpha",
84+
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.37.0-alpha",
8585
"io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha",
8686
"io.opentracing:opentracing-api:0.33.0",
8787
"io.opentracing:opentracing-noop:0.33.0",

‎sdk-extensions/autoconfigure/build.gradle.kts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@ testing {
8686
implementation(project(":sdk:testing"))
8787
}
8888
}
89+
90+
register<JvmTestSuite>("testDeclarativeConfigSpi") {
91+
dependencies {
92+
implementation(project(":sdk-extensions:incubator"))
93+
implementation(project(":exporters:logging"))
94+
implementation(project(":sdk:testing"))
95+
}
96+
}
8997
}
9098
}
9199

‎sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,21 @@ public AutoConfiguredOpenTelemetrySdk build() {
445445
}
446446

447447
private AutoConfiguredOpenTelemetrySdk buildImpl() {
448+
AutoConfiguredOpenTelemetrySdk fromFileConfiguration =
449+
maybeConfigureFromFile(
450+
this.config != null
451+
? this.config
452+
: DefaultConfigProperties.create(Collections.emptyMap(), componentLoader),
453+
componentLoader);
454+
if (fromFileConfiguration != null) {
455+
maybeRegisterShutdownHook(fromFileConfiguration.getOpenTelemetrySdk());
456+
Object configProvider = fromFileConfiguration.getConfigProvider();
457+
if (setResultAsGlobal && INCUBATOR_AVAILABLE && configProvider != null) {
458+
IncubatingUtil.setGlobalConfigProvider(configProvider);
459+
}
460+
return fromFileConfiguration;
461+
}
462+
448463
SpiHelper spiHelper = SpiHelper.create(componentLoader);
449464
if (!customized) {
450465
customized = true;
@@ -454,20 +469,8 @@ private AutoConfiguredOpenTelemetrySdk buildImpl() {
454469
customizer.customize(this);
455470
}
456471
}
457-
458472
ConfigProperties config = getConfig();
459473

460-
AutoConfiguredOpenTelemetrySdk fromFileConfiguration =
461-
maybeConfigureFromFile(config, componentLoader);
462-
if (fromFileConfiguration != null) {
463-
maybeRegisterShutdownHook(fromFileConfiguration.getOpenTelemetrySdk());
464-
Object configProvider = fromFileConfiguration.getConfigProvider();
465-
if (setResultAsGlobal && INCUBATOR_AVAILABLE && configProvider != null) {
466-
IncubatingUtil.setGlobalConfigProvider(configProvider);
467-
}
468-
return fromFileConfiguration;
469-
}
470-
471474
Resource resource =
472475
ResourceConfiguration.configureResource(config, spiHelper, resourceCustomizer);
473476

@@ -571,6 +574,14 @@ void configureSdk(
571574
@Nullable
572575
private static AutoConfiguredOpenTelemetrySdk maybeConfigureFromFile(
573576
ConfigProperties config, ComponentLoader componentLoader) {
577+
if (INCUBATOR_AVAILABLE) {
578+
AutoConfiguredOpenTelemetrySdk sdk = IncubatingUtil.configureFromSpi(componentLoader);
579+
if (sdk != null) {
580+
logger.fine("Autoconfigured from SPI by opentelemetry-sdk-extension-incubator");
581+
return sdk;
582+
}
583+
}
584+
574585
String otelConfigFile = config.getString("otel.config.file");
575586
if (otelConfigFile != null && !otelConfigFile.isEmpty()) {
576587
logger.warning(

‎sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/IncubatingUtil.java‎

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

66
package io.opentelemetry.sdk.autoconfigure;
77

8+
import static java.util.Objects.requireNonNull;
9+
810
import io.opentelemetry.api.incubator.config.ConfigProvider;
911
import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
1012
import io.opentelemetry.api.incubator.config.GlobalConfigProvider;
@@ -18,8 +20,8 @@
1820
import java.io.InputStream;
1921
import java.lang.reflect.InvocationTargetException;
2022
import java.lang.reflect.Method;
21-
import java.util.Objects;
2223
import java.util.logging.Logger;
24+
import javax.annotation.Nullable;
2325

2426
/**
2527
* Utilities for interacting with incubating components ({@code
@@ -32,54 +34,111 @@ final class IncubatingUtil {
3234

3335
private IncubatingUtil() {}
3436

37+
// Visible for testing
38+
interface Factory {
39+
@Nullable
40+
AutoConfiguredOpenTelemetrySdk create()
41+
throws ClassNotFoundException,
42+
NoSuchMethodException,
43+
IllegalAccessException,
44+
InvocationTargetException;
45+
}
46+
3547
static AutoConfiguredOpenTelemetrySdk configureFromFile(
3648
Logger logger, String configurationFile, ComponentLoader componentLoader) {
3749
logger.fine("Autoconfiguring from configuration file: " + configurationFile);
3850
try (FileInputStream fis = new FileInputStream(configurationFile)) {
39-
Class<?> declarativeConfiguration =
40-
Class.forName(
41-
"io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration");
42-
Method parse = declarativeConfiguration.getMethod("parse", InputStream.class);
43-
Object model = parse.invoke(null, fis);
44-
Class<?> openTelemetryConfiguration =
45-
Class.forName(
46-
"io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel");
47-
Method create =
48-
declarativeConfiguration.getMethod(
49-
"create", openTelemetryConfiguration, ComponentLoader.class);
50-
OpenTelemetrySdk sdk = (OpenTelemetrySdk) create.invoke(null, model, componentLoader);
51-
Class<?> sdkConfigProvider =
52-
Class.forName("io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider");
53-
Method createFileConfigProvider =
54-
sdkConfigProvider.getMethod("create", openTelemetryConfiguration, ComponentLoader.class);
55-
ConfigProvider configProvider =
56-
(ConfigProvider) createFileConfigProvider.invoke(null, model, componentLoader);
57-
// Note: can't access file configuration resource without reflection so setting a dummy
58-
// resource
59-
return AutoConfiguredOpenTelemetrySdk.create(
60-
sdk, Resource.getDefault(), null, configProvider);
51+
return requireNonNull(
52+
createWithFactory(
53+
"file",
54+
() ->
55+
getOpenTelemetrySdk(
56+
Class.forName(
57+
"io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration")
58+
.getMethod("parse", InputStream.class)
59+
.invoke(null, fis),
60+
componentLoader)));
6161
} catch (FileNotFoundException e) {
6262
throw new ConfigurationException("Configuration file not found", e);
63+
} catch (IOException e) {
64+
// IOException (other than FileNotFoundException which is caught above) is only thrown
65+
// above by FileInputStream.close()
66+
throw new ConfigurationException("Error closing file", e);
67+
}
68+
}
69+
70+
@Nullable
71+
public static AutoConfiguredOpenTelemetrySdk configureFromSpi(ComponentLoader componentLoader) {
72+
return createWithFactory(
73+
"SPI",
74+
() -> {
75+
Class<?> providerClass =
76+
Class.forName(
77+
"io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationProvider");
78+
Method getConfigurationModel = providerClass.getMethod("getConfigurationModel");
79+
80+
for (Object configProvider : componentLoader.load(providerClass)) {
81+
Object model = getConfigurationModel.invoke(configProvider);
82+
if (model != null) {
83+
return getOpenTelemetrySdk(model, componentLoader);
84+
}
85+
}
86+
return null;
87+
});
88+
}
89+
90+
private static AutoConfiguredOpenTelemetrySdk getOpenTelemetrySdk(
91+
Object model, ComponentLoader componentLoader)
92+
throws IllegalAccessException,
93+
InvocationTargetException,
94+
ClassNotFoundException,
95+
NoSuchMethodException {
96+
97+
Class<?> openTelemetryConfiguration =
98+
Class.forName(
99+
"io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel");
100+
Class<?> declarativeConfiguration =
101+
Class.forName(
102+
"io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration");
103+
Method create =
104+
declarativeConfiguration.getMethod(
105+
"create", openTelemetryConfiguration, ComponentLoader.class);
106+
107+
OpenTelemetrySdk sdk = (OpenTelemetrySdk) create.invoke(null, model, componentLoader);
108+
Class<?> sdkConfigProvider =
109+
Class.forName("io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider");
110+
Method createFileConfigProvider =
111+
sdkConfigProvider.getMethod("create", openTelemetryConfiguration, ComponentLoader.class);
112+
ConfigProvider configProvider =
113+
(ConfigProvider) createFileConfigProvider.invoke(null, model, componentLoader);
114+
// Note: can't access file configuration resource without reflection so setting a dummy
115+
// resource
116+
return AutoConfiguredOpenTelemetrySdk.create(sdk, Resource.getDefault(), null, configProvider);
117+
}
118+
119+
// Visible for testing
120+
@Nullable
121+
static AutoConfiguredOpenTelemetrySdk createWithFactory(String name, Factory factory) {
122+
try {
123+
return factory.create();
63124
} catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
64125
throw new ConfigurationException(
65-
"Error configuring from file. Is opentelemetry-sdk-extension-incubator on the classpath?",
126+
String.format(
127+
"Error configuring from %s. Is opentelemetry-sdk-extension-incubator on the classpath?",
128+
name),
66129
e);
67130
} catch (InvocationTargetException e) {
68131
Throwable cause = e.getCause();
69132
if (cause instanceof DeclarativeConfigException) {
70133
throw toConfigurationException((DeclarativeConfigException) cause);
71134
}
72-
throw new ConfigurationException("Unexpected error configuring from file", e);
73-
} catch (IOException e) {
74-
// IOException (other than FileNotFoundException which is caught above) is only thrown
75-
// above by FileInputStream.close()
76-
throw new ConfigurationException("Error closing file", e);
135+
throw new ConfigurationException("Unexpected error configuring from " + name, e);
77136
}
78137
}
79138

80139
private static ConfigurationException toConfigurationException(
81140
DeclarativeConfigException exception) {
82-
String message = Objects.requireNonNull(exception.getMessage());
141+
String message = requireNonNull(exception.getMessage());
83142
return new ConfigurationException(message, exception);
84143
}
85144

‎sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationSpiTest.java‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.sdk.autoconfigure;
7+
8+
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
9+
import static org.mockito.ArgumentMatchers.any;
10+
import static org.mockito.Mockito.doReturn;
11+
import static org.mockito.Mockito.spy;
12+
13+
import io.opentelemetry.exporter.logging.LoggingSpanExporter;
14+
import io.opentelemetry.internal.testing.CleanupExtension;
15+
import io.opentelemetry.sdk.OpenTelemetrySdk;
16+
import io.opentelemetry.sdk.resources.Resource;
17+
import io.opentelemetry.sdk.trace.SdkTracerProvider;
18+
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
19+
import org.junit.jupiter.api.Test;
20+
import org.junit.jupiter.api.extension.RegisterExtension;
21+
22+
class DeclarativeConfigurationSpiTest {
23+
24+
@RegisterExtension private static final CleanupExtension cleanup = new CleanupExtension();
25+
26+
@Test
27+
void configFromSpi() {
28+
OpenTelemetrySdk expectedSdk =
29+
OpenTelemetrySdk.builder()
30+
.setTracerProvider(
31+
SdkTracerProvider.builder()
32+
.setResource(
33+
Resource.getDefault().toBuilder().put("service.name", "test").build())
34+
.addSpanProcessor(SimpleSpanProcessor.create(LoggingSpanExporter.create()))
35+
.build())
36+
.build();
37+
cleanup.addCloseable(expectedSdk);
38+
AutoConfiguredOpenTelemetrySdkBuilder builder = spy(AutoConfiguredOpenTelemetrySdk.builder());
39+
Thread thread = new Thread();
40+
doReturn(thread).when(builder).shutdownHook(any());
41+
42+
AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk = builder.build();
43+
cleanup.addCloseable(autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk());
44+
45+
assertThat(autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk().toString())
46+
.isEqualTo(expectedSdk.toString());
47+
}
48+
}

‎sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/IncubatingUtilTest.java‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.sdk.autoconfigure;
7+
8+
import static org.assertj.core.api.Assertions.assertThatCode;
9+
10+
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
11+
import java.lang.reflect.InvocationTargetException;
12+
import org.junit.jupiter.api.Test;
13+
14+
class IncubatingUtilTest {
15+
16+
@Test
17+
void classNotFoundException() {
18+
assertThatCode(
19+
() ->
20+
IncubatingUtil.createWithFactory(
21+
"test",
22+
() -> {
23+
Class.forName("foo");
24+
return null;
25+
}))
26+
.isInstanceOf(ConfigurationException.class)
27+
.hasMessage(
28+
"Error configuring from test. Is opentelemetry-sdk-extension-incubator on the classpath?");
29+
}
30+
31+
@Test
32+
void invocationTargetException() {
33+
assertThatCode(
34+
() ->
35+
IncubatingUtil.createWithFactory(
36+
"test",
37+
() -> {
38+
throw new InvocationTargetException(new RuntimeException("test exception"));
39+
}))
40+
.isInstanceOf(ConfigurationException.class)
41+
.hasMessage("Unexpected error configuring from test")
42+
.hasRootCauseMessage("test exception");
43+
}
44+
}

0 commit comments

Comments
 (0)