Skip to content

Commit

Permalink
Bump apm-agent-java to latest version (#213)
Browse files Browse the repository at this point in the history
  • Loading branch information
apmmachine authored Aug 10, 2023
1 parent 81d02fd commit f4eeaaa
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.40.0
1.41.1
4 changes: 2 additions & 2 deletions Dockerfile
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.40.0 /usr/agent/elastic-apm-agent.jar /app/elastic-apm-agent.jar
COPY --from=docker.elastic.co/observability/apm-agent-java:1.41.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.40.0" \
org.label-schema.version="1.41.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
6 changes: 2 additions & 4 deletions opbeans/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>co.elastic.apm</groupId>
Expand Down Expand Up @@ -29,7 +27,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
<!-- required this property so the updatecli automation uses it -->
<version.apm-agent-java>1.41.0</version.apm-agent-java>
<version.apm-agent-java>1.41.1</version.apm-agent-java>
</properties>


Expand Down

0 comments on commit f4eeaaa

Please sign in to comment.