Skip to content

Commit 6fe280f

Browse files
jaydelucajaydeluca
authored
Merge branch 'main' into jaxws-metadata
2 parents efe7dd5 + fddb1ed commit 6fe280f

File tree

86 files changed

+2888
-797
lines changed

Some content is hidden

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

86 files changed

+2888
-797
lines changed

‎.fossa.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,12 @@ targets:
136136
- type: gradle
137137
path: ./
138138
target: ':instrumentation:gwt-2.0:javaagent'
139+
- type: gradle
140+
path: ./
141+
target: ':instrumentation:helidon-4.3:javaagent'
142+
- type: gradle
143+
path: ./
144+
target: ':instrumentation:helidon-4.3:library'
139145
- type: gradle
140146
path: ./
141147
target: ':instrumentation:hikaricp-3.0:javaagent'
@@ -751,6 +757,9 @@ targets:
751757
- type: gradle
752758
path: ./
753759
target: ':instrumentation:openai:openai-java-1.1:library'
760+
- type: gradle
761+
path: ./
762+
target: ':instrumentation:opensearch:opensearch-java-3.0:javaagent'
754763
- type: gradle
755764
path: ./
756765
target: ':instrumentation:opensearch:opensearch-rest-1.0:javaagent'

‎.lychee.toml‎ renamed to ‎.github/config/lychee.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ exclude = [
2121
'^http://code.google.com/p/concurrentlinkedhashmap$',
2222
'^https://softwareengineering.stackexchange.com/questions/29727.*',
2323
'^https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/opentelemetry/$',
24+
# new artifact, remove after 2.21.0 release
25+
'^https://central.sonatype.com/artifact/io.opentelemetry.instrumentation/opentelemetry-helidon-4.3$',
2426
]

‎.github/scripts/dependencies.dockerfile‎

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

‎.github/scripts/link-check.sh‎

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

‎.github/workflows/reusable-link-check.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,18 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
14+
with:
15+
fetch-depth: 0 # needed for merge-base used in lint:links-in-modified-files
1416

15-
- name: Link check
17+
- uses: jdx/mise-action@e3d7b8d67a7958d1207f6ed871e83b1ea780e7b0 # v3.3.1
18+
19+
- name: Link check - relative links (all files)
20+
if: github.event_name == 'pull_request'
21+
env:
22+
GITHUB_TOKEN: ${{ github.token }}
23+
run: mise run lint:local-links
24+
25+
- name: Link check (modified files only)
1626
env:
1727
GITHUB_TOKEN: ${{ github.token }}
18-
run: ./.github/scripts/link-check.sh
28+
run: mise run lint:links-in-modified-files --base origin/${{ github.base_ref }} --head ${{ github.event.pull_request.head.sha }} --event ${{ github.event_name }}

‎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.17.7")
66+
implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.17.8")
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")

‎dependencyManagement/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ val DEPENDENCY_BOMS = listOf(
3838
val autoServiceVersion = "1.1.1"
3939
val autoValueVersion = "1.11.0"
4040
val errorProneVersion = "2.42.0"
41-
val byteBuddyVersion = "1.17.7"
41+
val byteBuddyVersion = "1.17.8"
4242
val asmVersion = "9.9"
4343
val jmhVersion = "1.37"
4444
val mockitoVersion = "4.11.0"
@@ -116,7 +116,7 @@ val DEPENDENCIES = listOf(
116116
"com.google.code.findbugs:jsr305:3.0.2",
117117
"org.apache.groovy:groovy:${groovyVersion}",
118118
"org.apache.groovy:groovy-json:${groovyVersion}",
119-
"org.codehaus.mojo:animal-sniffer-annotations:1.24",
119+
"org.codehaus.mojo:animal-sniffer-annotations:1.26",
120120
"org.junit-pioneer:junit-pioneer:1.9.1",
121121
"org.objenesis:objenesis:3.4",
122122
"javax.validation:validation-api:2.0.1.Final",

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ These are the supported libraries and frameworks:
7676
| [gRPC](https://github.com/grpc/grpc-java) | 1.6+ | [opentelemetry-grpc-1.6](../instrumentation/grpc-1.6/library) | [RPC Client Spans], [RPC Client Metrics], [RPC Server Spans], [RPC Server Metrics] |
7777
| [Guava ListenableFuture](https://guava.dev/releases/snapshot/api/docs/com/google/common/util/concurrent/ListenableFuture.html) | 10.0+ | [opentelemetry-guava-10.0](../instrumentation/guava-10.0/library) | Context propagation |
7878
| [GWT](https://www.gwtproject.org/) | 2.0+ | N/A | [RPC Server Spans] |
79+
| [Helidon](https://helidon.io/) | 4.3+ | [opentelemetry-helidon-4.3](../instrumentation/helidon-4.3/library) | [HTTP Server Spans], [HTTP Server Metrics], Provides `http.route` [2] |
7980
| [Hibernate](https://github.com/hibernate/hibernate-orm) | 3.3+ | N/A | none |
8081
| [Hibernate Reactive](https://hibernate.org/reactive) | 1.0+ | N/A | none |
8182
| [HikariCP](https://github.com/brettwooldridge/HikariCP) | 3.0+ | [opentelemetry-hikaricp-3.0](../instrumentation/hikaricp-3.0/library) | [Database Pool Metrics] |

‎gradle-plugins/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ configurations.named("compileOnly") {
2525
extendsFrom(bbGradlePlugin)
2626
}
2727

28-
val byteBuddyVersion = "1.17.7"
28+
val byteBuddyVersion = "1.17.8"
2929
val aetherVersion = "1.1.0"
3030

3131
dependencies {

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
99
import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
10+
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_SUMMARY;
1011
import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
1112

1213
import io.opentelemetry.api.common.AttributeKey;
@@ -48,6 +49,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST
4849
if (SemconvStability.emitStableDatabaseSemconv()) {
4950
internalSet(attributes, DB_QUERY_TEXT, getter.getDbQueryText(request));
5051
internalSet(attributes, DB_OPERATION_NAME, getter.getDbOperationName(request));
52+
internalSet(attributes, DB_QUERY_SUMMARY, getter.getDbQuerySummary(request));
5153
}
5254
if (SemconvStability.emitOldDatabaseSemconv()) {
5355
internalSet(attributes, DB_STATEMENT, getter.getDbQueryText(request));

0 commit comments

Comments
 (0)