Skip to content

deps(apm-agent-java): Update APM Agent Java to 1.52.1 #346

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

Merged
merged 4 commits into from
Nov 25, 2024
Merged

deps(apm-agent-java): Update APM Agent Java to 1.52.1 #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ceeac9d
chore: Update maven package version
elastic-observability-automation[bot] Nov 19, 2024
1c7a66b
chore: Set apm-agent version in Dockerfile
elastic-observability-automation[bot] Nov 19, 2024
2e7c6f3
chore: Set org.label-schema.version in Dockerfile
elastic-observability-automation[bot] Nov 19, 2024
03b1184
chore: Update .version file
elastic-observability-automation[bot] Nov 20, 2024
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
2 changes: 1 addition & 1 deletion .version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.52.0
1.52.1
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ COPY --from=0 /usr/src/java-app/*.jar ./

# Copy Elastic agent from docker image
# updated by .ci/bump-version.sh
COPY --from=docker.elastic.co/observability/apm-agent-java:1.49.0 /usr/agent/elastic-apm-agent.jar /app/elastic-apm-agent.jar
COPY --from=docker.elastic.co/observability/apm-agent-java:1.52.1 /usr/agent/elastic-apm-agent.jar /app/elastic-apm-agent.jar

#Download the opentelemetry agent
RUN curl -L https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.10.1/opentelemetry-javaagent.jar --output /app/opentelemetry-javaagent.jar
Expand All @@ -47,7 +47,7 @@ LABEL \
org.label-schema.schema-version="1.0" \
org.label-schema.vendor="Elastic" \
org.label-schema.name="opbeans-java" \
org.label-schema.version="1.52.0" \
org.label-schema.version="1.52.1" \
org.label-schema.url="https://hub.docker.com/r/opbeans/opbeans-java" \
org.label-schema.vcs-url="https://github.com/elastic/opbeans-java" \
org.label-schema.license="MIT"
Expand Down
2 changes: 1 addition & 1 deletion opbeans/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<elasticsearch.version>8.15.0</elasticsearch.version>
<java.version>17</java.version>
<!-- required this property so the updatecli automation uses it -->
<version.apm-agent-java>1.52.0</version.apm-agent-java>
<version.apm-agent-java>1.52.1</version.apm-agent-java>
</properties>


Expand Down