Skip to content

Commit 369a6b7

Browse files
committed
rename to agent tracer customizer - it's not reusable
1 parent 9cb607b commit 369a6b7

File tree

6 files changed

+43
-32
lines changed

6 files changed

+43
-32
lines changed
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
package io.opentelemetry.instrumentation.thread;
1+
package io.opentelemetry.javaagent.tooling;
22

3+
import com.google.auto.service.AutoService;
34
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
5+
import io.opentelemetry.instrumentation.thread.AddThreadDetailsSpanProcessor;
46
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
57
import io.opentelemetry.sdk.trace.SpanProcessor;
68

7-
public class ThreadDetailsComponentProvider implements ComponentProvider<SpanProcessor> {
9+
@AutoService(ComponentProvider.class)
10+
public class AgentTracerComponentProvider implements ComponentProvider<SpanProcessor> {
811
@Override
912
public String getName() {
1013
return "thread_details";
Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
package io.opentelemetry.instrumentation.thread;
1+
package io.opentelemetry.javaagent.tooling;
22

3+
import com.google.auto.service.AutoService;
34
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
45
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
6+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationModel;
7+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.InstrumentationModel;
58
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
69
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
710

8-
public class ThreadDetailsConfigurationCustomizerProvider
11+
@AutoService(DeclarativeConfigurationCustomizerProvider.class)
12+
public class AgentTracerCustomizerProvider
913
implements DeclarativeConfigurationCustomizerProvider {
1014
@Override
1115
public void customize(DeclarativeConfigurationCustomizer customizer) {
@@ -15,6 +19,13 @@ public void customize(DeclarativeConfigurationCustomizer customizer) {
1519
if (tracerProvider == null) {
1620
return model;
1721
}
22+
InstrumentationModel instrumentationModel = model.getInstrumentationDevelopment();
23+
ExperimentalLanguageSpecificInstrumentationModel java = instrumentationModel.getJava();
24+
// todo how to get the "add_thread_details" from the config?
25+
// do we need a ConfigProvider?
26+
27+
// todo also add logging like in AgentTracerProviderConfigurer
28+
1829
tracerProvider
1930
.getProcessors()
2031
.add(new SpanProcessorModel().withAdditionalProperty("thread_details", null));
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package io.opentelemetry.javaagent.tooling;
2+
3+
import static org.assertj.core.api.Assertions.assertThat;
4+
5+
import io.opentelemetry.sdk.OpenTelemetrySdk;
6+
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
7+
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationBuilder;
8+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
9+
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
10+
import org.junit.jupiter.api.Test;
11+
12+
class AgentTracerComponentProviderTest {
13+
@Test
14+
void addSpanProcessor() {
15+
OpenTelemetryConfigurationModel model =
16+
new DeclarativeConfigurationBuilder().customizeModel(
17+
new OpenTelemetryConfigurationModel()
18+
.withFileFormat("0.4")
19+
.withTracerProvider(new TracerProviderModel()));
20+
21+
try (OpenTelemetrySdk sdk = DeclarativeConfiguration.create(model)) {
22+
assertThat(sdk.toString()).containsOnlyOnce("AddThreadDetailsSpanProcessor");
23+
}
24+
}
25+
}

sdk-autoconfigure-support/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider

Lines changed: 0 additions & 1 deletion
This file was deleted.

sdk-autoconfigure-support/src/main/resources/META-INF/services/io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider

Lines changed: 0 additions & 1 deletion
This file was deleted.

sdk-autoconfigure-support/src/test/java/io/opentelemetry/instrumentation/thread/ThreadDetailsConfigurationCustomizerProviderTest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)