Preserve SQL query summary operation case by trask · Pull Request #18930 · open-telemetry/opentelemetry-java-instrumentation

trask · 2026-06-07T05:33:01Z

Preserve the original case of SQL operation keywords when building stable query summaries. This switches matched operation tokens to use the lexer text consistently, including nested SELECTs and top-level VALUES, and adds coverage across supported summary operations.

Copilot

Pull request overview

This PR updates the SQL query summary lexer to preserve the original case of operation keywords (e.g., select vs SELECT) when building stable query summaries, and expands test coverage to validate case preservation across supported summary operations and nested SELECT scenarios.

Changes:

Switched query-summary operation tokens to use the lexer’s matched text (yytext()) instead of hard-coded uppercase keywords.
Updated nested/embedded SELECT handling to propagate the matched operation text through handleSelect(...).
Added/updated tests to assert query summaries preserve the input operation keyword case across many operations (including nested SELECTs and top-level VALUES).

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
instrumentation-api-incubator/src/main/jflex/SqlSanitizerWithSummary.jflex	Uses matched lexer text for operation keywords and threads original `SELECT` token text through operation handling to preserve case in summaries.
instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlQueryAnalyzerTest.java	Adds a parameterized test for operation-case preservation and updates existing summary expectations to reflect case-preserving behavior.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

SQL query summaries now preserve the operation casing from the original statement. Stable database semconv tests were still expecting canonical uppercase summaries and span names for lowercase generated SQL, causing the CI failures. Update the affected Camel, Hibernate, and Vert.x expectations to match the preserved case while leaving uppercase native SQL expectations unchanged. Validation: .\gradlew.bat :instrumentation-api-incubator:test --tests io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlQueryAnalyzerTest --tests io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlQuerySummaryEdgeCasesTest; .\gradlew.bat :instrumentation:hibernate:hibernate-6.0:javaagent:hibernate6TestStableSemconv; .\gradlew.bat :instrumentation:camel-2.20:javaagent-unit-tests:testStableSemconv :instrumentation:camel-2.20:javaagent:testStableSemconv :instrumentation:hibernate:hibernate-6.0:javaagent:hibernate6TestStableSemconv :instrumentation:hibernate:hibernate-6.0:spring-testing:testStableSemconv :instrumentation:hibernate:hibernate-reactive-1.0:javaagent:hibernateReactive1TestStableSemconv :instrumentation:vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent:testStableSemconv; .\gradlew.bat spotlessCheck

…ary-case

Copilot

Pull request overview

Copilot reviewed 19 out of 19 changed files in this pull request and generated no new comments.

Stable database semantic convention query summaries are emitted with lowercase SQL operation names by the updated SQL analyzer. Several Hibernate, ClickHouse, and Spring Data tests still expected uppercase stable span names or db.query.summary values, causing the CI testStableSemconv jobs to fail. Update the affected expectations to match the emitted stable semconv values while preserving legacy-mode expectations. Validation: ./gradlew.bat :instrumentation:hibernate:hibernate-6.0:javaagent:test --tests io.opentelemetry.javaagent.instrumentation.hibernate.v6_0.CriteriaTest --tests io.opentelemetry.javaagent.instrumentation.hibernate.v6_0.EntityManagerTest.testNoResultExceptionIgnored ./gradlew.bat :instrumentation:hibernate:hibernate-6.0:javaagent:testStableSemconv --tests io.opentelemetry.javaagent.instrumentation.hibernate.v6_0.CriteriaTest --tests io.opentelemetry.javaagent.instrumentation.hibernate.v6_0.EntityManagerTest.testNoResultExceptionIgnored ./gradlew.bat :instrumentation:hibernate:hibernate-6.0:spring-testing:test --tests spring.jpa.SpringJpaTest ./gradlew.bat :instrumentation:hibernate:hibernate-4.0:javaagent:testStableSemconv --tests io.opentelemetry.javaagent.instrumentation.hibernate.v4_0.CriteriaTest --tests io.opentelemetry.javaagent.instrumentation.hibernate.v4_0.EntityManagerTest.testNoResultExceptionIgnored --tests io.opentelemetry.javaagent.instrumentation.hibernate.v4_0.QueryTest.testHibernateQuerySingleCall ./gradlew.bat :instrumentation:hibernate:hibernate-3.3:javaagent:testStableSemconv --tests io.opentelemetry.javaagent.instrumentation.hibernate.v3_3.QueryTest ./gradlew.bat :instrumentation:clickhouse:clickhouse-client-v2-0.8:javaagent:testStableSemconv --tests io.opentelemetry.javaagent.instrumentation.clickhouse.clientv2.v0_8.ClickHouseClientV2Test ./gradlew.bat :instrumentation:spring:spring-data:spring-data-1.8:javaagent:testStableSemconv

Stable database semconv lowercases generated HQL/ORM query summaries and span names, while native SQL keeps its SQL operation casing. The Hibernate tests mixed those expectations, causing stable-semconv and latest-deps CI failures after the PR changed the expected assertions. Update the affected Hibernate 4 and 6 tests to expect lowercase generated query names and preserve uppercase native SQL names, and run Spotless for the logged formatting issue. Validation: .\gradlew.bat :instrumentation:hibernate:hibernate-4.0:javaagent:testStableSemconv :instrumentation:hibernate:hibernate-6.0:javaagent:testStableSemconv .\gradlew.bat :instrumentation:hibernate:hibernate-4.0:javaagent:testStableSemconv :instrumentation:hibernate:hibernate-6.0:javaagent:testStableSemconv -PtestLatestDeps=true .\gradlew.bat :instrumentation:hibernate:hibernate-3.3:javaagent:spotlessCheck :instrumentation:hibernate:hibernate-4.0:javaagent:spotlessCheck :instrumentation:hibernate:hibernate-6.0:javaagent:spotlessCheck

The Hibernate 6 and 7 SessionTest query-state assertions always expected stable-semconv lowercase HQL span names, but the failing CI jobs run legacy database semconv mode where the instrumentation emits uppercase SELECT names. The tests now derive the expected query span name from the active semconv mode. Validation: .\gradlew.bat :instrumentation:hibernate:hibernate-6.0:javaagent:hibernate6Test :instrumentation:hibernate:hibernate-6.0:javaagent:hibernate7Test --tests *SessionTest .\gradlew.bat :instrumentation:hibernate:hibernate-6.0:javaagent:hibernate7Test --tests *SessionTest -PtestLatestDeps=true Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

trask · 2026-06-08T22:56:31Z


        // hibernate/jpa query language
-        Arguments.of("FROM TABLE WHERE FIELD=1234", "FROM TABLE WHERE FIELD=?", "SELECT TABLE"));
+        Arguments.of("from TABLE WHERE FIELD=1234", "from TABLE WHERE FIELD=?", "select TABLE"));


changing FROM to from isn't relevant, but it does match what's seen from hibernate, so seems more realistic example data

Copilot

Pull request overview

Copilot reviewed 30 out of 30 changed files in this pull request and generated 1 comment.

Copilot

Pull request overview

Copilot reviewed 30 out of 30 changed files in this pull request and generated no new comments.

* Update version to 2.29.0-SNAPSHOT (open-telemetry#18790) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update all patch versions (open-telemetry#18793) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update quarkus packages to v3.35.3 (open-telemetry#18794) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Post-release updates for 2.28.0 (open-telemetry#18798) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update spotless packages to v8.5.1 (open-telemetry#18799) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update pinned latest dep versions (open-telemetry#18801) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * chore(deps): update weekly update (open-telemetry#18800) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Enable opentelemetry-api and opentelemetry-instrumentation-annotations even when default-enabled is false (open-telemetry#18792) * Rename Jetty and Tomcat common modules (open-telemetry#18786) * Rename OpenSearch REST common module (open-telemetry#18787) * Require telemetry stability in stable artifacts (open-telemetry#18789) * Capture pulsar message id earlier (open-telemetry#18803) * Increase timeout (open-telemetry#18805) * fix(deps): update dependency com.google.protobuf:protobuf-java-util to v4.35.0 (open-telemetry#18807) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update pinned latest dep versions (open-telemetry#18810) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update opentelemetry-java-contrib monorepo to v1.57.0-alpha (open-telemetry#18809) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * fix(deps): update quarkus packages to v3.36.0 (open-telemetry#18814) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Make waiting for gc ignore OutOfMemoryError (open-telemetry#18815) * Post-release updates for 2.28.1 (open-telemetry#18819) * Reduce the amount of test state (open-telemetry#18817) * Document constructor annotation behavior (open-telemetry#18797) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Update pinned latest dep versions (open-telemetry#18821) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Ensure docker is started before running windows smoke tests (open-telemetry#18823) * Fix flaky tomcat requestWithException test (open-telemetry#18804) * Increase server stop timeout for finalge tests (open-telemetry#18827) * Fix flaky finagle future pool test (open-telemetry#18826) * Rename Spring WebMVC common module (open-telemetry#18788) * Rename Payara module to include base version (open-telemetry#18835) * Update pinned latest dep versions (open-telemetry#18840) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * chore(deps): update flint-managed linter updates to v0.2.0 (open-telemetry#18843) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Rename Spring common testing packages (open-telemetry#18839) * Update pinned latest dep versions (open-telemetry#18842) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update all patch versions (open-telemetry#18847) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * chore(deps): update weekly update (open-telemetry#18848) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Change method to package private (open-telemetry#18849) * Clarify annotation instrumentation method matching (open-telemetry#18836) * Rename Quarkus RESTEasy Reactive and Tomcat JDBC modules (open-telemetry#18838) * JDBC url parsing for Amazon Aurora (open-telemetry#18831) * Disable kafka metrics by default in v3 (open-telemetry#18828) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Fix the bug where Redisson loses context during command execution. (open-telemetry#18701) Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * fix(ktor): resolve client hang on streaming path with Ktor 3.5.0 (open-telemetry#18781) * Use GraphQL to find the existing dashboard issue (open-telemetry#18856) Signed-off-by: Trask Stalnaker <trask.stalnaker@gmail.com> * Rename OSHI and Elasticsearch transport common modules to include base version (open-telemetry#18854) * fix(deps): update spotless packages to v8.6.0 (open-telemetry#18861) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Remove setup_migration_version from flint.toml (open-telemetry#18864) * Move servlet-common internal package under servlet.common.internal (open-telemetry#18855) * Fallback to old muzzle resolution when pinned versions file is missing (open-telemetry#18834) * Update pinned latest dep versions (open-telemetry#18858) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Update pinned latest dep versions (open-telemetry#18867) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Fix flaky tomcat exception tests (open-telemetry#18868) * fix(deps): update dependency checkstyle to v13.5.0 (open-telemetry#18870) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update pinned latest dep versions (open-telemetry#18869) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Update pinned latest dep versions (open-telemetry#18872) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update all patch versions (open-telemetry#18877) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update gradle develocity packages to v4.4.2 (open-telemetry#18880) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update pinned latest dep versions (open-telemetry#18881) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Fix deprection warning in build script (open-telemetry#18875) * fix(deps): update gradle shadow packages to v9.4.2 (open-telemetry#18882) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update graalvm buildtools packages to v1.1.1 (open-telemetry#18879) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Set instrumentation version on emitted Meter scopes (open-telemetry#18866) * Rename Akka and Scala forkjoin modules (open-telemetry#18772) * fix(deps): update byte buddy packages to v1.18.9 - abandoned (open-telemetry#18878) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Use SHA-256 for runtime telemetry package checksums (open-telemetry#18846) Signed-off-by: Israel Blancas <iblancasa@gmail.com> Co-authored-by: jason plumb <75337021+breedx-splk@users.noreply.github.com> * Run @WithSpan instrumetnation after other instrumentations (open-telemetry#18874) * Update pinned latest dep versions (open-telemetry#18888) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Add opt-in support for emitting exceptions as log signals (open-telemetry#16259) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Update pinned latest dep versions (open-telemetry#18895) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update jackson packages to v2.22.0 (open-telemetry#18871) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * chore(deps): update weekly update (open-telemetry#18850) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Rename opentelemetry-instrumentation-api module to v1.14 and add v1_14 subpackage (open-telemetry#18887) * finagle: set read timeout only for read timeout test (open-telemetry#18897) * Consistent checking for read timeout uri (open-telemetry#18900) * Fix missing metric metadata for jdbc and oshi (open-telemetry#18901) * Update pinned latest dep versions (open-telemetry#18902) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update dependency net.ltgt.gradle:gradle-nullaway-plugin to v3.1.0 (open-telemetry#18906) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Align 3.0 deprecation markers in javaagent-extension-api (open-telemetry#18904) * Stream spotless output in PR triage script (open-telemetry#18910) * Clarify that config properties that contain the word `preview` are not stable (open-telemetry#18909) * Update pinned latest dep versions (open-telemetry#18917) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Preserve log total attribute count in tests (open-telemetry#18913) * Update pinned latest dep versions (open-telemetry#18931) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Fix metadata collection on Windows (open-telemetry#18928) * Collect Redisson 3.0 stable database telemetry (open-telemetry#18929) * Fix logback MDC declarative config keys (open-telemetry#18924) * Remove `network.type` from stable Cassandra db spans (open-telemetry#18920) * Prepare for SQLQueryAnalyzer analyze change in 3.0 (open-telemetry#18921) * Disable coroutine WithSpan by default in v3 preview (open-telemetry#18919) * aws-sdk-2.2: remove *AdviceBridge classes living in non-standard javaagent package (open-telemetry#18915) * aws-sdk-1.11: remove SqsAdviceBridge living in non-standard javaagent package (open-telemetry#18916) * Move nonstable semconv opt-ins to preview flag in 3.0 (open-telemetry#18914) * Move opentelemetry-api-1.0 instrumentation under v1_0 subpackage (open-telemetry#18886) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Remove deprecated db config names when v3 preview is enabled (open-telemetry#18934) Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> * Update metadata workflow to run on forks (open-telemetry#18940) * fix(deps): update okhttp monorepo to v5.4.0 (open-telemetry#18939) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix scope/telemetry attribution in metadata (open-telemetry#18941) * Update pinned latest dep versions (open-telemetry#18949) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update byte buddy packages to v1.18.10 (open-telemetry#18947) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Harden workflow input handling (open-telemetry#18946) * fix(deps): update armeria packages to v1.39.1 (open-telemetry#18944) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update quarkus packages to v3.36.1 (open-telemetry#18945) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Add v3 preview config fallback (open-telemetry#18936) * chore(deps): update weekly update (open-telemetry#18942) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * fix(deps): update all patch versions (open-telemetry#18943) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Emit RPC exceptions as logs under the opt-in preview (open-telemetry#18890) * Emit DB exceptions as logs under the opt-in preview (open-telemetry#18889) * Emit FaaS exceptions as logs under the opt-in preview (open-telemetry#18892) * Emit messaging exceptions as logs under the opt-in preview (open-telemetry#18891) * Close BufferedWriter in code (open-telemetry#18923) Co-authored-by: tejasae-afk <tejasae-afk@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Exclude gh aw lockfiles from renovate update (open-telemetry#18950) * Support sqlite (open-telemetry#18885) Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> * Preserve SQL query summary operation case (open-telemetry#18930) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add Couchbase 3.x stable db semconv support (open-telemetry#18926) * chore: update instrumentation list [automated] (open-telemetry#18857) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Emit GenAI exceptions as logs under the opt-in preview (open-telemetry#18893) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Fix NPE in Bedrock converseStream when tool use has empty arguments (open-telemetry#18783) * Allow producing complex jmx based metrics (open-telemetry#18782) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Fix peer service declarative config names metadata (open-telemetry#18883) * Fix DDL target case handling for password sanitization (open-telemetry#18927) * Add prettier to spotless (open-telemetry#18952) * Emit AWS SDK exceptions as logs under the opt-in preview (open-telemetry#18894) * chore: update instrumentation list [automated] (open-telemetry#18954) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Emit stable Cassandra operation and collection attributes (open-telemetry#18922) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Update the OpenTelemetry SDK version to 1.63.0 (open-telemetry#18911) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Update pinned latest dep versions (open-telemetry#18955) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Module cleanup: batch of 19 modules (run 27261702849) (open-telemetry#18956) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Rename enduser attributes for v3 preview (open-telemetry#18795) * Update Jedis to stable database semconv (open-telemetry#18808) * fix(deps): update grpc-java monorepo to v1.82.0 (open-telemetry#18960) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update spring boot to v4.1.0 (open-telemetry#18961) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore: update instrumentation list [automated] (open-telemetry#18962) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Restore OpenTelemetry API 1.47 incubator log bridge (open-telemetry#18959) * Update pinned latest dep versions (open-telemetry#18963) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * feat: Add support for SOFARPC framework (open-telemetry#15589) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Steve Rao <raozihao.rzh@alibaba-inc.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * feat: Add support for HBase versions 2.0.0 to 2.5.0. (open-telemetry#18253) Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Module cleanup: batch of 4 modules (run 27361345481) (open-telemetry#18965) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Module cleanup: batch of 2 modules (run 27362648931) (open-telemetry#18966) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Propagate Log4j appender context through async loggers (open-telemetry#18937) * Add db.collection.name to DynamoDB spans under stable database semconv (open-telemetry#18853) Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Rename common logging properties (open-telemetry#18851) Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> * Update pinned latest dep versions (open-telemetry#18972) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update error-prone monorepo to v2.50.0 (open-telemetry#18957) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Fix DynamoDB stable database semconv (open-telemetry#18970) * chore: update instrumentation list [automated] (open-telemetry#18969) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Enable errorprone DefaultPackage check (open-telemetry#18973) * Clean up latest dependency override comments (open-telemetry#18968) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Capture Cassandra batch queries (open-telemetry#18964) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Update pinned latest dep versions (open-telemetry#18983) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update dependency checkstyle to v13.6.0 (open-telemetry#18996) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore: update instrumentation list [automated] (open-telemetry#18981) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Support Redisson batch operations (open-telemetry#18985) * Fix Vert.x Redis stable span names (open-telemetry#18986) * Prevent Lettuce Redis db.namespace being included in span names (open-telemetry#18984) * Add R2DBC batch size semconv attributes (open-telemetry#18980) * Fix DynamoDB batch attributes (open-telemetry#18979) * Update pinned latest dep versions (open-telemetry#18997) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Add back isMethod check in jedis instrumentation (open-telemetry#19000) * Add DB client collection semconv API (open-telemetry#18989) * Fix Couchbase stable DB span names (open-telemetry#18993) * Delete unnecessary @DisabledIfSystemProperty (open-telemetry#18999) * Fix Geode stable DB semconv attributes (open-telemetry#18992) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Mark nonstable JMX targets experimental (open-telemetry#18971) * Fix HBase stable DB semconv attributes (open-telemetry#18990) * Disable hbase tests on openj9 (open-telemetry#18998) * Fix daily workflow failure notifications (open-telemetry#19001) * Fix test label comment workflow (open-telemetry#19002) * Fix Mongo stable DB span names (open-telemetry#18987) * Add JDBC transaction duration metrics (open-telemetry#19003) * fix(deps): update all patch versions (open-telemetry#19013) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * fix(deps): update quarkus packages to v3.36.2 (open-telemetry#19015) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update weekly update (open-telemetry#18951) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Assert stable connection pool metric names in stable semconv mode (open-telemetry#19011) * chore: update instrumentation list [automated] (open-telemetry#19012) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Improve Vert.x SQL stable metric tests (open-telemetry#19010) * Improve Vert.x Redis stable metric test (open-telemetry#19009) * fix(deps): update graalvm buildtools packages to v1.1.2 (open-telemetry#19014) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Add Redisson batch size attribute (open-telemetry#19005) * Update pinned latest dep versions (open-telemetry#19016) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Add Vert.x SQL batch size attribute (open-telemetry#19004) Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * fix(deps): update spotless packages to v8.7.0 (open-telemetry#19017) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Add thread details for declarative config via span processor (open-telemetry#19008) Signed-off-by: Trask Stalnaker <trask.stalnaker@gmail.com> * Generate opt-in instrumentation version class (open-telemetry#19006) * Align SemconvStability with newer declarative config (open-telemetry#18908) Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> * Enable jvm.gc.cause attribute by default (open-telemetry#18967) Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> * fix(deps): update semconvversion to v1.42.0 (open-telemetry#19020) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * chore: update instrumentation list [automated] (open-telemetry#19022) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Update pinned latest dep versions (open-telemetry#19023) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Fix duplicate Pulsar multi-topic receive spans (open-telemetry#18771) Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> * Add another port wait for hadoop test (open-telemetry#19028) * Set query timeouts for camel cassandara test (open-telemetry#19026) * Set request timeout only for the read timeout test (open-telemetry#19025) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Run openserch asyn callbacks with parent context (open-telemetry#19027) * fix(deps): update dependency commons-logging:commons-logging to v1.4.0 (open-telemetry#19030) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update armeria packages to v1.40.0 (open-telemetry#19032) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update quarkus packages to v3.37.0 (open-telemetry#19031) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update pinned latest dep versions (open-telemetry#19033) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> * Draft release notes (open-telemetry#19040) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> * [release/v2.29.x] Prepare release 2.29.0 (open-telemetry#19042) Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> --------- Signed-off-by: Trask Stalnaker <trask.stalnaker@gmail.com> Signed-off-by: Israel Blancas <iblancasa@gmail.com> Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> Co-authored-by: otelbot[bot] <197425009+otelbot[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: YaoYingLong <906271196@qq.com> Co-authored-by: Adrian McCague <amccague@gmail.com> Co-authored-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> Co-authored-by: jason plumb <75337021+breedx-splk@users.noreply.github.com> Co-authored-by: Jay DeLuca <jaydeluca4@gmail.com> Co-authored-by: Tejas Attarde <201814263+tejasae-afk@users.noreply.github.com> Co-authored-by: tejasae-afk <tejasae-afk@users.noreply.github.com> Co-authored-by: Michael Dent <vikinghawk@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: otelbot-java-instrumentation[bot] <212412449+otelbot-java-instrumentation[bot]@users.noreply.github.com> Co-authored-by: Stefano Pace <stefanopace01@gmail.com> Co-authored-by: Me1iodas <fangxiu.wf@alibaba-inc.com> Co-authored-by: Steve Rao <raozihao.rzh@alibaba-inc.com> Co-authored-by: Egor Fatyushin <Egor.Fatyushin@skyscanner.net> Co-authored-by: somil jain <somil16022006@gmail.com>

Preserve SQL query summary operation case

6c3c86c

trask requested a review from a team as a code owner June 7, 2026 05:33

Copilot AI review requested due to automatic review settings June 7, 2026 05:33

Copilot started reviewing on behalf of trask June 7, 2026 05:33

View session

trask marked this pull request as draft June 7, 2026 05:34

This was referenced Jun 7, 2026

Emit stable Cassandra operation and collection attributes #18922

Merged

Fix DDL target case handling for password sanitization #18927

Merged

Copilot AI reviewed Jun 7, 2026

View reviewed changes

github-actions Bot mentioned this pull request Jun 7, 2026

Pull Request Dashboard #18435

Open

fix

61a9870

trask force-pushed the fix-stable-sql-summary-case branch from d549bc9 to 61a9870 Compare June 8, 2026 02:50

trask requested a review from Copilot June 8, 2026 03:02

Copilot started reviewing on behalf of trask June 8, 2026 03:02

View session

Copilot AI reviewed Jun 8, 2026

View reviewed changes

Comment thread instrumentation-api-incubator/src/main/jflex/SqlSanitizerWithSummary.jflex

trask requested a review from Copilot June 8, 2026 03:16

Copilot started reviewing on behalf of trask June 8, 2026 03:16

View session

Copilot AI reviewed Jun 8, 2026

View reviewed changes

Comment thread instrumentation-api-incubator/src/main/jflex/SqlSanitizerWithSummary.jflex

Avoid yytext allocation in SQL summary

d857c00

trask force-pushed the fix-stable-sql-summary-case branch from 5dc9919 to d857c00 Compare June 8, 2026 03:24

trask requested a review from Copilot June 8, 2026 03:25

Copilot started reviewing on behalf of trask June 8, 2026 03:25

View session

Copilot AI reviewed Jun 8, 2026

View reviewed changes

Comment thread ...est/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlQueryAnalyzerTest.java

trask added 3 commits June 7, 2026 21:30

Gate SQL summary case test by stable semconv

3634baf

Merge remote-tracking branch 'upstream/main' into fix-stable-sql-summ…

499a71b

…ary-case

trask requested a review from Copilot June 8, 2026 15:23

Copilot started reviewing on behalf of trask June 8, 2026 15:24

View session

Copilot AI reviewed Jun 8, 2026

View reviewed changes

trask added 2 commits June 8, 2026 10:11

trask and others added 2 commits June 8, 2026 12:28

Fix stable SQL summary casing

01e5cc2

trask commented Jun 8, 2026

View reviewed changes

trask added 6 commits June 8, 2026 16:10

Simplify Hibernate 6 semconv expectations

839127c

Pass semconv-specific Hibernate verbs

87872b1

Clean up Hibernate 6 query expectations

836b60f

Clean up Hibernate 6 query expectations

a99c39a

Inline Hibernate entity span name expectation

c632304

spotless

b795c64

trask requested a review from Copilot June 9, 2026 00:51

Copilot started reviewing on behalf of trask June 9, 2026 00:51

View session

Copilot AI reviewed Jun 9, 2026

View reviewed changes

Comment thread instrumentation-api-incubator/src/main/jflex/SqlSanitizerWithSummary.jflex

Derive synthetic select case from FROM

4a6446b

trask requested a review from Copilot June 9, 2026 02:13

Copilot started reviewing on behalf of trask June 9, 2026 02:13

View session

Copilot AI reviewed Jun 9, 2026

View reviewed changes

trask marked this pull request as ready for review June 9, 2026 02:51

laurit approved these changes Jun 9, 2026

View reviewed changes

laurit merged commit ad5dcc3 into open-telemetry:main Jun 9, 2026
95 checks passed

Navigation Menu

Repository navigation

Preserve SQL query summary operation case - #18930

Preserve SQL query summary operation case#18930
laurit merged 17 commits into
open-telemetry:mainfrom
trask:fix-stable-sql-summary-case

trask commented Jun 7, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

trask Jun 8, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

trask commented Jun 7, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

trask Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants