Skip to content

Commit efab929

Browse files
jaydelucajaydeluca
committed
merge main
2 parents 392e6f7 + 901e0ec commit efab929

File tree

81 files changed

+1342
-605
lines changed

Some content is hidden

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

81 files changed

+1342
-605
lines changed

‎build.gradle.kts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,14 @@ tasks {
166166

167167
val uploadReleaseBundle by registering {
168168
dependsOn(generateReleaseBundle)
169+
doFirst {
170+
val username = System.getenv("SONATYPE_USER") ?: throw GradleException("Sonatype user not set")
171+
val password = System.getenv("SONATYPE_KEY") ?: throw GradleException("Sonatype key not set")
172+
val token = Base64.getEncoder().encodeToString("$username:$password".toByteArray())
169173

170-
val username = System.getenv("SONATYPE_USER") ?: throw GradleException("Sonatype user not set")
171-
val password = System.getenv("SONATYPE_KEY") ?: throw GradleException("Sonatype key not set")
172-
val token = Base64.getEncoder().encodeToString("$username:$password".toByteArray())
173-
174-
var query = "?name=opentelemetry-java-instrumentation-$stableVersion"
175-
query += "&publishingType=AUTOMATIC"
174+
var query = "?name=opentelemetry-java-instrumentation-$stableVersion"
175+
query += "&publishingType=AUTOMATIC"
176176

177-
doFirst {
178177
val bundle = generateReleaseBundle.get().outputs.files.singleFile
179178
val httpClient = OkHttpClient()
180179

‎docs/instrumentation-list.yaml‎

Lines changed: 56 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ libraries:
5959
type: STRING
6060
akka:
6161
- name: akka-actor-2.3
62+
description: This instrumentation provides context propagation for Akka actors,
63+
it does not emit any telemetry on its own.
6264
source_path: instrumentation/akka/akka-actor-2.3
6365
scope:
6466
name: io.opentelemetry.akka-actor-2.3
@@ -68,6 +70,8 @@ libraries:
6870
- com.typesafe.akka:akka-actor_2.12:[2.3,)
6971
- com.typesafe.akka:akka-actor_2.13:[2.3,)
7072
- name: akka-actor-fork-join-2.5
73+
description: This instrumentation provides context propagation for the Akka Fork-Join
74+
Pool, it does not emit any telemetry on its own.
7175
source_path: instrumentation/akka/akka-actor-fork-join-2.5
7276
scope:
7377
name: io.opentelemetry.akka-actor-fork-join-2.5
@@ -780,6 +784,37 @@ libraries:
780784
target_versions:
781785
javaagent:
782786
- com.linecorp.armeria:armeria-grpc:[1.14.0,)
787+
telemetry:
788+
- when: default
789+
spans:
790+
- span_kind: CLIENT
791+
attributes:
792+
- name: rpc.grpc.status_code
793+
type: LONG
794+
- name: rpc.method
795+
type: STRING
796+
- name: rpc.service
797+
type: STRING
798+
- name: rpc.system
799+
type: STRING
800+
- name: server.address
801+
type: STRING
802+
- name: server.port
803+
type: LONG
804+
- span_kind: SERVER
805+
attributes:
806+
- name: rpc.grpc.status_code
807+
type: LONG
808+
- name: rpc.method
809+
type: STRING
810+
- name: rpc.service
811+
type: STRING
812+
- name: rpc.system
813+
type: STRING
814+
- name: server.address
815+
type: STRING
816+
- name: server.port
817+
type: LONG
783818
async:
784819
- name: async-http-client-1.9
785820
description: This instrumentation enables CLIENT spans and metrics for version
@@ -887,7 +922,7 @@ libraries:
887922
aws:
888923
- name: aws-lambda-core-1.0
889924
description: |
890-
Provides lightweight instrumentation of the Lambda core library, supporting all versions. Use this package if you only use `RequestStreamHandler` or know you don't use any event classes from `aws-lambda-java-events`. This also includes when you are using `aws-serverless-java-container` to run e.g., a Spring Boot application on Lambda.
925+
Provides lightweight instrumentation of the Lambda core library, supporting all versions. It generates FaaS SERVER spans with the `faas.invocation_id` attribute. Use this package if you only use `RequestStreamHandler` or know you don't use any event classes from `aws-lambda-java-events`. This also includes when you are using `aws-serverless-java-container` to run e.g., a Spring Boot application on Lambda.
891926
source_path: instrumentation/aws-lambda/aws-lambda-core-1.0
892927
scope:
893928
name: io.opentelemetry.aws-lambda-core-1.0
@@ -949,6 +984,8 @@ libraries:
949984
- name: user_agent.original
950985
type: STRING
951986
- name: aws-sdk-1.11
987+
description: |
988+
This instrumentation covers the AWS SDK 1.11+ client library, enabling messaging and client spans and metrics for calls to AWS services including DynamoDB, EC2, Kinesis, Lambda, RDS, S3, secrets manager, SNS/SQS and step functions.
952989
source_path: instrumentation/aws-sdk/aws-sdk-1.11
953990
scope:
954991
name: io.opentelemetry.aws-sdk-1.11
@@ -961,7 +998,8 @@ libraries:
961998
- com.amazonaws:aws-java-sdk-core:1.11.0
962999
configurations:
9631000
- name: otel.instrumentation.aws-sdk.experimental-span-attributes
964-
description: Enables experimental span attributes for AWS SDK instrumentation.
1001+
description: |
1002+
Enables the experimental span attributes `aws.agent`, `aws.bucket.name`, `aws.queue.url`, `aws.queue.name`, `aws.stream.name`, `aws.table.name`, `aws.lambda.function.arn` and `aws.lambda.function.name` for AWS SDK instrumentation.
9651003
type: boolean
9661004
default: false
9671005
- name: otel.instrumentation.messaging.experimental.receive-telemetry.enabled
@@ -1173,6 +1211,8 @@ libraries:
11731211
- name: url.full
11741212
type: STRING
11751213
- name: aws-sdk-2.2
1214+
description: |
1215+
This instrumentation covers the AWS SDK 2.2+ client library, enabling messaging and client spans and metrics for calls to AWS services including DynamoDB, EC2, Kinesis, Lambda, RDS, S3, SNS/SQS and Bedrock.
11761216
source_path: instrumentation/aws-sdk/aws-sdk-2.2
11771217
scope:
11781218
name: io.opentelemetry.aws-sdk-2.2
@@ -1200,7 +1240,8 @@ libraries:
12001240
type: list
12011241
default: ''
12021242
- name: otel.instrumentation.aws-sdk.experimental-span-attributes
1203-
description: Enables experimental span attributes for AWS SDK instrumentation.
1243+
description: |
1244+
Enables experimental span attributes `aws.agent`, `aws.lambda.function.arn` and `aws.lambda.function.name` for AWS SDK instrumentation.
12041245
type: boolean
12051246
default: false
12061247
- name: otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging
@@ -1209,9 +1250,8 @@ libraries:
12091250
type: boolean
12101251
default: false
12111252
- name: otel.instrumentation.genai.capture-message-content
1212-
description: Determines whether Generative AI events include full content of
1213-
user and assistant messages. Note that full content can have data privacy
1214-
and size concerns and care should be taken when enabling this
1253+
description: |
1254+
Determines whether Generative AI events include full content of user and assistant messages. Note that full content can have data privacy and size concerns and care should be taken when enabling this
12151255
type: boolean
12161256
default: false
12171257
- name: otel.instrumentation.aws-sdk.experimental-record-individual-http-error
@@ -1529,20 +1569,26 @@ libraries:
15291569
type: STRING
15301570
azure:
15311571
- name: azure-core-1.14
1572+
description: This instrumentation enables context propagation for the Azure Core
1573+
library, it does not emit any telemetry on its own.
15321574
source_path: instrumentation/azure-core/azure-core-1.14
15331575
scope:
15341576
name: io.opentelemetry.azure-core-1.14
15351577
target_versions:
15361578
javaagent:
15371579
- com.azure:azure-core:[1.14.0,1.19.0)
15381580
- name: azure-core-1.19
1581+
description: This instrumentation enables context propagation for the Azure Core
1582+
library, it does not emit any telemetry on its own.
15391583
source_path: instrumentation/azure-core/azure-core-1.19
15401584
scope:
15411585
name: io.opentelemetry.azure-core-1.19
15421586
target_versions:
15431587
javaagent:
15441588
- com.azure:azure-core:[1.19.0,1.36.0)
15451589
- name: azure-core-1.36
1590+
description: This instrumentation enables context propagation for the Azure Core
1591+
library, it does not emit any telemetry on its own.
15461592
source_path: instrumentation/azure-core/azure-core-1.36
15471593
scope:
15481594
name: io.opentelemetry.azure-core-1.36
@@ -1613,7 +1659,8 @@ libraries:
16131659
- org.apache.camel:camel-core:[2.19,3)
16141660
configurations:
16151661
- name: otel.instrumentation.camel.experimental-span-attributes
1616-
description: Enable the capture of experimental span attributes.
1662+
description: |
1663+
Enable the capture of experimental `camel.uri`, `camel.kafka.partitionKey`, `camel.kafka.key` and `camel.kafka.offset` span attributes.
16171664
type: boolean
16181665
default: false
16191666
telemetry:
@@ -2043,8 +2090,8 @@ libraries:
20432090
- com.couchbase.client:java-client:[2,3)
20442091
configurations:
20452092
- name: otel.instrumentation.couchbase.experimental-span-attributes
2046-
description: Enables experimental span attributes couchbase.operation_id and
2047-
couchbase.local.address
2093+
description: Enables experimental span attributes `couchbase.operation_id` and
2094+
`couchbase.local.address`
20482095
type: boolean
20492096
default: false
20502097
- name: couchbase-2.6

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ These are the supported libraries and frameworks:
106106
| [MongoDB Driver](https://mongodb.github.io/mongo-java-driver/) | 3.1+ | [opentelemetry-mongo-3.1](../instrumentation/mongo/mongo-3.1/library) | [Database Client Spans], [Database Client Metrics] [6] |
107107
| [MyBatis](https://mybatis.org/mybatis-3/) | 3.2+ | N/A | none |
108108
| [Netty HTTP codec [5]](https://github.com/netty/netty) | 3.8+ | [opentelemetry-netty-4.1](../instrumentation/netty/netty-4.1/library) | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics] |
109-
| [OpenAI Java SDK](https://github.com/openai/openai-java) | 1.1+ | [openai-java-1.1](../instrumentation/openai/openai-java-1.1/library) | [GenAI Client Spans], [GenAI Client Metrics] |
109+
| [OpenAI Java SDK](https://github.com/openai/openai-java) | 1.1+ (not including 3.0+ yet) | [openai-java-1.1](../instrumentation/openai/openai-java-1.1/library) | [GenAI Client Spans], [GenAI Client Metrics] |
110110
| [OpenSearch Rest Client](https://github.com/opensearch-project/opensearch-java) | 1.0+ | | [Database Client Spans], [Database Client Metrics] [6] |
111111
| [OkHttp](https://github.com/square/okhttp/) | 2.2+ | [opentelemetry-okhttp-3.0](../instrumentation/okhttp/okhttp-3.0/library) | [HTTP Client Spans], [HTTP Client Metrics] |
112112
| [Oracle UCP](https://docs.oracle.com/database/121/JJUCP/) | 11.2+ | [opentelemetry-oracle-ucp-11.2](../instrumentation/oracle-ucp-11.2/library) | [Database Pool Metrics] |

‎examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected Map<String, String> getExtraEnv() {
6565
static void setup() {
6666
backend =
6767
new GenericContainer<>(
68-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20221127.3559314891")
68+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20250811.16876216352")
6969
.withExposedPorts(8080)
7070
.waitingFor(Wait.forHttp("/health").forPort(8080))
7171
.withNetwork(network)

‎instrumentation-docs/collect.sh‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ find_and_remove_all_telemetry() {
143143

144144
# Main execution
145145
main() {
146-
# colima stop
146+
colima stop
147147

148148
# Process regular instrumentations
149149
echo "Processing standard instrumentations..."
@@ -154,17 +154,17 @@ main() {
154154
run_gradle_tasks "${gradle_tasks[@]}"
155155

156156
# Setup colima if needed
157-
# setup_colima
158-
#
159-
# # Process colima-specific instrumentations
160-
# echo "Processing colima instrumentations..."
161-
# gradle_tasks=()
162-
# while IFS= read -r line; do
163-
# gradle_tasks+=("$line")
164-
# done < <(process_descriptors "${COLIMA_INSTRUMENTATIONS[@]}")
165-
# run_gradle_tasks "${gradle_tasks[@]}"
166-
#
167-
# colima stop
157+
setup_colima
158+
159+
# Process colima-specific instrumentations
160+
echo "Processing colima instrumentations..."
161+
gradle_tasks=()
162+
while IFS= read -r line; do
163+
gradle_tasks+=("$line")
164+
done < <(process_descriptors "${COLIMA_INSTRUMENTATIONS[@]}")
165+
run_gradle_tasks "${gradle_tasks[@]}"
166+
167+
colima stop
168168

169169
# uncomment the next line to remove all .telemetry directories
170170
#find_and_remove_all_telemetry

0 commit comments

Comments
 (0)