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

Jump to bottom

Add java.util.logging javaagent instrumentation #4941

Merged
merged 11 commits into from
Dec 20, 2021
Merged

Add java.util.logging javaagent instrumentation #4941

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
07024e3
java.util.logging
trask Dec 19, 2021
7ee78bc
Update instrumentation/java-util-logging/javaagent/src/main/java/io/o…
trask Dec 19, 2021
407d0da
sync
trask Dec 20, 2021
911894d
Merge remote-tracking branch 'upstream/main' into add-java-util-loggi…
trask Dec 20, 2021
83a2bde
Update instrumentation/java-util-logging/javaagent/src/main/java/io/o…
trask Dec 20, 2021
3d4443b
Remove unused code
trask Dec 20, 2021
65e2c7d
Simplification
trask Dec 20, 2021
305598a
Remove JBoss logger instrumentation
trask Dec 20, 2021
a5f1e06
Spotless
trask Dec 20, 2021
39f96d1
Unroll
trask Dec 20, 2021
9cb4416
Remove unused dependency
trask Dec 20, 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
Prev Previous commit
Next Next commit
Unroll
  • Loading branch information
@trask
trask committed Dec 20, 2021
commit 39f96d1d039c2f567067f17ab974aa8acdb33f69
4 changes: 3 additions & 1 deletion instrumentation/java-util-logging/javaagent/src/test/groovy/JavaUtilLoggingTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
import io.opentelemetry.sdk.logs.data.Severity
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
import spock.lang.Unroll

import java.util.logging.Level
import java.util.logging.Logger
Expand All @@ -18,6 +19,7 @@ class JavaUtilLoggingTest extends AgentInstrumentationSpecification {

private static final Logger logger = Logger.getLogger("abc")

@Unroll
def "test method=#testMethod with exception=#exception and parent=#parent"() {
when:
if (parent) {
Expand Down Expand Up @@ -67,7 +69,7 @@ class JavaUtilLoggingTest extends AgentInstrumentationSpecification {
assertThat(log.getSpanContext().isValid()).isFalse()
}
} else {
Thread.sleep(500) // sleep a bit just to make sure no span is captured
Thread.sleep(500) // sleep a bit just to make sure no log is captured
logs.size() == 0
}

Expand Down