Skip to content

Commit 2dea105

Browse files
committed
Updated to SpanManager lib version 0.0.3.
1 parent fcdf3da commit 2dea105

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

opentracing-span-propagation/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<properties>
3333
<root.basedir>${project.parent.basedir}</root.basedir>
3434
<project.build.java.version>1.6</project.build.java.version>
35-
<opentracing-spanmanager.version>0.0.2</opentracing-spanmanager.version>
35+
<opentracing-spanmanager.version>0.0.3</opentracing-spanmanager.version>
3636
</properties>
3737

3838
<dependencies>

opentracing-span-propagation/src/main/java/nl/talsmasoftware/context/opentracing/GlobalSpanManager.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ public ManagedSpan current() {
8686
}
8787

8888
@Override
89-
public ManagedSpan manage(Span span) {
89+
public ManagedSpan activate(Span span) {
9090
init();
9191
final int delegateCount = DELEGATES.size();
92-
if (delegateCount == 1) return DELEGATES.get(0).manage(span);
92+
if (delegateCount == 1) return DELEGATES.get(0).activate(span);
9393
List<ManagedSpan> managedSpans = new ArrayList<ManagedSpan>(delegateCount);
9494
for (SpanManager delegate : DELEGATES) {
9595
try {
96-
managedSpans.add(delegate.manage(span));
96+
managedSpans.add(delegate.activate(span));
9797
} catch (RuntimeException manageEx) {
9898
LOGGER.log(Level.SEVERE, "Error managing " + span + ": " + manageEx.getMessage(), manageEx);
9999
}
@@ -133,10 +133,10 @@ public Span getSpan() {
133133
}
134134

135135
@Override
136-
public void release() {
136+
public void deactivate() {
137137
for (ManagedSpan delegate : delegates) {
138138
try {
139-
delegate.release();
139+
delegate.deactivate();
140140
} catch (RuntimeException releaseEx) {
141141
LOGGER.log(Level.SEVERE, "Error releasing " + delegate + ": " + releaseEx.getMessage(), releaseEx);
142142
}

opentracing-span-propagation/src/main/java/nl/talsmasoftware/context/opentracing/SpanContextManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
public final class SpanContextManager implements ContextManager<Span> {
3434

3535
@Override
36-
@SuppressWarnings("deprecation") // Intentional deprecation
36+
@SuppressWarnings("deprecation") // Intentional deprecation of GlobalSpanManager
3737
public Context<Span> initializeNewContext(Span value) {
38-
return new ManagedSpanContext(GlobalSpanManager.get().manage(value));
38+
return new ManagedSpanContext(GlobalSpanManager.get().activate(value));
3939
}
4040

4141
@Override
42-
@SuppressWarnings("deprecation") // Intentional deprecation
42+
@SuppressWarnings("deprecation") // Intentional deprecation of GlobalSpanManager
4343
public Context<Span> getActiveContext() {
44-
return new ManagedSpanContext(GlobalSpanManager.get().currentSpan());
44+
return new ManagedSpanContext(GlobalSpanManager.get().current().getSpan());
4545
}
4646

4747
@Override

0 commit comments

Comments
 (0)