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.

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

Implement stable database semantic conventions #11575

Open
wants to merge 58 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
9728c0d
Protype for db stable semconv
heyams Jun 13, 2024
46ee9f7
Update redis db.namespace value
heyams Jun 13, 2024
817dc2d
Update
heyams Jun 13, 2024
8b26641
Update
heyams Jul 31, 2024
a0464be
Merge remote-tracking branch 'upstream/main' into heya/implement-data…
heyams Jul 31, 2024
cb4e57c
Use inline
heyams Aug 9, 2024
338549a
Merge remote-tracking branch 'upstream/main' into heya/implement-data…
heyams Aug 9, 2024
7d718cb
Fix
heyams Aug 9, 2024
818c9c8
Fix compilation error
heyams Aug 9, 2024
13f78f4
Fix
heyams Aug 9, 2024
aeac9d2
Merge remote-tracking branch 'upstream/main' into heya/implement-data…
heyams Aug 19, 2024
dd168ee
Update
heyams Aug 19, 2024
5106782
Fix
heyams Aug 20, 2024
27be3ed
Comment
heyams Aug 20, 2024
d4d332e
Suppress deprecation
heyams Aug 20, 2024
bd3a77d
Fix deprecation
heyams Aug 20, 2024
6714f40
Fix span name for vertxRedisClient
heyams Aug 21, 2024
fc6caa5
Fix couchbaseSpringRepositoryTest
heyams Aug 21, 2024
0cb4c9d
Fix
heyams Aug 21, 2024
9abe6e5
Merge remote-tracking branch 'upstream/main' into heya/implement-data…
heyams Aug 21, 2024
5458730
Merge remote-tracking branch 'upstream/main' into heya/implement-data…
heyams Aug 27, 2024
0b41bdd
Fix network_type
heyams Aug 28, 2024
fe8fe48
Fix cassandra tests
heyams Aug 28, 2024
7a4234d
Fix cassandraClient test
heyams Aug 28, 2024
76fa8be
Fix RedissonClientTest
heyams Aug 29, 2024
2007a22
Fix db.statement vs. db.query.text
heyams Aug 29, 2024
2ae1354
Fix
heyams Aug 29, 2024
ed94de3
Fix AbstractRedissonAsyncClientTest
heyams Aug 29, 2024
da00aa2
Fix
heyams Aug 29, 2024
f62fc39
Fix
heyams Aug 29, 2024
9dac540
Fix couchbase tests
heyams Aug 29, 2024
066897a
Fix
heyams Aug 29, 2024
181ee2c
Fix codenarc
heyams Aug 29, 2024
be44287
Fix cassandraclienttest 3.0
heyams Aug 29, 2024
c5b8888
Fix cassandra sync test
heyams Aug 30, 2024
dd5b1ef
Fix
heyams Aug 30, 2024
e80ead2
Fix
heyams Aug 30, 2024
0536e20
Fix
heyams Aug 30, 2024
a999f1b
Deprecate getUser and getConnectionString
heyams Sep 9, 2024
a956705
Deprecate getOperation and getStatement
heyams Sep 9, 2024
9cdd39f
Revert
heyams Sep 9, 2024
566318a
Remove supressionWarning
heyams Sep 9, 2024
616b243
Fix
heyams Sep 9, 2024
6e09209
Fix
heyams Sep 10, 2024
63261be
Fix deprecation
heyams Sep 10, 2024
78278e8
Fix
heyams Sep 10, 2024
63fad77
Fix
heyams Sep 10, 2024
a4bbdfc
Fix
heyams Sep 10, 2024
3b60339
Merge remote-tracking branch 'upstream/main' into heya/implement-data…
heyams Sep 13, 2024
14495e3
Fix couchbase tests
heyams Sep 13, 2024
7928bb4
Fix
heyams Sep 13, 2024
60c344f
Fix
heyams Sep 16, 2024
39743eb
Fix
heyams Sep 16, 2024
4171532
Rename getOperationName to getDbOperationName
heyams Sep 17, 2024
dbc596f
Rename getNamespace to getDbNamespace
heyams Sep 17, 2024
f449cf8
Deprecate getSystem and introduce getDbSystem
heyams Sep 17, 2024
8f841e1
Delete SemconvStability.getAttributeKey
heyams Sep 17, 2024
4820887
Fix unused var
heyams Sep 17, 2024
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
Fix
  • Loading branch information
heyams committed Aug 30, 2024
commit e80ead2061d60249e3c00291c3b2ad0139e3cbbb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.cassandra.v4.common.AbstractCassandraTest;
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
import io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil;
import io.opentelemetry.semconv.NetworkAttributes;
import java.util.stream.Stream;
import org.junit.jupiter.params.ParameterizedTest;
Expand Down Expand Up @@ -75,8 +76,12 @@ void reactiveTest(Parameter parameter) {
equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort),
equalTo(DB_SYSTEM, "cassandra"),
equalTo(DB_NAME, parameter.keyspace),
equalTo(DB_STATEMENT, parameter.expectedStatement),
equalTo(DB_OPERATION, parameter.operation),
equalTo(
SemconvStabilityUtil.getAttributeKey(DB_STATEMENT),
parameter.expectedStatement),
equalTo(
SemconvStabilityUtil.getAttributeKey(DB_OPERATION),
parameter.operation),
equalTo(DB_CASSANDRA_CONSISTENCY_LEVEL, "LOCAL_ONE"),
equalTo(DB_CASSANDRA_COORDINATOR_DC, "datacenter1"),
satisfies(
Expand All @@ -87,7 +92,9 @@ void reactiveTest(Parameter parameter) {
val -> val.isInstanceOf(Boolean.class)),
equalTo(DB_CASSANDRA_PAGE_SIZE, 5000),
equalTo(DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, 0),
equalTo(DB_CASSANDRA_TABLE, parameter.table)),
equalTo(
SemconvStabilityUtil.getAttributeKey(DB_CASSANDRA_TABLE),
parameter.table)),
span ->
span.hasName("child")
.hasKind(SpanKind.INTERNAL)
Expand Down
Loading