Skip to content

Commit 66be37b

Browse files
123liuziming123liuziming
authored
Merge branch 'main' into feat/custom-client-resources
2 parents 195ab18 + 50c83ae commit 66be37b

File tree

53 files changed

+1123
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1123
-190
lines changed

‎.github/config/.markdownlint-cli2.yaml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.github/workflows/auto-license-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
echo "exists=true" >> $GITHUB_OUTPUT
6868
fi
6969
70-
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
70+
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
7171
if: steps.check-patch.outputs.exists == 'true'
7272
id: otelbot-token
7373
with:

‎.github/workflows/reusable-markdown-lint-check.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
1414

15+
- uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
16+
1517
- name: Run markdownlint
1618
run: |
17-
npx [email protected] --config .github/config/.markdownlint-cli2.yaml "**/*.md"
19+
if ! mise run lint:markdown; then
20+
echo "markdownlint failed. To auto-fix many issues locally, run:"
21+
echo " mise run lint:markdown --fix"
22+
exit 1
23+
fi

‎.github/workflows/reusable-native-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2828
- id: read-java
2929
run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT"
30-
- uses: graalvm/setup-graalvm@eec48106e0bf45f2976c2ff0c3e22395cced8243 # v1.4.2.1
30+
- uses: graalvm/setup-graalvm@dec5790292b7b36d7ad368abe856887749c6c520 # v1.4.3.1
3131
with:
3232
version: "latest"
3333
java-version: ${{ matrix.test-java-version }}

‎.markdownlint.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# See https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md
2+
# and https://github.com/DavidAnson/markdownlint-cli2
3+
4+
ul-style: false
5+
line-length: false
6+
no-duplicate-heading:
7+
siblings_only: true
8+
ol-prefix:
9+
style: ordered
10+
no-inline-html: false
11+
fenced-code-language: false
12+
no-trailing-punctuation:
13+
punctuation: ".,;:" # allowing exclamation points and question marks at end of sentences
14+
MD059: false # disable link text should be descriptive check

‎.mise/tasks/lint/markdown.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env bash
2+
#MISE description="Lint markdown files"
3+
#MISE flag "--fix" help="Automatically fix issues"
4+
5+
set -e
6+
7+
if [ "${usage_fix}" = "true" ]; then
8+
markdownlint-cli2 --fix "**/*.md" "#**/build" "#CHANGELOG.md" "#licenses/licenses.md"
9+
else
10+
markdownlint-cli2 "**/*.md" "#**/build" "#CHANGELOG.md" "#licenses/licenses.md"
11+
fi

‎conventions/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies {
6363
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
6464
implementation("org.spdx:spdx-gradle-plugin:0.9.0")
6565
// When updating, also update dependencyManagement/build.gradle.kts
66-
implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.18.1")
66+
implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.18.2")
6767
implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
6868
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
6969
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")

‎conventions/src/main/kotlin/otel.java-conventions.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ dependencies {
159159
compileOnly("com.google.code.findbugs:jsr305")
160160
compileOnly("com.google.errorprone:error_prone_annotations")
161161

162-
codenarc("org.codenarc:CodeNarc:3.6.0")
162+
codenarc("org.codenarc:CodeNarc:3.7.0")
163163
codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.25"))
164164

165165
modules {
@@ -422,7 +422,7 @@ codenarc {
422422
checkstyle {
423423
configFile = rootProject.file("buildscripts/checkstyle.xml")
424424
// this version should match the version of google_checks.xml used as basis for above configuration
425-
toolVersion = "12.1.2"
425+
toolVersion = "12.2.0"
426426
maxWarnings = 0
427427
}
428428

‎dependencyManagement/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ val DEPENDENCY_BOMS = listOf(
3737

3838
val autoServiceVersion = "1.1.1"
3939
val autoValueVersion = "1.11.1"
40-
val errorProneVersion = "2.44.0"
41-
val byteBuddyVersion = "1.18.1"
40+
val errorProneVersion = "2.45.0"
41+
val byteBuddyVersion = "1.18.2"
4242
val asmVersion = "9.9"
4343
val jmhVersion = "1.37"
4444
val mockitoVersion = "4.11.0"

‎docs/instrumentation-list.yaml‎

Lines changed: 240 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7801,20 +7801,193 @@ libraries:
78017801
type: STRING
78027802
lettuce:
78037803
- name: lettuce-4.0
7804+
description: |
7805+
This instrumentation enables database client spans and database client metrics for the Lettuce Redis client.
7806+
semantic_conventions:
7807+
- DATABASE_CLIENT_SPANS
7808+
- DATABASE_CLIENT_METRICS
7809+
library_link: https://github.com/redis/lettuce
78047810
source_path: instrumentation/lettuce/lettuce-4.0
78057811
scope:
78067812
name: io.opentelemetry.lettuce-4.0
78077813
target_versions:
78087814
javaagent:
78097815
- biz.paluch.redis:lettuce:[4.0.Final,)
7816+
configurations:
7817+
- name: otel.instrumentation.lettuce.connection-telemetry.enabled
7818+
description: Enables connection telemetry spans for Redis connections.
7819+
type: boolean
7820+
default: false
7821+
- name: otel.instrumentation.lettuce.experimental-span-attributes
7822+
description: Enables experimental span attribute `lettuce.command.cancelled`.
7823+
type: boolean
7824+
default: false
7825+
- name: otel.instrumentation.common.peer-service-mapping
7826+
description: Used to specify a mapping from host names or IP addresses to peer
7827+
services.
7828+
type: map
7829+
default: ''
7830+
telemetry:
7831+
- when: default
7832+
spans:
7833+
- span_kind: CLIENT
7834+
attributes:
7835+
- name: db.operation
7836+
type: STRING
7837+
- name: db.system
7838+
type: STRING
7839+
- name: peer.service
7840+
type: STRING
7841+
- name: server.address
7842+
type: STRING
7843+
- name: server.port
7844+
type: LONG
7845+
- when: otel.instrumentation.lettuce.experimental-span-attributes=true
7846+
spans:
7847+
- span_kind: CLIENT
7848+
attributes:
7849+
- name: db.operation
7850+
type: STRING
7851+
- name: db.system
7852+
type: STRING
7853+
- name: lettuce.command.cancelled
7854+
type: BOOLEAN
7855+
- name: peer.service
7856+
type: STRING
7857+
- name: server.address
7858+
type: STRING
7859+
- name: server.port
7860+
type: LONG
7861+
- when: otel.semconv-stability.opt-in=database
7862+
metrics:
7863+
- name: db.client.operation.duration
7864+
description: Duration of database client operations.
7865+
type: HISTOGRAM
7866+
unit: s
7867+
attributes:
7868+
- name: db.operation.name
7869+
type: STRING
7870+
- name: db.system.name
7871+
type: STRING
7872+
spans:
7873+
- span_kind: CLIENT
7874+
attributes:
7875+
- name: db.operation.name
7876+
type: STRING
7877+
- name: db.system.name
7878+
type: STRING
7879+
- name: error.type
7880+
type: STRING
7881+
- name: peer.service
7882+
type: STRING
7883+
- name: server.address
7884+
type: STRING
7885+
- name: server.port
7886+
type: LONG
78107887
- name: lettuce-5.0
7888+
description: |
7889+
This instrumentation enables database client spans and database client metrics for the Lettuce Redis client.
7890+
semantic_conventions:
7891+
- DATABASE_CLIENT_SPANS
7892+
- DATABASE_CLIENT_METRICS
7893+
library_link: https://github.com/redis/lettuce
78117894
source_path: instrumentation/lettuce/lettuce-5.0
78127895
scope:
78137896
name: io.opentelemetry.lettuce-5.0
78147897
target_versions:
78157898
javaagent:
78167899
- io.lettuce:lettuce-core:[5.0.0.RELEASE,5.1.0.RELEASE)
7900+
configurations:
7901+
- name: otel.instrumentation.lettuce.connection-telemetry.enabled
7902+
description: Enables connection telemetry spans for Redis connections.
7903+
type: boolean
7904+
default: false
7905+
- name: otel.instrumentation.lettuce.experimental-span-attributes
7906+
description: |
7907+
Enables experimental span attributes `lettuce.command.cancelled` and `lettuce.command.results.count`.
7908+
type: boolean
7909+
default: false
7910+
- name: otel.instrumentation.common.db-statement-sanitizer.enabled
7911+
description: Enables statement sanitization for database queries.
7912+
type: boolean
7913+
default: true
7914+
- name: otel.instrumentation.common.peer-service-mapping
7915+
description: Used to specify a mapping from host names or IP addresses to peer
7916+
services.
7917+
type: map
7918+
default: ''
7919+
telemetry:
7920+
- when: default
7921+
spans:
7922+
- span_kind: CLIENT
7923+
attributes:
7924+
- name: db.operation
7925+
type: STRING
7926+
- name: db.statement
7927+
type: STRING
7928+
- name: db.system
7929+
type: STRING
7930+
- name: peer.service
7931+
type: STRING
7932+
- name: server.address
7933+
type: STRING
7934+
- name: server.port
7935+
type: LONG
7936+
- when: otel.instrumentation.lettuce.experimental-span-attributes=true
7937+
spans:
7938+
- span_kind: CLIENT
7939+
attributes:
7940+
- name: db.operation
7941+
type: STRING
7942+
- name: db.statement
7943+
type: STRING
7944+
- name: db.system
7945+
type: STRING
7946+
- name: lettuce.command.cancelled
7947+
type: BOOLEAN
7948+
- name: lettuce.command.results.count
7949+
type: LONG
7950+
- name: peer.service
7951+
type: STRING
7952+
- name: server.address
7953+
type: STRING
7954+
- name: server.port
7955+
type: LONG
7956+
- when: otel.semconv-stability.opt-in=database
7957+
metrics:
7958+
- name: db.client.operation.duration
7959+
description: Duration of database client operations.
7960+
type: HISTOGRAM
7961+
unit: s
7962+
attributes:
7963+
- name: db.operation.name
7964+
type: STRING
7965+
- name: db.system.name
7966+
type: STRING
7967+
spans:
7968+
- span_kind: CLIENT
7969+
attributes:
7970+
- name: db.operation.name
7971+
type: STRING
7972+
- name: db.query.text
7973+
type: STRING
7974+
- name: db.system.name
7975+
type: STRING
7976+
- name: error.type
7977+
type: STRING
7978+
- name: peer.service
7979+
type: STRING
7980+
- name: server.address
7981+
type: STRING
7982+
- name: server.port
7983+
type: LONG
78177984
- name: lettuce-5.1
7985+
description: |
7986+
This instrumentation enables database client spans and database client metrics for the Lettuce Redis client.
7987+
semantic_conventions:
7988+
- DATABASE_CLIENT_SPANS
7989+
- DATABASE_CLIENT_METRICS
7990+
library_link: https://github.com/redis/lettuce
78187991
source_path: instrumentation/lettuce/lettuce-5.1
78197992
scope:
78207993
name: io.opentelemetry.lettuce-5.1
@@ -7823,6 +7996,73 @@ libraries:
78237996
- io.lettuce:lettuce-core:[5.1.0.RELEASE,)
78247997
library:
78257998
- io.lettuce:lettuce-core:5.1.0.RELEASE
7999+
configurations:
8000+
- name: otel.instrumentation.lettuce.experimental.command-encoding-events.enabled
8001+
description: Enables capturing `redis.encode.start` and `redis.encode.end` span
8002+
events.
8003+
type: boolean
8004+
default: false
8005+
- name: otel.instrumentation.common.db-statement-sanitizer.enabled
8006+
description: Enables statement sanitization for database queries.
8007+
type: boolean
8008+
default: true
8009+
telemetry:
8010+
- when: default
8011+
spans:
8012+
- span_kind: CLIENT
8013+
attributes:
8014+
- name: db.statement
8015+
type: STRING
8016+
- name: db.system
8017+
type: STRING
8018+
- name: error
8019+
type: STRING
8020+
- name: network.peer.address
8021+
type: STRING
8022+
- name: network.peer.port
8023+
type: LONG
8024+
- name: network.type
8025+
type: STRING
8026+
- name: server.address
8027+
type: STRING
8028+
- name: server.port
8029+
type: LONG
8030+
- when: otel.semconv-stability.opt-in=database
8031+
metrics:
8032+
- name: db.client.operation.duration
8033+
description: Duration of database client operations.
8034+
type: HISTOGRAM
8035+
unit: s
8036+
attributes:
8037+
- name: db.system.name
8038+
type: STRING
8039+
- name: network.peer.address
8040+
type: STRING
8041+
- name: network.peer.port
8042+
type: LONG
8043+
- name: server.address
8044+
type: STRING
8045+
- name: server.port
8046+
type: LONG
8047+
spans:
8048+
- span_kind: CLIENT
8049+
attributes:
8050+
- name: db.query.text
8051+
type: STRING
8052+
- name: db.system.name
8053+
type: STRING
8054+
- name: error
8055+
type: STRING
8056+
- name: network.peer.address
8057+
type: STRING
8058+
- name: network.peer.port
8059+
type: LONG
8060+
- name: network.type
8061+
type: STRING
8062+
- name: server.address
8063+
type: STRING
8064+
- name: server.port
8065+
type: LONG
78268066
liberty:
78278067
- name: liberty-20.0
78288068
source_path: instrumentation/liberty/liberty-20.0

0 commit comments

Comments
 (0)