Skip to content

Commit 87d1a49

Browse files
committed
removed synchronized constructs from some functions to improve performance
1 parent 1974122 commit 87d1a49

File tree

1 file changed

+17
-29
lines changed
  • core/src/main/java/com/expedia/www/haystack/client

1 file changed

+17
-29
lines changed

core/src/main/java/com/expedia/www/haystack/client/Span.java

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,14 @@ Long getEndTime() {
9999
* @return the endTime
100100
*/
101101
public Long getStartTime() {
102-
synchronized (this) {
103102
return startTime;
104-
}
105103
}
106104

107105
/**
108106
* @return the tracer
109107
*/
110108
public Tracer getTracer() {
111-
synchronized (this) {
112-
return this.tracer;
113-
}
109+
return this.tracer;
114110
}
115111

116112
@Override
@@ -172,23 +168,17 @@ public Map<String, String> getBaggageItems() {
172168

173169
@Override
174170
public Span setTag(String key, Number value) {
175-
synchronized (this) {
176-
return addTag(key, value);
177-
}
171+
return addTag(key, value);
178172
}
179173

180174
@Override
181175
public Span setTag(String key, boolean value) {
182-
synchronized (this) {
183-
return addTag(key, value);
184-
}
176+
return addTag(key, value);
185177
}
186178

187179
@Override
188180
public Span setTag(String key, String value) {
189-
synchronized (this) {
190-
return addTag(key, value);
191-
}
181+
return addTag(key, value);
192182
}
193183

194184
public Map<String, Object> getTags() {
@@ -209,13 +199,6 @@ public Span log(long timestampMicroseconds, Map<String, ?> fields) {
209199
}
210200
}
211201

212-
@Override
213-
public Span log(Map<String, ?> fields) {
214-
synchronized (this) {
215-
return log(System.nanoTime(), fields);
216-
}
217-
}
218-
219202
@Override
220203
public Span log(long timestampMicroseconds, String event) {
221204
synchronized (this) {
@@ -228,11 +211,15 @@ public Span log(long timestampMicroseconds, String event) {
228211
}
229212
}
230213

214+
@Override
215+
public Span log(Map<String, ?> fields) {
216+
return log(System.nanoTime(), fields);
217+
}
218+
219+
231220
@Override
232221
public Span log(String event) {
233-
synchronized (this) {
234-
return log(System.nanoTime(), event);
235-
}
222+
return log(System.nanoTime(), event);
236223
}
237224

238225
public List<LogData> getLogs() {
@@ -256,13 +243,14 @@ private void finishedCheck(String format, Object... args) {
256243

257244

258245
private Span addTag(String key, Object value) {
259-
if (key == null || value == null) {
246+
synchronized (this) {
247+
if (key == null || value == null) {
248+
return this;
249+
}
250+
finishedCheck("Setting a tag (%s:%s) on a finished span", key, value);
251+
tags.put(key, value);
260252
return this;
261253
}
262-
263-
finishedCheck("Setting a tag (%s:%s) on a finished span", key, value);
264-
tags.put(key, value);
265-
return this;
266254
}
267255

268256
private void finishTrace(long finishMicros) {

0 commit comments

Comments
 (0)