Skip to content

Commit 77861de

Browse files
committed
cleanup test runners
1 parent 54450af commit 77861de

File tree

10 files changed

+11
-584
lines changed

10 files changed

+11
-584
lines changed

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/InstrumentationAnalyzer.java

-24
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77

88
import static io.opentelemetry.instrumentation.docs.GradleParser.parseGradleFile;
99

10-
import io.opentelemetry.instrumentation.docs.internal.EmittedMetrics;
1110
import io.opentelemetry.instrumentation.docs.internal.EmittedScope;
12-
import io.opentelemetry.instrumentation.docs.internal.EmittedSpans;
1311
import io.opentelemetry.instrumentation.docs.internal.InstrumentationEntity;
1412
import io.opentelemetry.instrumentation.docs.internal.InstrumentationType;
1513
import io.opentelemetry.instrumentation.docs.utils.FileManager;
@@ -86,28 +84,6 @@ List<InstrumentationEntity> analyze() {
8684
entity.setScope(scope.getScope());
8785
}
8886
}
89-
90-
String emittedMetrics = fileSearch.getMetrics(entity.getSrcPath());
91-
if (emittedMetrics != null) {
92-
EmittedMetrics metrics = YamlHelper.emittedMetricsParser(emittedMetrics);
93-
if (metrics != null && metrics.getMetrics() != null) {
94-
entity.setMetrics(metrics.getMetrics());
95-
}
96-
}
97-
98-
String emittedSpans = fileSearch.getSpans(entity.getSrcPath());
99-
if (emittedSpans != null) {
100-
EmittedSpans spans = YamlHelper.emittedSpansParser(emittedSpans);
101-
if (spans != null) {
102-
if (spans.getSpanKinds() != null && !spans.getSpanKinds().isEmpty()) {
103-
entity.setSpanKinds(spans.getSpanKinds());
104-
}
105-
106-
if (spans.getAttributes() != null && !spans.getAttributes().isEmpty()) {
107-
entity.setSpanAttributes(spans.getAttributes());
108-
}
109-
}
110-
}
11187
}
11288
return entities;
11389
}

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/internal/EmittedMetrics.java

-125
This file was deleted.

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/internal/EmittedSpans.java

-72
This file was deleted.

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/internal/InstrumentationEntity.java

-49
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package io.opentelemetry.instrumentation.docs.internal;
77

8-
import java.util.List;
98
import java.util.Map;
109
import java.util.Set;
1110

@@ -29,9 +28,6 @@ public void setMetadata(InstrumentationMetaData metadata) {
2928
}
3029

3130
private InstrumentationMetaData metadata;
32-
private List<EmittedMetrics.Metric> metrics;
33-
private List<EmittedSpans.EmittedSpanAttribute> spanAttributes;
34-
private List<String> spanKinds;
3531
private EmittedScope.Scope scope;
3632

3733
/**
@@ -45,24 +41,9 @@ public InstrumentationEntity(Builder builder) {
4541
this.group = builder.group;
4642
this.metadata = builder.metadata;
4743
this.targetVersions = builder.targetVersions;
48-
this.metrics = builder.metrics;
49-
this.spanAttributes = builder.spanAttributes;
50-
this.spanKinds = builder.spanKinds;
5144
this.scope = builder.scope;
5245
}
5346

54-
public void setMetrics(List<EmittedMetrics.Metric> metrics) {
55-
this.metrics = metrics;
56-
}
57-
58-
public void setSpanAttributes(List<EmittedSpans.EmittedSpanAttribute> spanAttributes) {
59-
this.spanAttributes = spanAttributes;
60-
}
61-
62-
public void setSpanKinds(List<String> spanKinds) {
63-
this.spanKinds = spanKinds;
64-
}
65-
6647
public void setScope(EmittedScope.Scope scope) {
6748
this.scope = scope;
6849
}
@@ -91,18 +72,6 @@ public Map<InstrumentationType, Set<String>> getTargetVersions() {
9172
return targetVersions;
9273
}
9374

94-
public List<EmittedMetrics.Metric> getMetrics() {
95-
return metrics;
96-
}
97-
98-
public List<EmittedSpans.EmittedSpanAttribute> getSpanAttributes() {
99-
return spanAttributes;
100-
}
101-
102-
public List<String> getSpanKinds() {
103-
return spanKinds;
104-
}
105-
10675
public EmittedScope.Scope getScope() {
10776
return scope;
10877
}
@@ -119,9 +88,6 @@ public static class Builder {
11988
private String group;
12089
private InstrumentationMetaData metadata;
12190
private Map<InstrumentationType, Set<String>> targetVersions;
122-
private List<EmittedMetrics.Metric> metrics;
123-
private List<EmittedSpans.EmittedSpanAttribute> spanAttributes;
124-
private List<String> spanKinds;
12591
private EmittedScope.Scope scope;
12692

12793
public Builder srcPath(String srcPath) {
@@ -154,21 +120,6 @@ public Builder targetVersions(Map<InstrumentationType, Set<String>> targetVersio
154120
return this;
155121
}
156122

157-
public Builder metrics(List<EmittedMetrics.Metric> metrics) {
158-
this.metrics = metrics;
159-
return this;
160-
}
161-
162-
public Builder spanAttributes(List<EmittedSpans.EmittedSpanAttribute> spanAttributes) {
163-
this.spanAttributes = spanAttributes;
164-
return this;
165-
}
166-
167-
public Builder spanKinds(List<String> spanKinds) {
168-
this.spanKinds = spanKinds;
169-
return this;
170-
}
171-
172123
public Builder scope(EmittedScope.Scope scope) {
173124
this.scope = scope;
174125
return this;

0 commit comments

Comments
 (0)