Skip to content

Commit f42b0ad

Browse files
JonasKunzJonasKunz
committed
Remaining review fixes
1 parent 6f4b0af commit f42b0ad

File tree

12 files changed

+32
-69
lines changed

12 files changed

+32
-69
lines changed

‎sdk/trace/src/main/java/io/opentelemetry/sdk/trace/NonRecordingSpan.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.api.trace.Span;
1111
import io.opentelemetry.api.trace.SpanContext;
1212
import io.opentelemetry.api.trace.StatusCode;
13-
import io.opentelemetry.sdk.trace.internal.metrics.SpanInstrumentation;
13+
import io.opentelemetry.sdk.trace.internal.SpanInstrumentation;
1414
import java.util.concurrent.TimeUnit;
1515
import javax.annotation.Nullable;
1616
import javax.annotation.concurrent.Immutable;

‎sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import io.opentelemetry.sdk.trace.data.SpanData;
2727
import io.opentelemetry.sdk.trace.data.StatusData;
2828
import io.opentelemetry.sdk.trace.internal.ExtendedSpanProcessor;
29-
import io.opentelemetry.sdk.trace.internal.metrics.SpanInstrumentation;
29+
import io.opentelemetry.sdk.trace.internal.SpanInstrumentation;
3030
import java.util.ArrayList;
3131
import java.util.Collections;
3232
import java.util.List;

‎sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpanBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import io.opentelemetry.sdk.internal.AttributeUtil;
2525
import io.opentelemetry.sdk.internal.AttributesMap;
2626
import io.opentelemetry.sdk.trace.data.LinkData;
27-
import io.opentelemetry.sdk.trace.internal.metrics.SpanInstrumentation;
27+
import io.opentelemetry.sdk.trace.internal.SpanInstrumentation;
2828
import io.opentelemetry.sdk.trace.samplers.SamplingDecision;
2929
import io.opentelemetry.sdk.trace.samplers.SamplingResult;
3030
import java.util.ArrayList;

‎sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import io.opentelemetry.sdk.internal.ScopeConfigurator;
1919
import io.opentelemetry.sdk.resources.Resource;
2020
import io.opentelemetry.sdk.trace.internal.SdkTracerProviderUtil;
21+
import io.opentelemetry.sdk.trace.internal.SpanInstrumentation;
2122
import io.opentelemetry.sdk.trace.internal.TracerConfig;
22-
import io.opentelemetry.sdk.trace.internal.metrics.SpanInstrumentation;
2323
import io.opentelemetry.sdk.trace.samplers.Sampler;
2424
import java.io.Closeable;
2525
import java.util.List;

‎sdk/trace/src/main/java/io/opentelemetry/sdk/trace/TracerSharedState.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import io.opentelemetry.sdk.common.CompletableResultCode;
1010
import io.opentelemetry.sdk.internal.ExceptionAttributeResolver;
1111
import io.opentelemetry.sdk.resources.Resource;
12-
import io.opentelemetry.sdk.trace.internal.metrics.SpanInstrumentation;
12+
import io.opentelemetry.sdk.trace.internal.SpanInstrumentation;
1313
import io.opentelemetry.sdk.trace.samplers.Sampler;
1414
import java.util.List;
1515
import java.util.function.Supplier;

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/metrics/NoopSpanInstrumentation.java renamed to sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/NoopSpanInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.sdk.trace.internal.metrics;
6+
package io.opentelemetry.sdk.trace.internal;
77

88
import io.opentelemetry.sdk.trace.samplers.SamplingResult;
99

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/metrics/SemConvSpanInstrumentation.java renamed to sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/SemConvSpanInstrumentation.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.sdk.trace.internal.metrics;
6+
package io.opentelemetry.sdk.trace.internal;
77

88
import io.opentelemetry.api.common.Attributes;
9+
import io.opentelemetry.api.internal.GuardedBy;
910
import io.opentelemetry.api.metrics.LongCounter;
1011
import io.opentelemetry.api.metrics.LongUpDownCounter;
1112
import io.opentelemetry.api.metrics.Meter;
@@ -16,11 +17,7 @@
1617
import java.util.function.Supplier;
1718
import javax.annotation.Nullable;
1819

19-
/**
20-
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
21-
* any time.
22-
*/
23-
public class SemConvSpanInstrumentation implements SpanInstrumentation {
20+
class SemConvSpanInstrumentation implements SpanInstrumentation {
2421

2522
private final Supplier<MeterProvider> meterProviderSupplier;
2623

@@ -34,7 +31,7 @@ public class SemConvSpanInstrumentation implements SpanInstrumentation {
3431
@Nullable private volatile LongUpDownCounter live = null;
3532
@Nullable private volatile LongCounter ended = null;
3633

37-
public SemConvSpanInstrumentation(Supplier<MeterProvider> meterProviderSupplier) {
34+
SemConvSpanInstrumentation(Supplier<MeterProvider> meterProviderSupplier) {
3835
this.meterProviderSupplier = meterProviderSupplier;
3936
}
4037

@@ -97,6 +94,8 @@ public SpanInstrumentation.Recording recordSpanStart(SamplingResult samplingResu
9794
private class Recording implements SpanInstrumentation.Recording {
9895

9996
private final Attributes attributes;
97+
98+
@GuardedBy("this")
10099
private boolean endAlreadyReported = false;
101100

102101
private Recording(Attributes attributes) {

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/metrics/SpanInstrumentation.java renamed to sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/SpanInstrumentation.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.sdk.trace.internal.metrics;
6+
package io.opentelemetry.sdk.trace.internal;
77

88
import io.opentelemetry.api.metrics.MeterProvider;
99
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
@@ -16,16 +16,12 @@
1616
*/
1717
public interface SpanInstrumentation {
1818

19-
static SpanInstrumentation noop() {
20-
return NoopSpanInstrumentation.INSTANCE;
21-
}
22-
2319
static SpanInstrumentation create(
2420
InternalTelemetryVersion internalTelemetryVersion,
2521
Supplier<MeterProvider> meterProviderSupplier) {
2622
switch (internalTelemetryVersion) {
2723
case LEGACY:
28-
return SpanInstrumentation.noop();
24+
return NoopSpanInstrumentation.INSTANCE;
2925
case LATEST:
3026
return new SemConvSpanInstrumentation(meterProviderSupplier);
3127
}

‎sdk/trace/src/test/java/io/opentelemetry/sdk/trace/NonRecordingSpanTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import io.opentelemetry.api.trace.StatusCode;
2323
import io.opentelemetry.api.trace.TraceFlags;
2424
import io.opentelemetry.api.trace.TraceState;
25-
import io.opentelemetry.sdk.trace.internal.metrics.SpanInstrumentation;
25+
import io.opentelemetry.sdk.trace.internal.SpanInstrumentation;
2626
import java.time.Instant;
2727
import java.util.concurrent.TimeUnit;
2828
import org.junit.jupiter.api.Test;

‎sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanBuilderTest.java‎

Lines changed: 15 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
import static io.opentelemetry.api.common.AttributeKey.longKey;
1414
import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
1515
import static io.opentelemetry.api.common.AttributeKey.stringKey;
16+
import static io.opentelemetry.semconv.incubating.OtelIncubatingAttributes.OTEL_SPAN_SAMPLING_RESULT;
17+
import static io.opentelemetry.semconv.incubating.OtelIncubatingAttributes.OtelSpanSamplingResultIncubatingValues.DROP;
18+
import static io.opentelemetry.semconv.incubating.OtelIncubatingAttributes.OtelSpanSamplingResultIncubatingValues.RECORD_AND_SAMPLE;
19+
import static io.opentelemetry.semconv.incubating.OtelIncubatingAttributes.OtelSpanSamplingResultIncubatingValues.RECORD_ONLY;
1620
import static java.util.Collections.emptyList;
1721
import static java.util.stream.Collectors.joining;
1822
import static org.assertj.core.api.Assertions.assertThat;
@@ -44,7 +48,6 @@
4448
import io.opentelemetry.sdk.trace.samplers.Sampler;
4549
import io.opentelemetry.sdk.trace.samplers.SamplingDecision;
4650
import io.opentelemetry.sdk.trace.samplers.SamplingResult;
47-
import io.opentelemetry.semconv.incubating.OtelIncubatingAttributes;
4851
import java.time.Instant;
4952
import java.util.ArrayList;
5053
import java.util.Arrays;
@@ -1026,29 +1029,16 @@ public String getDescription() {
10261029
ma.hasPointsSatisfying(
10271030
pa ->
10281031
pa.hasAttributes(
1029-
Attributes.of(
1030-
OtelIncubatingAttributes
1031-
.OTEL_SPAN_SAMPLING_RESULT,
1032-
OtelIncubatingAttributes
1033-
.OtelSpanSamplingResultIncubatingValues.DROP))
1032+
Attributes.of(OTEL_SPAN_SAMPLING_RESULT, DROP))
10341033
.hasValue(1),
10351034
pa ->
10361035
pa.hasAttributes(
1037-
Attributes.of(
1038-
OtelIncubatingAttributes
1039-
.OTEL_SPAN_SAMPLING_RESULT,
1040-
OtelIncubatingAttributes
1041-
.OtelSpanSamplingResultIncubatingValues
1042-
.RECORD_ONLY))
1036+
Attributes.of(OTEL_SPAN_SAMPLING_RESULT, RECORD_ONLY))
10431037
.hasValue(2),
10441038
pa ->
10451039
pa.hasAttributes(
10461040
Attributes.of(
1047-
OtelIncubatingAttributes
1048-
.OTEL_SPAN_SAMPLING_RESULT,
1049-
OtelIncubatingAttributes
1050-
.OtelSpanSamplingResultIncubatingValues
1051-
.RECORD_AND_SAMPLE))
1041+
OTEL_SPAN_SAMPLING_RESULT, RECORD_AND_SAMPLE))
10521042
.hasValue(3))));
10531043

10541044
spansToEnd.forEach(Span::end);
@@ -1067,29 +1057,18 @@ public String getDescription() {
10671057
pa ->
10681058
pa.hasAttributes(
10691059
Attributes.of(
1070-
OtelIncubatingAttributes
1071-
.OTEL_SPAN_SAMPLING_RESULT,
1072-
OtelIncubatingAttributes
1073-
.OtelSpanSamplingResultIncubatingValues
1074-
.DROP))
1060+
OTEL_SPAN_SAMPLING_RESULT, DROP))
10751061
.hasValue(0),
10761062
pa ->
10771063
pa.hasAttributes(
10781064
Attributes.of(
1079-
OtelIncubatingAttributes
1080-
.OTEL_SPAN_SAMPLING_RESULT,
1081-
OtelIncubatingAttributes
1082-
.OtelSpanSamplingResultIncubatingValues
1083-
.RECORD_ONLY))
1065+
OTEL_SPAN_SAMPLING_RESULT, RECORD_ONLY))
10841066
.hasValue(0),
10851067
pa ->
10861068
pa.hasAttributes(
10871069
Attributes.of(
1088-
OtelIncubatingAttributes
1089-
.OTEL_SPAN_SAMPLING_RESULT,
1090-
OtelIncubatingAttributes
1091-
.OtelSpanSamplingResultIncubatingValues
1092-
.RECORD_AND_SAMPLE))
1070+
OTEL_SPAN_SAMPLING_RESULT,
1071+
RECORD_AND_SAMPLE))
10931072
.hasValue(0))))
10941073
.anySatisfy(
10951074
metric ->
@@ -1102,29 +1081,18 @@ public String getDescription() {
11021081
pa ->
11031082
pa.hasAttributes(
11041083
Attributes.of(
1105-
OtelIncubatingAttributes
1106-
.OTEL_SPAN_SAMPLING_RESULT,
1107-
OtelIncubatingAttributes
1108-
.OtelSpanSamplingResultIncubatingValues
1109-
.DROP))
1084+
OTEL_SPAN_SAMPLING_RESULT, DROP))
11101085
.hasValue(1),
11111086
pa ->
11121087
pa.hasAttributes(
11131088
Attributes.of(
1114-
OtelIncubatingAttributes
1115-
.OTEL_SPAN_SAMPLING_RESULT,
1116-
OtelIncubatingAttributes
1117-
.OtelSpanSamplingResultIncubatingValues
1118-
.RECORD_ONLY))
1089+
OTEL_SPAN_SAMPLING_RESULT, RECORD_ONLY))
11191090
.hasValue(2),
11201091
pa ->
11211092
pa.hasAttributes(
11221093
Attributes.of(
1123-
OtelIncubatingAttributes
1124-
.OTEL_SPAN_SAMPLING_RESULT,
1125-
OtelIncubatingAttributes
1126-
.OtelSpanSamplingResultIncubatingValues
1127-
.RECORD_AND_SAMPLE))
1094+
OTEL_SPAN_SAMPLING_RESULT,
1095+
RECORD_AND_SAMPLE))
11281096
.hasValue(3))));
11291097
endAssertions.run();
11301098

0 commit comments

Comments
 (0)