Skip to content

Commit 30e70a5

Browse files
zeitlingerzeitlinger
committed
1 parent 6ac24d5 commit 30e70a5

File tree

11 files changed

+51
-45
lines changed

11 files changed

+51
-45
lines changed

‎instrumentation/methods/javaagent/src/declarativeConfigTest/resources/declarative-config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ tracer_provider:
33
processors:
44
- simple:
55
exporter:
6-
test_bridge:
6+
memory:
77
- simple:
88
exporter:
99
console:
@@ -12,7 +12,7 @@ logger_provider:
1212
processors:
1313
- simple:
1414
exporter:
15-
test_bridge:
15+
memory:
1616

1717
meter_provider:
1818
readers:
@@ -21,7 +21,7 @@ meter_provider:
2121
# instead of collecting them periodically.
2222
interval: 1000000
2323
exporter:
24-
test_bridge:
24+
memory:
2525

2626
instrumentation/development:
2727
java:

‎testing-common/src/main/java/io/opentelemetry/instrumentation/testing/LibraryTestRunner.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import io.opentelemetry.contrib.baggage.processor.BaggageSpanProcessor;
2323
import io.opentelemetry.exporter.logging.LoggingSpanExporter;
2424
import io.opentelemetry.instrumentation.testing.internal.MetaDataCollector;
25-
import io.opentelemetry.instrumentation.testing.provider.TestBridgeLogRecordExporterComponentProvider;
26-
import io.opentelemetry.instrumentation.testing.provider.TestBridgeMetricExporterComponentProvider;
27-
import io.opentelemetry.instrumentation.testing.provider.TestBridgeSpanExporterComponentProvider;
25+
import io.opentelemetry.instrumentation.testing.provider.MemoryLogRecordExporterComponentProvider;
26+
import io.opentelemetry.instrumentation.testing.provider.MemoryMetricExporterComponentProvider;
27+
import io.opentelemetry.instrumentation.testing.provider.MemorySpanExporterComponentProvider;
2828
import io.opentelemetry.sdk.OpenTelemetrySdk;
2929
import io.opentelemetry.sdk.common.CompletableResultCode;
3030
import io.opentelemetry.sdk.logs.SdkLoggerProvider;
@@ -72,9 +72,9 @@ public final class LibraryTestRunner extends InstrumentationTestRunner {
7272
testSpanExporter = InMemorySpanExporter.create();
7373
testMetricExporter = InMemoryMetricExporter.create(AggregationTemporality.DELTA);
7474
testLogRecordExporter = InMemoryLogRecordExporter.create();
75-
TestBridgeSpanExporterComponentProvider.setSpanExporter(testSpanExporter);
76-
TestBridgeMetricExporterComponentProvider.setMetricExporter(testMetricExporter);
77-
TestBridgeLogRecordExporterComponentProvider.setLogRecordExporter(testLogRecordExporter);
75+
MemorySpanExporterComponentProvider.setSpanExporter(testSpanExporter);
76+
MemoryMetricExporterComponentProvider.setMetricExporter(testMetricExporter);
77+
MemoryLogRecordExporterComponentProvider.setLogRecordExporter(testLogRecordExporter);
7878

7979
metricReader =
8080
PeriodicMetricReader.builder(testMetricExporter)

‎testing-common/src/main/java/io/opentelemetry/instrumentation/testing/provider/TestBridgeLogRecordExporterComponentProvider.java‎ renamed to ‎testing-common/src/main/java/io/opentelemetry/instrumentation/testing/provider/MemoryLogRecordExporterComponentProvider.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
99
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
1010
import io.opentelemetry.sdk.logs.export.LogRecordExporter;
11+
import java.util.Objects;
1112

12-
public class TestBridgeLogRecordExporterComponentProvider
13+
public class MemoryLogRecordExporterComponentProvider
1314
implements ComponentProvider<LogRecordExporter> {
1415

1516
private static LogRecordExporter logRecordExporter;
@@ -21,15 +22,15 @@ public Class<LogRecordExporter> getType() {
2122

2223
@Override
2324
public String getName() {
24-
return "test_bridge";
25+
return "memory";
2526
}
2627

2728
@Override
2829
public LogRecordExporter create(DeclarativeConfigProperties config) {
29-
return logRecordExporter;
30+
return Objects.requireNonNull(logRecordExporter, "logRecordExporter must not be null");
3031
}
3132

3233
public static void setLogRecordExporter(LogRecordExporter logRecordExporter) {
33-
TestBridgeLogRecordExporterComponentProvider.logRecordExporter = logRecordExporter;
34+
MemoryLogRecordExporterComponentProvider.logRecordExporter = logRecordExporter;
3435
}
3536
}

‎testing-common/src/main/java/io/opentelemetry/instrumentation/testing/provider/TestBridgeMetricExporterComponentProvider.java‎ renamed to ‎testing-common/src/main/java/io/opentelemetry/instrumentation/testing/provider/MemoryMetricExporterComponentProvider.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
99
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
1010
import io.opentelemetry.sdk.metrics.export.MetricExporter;
11+
import java.util.Objects;
1112

12-
public class TestBridgeMetricExporterComponentProvider
13+
public class MemoryMetricExporterComponentProvider
1314
implements ComponentProvider<MetricExporter> {
1415

1516
private static MetricExporter metricExporter;
@@ -21,15 +22,15 @@ public Class<MetricExporter> getType() {
2122

2223
@Override
2324
public String getName() {
24-
return "test_bridge";
25+
return "memory";
2526
}
2627

2728
@Override
2829
public MetricExporter create(DeclarativeConfigProperties config) {
29-
return metricExporter;
30+
return Objects.requireNonNull(metricExporter, "metricExporter must not be null");
3031
}
3132

3233
public static void setMetricExporter(MetricExporter metricExporter) {
33-
TestBridgeMetricExporterComponentProvider.metricExporter = metricExporter;
34+
MemoryMetricExporterComponentProvider.metricExporter = metricExporter;
3435
}
3536
}

‎testing-common/src/main/java/io/opentelemetry/instrumentation/testing/provider/TestBridgeSpanExporterComponentProvider.java‎ renamed to ‎testing-common/src/main/java/io/opentelemetry/instrumentation/testing/provider/MemorySpanExporterComponentProvider.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
99
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
1010
import io.opentelemetry.sdk.trace.export.SpanExporter;
11+
import java.util.Objects;
1112

12-
public class TestBridgeSpanExporterComponentProvider implements ComponentProvider<SpanExporter> {
13+
public class MemorySpanExporterComponentProvider implements ComponentProvider<SpanExporter> {
1314

1415
private static SpanExporter spanExporter;
1516

@@ -20,15 +21,15 @@ public Class<SpanExporter> getType() {
2021

2122
@Override
2223
public String getName() {
23-
return "test_bridge";
24+
return "memory";
2425
}
2526

2627
@Override
2728
public SpanExporter create(DeclarativeConfigProperties config) {
28-
return spanExporter;
29+
return Objects.requireNonNull(spanExporter, "spanExporter must not be null");
2930
}
3031

3132
public static void setSpanExporter(SpanExporter spanExporter) {
32-
TestBridgeSpanExporterComponentProvider.spanExporter = spanExporter;
33+
MemorySpanExporterComponentProvider.spanExporter = spanExporter;
3334
}
3435
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
io.opentelemetry.instrumentation.testing.provider.TestBridgeSpanExporterComponentProvider
2-
io.opentelemetry.instrumentation.testing.provider.TestBridgeMetricExporterComponentProvider
3-
io.opentelemetry.instrumentation.testing.provider.TestBridgeLogRecordExporterComponentProvider
1+
io.opentelemetry.instrumentation.testing.provider.MemorySpanExporterComponentProvider
2+
io.opentelemetry.instrumentation.testing.provider.MemoryMetricExporterComponentProvider
3+
io.opentelemetry.instrumentation.testing.provider.MemoryLogRecordExporterComponentProvider
44

‎testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/exporter/AgentTestingExporterFactory.java‎

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

66
package io.opentelemetry.javaagent.testing.exporter;
77

8-
import io.opentelemetry.javaagent.testing.provider.TestBridgeLogRecordExporterComponentProvider;
9-
import io.opentelemetry.javaagent.testing.provider.TestBridgeMetricExporterComponentProvider;
10-
import io.opentelemetry.javaagent.testing.provider.TestBridgeSpanExporterComponentProvider;
8+
import io.opentelemetry.javaagent.testing.provider.MemoryLogRecordExporterComponentProvider;
9+
import io.opentelemetry.javaagent.testing.provider.MemoryMetricExporterComponentProvider;
10+
import io.opentelemetry.javaagent.testing.provider.MemorySpanExporterComponentProvider;
1111
import java.util.List;
1212
import java.util.concurrent.TimeUnit;
1313

@@ -18,9 +18,9 @@ public final class AgentTestingExporterFactory {
1818
static final OtlpInMemoryLogRecordExporter logExporter = new OtlpInMemoryLogRecordExporter();
1919

2020
static {
21-
TestBridgeSpanExporterComponentProvider.setSpanExporter(spanExporter);
22-
TestBridgeMetricExporterComponentProvider.setMetricExporter(metricExporter);
23-
TestBridgeLogRecordExporterComponentProvider.setLogRecordExporter(logExporter);
21+
MemorySpanExporterComponentProvider.setSpanExporter(spanExporter);
22+
MemoryMetricExporterComponentProvider.setMetricExporter(metricExporter);
23+
MemoryLogRecordExporterComponentProvider.setLogRecordExporter(logExporter);
2424
}
2525

2626
public static List<byte[]> getSpanExportRequests() {

‎testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/TestBridgeLogRecordExporterComponentProvider.java‎ renamed to ‎testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/MemoryLogRecordExporterComponentProvider.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
99
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
1010
import io.opentelemetry.sdk.logs.export.LogRecordExporter;
11+
import java.util.Objects;
1112

12-
public class TestBridgeLogRecordExporterComponentProvider
13+
public class MemoryLogRecordExporterComponentProvider
1314
implements ComponentProvider<LogRecordExporter> {
1415

1516
private static LogRecordExporter logRecordExporter;
@@ -21,15 +22,15 @@ public Class<LogRecordExporter> getType() {
2122

2223
@Override
2324
public String getName() {
24-
return "test_bridge";
25+
return "memory";
2526
}
2627

2728
@Override
2829
public LogRecordExporter create(DeclarativeConfigProperties config) {
29-
return logRecordExporter;
30+
return Objects.requireNonNull(logRecordExporter, "logRecordExporter must not be null");
3031
}
3132

3233
public static void setLogRecordExporter(LogRecordExporter logRecordExporter) {
33-
TestBridgeLogRecordExporterComponentProvider.logRecordExporter = logRecordExporter;
34+
MemoryLogRecordExporterComponentProvider.logRecordExporter = logRecordExporter;
3435
}
3536
}

‎testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/TestBridgeMetricExporterComponentProvider.java‎ renamed to ‎testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/MemoryMetricExporterComponentProvider.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
99
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
1010
import io.opentelemetry.sdk.metrics.export.MetricExporter;
11+
import java.util.Objects;
1112

12-
public class TestBridgeMetricExporterComponentProvider
13+
public class MemoryMetricExporterComponentProvider
1314
implements ComponentProvider<MetricExporter> {
1415

1516
private static MetricExporter metricExporter;
@@ -21,15 +22,15 @@ public Class<MetricExporter> getType() {
2122

2223
@Override
2324
public String getName() {
24-
return "test_bridge";
25+
return "memory";
2526
}
2627

2728
@Override
2829
public MetricExporter create(DeclarativeConfigProperties config) {
29-
return metricExporter;
30+
return Objects.requireNonNull(metricExporter, "metricExporter must not be null");
3031
}
3132

3233
public static void setMetricExporter(MetricExporter metricExporter) {
33-
TestBridgeMetricExporterComponentProvider.metricExporter = metricExporter;
34+
MemoryMetricExporterComponentProvider.metricExporter = metricExporter;
3435
}
3536
}

‎testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/TestBridgeSpanExporterComponentProvider.java‎ renamed to ‎testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/MemorySpanExporterComponentProvider.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
99
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
1010
import io.opentelemetry.sdk.trace.export.SpanExporter;
11+
import java.util.Objects;
1112

12-
public class TestBridgeSpanExporterComponentProvider implements ComponentProvider<SpanExporter> {
13+
public class MemorySpanExporterComponentProvider implements ComponentProvider<SpanExporter> {
1314

1415
private static SpanExporter spanExporter;
1516

@@ -20,15 +21,15 @@ public Class<SpanExporter> getType() {
2021

2122
@Override
2223
public String getName() {
23-
return "test_bridge";
24+
return "memory";
2425
}
2526

2627
@Override
2728
public SpanExporter create(DeclarativeConfigProperties config) {
28-
return spanExporter;
29+
return Objects.requireNonNull(spanExporter, "spanExporter must not be null");
2930
}
3031

3132
public static void setSpanExporter(SpanExporter spanExporter) {
32-
TestBridgeSpanExporterComponentProvider.spanExporter = spanExporter;
33+
MemorySpanExporterComponentProvider.spanExporter = spanExporter;
3334
}
3435
}

0 commit comments

Comments
 (0)