Skip to content

Commit 973e217

Browse files
committed
Revert demonstration bits
1 parent 4b63276 commit 973e217

File tree

5 files changed

+14
-36
lines changed

5 files changed

+14
-36
lines changed

api/all/src/main/java/io/opentelemetry/api/trace/Span.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* <p>{@code Span} <b>must</b> be ended by calling {@link #end()}.
2727
*/
2828
@ThreadSafe
29-
public interface Span extends ImplicitContextKeyed, SpanParent {
29+
public interface Span extends ImplicitContextKeyed {
3030

3131
/**
3232
* Returns the {@link Span} from the current {@link Context}, falling back to a default, no-op
@@ -339,6 +339,15 @@ default Span recordException(Throwable exception) {
339339
return recordException(exception, Attributes.empty());
340340
}
341341

342+
/**
343+
* Records information about the {@link Throwable} to the {@link Span}.
344+
*
345+
* @param exception the {@link Throwable} to record.
346+
* @param additionalAttributes the additional {@link Attributes} to record.
347+
* @return this.
348+
*/
349+
Span recordException(Throwable exception, Attributes additionalAttributes);
350+
342351
/**
343352
* Updates the {@code Span} name.
344353
*

api/all/src/main/java/io/opentelemetry/api/trace/SpanParent.java

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
11
Comparing source compatibility of opentelemetry-api-1.58.0-SNAPSHOT.jar against opentelemetry-api-1.57.0.jar
2-
*** MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.api.trace.Span (not serializable)
3-
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4-
+++ NEW INTERFACE: io.opentelemetry.api.trace.SpanParent
5-
--- REMOVED METHOD: PUBLIC(-) ABSTRACT(-) io.opentelemetry.api.trace.Span recordException(java.lang.Throwable, io.opentelemetry.api.common.Attributes)
6-
+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.trace.SpanParent (not serializable)
7-
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
8-
+++ NEW SUPERCLASS: java.lang.Object
9-
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.trace.Span recordException(java.lang.Throwable, io.opentelemetry.api.common.Attributes)
2+
No changes.

docs/apidiffs/current_vs_latest/opentelemetry-sdk-trace.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ Comparing source compatibility of opentelemetry-sdk-trace-1.58.0-SNAPSHOT.jar ag
66
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.trace.export.SimpleSpanProcessorBuilder (not serializable)
77
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
88
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.export.SimpleSpanProcessorBuilder setMeterProvider(java.util.function.Supplier<io.opentelemetry.api.metrics.MeterProvider>)
9-
*** MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.sdk.trace.ReadWriteSpan (not serializable)
10-
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
11-
===! UNCHANGED INTERFACE: io.opentelemetry.api.trace.Span
12-
+++ NEW INTERFACE: io.opentelemetry.api.trace.SpanParent
139
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.trace.SdkTracerProviderBuilder (not serializable)
1410
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
1511
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.SdkTracerProviderBuilder setMeterProvider(java.util.function.Supplier<io.opentelemetry.api.metrics.MeterProvider>)

opencensus-shim/src/test/java/io/opentelemetry/opencensusshim/DelegatingSpanTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ void verifyAllMethodsAreUnderTest() {
6363
assertThat(methods)
6464
.describedAs("all interface methods are being tested")
6565
.containsAll(allInterfaceMethods(Span.class));
66-
// assertThat(allInterfaceMethods(Span.class))
67-
// .describedAs("all tested methods are on the Span interface")
68-
// .containsAll(methods);
66+
assertThat(allInterfaceMethods(Span.class))
67+
.describedAs("all tested methods are on the Span interface")
68+
.containsAll(methods);
6969
}
7070

7171
@ParameterizedTest

0 commit comments

Comments
 (0)