# Modules * New modules: `spring-cloud-sleuth-autoconfigure`, `spring-cloud-sleuth-api`, `spring-cloud-sleuth-instrumentation` `spring-cloud-sleuth-core` removed and changed to `spring-cloud-sleuth-instrumentation` & `spring-cloud-sleuth-api` * Removed `spring-cloud-starter-sleuth-otel` To add OpenTelemetry support you need to add `spring-cloud-starter-sleuth` (adds Brave by default), exclude Brave and add `spring-cloud-sleuth-otel` dependency * Except for the tests, `spring-cloud-sleuth-autoconfigure` is the only module that can have access to `@Configuration`, `@ConfigurationProperties` classes. Tests have been added to ensure such separation. ## Package moving * `org.springframework.cloud.sleuth.api` -> `org.springframework.cloud.sleuth` * `org.springframework.cloud.sleuth.brave.autoconfig` -> `org.springframework.cloud.sleuth.autoconfig.brave` * `org.springframework.cloud.sleuth.otel.autoconfig` -> `org.springframework.cloud.sleuth.autoconfig.otel` * `org.springframework.cloud.sleuth` -> `org.springframework.cloud.sleuth` * Instrumentation: `org.springframework.cloud.sleuth.annotation` -> `org.springframework.cloud.sleuth.instrument.annotation` * All the autoconfiguration classes were moved under `org.springframework.cloud/sleuth.autoconfig` package ## Global class modifications * Any class registered as a bean is now public ## Classes * `RateLimitingSampler` constructor changed * Merged a lot of auto configuration classes into one (e.g. `BraveAutoConfiguration` now imports various other configurations) * Renamed `TraceBraveAutoConfiguration` to `BraveAutoConfiguration` * Renamed `TraceOtelAutoConfiguration` to `OtelAutoConfiguration` * Removed all `NoOp` implementations of the API
264 lines
7.6 KiB
Bash
Executable File
264 lines
7.6 KiB
Bash
Executable File
#!/bin/sh
|
|
# ----------------------------------------------------------------------------
|
|
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# https://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
# ----------------------------------------------------------------------------
|
|
|
|
# ----------------------------------------------------------------------------
|
|
# Maven2 Start Up Batch script
|
|
#
|
|
# Required ENV vars:
|
|
# ------------------
|
|
# JAVA_HOME - location of a JDK home dir
|
|
#
|
|
# Optional ENV vars
|
|
# -----------------
|
|
# M2_HOME - location of maven2's installed home dir
|
|
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
|
|
# e.g. to debug Maven itself, use
|
|
# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
|
|
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
|
|
# ----------------------------------------------------------------------------
|
|
|
|
if [ -z "$MAVEN_SKIP_RC" ]; then
|
|
|
|
if [ -f /etc/mavenrc ]; then
|
|
. /etc/mavenrc
|
|
fi
|
|
|
|
if [ -f "$HOME/.mavenrc" ]; then
|
|
. "$HOME/.mavenrc"
|
|
fi
|
|
|
|
fi
|
|
|
|
# OS specific support. $var _must_ be set to either true or false.
|
|
cygwin=false
|
|
darwin=false
|
|
mingw=false
|
|
case "$(uname)" in
|
|
CYGWIN*) cygwin=true ;;
|
|
MINGW*) mingw=true ;;
|
|
Darwin*)
|
|
darwin=true
|
|
#
|
|
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
|
|
# for the new JDKs provided by Oracle.
|
|
#
|
|
if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ]; then
|
|
#
|
|
# Apple JDKs
|
|
#
|
|
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
|
|
fi
|
|
|
|
if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]; then
|
|
#
|
|
# Apple JDKs
|
|
#
|
|
export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
|
|
fi
|
|
|
|
if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]; then
|
|
#
|
|
# Oracle JDKs
|
|
#
|
|
export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
|
|
fi
|
|
|
|
if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
|
|
#
|
|
# Apple JDKs
|
|
#
|
|
export JAVA_HOME=$(/usr/libexec/java_home)
|
|
fi
|
|
;;
|
|
esac
|
|
|
|
if [ -z "$JAVA_HOME" ]; then
|
|
if [ -r /etc/gentoo-release ]; then
|
|
JAVA_HOME=$(java-config --jre-home)
|
|
fi
|
|
fi
|
|
|
|
if [ -z "$M2_HOME" ]; then
|
|
## resolve links - $0 may be a link to maven's home
|
|
PRG="$0"
|
|
|
|
# need this for relative symlinks
|
|
while [ -h "$PRG" ]; do
|
|
ls=$(ls -ld "$PRG")
|
|
link=$(expr "$ls" : '.*-> \(.*\)$')
|
|
if expr "$link" : '/.*' >/dev/null; then
|
|
PRG="$link"
|
|
else
|
|
PRG="$(dirname "$PRG")/$link"
|
|
fi
|
|
done
|
|
|
|
saveddir=$(pwd)
|
|
|
|
M2_HOME=$(dirname "$PRG")/..
|
|
|
|
# make it fully qualified
|
|
M2_HOME=$(cd "$M2_HOME" && pwd)
|
|
|
|
cd "$saveddir"
|
|
# echo Using m2 at $M2_HOME
|
|
fi
|
|
|
|
# For Cygwin, ensure paths are in UNIX format before anything is touched
|
|
if $cygwin; then
|
|
[ -n "$M2_HOME" ] &&
|
|
M2_HOME=$(cygpath --unix "$M2_HOME")
|
|
[ -n "$JAVA_HOME" ] &&
|
|
JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
|
|
[ -n "$CLASSPATH" ] &&
|
|
CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
|
|
fi
|
|
|
|
# For Migwn, ensure paths are in UNIX format before anything is touched
|
|
if $mingw; then
|
|
[ -n "$M2_HOME" ] &&
|
|
M2_HOME="$( (
|
|
cd "$M2_HOME"
|
|
pwd
|
|
))"
|
|
[ -n "$JAVA_HOME" ] &&
|
|
JAVA_HOME="$( (
|
|
cd "$JAVA_HOME"
|
|
pwd
|
|
))"
|
|
# TODO classpath?
|
|
fi
|
|
|
|
if [ -z "$JAVA_HOME" ]; then
|
|
javaExecutable="$(which javac)"
|
|
if [ -n "$javaExecutable" ] && ! [ "$(expr \"$javaExecutable\" : '\([^ ]*\)')" = "no" ]; then
|
|
# readlink(1) is not available as standard on Solaris 10.
|
|
readLink=$(which readlink)
|
|
if [ ! $(expr "$readLink" : '\([^ ]*\)') = "no" ]; then
|
|
if $darwin; then
|
|
javaHome="$(dirname \"$javaExecutable\")"
|
|
javaExecutable="$(cd \"$javaHome\" && pwd -P)/javac"
|
|
else
|
|
javaExecutable="$(readlink -f \"$javaExecutable\")"
|
|
fi
|
|
javaHome="$(dirname \"$javaExecutable\")"
|
|
javaHome=$(expr "$javaHome" : '\(.*\)/bin')
|
|
JAVA_HOME="$javaHome"
|
|
export JAVA_HOME
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
if [ -z "$JAVACMD" ]; then
|
|
if [ -n "$JAVA_HOME" ]; then
|
|
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
|
|
# IBM's JDK on AIX uses strange locations for the executables
|
|
JAVACMD="$JAVA_HOME/jre/sh/java"
|
|
else
|
|
JAVACMD="$JAVA_HOME/bin/java"
|
|
fi
|
|
else
|
|
JAVACMD="$(which java)"
|
|
fi
|
|
fi
|
|
|
|
if [ ! -x "$JAVACMD" ]; then
|
|
echo "Error: JAVA_HOME is not defined correctly." >&2
|
|
echo " We cannot execute $JAVACMD" >&2
|
|
exit 1
|
|
fi
|
|
|
|
if [ -z "$JAVA_HOME" ]; then
|
|
echo "Warning: JAVA_HOME environment variable is not set."
|
|
fi
|
|
|
|
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
|
|
|
|
# For Cygwin, switch paths to Windows format before running java
|
|
if $cygwin; then
|
|
[ -n "$M2_HOME" ] &&
|
|
M2_HOME=$(cygpath --path --windows "$M2_HOME")
|
|
[ -n "$JAVA_HOME" ] &&
|
|
JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
|
|
[ -n "$CLASSPATH" ] &&
|
|
CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
|
|
fi
|
|
|
|
# traverses directory structure from process work directory to filesystem root
|
|
# first directory with .mvn subdirectory is considered project base directory
|
|
find_maven_basedir() {
|
|
local basedir=$(pwd)
|
|
local wdir=$(pwd)
|
|
while [ "$wdir" != '/' ]; do
|
|
if [ -d "$wdir"/.mvn ]; then
|
|
basedir=$wdir
|
|
break
|
|
fi
|
|
wdir=$(
|
|
cd "$wdir/.."
|
|
pwd
|
|
)
|
|
done
|
|
echo "${basedir}"
|
|
}
|
|
|
|
# concatenates all lines of a file
|
|
concat_lines() {
|
|
if [ -f "$1" ]; then
|
|
echo "$(tr -s '\n' ' ' <"$1")"
|
|
fi
|
|
}
|
|
|
|
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
|
|
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
|
|
|
|
# Provide a "standardized" way to retrieve the CLI args that will
|
|
# work with both Windows and non-Windows executions.
|
|
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
|
|
export MAVEN_CMD_LINE_ARGS
|
|
|
|
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
|
|
|
|
echo "Running version check"
|
|
VERSION=$(sed '\!<parent!,\!</parent!d' $(dirname $0)/pom.xml | grep '<version' | head -1 | sed -e 's/.*<version>//' -e 's!</version>.*$!!')
|
|
echo "The found version is [${VERSION}]"
|
|
|
|
if echo $VERSION | egrep -q 'M|RC'; then
|
|
echo Activating \"milestone\" profile for version=\"$VERSION\"
|
|
echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pmilestone"
|
|
else
|
|
echo Deactivating \"milestone\" profile for version=\"$VERSION\"
|
|
echo $MAVEN_ARGS | grep -q milestone && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pmilestone//')
|
|
fi
|
|
|
|
if echo $VERSION | egrep -q 'RELEASE'; then
|
|
echo Activating \"central\" profile for version=\"$VERSION\"
|
|
echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pcentral"
|
|
else
|
|
echo Deactivating \"central\" profile for version=\"$VERSION\"
|
|
echo $MAVEN_ARGS | grep -q central && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pcentral//')
|
|
fi
|
|
|
|
exec "$JAVACMD" \
|
|
$MAVEN_OPTS \
|
|
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
|
|
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
|
|
${WRAPPER_LAUNCHER} ${MAVEN_ARGS} "$@"
|