Skip to content

Commit 9a77135

Browse files
jaydelucajaydeluca
committed
updates
1 parent 1f6c53c commit 9a77135

File tree

12 files changed

+478
-103
lines changed

12 files changed

+478
-103
lines changed

‎docs/instrumentation-list.yaml‎

Lines changed: 293 additions & 83 deletions
Large diffs are not rendered by default.

‎instrumentation-docs/collect.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -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

‎instrumentation-docs/instrumentations.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,15 @@ readonly INSTRUMENTATIONS=(
127127
"jaxws:jaxws-2.0-axis2-1.6:javaagent:test"
128128
"jaxws:jaxws-cxf-3.0:javaagent:test"
129129
"jaxws:jaxws-jws-api-1.1:javaagent:test"
130-
"jdbc:javaagent:test"
131-
"jdbc:javaagent:testStableSemconv"
132130
"jedis:jedis-1.4:javaagent:test"
133131
"jedis:jedis-1.4:javaagent:testStableSemconv"
134132
"jedis:jedis-3.0:javaagent:test"
135133
"jedis:jedis-3.0:javaagent:testStableSemconv"
136134
"jedis:jedis-4.0:javaagent:test"
137135
"jedis:jedis-4.0:javaagent:testStableSemconv"
136+
"jetty:jetty-8.0:javaagent:test"
137+
"jetty:jetty-11.0:javaagent:test"
138+
"jetty:jetty-12.0:javaagent:test"
138139
"jetty-httpclient:jetty-httpclient-12.0:javaagent:test"
139140
"jetty-httpclient:jetty-httpclient-9.2:javaagent:test"
140141
"jodd-http-4.2:javaagent:test"

‎instrumentation/jdbc/metadata.yaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
description: >
2-
This instrumentation enables database client spans and database client metrics for JDBC
3-
database operations. There is also a "jdbc-datasource" instrumentation that creates spans
4-
for datasource connections, but is disabled by default due to the volume of telemetry
5-
produced.
6-
semantic_conventions:
7-
- DATABASE_CLIENT_SPANS
8-
- DATABASE_CLIENT_METRICS
2+
The JDBC instrumentation provides database client spans and metrics. Each call produces a span
3+
named after the SQL verb, enriched with standard DB client attributes (system, database,
4+
operation, sanitized statement, peer address) and error details if an exception occurs.
5+
6+
There is also a "jdbc-datasource" instrumentation that creates spans for datasource connections,
7+
but is disabled by default due to the volume of telemetry produced.
98
library_link: https://docs.oracle.com/javase/8/docs/api/java/sql/package-summary.html
109
configurations:
1110
- name: otel.instrumentation.jdbc.statement-sanitizer.enabled

‎instrumentation/jetty-httpclient/jetty-httpclient-12.0/metadata.yaml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
description: This instrumentation enables HTTP client spans and HTTP client metrics for Jetty HTTP Client.
2+
semantic_conventions:
3+
- HTTP_CLIENT_SPANS
4+
- HTTP_CLIENT_METRICS
5+
library_link: https://eclipse.dev/jetty/
6+
configurations:
7+
- name: otel.instrumentation.http.known-methods
8+
description: >
9+
Configures the instrumentation to recognize an alternative set of HTTP request methods. All
10+
other methods will be treated as `_OTHER`.
11+
type: list
12+
default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
13+
- name: otel.instrumentation.http.client.capture-request-headers
14+
description: List of HTTP request headers to capture in HTTP client telemetry.
15+
type: list
16+
default: ""
17+
- name: otel.instrumentation.http.client.capture-response-headers
18+
description: List of HTTP response headers to capture in HTTP client telemetry.
19+
type: list
20+
default: ""
21+
- name: otel.instrumentation.common.peer-service-mapping
22+
description: Used to specify a mapping from host names or IP addresses to peer services.
23+
type: map
24+
default: ""
25+
- name: otel.instrumentation.http.client.emit-experimental-telemetry
26+
description: >
27+
Enable the capture of experimental HTTP client telemetry. Adds the `http.request.body.size`
28+
and `http.response.body.size` attributes to spans, and records `http.client.request.size` and
29+
`http.client.response.size` metrics.
30+
type: boolean
31+
default: false
32+
- name: otel.instrumentation.http.client.experimental.redact-query-parameters
33+
description: Redact sensitive URL parameters. See https://opentelemetry.io/docs/specs/semconv/http/http-spans.
34+
type: boolean
35+
default: true

‎instrumentation/jetty-httpclient/jetty-httpclient-9.2/metadata.yaml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
description: This instrumentation enables HTTP client spans and HTTP client metrics for Jetty HTTP Client.
2+
semantic_conventions:
3+
- HTTP_CLIENT_SPANS
4+
- HTTP_CLIENT_METRICS
5+
library_link: https://eclipse.dev/jetty/
6+
configurations:
7+
- name: otel.instrumentation.http.known-methods
8+
description: >
9+
Configures the instrumentation to recognize an alternative set of HTTP request methods. All
10+
other methods will be treated as `_OTHER`.
11+
type: list
12+
default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
13+
- name: otel.instrumentation.http.client.capture-request-headers
14+
description: List of HTTP request headers to capture in HTTP client telemetry.
15+
type: list
16+
default: ""
17+
- name: otel.instrumentation.http.client.capture-response-headers
18+
description: List of HTTP response headers to capture in HTTP client telemetry.
19+
type: list
20+
default: ""
21+
- name: otel.instrumentation.common.peer-service-mapping
22+
description: Used to specify a mapping from host names or IP addresses to peer services.
23+
type: map
24+
default: ""
25+
- name: otel.instrumentation.http.client.emit-experimental-telemetry
26+
description: >
27+
Enable the capture of experimental HTTP client telemetry. Adds the `http.request.body.size`
28+
and `http.response.body.size` attributes to spans, and records `http.client.request.size` and
29+
`http.client.response.size` metrics.
30+
type: boolean
31+
default: false
32+
- name: otel.instrumentation.http.client.experimental.redact-query-parameters
33+
description: Redact sensitive URL parameters. See https://opentelemetry.io/docs/specs/semconv/http/http-spans.
34+
type: boolean
35+
default: true

‎instrumentation/jetty/jetty-11.0/javaagent/build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ dependencies {
2828
otelJava {
2929
minJavaVersionSupported.set(JavaVersion.VERSION_11)
3030
}
31+
32+
tasks.test {
33+
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
34+
}

‎instrumentation/jetty/jetty-11.0/metadata.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
description: This instrumentation enables HTTP server spans and HTTP server metrics for Jetty.
2+
semantic_conventions:
3+
- HTTP_SERVER_SPANS
4+
- HTTP_SERVER_METRICS
5+
library_link: https://eclipse.dev/jetty/
6+
configurations:
7+
- name: otel.instrumentation.http.known-methods
8+
description: >
9+
Configures the instrumentation to recognize an alternative set of HTTP request methods. All
10+
other methods will be treated as `_OTHER`.
11+
type: list
12+
default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
13+
- name: otel.instrumentation.http.server.capture-request-headers
14+
description: List of HTTP request headers to capture in HTTP server telemetry.
15+
type: list
16+
default: ""
17+
- name: otel.instrumentation.http.server.capture-response-headers
18+
description: List of HTTP response headers to capture in HTTP server telemetry.
19+
type: list
20+
default: ""
21+
- name: otel.instrumentation.http.server.emit-experimental-telemetry
22+
description: >
23+
Enable the capture of experimental HTTP server telemetry. Adds the `http.request.body.size`
24+
and `http.response.body.size` attributes to spans, and records `http.server.request.size` and
25+
`http.server.response.size` metrics.
26+
type: boolean
27+
default: false

‎instrumentation/jetty/jetty-12.0/javaagent/build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,7 @@ dependencies {
2525
otelJava {
2626
minJavaVersionSupported.set(JavaVersion.VERSION_17)
2727
}
28+
29+
tasks.test {
30+
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
31+
}

‎instrumentation/jetty/jetty-12.0/metadata.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
description: This instrumentation enables HTTP server spans and HTTP server metrics for Jetty.
2+
semantic_conventions:
3+
- HTTP_SERVER_SPANS
4+
- HTTP_SERVER_METRICS
5+
library_link: https://eclipse.dev/jetty/
6+
configurations:
7+
- name: otel.instrumentation.http.known-methods
8+
description: >
9+
Configures the instrumentation to recognize an alternative set of HTTP request methods. All
10+
other methods will be treated as `_OTHER`.
11+
type: list
12+
default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
13+
- name: otel.instrumentation.http.server.capture-request-headers
14+
description: List of HTTP request headers to capture in HTTP server telemetry.
15+
type: list
16+
default: ""
17+
- name: otel.instrumentation.http.server.capture-response-headers
18+
description: List of HTTP response headers to capture in HTTP server telemetry.
19+
type: list
20+
default: ""
21+
- name: otel.instrumentation.http.server.emit-experimental-telemetry
22+
description: >
23+
Enable the capture of experimental HTTP server telemetry. Adds the `http.request.body.size`
24+
and `http.response.body.size` attributes to spans, and records `http.server.request.size` and
25+
`http.server.response.size` metrics.
26+
type: boolean
27+
default: false

0 commit comments

Comments
 (0)