-
Notifications
You must be signed in to change notification settings - Fork 321
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
post release v1.49.0: update major branch (#3580)
* [maven-release-plugin] prepare for next development iteration * Update cloudfoundry for 1.48.1 release * ci: use .java-version and prepare to use VM with installed tools in BK (#3554) * ci(bk): use specialised VMs (#3555) * Added a note on centralized agent config support for AWS Lambda (#3498) * Bump com.networknt:json-schema-validator from 1.1.0 to 1.3.3 (#3547) * Bump com.networknt:json-schema-validator from 1.1.0 to 1.3.3 Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.1.0 to 1.3.3. - [Release notes](https://github.com/networknt/json-schema-validator/releases) - [Changelog](https://github.com/networknt/json-schema-validator/blob/master/CHANGELOG.md) - [Commits](networknt/json-schema-validator@1.1.0...1.3.3) --- updated-dependencies: - dependency-name: com.networknt:json-schema-validator dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Fix compilation * Fix schema version --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonas Kunz <[email protected]> * Fix inheritance for API annotations (#3551) * powershell no-logo (#3556) * security: add permissions block to workflows (#3531) * Bump io.micrometer:micrometer-core from 1.12.2 to 1.12.4 (#3559) Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.12.2 to 1.12.4. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.12.2...v1.12.4) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version.log4j from 2.12.4 to 2.23.1 (#3557) * Bump version.log4j from 2.12.4 to 2.23.1 Bumps `version.log4j` from 2.12.4 to 2.23.1. Updates `org.apache.logging.log4j:log4j-core` from 2.12.4 to 2.23.1 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.12.4 to 2.23.1 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * restore previous log4j version --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sylvain Juge <[email protected]> * Add API for instrumenting FAAS and adjust the AWS plugin (#3516) --------- Co-authored-by: Sylvain Juge <[email protected]> * Introduce API for metrics collection that does not depend on agent-core (#3522) * Remove logging API. * Clean up core dependencies from POMs that do not need it. * Add API for handling lambda instrumentation and apply to the AWS plugin. * Move metrics API to tracer. * Factor out JSON DSL for metrics. * Fix import issue. * Fix imports. * Fix imports. * fix formatting --------- Co-authored-by: Sylvain Juge <[email protected]> * differentiate Lambda url from api gateway (#3417) --------- Co-authored-by: Sylvain Juge <[email protected]> * added support to Elastic Load Balancer triggers (#3411) --------- Co-authored-by: Sylvain Juge <[email protected]> * feat: new release process with PRs (#3567) * feat: new release process with PRs Signed-off-by: Adrien Mannocci <[email protected]> * chore: redirect to stderr for both message Signed-off-by: Adrien Mannocci <[email protected]> * chore: apply suggest Signed-off-by: Adrien Mannocci <[email protected]> * ci(chore): use env var instead of prefix v Signed-off-by: Adrien Mannocci <[email protected]> * ci: use maven wrapper instead of direct maven Signed-off-by: Adrien Mannocci <[email protected]> * feat: validate snapshot for snapshot workflow Signed-off-by: Adrien Mannocci <[email protected]> * docs: add new release process Signed-off-by: Adrien Mannocci <[email protected]> --------- Signed-off-by: Adrien Mannocci <[email protected]> * Bump version.aws.sdk from 2.25.0 to 2.25.21 in /apm-agent-plugins (#3574) Bumps `version.aws.sdk` from 2.25.0 to 2.25.21. Updates `software.amazon.awssdk:s3` from 2.25.0 to 2.25.21 Updates `software.amazon.awssdk:sqs` from 2.25.0 to 2.25.21 Updates `software.amazon.awssdk:dynamodb` from 2.25.0 to 2.25.21 --- updated-dependencies: - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sqs dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:dynamodb dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.awaitility:awaitility from 4.2.0 to 4.2.1 (#3573) Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.2.1. - [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt) - [Commits](awaitility/awaitility@awaitility-4.2.0...awaitility-4.2.1) --- updated-dependencies: - dependency-name: org.awaitility:awaitility dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add exclusion list option for calling DatabaseMetaData.getUserName (#3568) * use a dummy user for testing * exclusion list option for calling getUserName * changelog and test break fixed * pre release: elastic-apm-agent v1.49.0 (#3576) Co-authored-by: apmmachine <[email protected]> * ci(fix): use input value instead of env value for post release trigger (#3577) Signed-off-by: Adrien Mannocci <[email protected]> * ci(fix): correct buildkite pipeline trigger (#3578) Signed-off-by: Adrien Mannocci <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Adrien Mannocci <[email protected]> Co-authored-by: apmmachine <[email protected]> Co-authored-by: Victor Martinez <[email protected]> Co-authored-by: Som <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonas Kunz <[email protected]> Co-authored-by: SylvainJuge <[email protected]> Co-authored-by: Jan Calanog <[email protected]> Co-authored-by: Rafael Winterhalter <[email protected]> Co-authored-by: Nugusbayev Kanagat <[email protected]> Co-authored-by: Adrien Mannocci <[email protected]> Co-authored-by: jackshirazi <[email protected]>
- Loading branch information
1 parent
b6be414
commit fd29376
Showing
335 changed files
with
2,381 additions
and
1,057 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,27 @@ | ||
#!/usr/bin/env bash | ||
set -euo pipefail | ||
|
||
echo "--- Install JDK17 :java:" | ||
# JDK version is defined in two different locations, here and .github/workflows/maven-goal/action.yml | ||
JAVA_URL=https://jvm-catalog.elastic.co/jdk | ||
JAVA_HOME=$(pwd)/.openjdk17 | ||
JAVA_PKG="$JAVA_URL/latest_openjdk_17_linux.tar.gz" | ||
curl -L --output /tmp/jdk.tar.gz "$JAVA_PKG" | ||
mkdir -p "$JAVA_HOME" | ||
tar --extract --file /tmp/jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1 | ||
|
||
# Configure the java version | ||
JAVA_VERSION=$(cat .java-version | xargs | tr -dc '[:print:]') | ||
JAVA_HOME="${HOME}/.java/openjdk${JAVA_VERSION}" | ||
export JAVA_HOME | ||
PATH=$JAVA_HOME/bin:$PATH | ||
PATH="${JAVA_HOME}/bin:${PATH}" | ||
export PATH | ||
|
||
java -version || true | ||
if [ -d "${JAVA_HOME}" ] ; then | ||
echo "--- Skip installing JDK${JAVA_VERSION} :java:" | ||
echo "already available in the Buildkite runner" | ||
else | ||
# Fallback to install at runtime | ||
# This should not be the case normally untless the .java-version file has been changed | ||
# and the VM Image is not yet available with the latest version. | ||
echo "--- Install JDK${JAVA_VERSION} :java:" | ||
JAVA_URL=https://jvm-catalog.elastic.co/jdk | ||
JAVA_PKG="${JAVA_URL}/latest_openjdk_${JAVA_VERSION}_linux.tar.gz" | ||
curl -L --output /tmp/jdk.tar.gz "${JAVA_PKG}" | ||
mkdir -p "${JAVA_HOME}" | ||
tar --extract --file /tmp/jdk.tar.gz --directory "${JAVA_HOME}" --strip-components 1 | ||
fi | ||
|
||
# Validate java is available in the runner. | ||
java -version |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
#!/usr/bin/env bash | ||
|
||
# Bash strict mode | ||
set -euo pipefail | ||
|
||
# Found current script directory | ||
RELATIVE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" | ||
|
||
# Found project directory | ||
BASE_PROJECT="$(dirname $(dirname "${RELATIVE_DIR}"))" | ||
|
||
# Import dependencies | ||
source "${RELATIVE_DIR}/util.sh" | ||
|
||
# Constants | ||
BASE_URL="https://repo1.maven.org/maven2/co/elastic/apm/elastic-apm-agent" | ||
CF_FILE="${BASE_PROJECT}/cloudfoundry/index.yml" | ||
|
||
# Requirements | ||
check_version "${RELEASE_VERSION}" | ||
|
||
echo "Set next snapshot version" | ||
./mvnw -V versions:set -DprocessAllModules=true -DgenerateBackupPoms=false -DnextSnapshot=true | ||
|
||
# make script idempotent if release is already in CF descriptor | ||
set +e | ||
grep -e "^${RELEASE_VERSION}:" ${CF_FILE} | ||
[[ $? == 0 ]] && exit 0 | ||
set -e | ||
echo "Update cloudfoundry version" | ||
echo "${RELEASE_VERSION}: ${BASE_URL}/${RELEASE_VERSION}/elastic-apm-agent-${RELEASE_VERSION}.jar" >> "${CF_FILE}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
#!/usr/bin/env bash | ||
|
||
# Bash strict mode | ||
set -euo pipefail | ||
|
||
# Found current script directory | ||
RELATIVE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" | ||
|
||
# Found project directory | ||
BASE_PROJECT="$(dirname $(dirname "${RELATIVE_DIR}"))" | ||
|
||
# Import dependencies | ||
source "${RELATIVE_DIR}/util.sh" | ||
|
||
# Requirements | ||
check_version "${RELEASE_VERSION}" | ||
|
||
echo "Set release version" | ||
./mvnw -V versions:set -DprocessAllModules=true -DgenerateBackupPoms=false -DnewVersion="${RELEASE_VERSION}" | ||
|
||
echo "Prepare changelog for release" | ||
java "${BASE_PROJECT}/.ci/ReleaseChangelog.java" CHANGELOG.asciidoc "${RELEASE_VERSION}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
--- | ||
|
||
name: common build tasks | ||
description: Install specific JDK and run a command | ||
|
||
inputs: | ||
test-java-version: | ||
description: 'Testing Java version' | ||
required: true | ||
default: '17' | ||
test-java-distribution: | ||
description: 'Testing Java distribution' | ||
required: true | ||
default: 'temurin' | ||
command: | ||
description: 'Command to execute' | ||
required: true | ||
shell: | ||
description: 'Default shell' | ||
default: 'bash' | ||
required: false | ||
|
||
runs: | ||
using: "composite" | ||
steps: | ||
- name: Set up testing JDK | ||
uses: actions/setup-java@v4 | ||
with: | ||
java-version: ${{ inputs.test-java-version}} | ||
distribution: ${{ inputs.test-java-distribution}} | ||
|
||
- name: Set up TEST_JAVA_BINARY environment variable | ||
shell: bash | ||
run: | | ||
major_version="$(echo '${{ inputs.test-java-version }}' | sed 's/\([0-9]*\).*/\1/')" | ||
java_home_var=JAVA_HOME_${major_version}_${{ runner.arch }} | ||
echo "TEST_JAVA_BINARY=${!java_home_var}/bin/java" >> $GITHUB_ENV | ||
- uses: ./.github/workflows/maven-goal | ||
with: | ||
command: ${{ inputs.command }} | ||
shell: ${{ inputs.shell }} | ||
env: | ||
TEST_JAVA_BINARY: ${{ env.TEST_JAVA_BINARY }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.