Skip to content

Commit bfa7202

Browse files
committed
Merge branch 'openai-async' of github.com:anuraaga/opentelemetry-java-instrumentation into openai-async
2 parents 87820df + a048b3b commit bfa7202

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

benchmark-overhead-jmh/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ otelJava {
1313
}
1414

1515
dependencies {
16-
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.3")
16+
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.4")
1717
}
1818

1919
tasks {

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ val DEPENDENCIES = listOf(
121121
"org.objenesis:objenesis:3.4",
122122
"javax.validation:validation-api:2.0.1.Final",
123123
"org.snakeyaml:snakeyaml-engine:2.10",
124-
"org.elasticmq:elasticmq-rest-sqs_2.13:1.6.12"
124+
"org.elasticmq:elasticmq-rest-sqs_2.13:1.6.14"
125125
)
126126

127127
javaPlatform {

docs/advanced-configuration-options.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ This feature is designed for integrating client-side monitoring.
4545
We plan to integrate OpenTelemetry's own client-side monitoring solution by default once it's available
4646
(see the [browser instrumentation proposal](https://github.com/open-telemetry/community/blob/main/projects/browser-phase-1.md)).
4747

48-
| System property | Environment variable | Purpose |
49-
|-----------------------------------------|-----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
50-
| otel.experimental.javascript-snippet | OTEL_EXPERIMENTAL_JAVASCRIPT_SNIPPET | JavaScript code to inject into HTML responses before the closing `</head>` tag. The value should be a complete JavaScript snippet including `<script>` tags if needed, e.g. `-Dotel.experimental.javascript-snippet="<script>console.log('Hello world!');</script>"` |
48+
| System property | Environment variable | Purpose |
49+
|--------------------------------------|--------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
50+
| otel.experimental.javascript-snippet | OTEL_EXPERIMENTAL_JAVASCRIPT_SNIPPET | JavaScript code to inject into HTML responses before the closing `</head>` tag. The value should be a complete JavaScript snippet including `<script>` tags if needed, e.g. `-Dotel.experimental.javascript-snippet="<script>console.log('Hello world!');</script>"` |
5151

5252
**Important notes:**
5353

0 commit comments

Comments
 (0)