Skip to content

Commit 4b02a57

Browse files
authored
Merge branch 'main' into lambdadocchnage
2 parents 3691e6c + 48f34a3 commit 4b02a57

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

src/docs/getting-started/java-sdk/trace-auto-instr.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ artifact, any usage of it will be disabled by the agent.
9393
##### For Gradle:
9494
```kotlin lineNumbers=true
9595
dependencies {
96-
implementation("io.opentelemetry:opentelemetry-api:1.16.0")
96+
implementation("io.opentelemetry:opentelemetry-api:1.19.1")
9797
}
9898
```
9999

@@ -103,7 +103,7 @@ dependencies {
103103
<dependency>
104104
<groupId>io.opentelemetry</groupId>
105105
<artifactId>opentelemetry-api</artifactId>
106-
<version>1.16.0</version>
106+
<version>1.19.1</version>
107107
</dependency>
108108
</dependencies>
109109
```

src/docs/getting-started/java-sdk/trace-manual-instr.mdx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ to align dependency versions for non-contrib components.
3737
##### For Gradle:
3838
```kotlin lineNumbers=true
3939
dependencies {
40-
api(platform("io.opentelemetry:opentelemetry-bom:1.16.0"))
40+
api(platform("io.opentelemetry:opentelemetry-bom:1.19.1"))
4141

4242
implementation("io.opentelemetry:opentelemetry-api")
4343
implementation("io.opentelemetry:opentelemetry-exporter-otlp")
@@ -46,7 +46,7 @@ dependencies {
4646

4747
implementation("io.opentelemetry:opentelemetry-extension-aws")
4848
implementation("io.opentelemetry:opentelemetry-sdk-extension-aws")
49-
implementation("io.opentelemetry.contrib:opentelemetry-aws-xray:1.16.0")
49+
implementation("io.opentelemetry.contrib:opentelemetry-aws-xray:1.19.1")
5050
}
5151
```
5252

@@ -57,7 +57,7 @@ dependencies {
5757
<dependency>
5858
<groupId>io.opentelemetry</groupId>
5959
<artifactId>opentelemetry-bom</artifactId>
60-
<version>1.16.0</version>
60+
<version>1.19.1</version>
6161
<type>pom</type>
6262
<scope>import</scope>
6363
<dependency>
@@ -87,7 +87,7 @@ dependencies {
8787
<dependency>
8888
<groupId>io.opentelemetry.contrib</groupId>
8989
<artifactId>opentelemetry-aws-xray</artifactId>
90-
<version>1.16.0</version>
90+
<version>1.19.1</version>
9191
</dependency>
9292
</dependencies>
9393
```
@@ -211,7 +211,7 @@ library instrumentation. When using this, do not include `opentelemetry-bom`.
211211
##### For Gradle:
212212
```kotlin lineNumbers=true
213213
dependencies {
214-
api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha"))
214+
api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.19.1-alpha"))
215215

216216
implementation("io.opentelemetry:opentelemetry-api")
217217
implementation("io.opentelemetry:opentelemetry-exporter-otlp")
@@ -230,7 +230,7 @@ dependencies {
230230
<dependency>
231231
<groupId>io.opentelemetry.instrumentation</groupId>
232232
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
233-
<version>1.16.0-alpha</version>
233+
<version>1.19.1-alpha</version>
234234
<type>pom</type>
235235
<scope>import</scope>
236236
<dependency>
@@ -264,7 +264,7 @@ The `opentelemetry-instrumentation-aws-sdk-2.2` artifact provides instrumentatio
264264
##### For Gradle:
265265
```java lineNumbers=true
266266
dependencies {
267-
api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha"))\
267+
api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.19.1-alpha"))\
268268

269269
implementation("io.opentelemetry.instrumentation:opentelemetry-aws-sdk-2.2")
270270

@@ -279,7 +279,7 @@ dependencies {
279279
<dependency>
280280
<groupId>io.opentelemetry.instrumentation</groupId>
281281
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
282-
<version>1.16.0-alpha</version>
282+
<version>1.19.1-alpha</version>
283283
<type>pom</type>
284284
<scope>import</scope>
285285
<dependency>
@@ -397,7 +397,7 @@ class RequestHandler {
397397

398398
### Creating Metrics
399399

400-
Up to v1.16.0 of OpenTelemetry for Java, there are few libraries and frameworks that make use of the Metrics API.
400+
Up to v1.19.1 of OpenTelemetry for Java, there are few libraries and frameworks that make use of the Metrics API.
401401
Similarly to Traces, you can create custom metrics in your application using the OpentTelemetry API and SDK.
402402

403403
In the following example application we demonstrate how to use the three types of metric instruments that

src/docs/getting-started/lambda/lambda-java.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Find the supported regions and AMD64 (x86_64) layer ARN in the table below for t
3939

4040
|Supported Regions |Lambda layer ARN format | Contents |
4141
|---------------------|-------------------------|----------|
42-
| ap-northeast-1<br/>ap-northeast-2<br/>ap-south-1<br/>ap-southeast-1<br/>ap-southeast-2<br/>ca-central-1<br/>eu-central-1<br/>eu-north-1<br/>eu-west-1<br/>eu-west-2<br/>eu-west-3<br/>sa-east-1<br/>us-east-1<br/>us-east-2<br/>us-west-1<br/>us-west-2 | arn:aws:lambda:<region\>:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-8-0:1 | Contains [OpenTelemetry for Java v1.18.0](https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.18.0) with [Java Instrumentation v1.18.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.18.0) <br/><br/> Contains the [ADOT Collector for Lambda v0.22.0](https://github.com/aws-observability/aws-otel-collector/releases/tag/pkg%2Flambdacomponents%2Fv0.22.0) |
42+
| ap-northeast-1<br/>ap-northeast-2<br/>ap-south-1<br/>ap-southeast-1<br/>ap-southeast-2<br/>ca-central-1<br/>eu-central-1<br/>eu-north-1<br/>eu-west-1<br/>eu-west-2<br/>eu-west-3<br/>sa-east-1<br/>us-east-1<br/>us-east-2<br/>us-west-1<br/>us-west-2 | arn:aws:lambda:<region\>:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-18-0:1 | Contains [OpenTelemetry for Java v1.18.0](https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.18.0) with [Java Instrumentation v1.18.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.18.0) <br/><br/> Contains the [ADOT Collector for Lambda v0.22.0](https://github.com/aws-observability/aws-otel-collector/releases/tag/pkg%2Flambdacomponents%2Fv0.22.0) |
4343

4444
Find the supported regions and ARM64 layer ARN in the table below for the ARNs to consume.
4545

src/docs/getting-started/x-ray.mdx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,14 @@ exporters:
184184

185185
##### OTel span CW Logs metadata translation
186186

187+
The attributes in this section are translated into the AWS resource field `cloudwatch_logs`. This resource field is used to correlate Cloudwatch Log Groups with the segments associated with it. This correlation can be explored when analyzing individual traces in the X-Ray console.
188+
187189
| OTel Attributes env var | X-Ray data model field | Notes |
188190
|-------------------------|---------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
189-
| aws.log.group.arns | cloudwatch_logs.arn | <ul><li> If value of aws.log.group.arns is not an empty slice, then the exporter creates a CloudWatch log object with log group and ARN for all ARNs. If aws.log.group.arns value is an empty slice and value of aws.log.group.names is not an empty slice, then exporter creates a CloudWatch log object with only a log group. </li></ul> |
190-
| aws.log.group.names | cloudwatch_logs.log_group | |
191+
| aws.log.group.arns | cloudwatch_logs.arn | |
192+
| aws.log.group.names | cloudwatch_logs.log_group | If both `aws.log.group.arns` and `aws.log.group.names` are defined, precedence is given to `aws.log.group.arns` |
191193

192-
See [AWS X-Ray Segment Documents](https://docs.aws.amazon.com/xray/latest/devguide/xray-api-segmentdocuments.html) for more information on the AWS X-Ray data model. See [OpenTelemetry data model spec](https://github.com/open-telemetry/opentelemetry-specification) for more information on OpenTelemetry data model.
194+
See [AWS X-Ray Segment Documents](https://docs.aws.amazon.com/xray/latest/devguide/xray-api-segmentdocuments.html) for more information on the AWS X-Ray data model. See [OpenTelemetry data model spec](https://github.com/open-telemetry/opentelemetry-specification) for more information on OpenTelemetry data model. See [X-Ray Logging Configuration](https://docs.aws.amazon.com/xray/latest/devguide/xray-sdk-java-configuration.html#xray-sdk-java-configuration-logging) for references of expected log pattern.
193195

194196
### Enable The Customized X-Ray Annotations
195197
By using OpenTelemetry SDK, we can add the customized attributes for each trace subsegment. By default, these OpenTelemetry

0 commit comments

Comments
 (0)