Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix span logs and tags while logging with level ERROR #328

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix span logs and tags while logging with level ERROR #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1946a99
Fix span logs and tags while logging with level ERROR
Jul 28, 2021
008d211
Fix license
Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions instrument-starters/opentracing-spring-cloud-aop/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2017-2018 The OpenTracing Authors
Copyright 2017-2021 The OpenTracing Authors

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand All @@ -19,7 +19,7 @@
<parent>
<groupId>io.opentracing.contrib</groupId>
<artifactId>opentracing-spring-cloud-parent</artifactId>
<version>0.5.8-SNAPSHOT</version>
<version>0.5.10-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ...racing-spring-cloud-aop/src/main/java/io/opentracing/contrib/spring/cloud/aop/Traced.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion instrument-starters/opentracing-spring-cloud-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2017-2020 The OpenTracing Authors
Copyright 2017-2021 The OpenTracing Authors

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion ...loud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/AopTracingProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion ...g-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/aop/BaseTracingAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/io/opentracing/contrib/spring/cloud/aop/MethodInterceptorSpanDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
5 changes: 3 additions & 2 deletions ...ng-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/log/SpanLogsAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down Expand Up @@ -52,7 +52,8 @@ protected void append(ILoggingEvent event) {
logs.put("message", event.getFormattedMessage());

if (Level.ERROR.equals(event.getLevel())) {
logs.put("event", Tags.ERROR);
Tags.ERROR.set(span, Boolean.TRUE);
logs.put("event", Tags.ERROR.getKey());
}

IThrowableProxy throwableProxy = event.getThrowableProxy();
Expand Down
2 changes: 1 addition & 1 deletion ...oud-core/src/main/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2019 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion ...ing-cloud-core/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion ...ore/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion ...ore/src/main/java/io/opentracing/contrib/spring/cloud/traced/TracedTracingProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion ...oud-core/src/test/java/io/opentracing/contrib/spring/cloud/aop/BaseTracingAspectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
5 changes: 3 additions & 2 deletions ...e/src/test/java/io/opentracing/contrib/spring/cloud/log/LoggingAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down Expand Up @@ -178,7 +178,8 @@ private void assertLogging(ContextData contextData) {
assertEquals(contextData.getThrowable().getMessage(), ((Throwable)logEntry.fields().get("error.object")).getMessage());
}
if (contextData.isError()) {
assertEquals(Tags.ERROR, logEntry.fields().get("event"));
assertEquals(Boolean.TRUE, mockSpan.tags().get(Tags.ERROR.getKey()));
assertEquals(Tags.ERROR.getKey(), logEntry.fields().get("event"));
}
// now >= timestamp +Nms > now
assertTrue(contextData.getTimestamp() >= logEntry.timestampMicros() && logEntry.timestampMicros() + 100 * 1000 > contextData.getTimestamp());
Expand Down
2 changes: 1 addition & 1 deletion ...cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/scheduled/ScheduledTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion ...cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/traced/TracedAspectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/io/opentracing/contrib/spring/cloud/traced/TracedAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2017-2018 The OpenTracing Authors
* Copyright 2017-2021 The OpenTracing Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2017-2020 The OpenTracing Authors
Copyright 2017-2021 The OpenTracing Authors

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
Expand Down