Skip to content

Commit 26c452a

Browse files
jaydelucajaydeluca
committed
new batch
1 parent 4782af4 commit 26c452a

File tree

6 files changed

+143
-122
lines changed

6 files changed

+143
-122
lines changed

‎instrumentation-docs/collect.sh‎

Lines changed: 120 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -8,113 +8,114 @@ set -euo pipefail
88

99
readonly INSTRUMENTATIONS=(
1010
# <module path (colon-separated)> : <javaagent|library> : [ gradle-task-suffix ]
11-
"activej-http-6.0:javaagent:test"
12-
"akka:akka-http-10.0:javaagent:test"
13-
"armeria:armeria-grpc-1.14:javaagent:test"
14-
"apache-httpasyncclient-4.1:javaagent:test"
15-
"alibaba-druid-1.0:javaagent:test"
16-
"alibaba-druid-1.0:javaagent:testStableSemconv"
17-
"apache-dbcp-2.0:javaagent:test"
18-
"apache-dbcp-2.0:javaagent:testStableSemconv"
19-
"apache-httpclient:apache-httpclient-2.0:javaagent:test"
20-
"apache-httpclient:apache-httpclient-4.0:javaagent:test"
21-
"apache-httpclient:apache-httpclient-4.3:library:test"
22-
"apache-httpclient:apache-httpclient-5.0:javaagent:test"
23-
"apache-dubbo-2.7:javaagent:testDubbo"
24-
"c3p0-0.9:javaagent:test"
25-
"c3p0-0.9:javaagent:testStableSemconv"
26-
"clickhouse-client-0.5:javaagent:test"
27-
"clickhouse-client-0.5:javaagent:testStableSemconv"
28-
"aws-sdk:aws-sdk-1.11:javaagent:test"
29-
"google-http-client-1.19:javaagent:test"
30-
"http-url-connection:javaagent:test"
31-
"java-http-client:javaagent:test"
32-
"jetty-httpclient:jetty-httpclient-9.2:javaagent:test"
33-
"jetty-httpclient:jetty-httpclient-12.0:javaagent:test"
34-
"jodd-http-4.2:javaagent:test"
35-
"netty:netty-3.8:javaagent:test"
36-
"netty:netty-4.0:javaagent:test"
37-
"netty:netty-4.1:javaagent:test"
38-
"okhttp:okhttp-2.2:javaagent:test"
39-
"okhttp:okhttp-3.0:javaagent:test"
40-
"pekko:pekko-http-1.0:javaagent:test"
41-
"play:play-ws:play-ws-1.0:javaagent:test"
42-
"play:play-ws:play-ws-2.0:javaagent:test"
43-
"play:play-ws:play-ws-2.1:javaagent:test"
44-
"reactor:reactor-netty:reactor-netty-0.9:javaagent:test"
45-
"reactor:reactor-netty:reactor-netty-1.0:javaagent:test"
46-
"spring:spring-webflux:spring-webflux-5.0:javaagent:test"
47-
"vertx:vertx-http-client:vertx-http-client-3.0:javaagent:test"
48-
"vertx:vertx-http-client:vertx-http-client-4.0:javaagent:test"
49-
"vertx:vertx-http-client:vertx-http-client-5.0:javaagent:test"
50-
"vertx:vertx-redis-client-4.0:javaagent:test"
51-
"vertx:vertx-redis-client-4.0:javaagent:testStableSemconv"
52-
"vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent:test"
53-
"vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent:testStableSemconv"
54-
"vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent:test"
55-
"vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent:testStableSemconv"
56-
"aws-sdk:aws-sdk-1.11:javaagent:testStableSemconv"
57-
"aws-sdk:aws-sdk-2.2:javaagent:test"
58-
"aws-sdk:aws-sdk-2.2:javaagent:testStableSemconv"
59-
"aws-sdk:aws-sdk-2.2:javaagent:testBedrockRuntime"
60-
"hikaricp-3.0:javaagent:test"
61-
"hikaricp-3.0:javaagent:testStableSemconv"
62-
"tomcat:tomcat-jdbc:javaagent:test"
63-
"tomcat:tomcat-jdbc:javaagent:testStableSemconv"
64-
"oshi:javaagent:test"
65-
"oshi:javaagent:testExperimental"
66-
"vibur-dbcp-11.0:javaagent:test"
67-
"vibur-dbcp-11.0:javaagent:testStableSemconv"
68-
"elasticsearch:elasticsearch-api-client-7.16:javaagent:test"
69-
"elasticsearch:elasticsearch-api-client-7.16:javaagent:testStableSemconv"
70-
"elasticsearch:elasticsearch-rest-7.0:javaagent:test"
71-
"elasticsearch:elasticsearch-transport-5.0:javaagent:test"
72-
"elasticsearch:elasticsearch-transport-5.0:javaagent:testStableSemconv"
73-
"elasticsearch:elasticsearch-transport-5.0:javaagent:testExperimental"
74-
"elasticsearch:elasticsearch-transport-5.3:javaagent:test"
75-
"elasticsearch:elasticsearch-transport-5.3:javaagent:testStableSemconv"
76-
"elasticsearch:elasticsearch-transport-5.3:javaagent:testExperimental"
77-
"elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch6Test"
78-
"elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch6TestStableSemconv"
79-
"elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch6TestExperimental"
80-
"elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch65Test"
81-
"elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch65TestStableSemconv"
82-
"elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch65TestExperimental"
83-
"elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch7Test"
84-
"elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch7TestStableSemconv"
85-
"elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch7TestExperimental"
86-
"apache-httpclient:apache-httpclient-5.2:library:test"
87-
"armeria:armeria-1.3:javaagent:test"
88-
"async-http-client:async-http-client-1.9:javaagent:test"
89-
"async-http-client:async-http-client-2.0:javaagent:test"
90-
"apache-dubbo-2.7:javaagent:testDubbo"
91-
"finagle-http-23.11:javaagent:test"
92-
"finatra-2.9:javaagent:test"
93-
"spring:spring-batch-3.0:javaagent:test"
94-
"spring:spring-data:spring-data-1.8:javaagent:test"
95-
"spring:spring-integration-4.1:javaagent:test"
96-
"spring:spring-integration-4.1:javaagent:testWithRabbitInstrumentation"
97-
"spring:spring-integration-4.1:javaagent:testWithProducerInstrumentation"
98-
"spring:spring-jms:spring-jms-2.0:javaagent:test"
99-
"spring:spring-kafka-2.7:javaagent:test"
100-
"spring:spring-kafka-2.7:javaagent:testNoReceiveTelemetry"
101-
"spring:spring-pulsar-1.0:javaagent:test"
102-
"spring:spring-rabbit-1.0:javaagent:test"
103-
"spring:spring-rmi-4.0:javaagent:test"
104-
"spring:spring-scheduling-3.1:javaagent:test"
105-
"spring:spring-scheduling-3.1:javaagent:testExperimental"
106-
"spring:spring-web:spring-web-3.1:library:test"
107-
"spring:spring-web:spring-web-6.0:javaagent:test"
108-
"spring:spring-webflux:spring-webflux-5.0:javaagent:test"
109-
"spring:spring-webflux:spring-webflux-5.3:library:test"
110-
"spring:spring-webmvc:spring-webmvc-3.1:javaagent:test"
111-
"spring:spring-webmvc:spring-webmvc-3.1:javaagent:testExperimental"
112-
"spring:spring-webmvc:spring-webmvc-5.3:library:test"
113-
"spring:spring-webmvc:spring-webmvc-6.0:javaagent:test"
114-
"spring:spring-webmvc:spring-webmvc-3.1:javaagent:testExperimental"
115-
"spring:spring-webmvc:spring-webmvc-6.0:javaagent:test"
116-
"spring:spring-webmvc:spring-webmvc-6.0:javaagent:testExperimental"
117-
"openai:openai-java-1.1:javaagent:test"
11+
# "activej-http-6.0:javaagent:test"
12+
# "akka:akka-http-10.0:javaagent:test"
13+
# "armeria:armeria-grpc-1.14:javaagent:test"
14+
# "apache-httpasyncclient-4.1:javaagent:test"
15+
# "alibaba-druid-1.0:javaagent:test"
16+
# "alibaba-druid-1.0:javaagent:testStableSemconv"
17+
# "apache-dbcp-2.0:javaagent:test"
18+
# "apache-dbcp-2.0:javaagent:testStableSemconv"
19+
# "apache-httpclient:apache-httpclient-2.0:javaagent:test"
20+
# "apache-httpclient:apache-httpclient-4.0:javaagent:test"
21+
# "apache-httpclient:apache-httpclient-4.3:library:test"
22+
# "apache-httpclient:apache-httpclient-5.0:javaagent:test"
23+
# "apache-dubbo-2.7:javaagent:testDubbo"
24+
# "c3p0-0.9:javaagent:test"
25+
# "c3p0-0.9:javaagent:testStableSemconv"
26+
# "clickhouse-client-0.5:javaagent:test"
27+
# "clickhouse-client-0.5:javaagent:testStableSemconv"
28+
# "aws-sdk:aws-sdk-1.11:javaagent:test"
29+
# "google-http-client-1.19:javaagent:test"
30+
# "http-url-connection:javaagent:test"
31+
# "java-http-client:javaagent:test"
32+
# "jetty-httpclient:jetty-httpclient-9.2:javaagent:test"
33+
# "jetty-httpclient:jetty-httpclient-12.0:javaagent:test"
34+
# "jodd-http-4.2:javaagent:test"
35+
# "netty:netty-3.8:javaagent:test"
36+
# "netty:netty-4.0:javaagent:test"
37+
# "netty:netty-4.1:javaagent:test"
38+
# "okhttp:okhttp-2.2:javaagent:test"
39+
# "okhttp:okhttp-3.0:javaagent:test"
40+
# "pekko:pekko-http-1.0:javaagent:test"
41+
# "play:play-ws:play-ws-1.0:javaagent:test"
42+
# "play:play-ws:play-ws-2.0:javaagent:test"
43+
# "play:play-ws:play-ws-2.1:javaagent:test"
44+
# "reactor:reactor-netty:reactor-netty-0.9:javaagent:test"
45+
# "reactor:reactor-netty:reactor-netty-1.0:javaagent:test"
46+
# "spring:spring-webflux:spring-webflux-5.0:javaagent:test"
47+
# "vertx:vertx-http-client:vertx-http-client-3.0:javaagent:test"
48+
# "vertx:vertx-http-client:vertx-http-client-4.0:javaagent:test"
49+
# "vertx:vertx-http-client:vertx-http-client-5.0:javaagent:test"
50+
# "vertx:vertx-redis-client-4.0:javaagent:test"
51+
# "vertx:vertx-redis-client-4.0:javaagent:testStableSemconv"
52+
# "vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent:test"
53+
# "vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent:testStableSemconv"
54+
# "vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent:test"
55+
# "vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent:testStableSemconv"
56+
# "aws-sdk:aws-sdk-1.11:javaagent:testStableSemconv"
57+
# "aws-sdk:aws-sdk-2.2:javaagent:test"
58+
# "aws-sdk:aws-sdk-2.2:javaagent:testStableSemconv"
59+
# "aws-sdk:aws-sdk-2.2:javaagent:testBedrockRuntime"
60+
# "hikaricp-3.0:javaagent:test"
61+
# "hikaricp-3.0:javaagent:testStableSemconv"
62+
# "tomcat:tomcat-jdbc:javaagent:test"
63+
# "tomcat:tomcat-jdbc:javaagent:testStableSemconv"
64+
# "oshi:javaagent:test"
65+
# "oshi:javaagent:testExperimental"
66+
# "vibur-dbcp-11.0:javaagent:test"
67+
# "vibur-dbcp-11.0:javaagent:testStableSemconv"
68+
# "elasticsearch:elasticsearch-api-client-7.16:javaagent:test"
69+
# "elasticsearch:elasticsearch-api-client-7.16:javaagent:testStableSemconv"
70+
# "elasticsearch:elasticsearch-rest-7.0:javaagent:test"
71+
# "elasticsearch:elasticsearch-transport-5.0:javaagent:test"
72+
# "elasticsearch:elasticsearch-transport-5.0:javaagent:testStableSemconv"
73+
# "elasticsearch:elasticsearch-transport-5.0:javaagent:testExperimental"
74+
# "elasticsearch:elasticsearch-transport-5.3:javaagent:test"
75+
# "elasticsearch:elasticsearch-transport-5.3:javaagent:testStableSemconv"
76+
# "elasticsearch:elasticsearch-transport-5.3:javaagent:testExperimental"
77+
# "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch6Test"
78+
# "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch6TestStableSemconv"
79+
# "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch6TestExperimental"
80+
# "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch65Test"
81+
# "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch65TestStableSemconv"
82+
# "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch65TestExperimental"
83+
# "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch7Test"
84+
# "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch7TestStableSemconv"
85+
# "elasticsearch:elasticsearch-transport-6.0:javaagent:elasticsearch7TestExperimental"
86+
# "apache-httpclient:apache-httpclient-5.2:library:test"
87+
# "armeria:armeria-1.3:javaagent:test"
88+
# "async-http-client:async-http-client-1.9:javaagent:test"
89+
# "async-http-client:async-http-client-2.0:javaagent:test"
90+
# "apache-dubbo-2.7:javaagent:testDubbo"
91+
# "finagle-http-23.11:javaagent:test"
92+
# "finatra-2.9:javaagent:test"
93+
# "spring:spring-batch-3.0:javaagent:test"
94+
# "spring:spring-data:spring-data-1.8:javaagent:test"
95+
# "spring:spring-integration-4.1:javaagent:test"
96+
# "spring:spring-integration-4.1:javaagent:testWithRabbitInstrumentation"
97+
# "spring:spring-integration-4.1:javaagent:testWithProducerInstrumentation"
98+
# "spring:spring-jms:spring-jms-2.0:javaagent:test"
99+
# "spring:spring-kafka-2.7:javaagent:test"
100+
# "spring:spring-kafka-2.7:javaagent:testNoReceiveTelemetry"
101+
# "spring:spring-pulsar-1.0:javaagent:test"
102+
# "spring:spring-rabbit-1.0:javaagent:test"
103+
# "spring:spring-rmi-4.0:javaagent:test"
104+
# "spring:spring-scheduling-3.1:javaagent:test"
105+
# "spring:spring-scheduling-3.1:javaagent:testExperimental"
106+
# "spring:spring-web:spring-web-3.1:library:test"
107+
# "spring:spring-web:spring-web-6.0:javaagent:test"
108+
# "spring:spring-webflux:spring-webflux-5.0:javaagent:test"
109+
# "spring:spring-webflux:spring-webflux-5.3:library:test"
110+
# "spring:spring-webmvc:spring-webmvc-3.1:javaagent:test"
111+
# "spring:spring-webmvc:spring-webmvc-3.1:javaagent:testExperimental"
112+
# "spring:spring-webmvc:spring-webmvc-5.3:library:test"
113+
# "spring:spring-webmvc:spring-webmvc-6.0:javaagent:test"
114+
# "spring:spring-webmvc:spring-webmvc-3.1:javaagent:testExperimental"
115+
# "spring:spring-webmvc:spring-webmvc-6.0:javaagent:test"
116+
# "spring:spring-webmvc:spring-webmvc-6.0:javaagent:testExperimental"
117+
# "openai:openai-java-1.1:javaagent:test"
118+
"aws-lambda:aws-lambda-core-1.0:javaagent:test"
118119
)
119120

120121
readonly COLIMA_INSTRUMENTATIONS=(
@@ -258,7 +259,7 @@ find_and_remove_all_telemetry() {
258259

259260
# Main execution
260261
main() {
261-
colima stop
262+
# colima stop
262263

263264
# Process regular instrumentations
264265
echo "Processing standard instrumentations..."
@@ -269,17 +270,17 @@ main() {
269270
run_gradle_tasks "${gradle_tasks[@]}"
270271

271272
# Setup colima if needed
272-
setup_colima
273-
274-
# Process colima-specific instrumentations
275-
echo "Processing colima instrumentations..."
276-
gradle_tasks=()
277-
while IFS= read -r line; do
278-
gradle_tasks+=("$line")
279-
done < <(process_descriptors "${COLIMA_INSTRUMENTATIONS[@]}")
280-
run_gradle_tasks "${gradle_tasks[@]}"
281-
282-
colima stop
273+
# setup_colima
274+
#
275+
# # Process colima-specific instrumentations
276+
# echo "Processing colima instrumentations..."
277+
# gradle_tasks=()
278+
# while IFS= read -r line; do
279+
# gradle_tasks+=("$line")
280+
# done < <(process_descriptors "${COLIMA_INSTRUMENTATIONS[@]}")
281+
# run_gradle_tasks "${gradle_tasks[@]}"
282+
#
283+
# colima stop
283284

284285
# uncomment the next line to remove all .telemetry directories
285286
#find_and_remove_all_telemetry

‎instrumentation/akka/akka-actor-2.3/metadata.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
description: This instrumentation provides context propagation for Akka actors, it does not emit any telemetry on its own.

‎instrumentation/akka/akka-actor-fork-join-2.5/metadata.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
description: This instrumentation provides context propagation for the Akka Fork-Join Pool, it does not emit any telemetry on its own.

‎instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ tasks.withType<Test>().configureEach {
2626
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
2727
jvmArgs("--add-opens=java.base/java.util=ALL-UNNAMED")
2828
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
29+
30+
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString()?.toBoolean() ?: false)
31+
systemProperty("collectSpans", true)
2932
}

‎instrumentation/aws-sdk/aws-sdk-1.11/metadata.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1+
description: >
2+
This instrumentation covers the AWS SDK 1.11+ client library, enabling messaging and client spans
3+
and metrics for calls to AWS services including DynamoDB, EC2, Kinesis, Lambda, RDS, S3, secrets
4+
manager, SNS/SQS and step functions.
15
configurations:
26
- name: otel.instrumentation.aws-sdk.experimental-span-attributes
3-
description: Enables experimental span attributes for AWS SDK instrumentation.
7+
description: >
8+
Enables the experimental span attributes `aws.agent`, `aws.bucket.name`, `aws.queue.url`,
9+
`aws.queue.name`, `aws.stream.name`, `aws.table.name`, `aws.lambda.function.arn` and
10+
`aws.lambda.function.name` for AWS SDK instrumentation.
411
type: boolean
512
default: false
613
- name: otel.instrumentation.messaging.experimental.receive-telemetry.enabled

‎instrumentation/aws-sdk/aws-sdk-2.2/metadata.yaml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
description: >
2+
This instrumentation covers the AWS SDK 2.2+ client library, enabling messaging and client spans
3+
and metrics for calls to AWS services including DynamoDB, EC2, Kinesis, Lambda, RDS, S3, SNS/SQS
4+
and Bedrock.
15
configurations:
26
- name: otel.instrumentation.messaging.experimental.receive-telemetry.enabled
37
description: >
@@ -10,15 +14,19 @@ configurations:
1014
type: list
1115
default: ''
1216
- name: otel.instrumentation.aws-sdk.experimental-span-attributes
13-
description: Enables experimental span attributes for AWS SDK instrumentation.
17+
description: >
18+
Enables experimental span attributes `aws.agent`, `aws.lambda.function.arn` and
19+
`aws.lambda.function.name` for AWS SDK instrumentation.
1420
type: boolean
1521
default: false
1622
- name: otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging
1723
description: Determines whether the configured TextMapPropagator should be used to inject into supported messaging attributes (for SQS).
1824
type: boolean
1925
default: false
2026
- name: otel.instrumentation.genai.capture-message-content
21-
description: 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
27+
description: >
28+
Determines whether Generative AI events include full content of user and assistant messages.
29+
Note that full content can have data privacy and size concerns and care should be taken when enabling this
2230
type: boolean
2331
default: false
2432
- name: otel.instrumentation.aws-sdk.experimental-record-individual-http-error

0 commit comments

Comments
 (0)