Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto-update java instrumentation version #2568

Merged
merged 2 commits into from
Apr 3, 2023
Merged

Auto-update java instrumentation version #2568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb71edd
Auto-update java instrumentation version
trask Apr 2, 2023
cb1b390
Merge branch 'main' into auto-update-java-instrumentation-version
cartermp Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/auto-update-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
.github/workflows/scripts/auto-update-version.sh "opentelemetry-collector-releases" "collectorVersion" "content/en/docs/collector/_index.md"
git reset --hard origin/main
.github/workflows/scripts/auto-update-version.sh "opentelemetry-java" "javaVersion" "content/en/docs/instrumentation/java/_index.md"
.github/workflows/scripts/auto-update-version.sh "opentelemetry-java-instrumentation" "javaInstrumentationVersion" "content/en/docs/instrumentation/java/automatic/annotations.md"
Comment on lines 26 to +27
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@trask - just double checking: was it intentional to not do a hard reset between the Java and Java-instrumentation version-update commands? If both are updated, the second PR will have two file updates (the one from the first PR and the java-instrumentation update.

If it wasn't intentional, then here's a fix:

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, no, thx!

env:
# change this to secrets.GITHUB_TOKEN when testing against a fork
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
6 changes: 3 additions & 3 deletions content/en/docs/instrumentation/java/automatic/annotations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Annotations
description: Using instrumentation annotations with a Java agent.
aliases: [/docs/instrumentation/java/annotations]
weight: 4
javaAnnotationsVersion: 1.24.0
javaInstrumentationVersion: 1.24.0
---

For most users, the out-of-the-box instrumentation is completely sufficient and
Expand All @@ -24,7 +24,7 @@ annotation.
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-instrumentation-annotations</artifactId>
<version>{{% param javaAnnotationsVersion %}}</version>
<version>{{% param javaInstrumentationVersion %}}</version>
</dependency>
</dependencies>
```
Expand All @@ -33,7 +33,7 @@ annotation.

```groovy
dependencies {
implementation('io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:{{% param javaAnnotationsVersion %}}')
implementation('io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:{{% param javaInstrumentationVersion %}}')
}
```

Expand Down