Skip to content

Commit 0206024

Browse files
zeitlingerzeitlinger
committed
pr review
1 parent 76dde36 commit 0206024

File tree

12 files changed

+39
-40
lines changed

12 files changed

+39
-40
lines changed

‎instrumentation/methods/javaagent/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ muzzle {
1111
dependencies {
1212
compileOnly(project(":javaagent-tooling"))
1313
compileOnly(project(":instrumentation-annotations-support"))
14-
compileOnly("net.bytebuddy:byte-buddy-dep")
1514
}
1615

1716
tasks.test {

‎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-
memory:
6+
test:
77
- simple:
88
exporter:
99
console:
@@ -12,7 +12,7 @@ logger_provider:
1212
processors:
1313
- simple:
1414
exporter:
15-
memory:
15+
test:
1616

1717
meter_provider:
1818
readers:
@@ -21,7 +21,7 @@ meter_provider:
2121
# instead of collecting them periodically.
2222
interval: 1000000
2323
exporter:
24-
memory:
24+
test:
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.MemoryLogRecordExporterComponentProvider;
26-
import io.opentelemetry.instrumentation.testing.provider.MemoryMetricExporterComponentProvider;
27-
import io.opentelemetry.instrumentation.testing.provider.MemorySpanExporterComponentProvider;
25+
import io.opentelemetry.instrumentation.testing.provider.TestLogRecordExporterComponentProvider;
26+
import io.opentelemetry.instrumentation.testing.provider.TestMetricExporterComponentProvider;
27+
import io.opentelemetry.instrumentation.testing.provider.TestSpanExporterComponentProvider;
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-
MemorySpanExporterComponentProvider.setSpanExporter(testSpanExporter);
76-
MemoryMetricExporterComponentProvider.setMetricExporter(testMetricExporter);
77-
MemoryLogRecordExporterComponentProvider.setLogRecordExporter(testLogRecordExporter);
75+
TestSpanExporterComponentProvider.setSpanExporter(testSpanExporter);
76+
TestMetricExporterComponentProvider.setMetricExporter(testMetricExporter);
77+
TestLogRecordExporterComponentProvider.setLogRecordExporter(testLogRecordExporter);
7878

7979
metricReader =
8080
PeriodicMetricReader.builder(testMetricExporter)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.sdk.logs.export.LogRecordExporter;
1111
import java.util.Objects;
1212

13-
public class MemoryLogRecordExporterComponentProvider
13+
public class TestLogRecordExporterComponentProvider
1414
implements ComponentProvider<LogRecordExporter> {
1515

1616
private static LogRecordExporter logRecordExporter;
@@ -22,7 +22,7 @@ public Class<LogRecordExporter> getType() {
2222

2323
@Override
2424
public String getName() {
25-
return "memory";
25+
return "test";
2626
}
2727

2828
@Override
@@ -31,6 +31,6 @@ public LogRecordExporter create(DeclarativeConfigProperties config) {
3131
}
3232

3333
public static void setLogRecordExporter(LogRecordExporter logRecordExporter) {
34-
MemoryLogRecordExporterComponentProvider.logRecordExporter = logRecordExporter;
34+
TestLogRecordExporterComponentProvider.logRecordExporter = logRecordExporter;
3535
}
3636
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.sdk.metrics.export.MetricExporter;
1111
import java.util.Objects;
1212

13-
public class MemoryMetricExporterComponentProvider implements ComponentProvider<MetricExporter> {
13+
public class TestMetricExporterComponentProvider implements ComponentProvider<MetricExporter> {
1414

1515
private static MetricExporter metricExporter;
1616

@@ -21,7 +21,7 @@ public Class<MetricExporter> getType() {
2121

2222
@Override
2323
public String getName() {
24-
return "memory";
24+
return "test";
2525
}
2626

2727
@Override
@@ -30,6 +30,6 @@ public MetricExporter create(DeclarativeConfigProperties config) {
3030
}
3131

3232
public static void setMetricExporter(MetricExporter metricExporter) {
33-
MemoryMetricExporterComponentProvider.metricExporter = metricExporter;
33+
TestMetricExporterComponentProvider.metricExporter = metricExporter;
3434
}
3535
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.sdk.trace.export.SpanExporter;
1111
import java.util.Objects;
1212

13-
public class MemorySpanExporterComponentProvider implements ComponentProvider<SpanExporter> {
13+
public class TestSpanExporterComponentProvider implements ComponentProvider<SpanExporter> {
1414

1515
private static SpanExporter spanExporter;
1616

@@ -21,7 +21,7 @@ public Class<SpanExporter> getType() {
2121

2222
@Override
2323
public String getName() {
24-
return "memory";
24+
return "test";
2525
}
2626

2727
@Override
@@ -30,6 +30,6 @@ public SpanExporter create(DeclarativeConfigProperties config) {
3030
}
3131

3232
public static void setSpanExporter(SpanExporter spanExporter) {
33-
MemorySpanExporterComponentProvider.spanExporter = spanExporter;
33+
TestSpanExporterComponentProvider.spanExporter = spanExporter;
3434
}
3535
}

‎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.MemorySpanExporterComponentProvider
2-
io.opentelemetry.instrumentation.testing.provider.MemoryMetricExporterComponentProvider
3-
io.opentelemetry.instrumentation.testing.provider.MemoryLogRecordExporterComponentProvider
1+
io.opentelemetry.instrumentation.testing.provider.TestSpanExporterComponentProvider
2+
io.opentelemetry.instrumentation.testing.provider.TestMetricExporterComponentProvider
3+
io.opentelemetry.instrumentation.testing.provider.TestLogRecordExporterComponentProvider
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.MemoryLogRecordExporterComponentProvider;
9-
import io.opentelemetry.javaagent.testing.provider.MemoryMetricExporterComponentProvider;
10-
import io.opentelemetry.javaagent.testing.provider.MemorySpanExporterComponentProvider;
8+
import io.opentelemetry.javaagent.testing.provider.TestLogRecordExporterComponentProvider;
9+
import io.opentelemetry.javaagent.testing.provider.TestMetricExporterComponentProvider;
10+
import io.opentelemetry.javaagent.testing.provider.TestSpanExporterComponentProvider;
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-
MemorySpanExporterComponentProvider.setSpanExporter(spanExporter);
22-
MemoryMetricExporterComponentProvider.setMetricExporter(metricExporter);
23-
MemoryLogRecordExporterComponentProvider.setLogRecordExporter(logExporter);
21+
TestSpanExporterComponentProvider.setSpanExporter(spanExporter);
22+
TestMetricExporterComponentProvider.setMetricExporter(metricExporter);
23+
TestLogRecordExporterComponentProvider.setLogRecordExporter(logExporter);
2424
}
2525

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.sdk.logs.export.LogRecordExporter;
1111
import java.util.Objects;
1212

13-
public class MemoryLogRecordExporterComponentProvider
13+
public class TestLogRecordExporterComponentProvider
1414
implements ComponentProvider<LogRecordExporter> {
1515

1616
private static LogRecordExporter logRecordExporter;
@@ -22,7 +22,7 @@ public Class<LogRecordExporter> getType() {
2222

2323
@Override
2424
public String getName() {
25-
return "memory";
25+
return "test";
2626
}
2727

2828
@Override
@@ -31,6 +31,6 @@ public LogRecordExporter create(DeclarativeConfigProperties config) {
3131
}
3232

3333
public static void setLogRecordExporter(LogRecordExporter logRecordExporter) {
34-
MemoryLogRecordExporterComponentProvider.logRecordExporter = logRecordExporter;
34+
TestLogRecordExporterComponentProvider.logRecordExporter = logRecordExporter;
3535
}
3636
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.sdk.metrics.export.MetricExporter;
1111
import java.util.Objects;
1212

13-
public class MemoryMetricExporterComponentProvider implements ComponentProvider<MetricExporter> {
13+
public class TestMetricExporterComponentProvider implements ComponentProvider<MetricExporter> {
1414

1515
private static MetricExporter metricExporter;
1616

@@ -21,7 +21,7 @@ public Class<MetricExporter> getType() {
2121

2222
@Override
2323
public String getName() {
24-
return "memory";
24+
return "test";
2525
}
2626

2727
@Override
@@ -30,6 +30,6 @@ public MetricExporter create(DeclarativeConfigProperties config) {
3030
}
3131

3232
public static void setMetricExporter(MetricExporter metricExporter) {
33-
MemoryMetricExporterComponentProvider.metricExporter = metricExporter;
33+
TestMetricExporterComponentProvider.metricExporter = metricExporter;
3434
}
3535
}

0 commit comments

Comments
 (0)