RUM-3389 Add the Otel API feature integration tests#1995
Merged
mariusc83 merged 2 commits intoApr 19, 2024
Merged
Conversation
mariusc83
force-pushed
the
mconstantin/rum-3389/add-trace-otel-feature-integration-tests
branch
from
April 17, 2024 12:54
f45e21c to
76ae6a7
Compare
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## feature/otel-support #1995 +/- ##
========================================================
+ Coverage 60.26% 60.38% +0.12%
========================================================
Files 808 808
Lines 30184 30224 +40
Branches 4945 4951 +6
========================================================
+ Hits 18188 18248 +60
+ Misses 10772 10760 -12
+ Partials 1224 1216 -8
|
mariusc83
force-pushed
the
mconstantin/rum-3389/add-trace-otel-feature-integration-tests
branch
from
April 17, 2024 14:05
76ae6a7 to
8c37b96
Compare
mariusc83
marked this pull request as ready for review
April 17, 2024 14:12
mariusc83
force-pushed
the
mconstantin/rum-3389/add-trace-otel-feature-integration-tests
branch
from
April 17, 2024 14:16
8c37b96 to
6a1b938
Compare
mariusc83
force-pushed
the
mconstantin/rum-4116/add-spanlink-support-for-otel-tracer
branch
4 times, most recently
from
April 18, 2024 12:26
40ec44a to
f28a8cf
Compare
Base automatically changed from
mconstantin/rum-4116/add-spanlink-support-for-otel-tracer
to
feature/otel-support
April 18, 2024 13:18
mariusc83
force-pushed
the
mconstantin/rum-3389/add-trace-otel-feature-integration-tests
branch
from
April 18, 2024 13:37
6a1b938 to
989c4e0
Compare
xgouchet
previously approved these changes
Apr 18, 2024
0xnm
previously approved these changes
Apr 18, 2024
| import com.datadog.trace.bootstrap.instrumentation.api.AgentSpan | ||
| import io.opentelemetry.api.trace.Span | ||
|
|
||
| internal fun Span.lessSignificantTraceIdAsHexString(): String { |
Member
There was a problem hiding this comment.
Suggested change
| internal fun Span.lessSignificantTraceIdAsHexString(): String { | |
| internal fun Span.leastSignificantTraceIdAsHexString(): String { |
Comment on lines
+17
to
+21
| internal class BlockingWriterWrapper(wrapped: Writer) : Writer { | ||
| private val latches: LinkedList<CountDownLatch> = LinkedList() | ||
| private val currentTraceCount: AtomicInteger = AtomicInteger(0) | ||
|
|
||
| private val wrappedWriter = wrapped |
Member
There was a problem hiding this comment.
Suggested change
| internal class BlockingWriterWrapper(wrapped: Writer) : Writer { | |
| private val latches: LinkedList<CountDownLatch> = LinkedList() | |
| private val currentTraceCount: AtomicInteger = AtomicInteger(0) | |
| private val wrappedWriter = wrapped | |
| internal class BlockingWriterWrapper(private val wrappedWriter: Writer) : Writer { | |
| private val latches: LinkedList<CountDownLatch> = LinkedList() | |
| private val currentTraceCount: AtomicInteger = AtomicInteger(0) |
Comment on lines
+55
to
+57
| val latch = CountDownLatch(toWait) | ||
| synchronized(latches) { | ||
| latches.add(latch) | ||
| } | ||
| return latch.await(seconds.toLong(), TimeUnit.SECONDS) |
Member
There was a problem hiding this comment.
In theory just a ConditionWatcher could be used here which polls the value of currentTraceCount, then in this case there is no need to create multiple latches. But fine as it is as well.
Member
Author
There was a problem hiding this comment.
I see, I might change that if I have time but maybe in another ticket. I forgot about that ConditionWatcher
| fun `set up`(forge: Forge) { | ||
| val datadogContextStorageClass = | ||
| Class.forName("com.datadog.android.trace.opentelemetry.DatadogContextStorage") | ||
| val constructor = datadogContextStorageClass.constructors.first { it.parameterCount == 1 } |
Member
There was a problem hiding this comment.
constructor is a reserved keyword in Kotlin, even github highlights this word differently. To avoid confusion it is better to rename it to something like ctor or contructorRef.
mariusc83
force-pushed
the
mconstantin/rum-3389/add-trace-otel-feature-integration-tests
branch
from
April 18, 2024 15:45
989c4e0 to
0a423fe
Compare
0xnm
approved these changes
Apr 18, 2024
mariusc83
deleted the
mconstantin/rum-3389/add-trace-otel-feature-integration-tests
branch
April 19, 2024 07:40
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
A brief description of the change being made with this pull request.
Motivation
What inspired you to submit this pull request?
Additional Notes
Anything else we should know when reviewing?
Review checklist (to be filled by reviewers)