Skip to content

Convert lettuce to use instrumenter#15838

Merged
trask merged 19 commits intoopen-telemetry:mainfrom
steverao:convert-lettuce-to-use-instrumenter
Feb 22, 2026
Merged

Convert lettuce to use instrumenter#15838
trask merged 19 commits intoopen-telemetry:mainfrom
steverao:convert-lettuce-to-use-instrumenter

Conversation

@steverao
Copy link
Copy Markdown
Contributor

Resolved #15703

@steverao steverao force-pushed the convert-lettuce-to-use-instrumenter branch from 2d37785 to 429eeed Compare January 13, 2026 14:59
@steverao steverao marked this pull request as ready for review January 13, 2026 15:00
@steverao steverao requested a review from a team as a code owner January 13, 2026 15:00
@steverao steverao force-pushed the convert-lettuce-to-use-instrumenter branch from 287e8bd to 4a353bb Compare January 13, 2026 15:21
Comment thread instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts Outdated
# Conflicts:
#	instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceTelemetry.java
#	instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceTelemetryBuilder.java
#	instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java
@trask
Copy link
Copy Markdown
Member

trask commented Feb 14, 2026

hey @steverao! I sent steverao#12 with a couple of suggestions

trask and others added 3 commits February 15, 2026 08:04
* Consolidate LettuceServerAttributesGetter into LettuceDbAttributesGetter

DbClientAttributesGetter extends ServerAttributesGetter, so
DbClientAttributesExtractor already handles server attributes internally.
Remove the separate LettuceServerAttributesGetter and ServerAttributesExtractor
to match the canonical pattern used by other DB instrumentations (Jedis, etc.).

* Prevent double-ending of span in finish()

Null out context after instrumenter.end() to guard against both the
onComplete callback and Lettuce's direct finish() call executing.
Add comment explaining error lifecycle when start() was not called.
@steverao
Copy link
Copy Markdown
Contributor Author

Please take a look again! @open-telemetry/java-instrumentation-approvers

@trask trask force-pushed the convert-lettuce-to-use-instrumenter branch 2 times, most recently from 9e3939b to 8f57a85 Compare February 22, 2026 00:46
@trask trask force-pushed the convert-lettuce-to-use-instrumenter branch from 6327c1e to b2df23e Compare February 22, 2026 03:44
@trask trask force-pushed the convert-lettuce-to-use-instrumenter branch from b255c0b to a6f52d1 Compare February 22, 2026 21:26
…use-instrumenter

# Conflicts:
#	instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java
#	instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java
#	instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java
#	instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java
#	instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java
@trask trask force-pushed the convert-lettuce-to-use-instrumenter branch from a6f52d1 to d4c6092 Compare February 22, 2026 21:31
@trask trask merged commit 34edf99 into open-telemetry:main Feb 22, 2026
85 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

InstrumenterCustomizerProvider doesn't work for lettuce-5.1

3 participants