Integrate fake-backend project into main build.
MODIFY
.github/workflows/pr-smoke-test-fake-backend-images.yml
.github/workflows/pr-smoke-test-fake-backend-images.yml
@@ -21,8 +21,7 @@ jobs:
- name: Build Docker image
uses: gradle/gradle-build-action@v2
with:
- arguments: jibDockerBuild -Djib.httpTimeout=120000 -Djib.console=plain
- build-root-directory: smoke-tests/images/fake-backend
+ arguments: :smoke-tests:images:fake-backend:jibDockerBuild -Djib.httpTimeout=120000 -Djib.console=plain
cache-read-only: true
buildWindows:
@@ -45,6 +44,5 @@ jobs:
- name: Build Docker image
uses: gradle/gradle-build-action@v2
with:
- arguments: windowsBackendImageBuild
- build-root-directory: smoke-tests/images/fake-backend
+ arguments: :smoke-tests:images:fake-backend:windowsBackendImageBuild
cache-read-only: true

MODIFY
.github/workflows/publish-smoke-test-fake-backend-images.yml
.github/workflows/publish-smoke-test-fake-backend-images.yml
@@ -34,8 +34,7 @@ jobs:
- name: Build Docker image
uses: gradle/gradle-build-action@v2
with:
- arguments: jib -Djib.httpTimeout=120000 -Djib.console=plain -PextraTag=${{ env.TAG }}
- build-root-directory: smoke-tests/images/fake-backend
+ arguments: :smoke-tests:images:fake-backend:jib -Djib.httpTimeout=120000 -Djib.console=plain -PextraTag=${{ env.TAG }}
publishWindows:
runs-on: windows-2019
@@ -67,8 +66,7 @@ jobs:
- name: Build Docker image
uses: gradle/gradle-build-action@v2
with:
- arguments: dockerPush -PextraTag=${{ env.TAG }}
- build-root-directory: smoke-tests/images/fake-backend
+ arguments: :smoke-tests:images:fake-backend:dockerPush -PextraTag=${{ env.TAG }}
open-issue-on-failure:
needs:

MODIFY
settings.gradle.kts
settings.gradle.kts
pluginManagement {
plugins {
+ id("com.bmuschko.docker-remote-api") version "7.3.0"
id("com.github.ben-manes.versions") version "0.42.0"
id("com.github.jk1.dependency-license-report") version "2.1"
id("com.google.cloud.tools.jib") version "3.2.1"
@@ -116,6 +117,7 @@ include(":testing-common:library-for-integration-tests")
// smoke tests
include(":smoke-tests")
+include(":smoke-tests:images:fake-backend")
include(":smoke-tests:images:grpc")
include(":smoke-tests:images:play")
include(":smoke-tests:images:quarkus")

MODIFY
smoke-tests/images/fake-backend/build.gradle.kts
smoke-tests/images/fake-backend/build.gradle.kts
@@ -4,37 +4,17 @@ import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
plugins {
- java
+ id("otel.java-conventions")
- id("com.google.cloud.tools.jib") version "3.2.1"
- id("com.bmuschko.docker-remote-api") version "7.3.0"
- id("com.github.johnrengelman.shadow") version "7.1.2"
- id("de.undercouch.download") version "5.0.4"
- id("com.diffplug.spotless") version "6.4.2"
-}
-
-group = "io.opentelemetry"
-version = "0.0.1-SNAPSHOT"
-
-repositories {
- mavenCentral()
-}
-
-spotless {
- java {
- googleJavaFormat()
- licenseHeaderFile(rootProject.file("../../../buildscripts/spotless.license.java"), "(package|import|public)")
- }
- kotlinGradle {
- ktlint().userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
- target("**/*.gradle.kts")
- }
+ id("com.bmuschko.docker-remote-api")
+ id("com.github.johnrengelman.shadow")
+ id("com.google.cloud.tools.jib")
}
dependencies {
implementation("com.linecorp.armeria:armeria-grpc:1.15.0")
- implementation("io.opentelemetry.proto:opentelemetry-proto:0.16.0-alpha")
- runtimeOnly("org.slf4j:slf4j-simple:1.7.36")
+ implementation("io.opentelemetry.proto:opentelemetry-proto")
+ runtimeOnly("org.slf4j:slf4j-simple")
}
val extraTag = findProperty("extraTag") ?: DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(LocalDateTime.now())
@@ -54,6 +34,10 @@ tasks {
}
}
+ javadoc {
+ isEnabled = false
+ }
+
shadowJar {
manifest {
attributes(mapOf("Main-Class" to "io.opentelemetry.smoketest.fakebackend.FakeBackendMain"))

DELETE
smoke-tests/images/fake-backend/gradle.properties
-org.gradle.parallel=true
-org.gradle.caching=true
-
-org.gradle.priority=low
-
-# Gradle default is 256m which causes issues with our build - https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
-# Also workaround https://github.com/diffplug/spotless/issues/834
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m \
- --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
- --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
- --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
- --add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
- --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
- --add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
- --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
- --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
- --add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
- --add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
-
-# Currently causes failure when importing project in IntelliJ
-# org.gradle.warning.mode=fail
-
-# To allow caching more tasks in buildSrc project
-# This property is not mentioned in Gradle documentation
-# See https://github.com/gradle/gradle/issues/15214 for background info
-systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true
-
-# Workaround https://youtrack.jetbrains.com/issue/KT-34862
-kotlin.incremental=false

DELETE
smoke-tests/images/fake-backend/gradle/wrapper/gradle-wrapper.jar
smoke-tests/images/fake-backend/gradle/wrapper/gradle-wrapper.jar
Binary files a/smoke-tests/images/fake-backend/gradle/wrapper/gradle-wrapper.jar and /dev/null differ

DELETE
smoke-tests/images/fake-backend/gradle/wrapper/gradle-wrapper.properties
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionSha256Sum=e5444a57cda4a95f90b0c9446a9e1b47d3d7f69057765bfb54bd4f482542d548
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

DELETE
smoke-tests/images/fake-backend/gradlew
-#!/bin/sh
-
-#
-# Copyright 2015-2021 the original authors.
-#
-# Licensed 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.
-#
-
-##############################################################################
-#
-# Gradle start up script for POSIX generated by Gradle.
-#
-# Important for running:
-#
-# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-# noncompliant, but you have some other compliant shell such as ksh or
-# bash, then to run this script, type that shell name before the whole
-# command line, like:
-#
-# ksh Gradle
-#
-# Busybox and similar reduced shells will NOT work, because this script
-# requires all of these POSIX shell features:
-# * functions;
-# * expansions $var, ${var}, ${var:-default}, ${var+SET},
-# ${var#prefix}, ${var%suffix}, and $( cmd );
-# * compound commands having a testable exit status, especially case;
-# * various built-in commands including command, set, and ulimit.
-#
-# Important for patching:
-#
-# (2) This script targets any POSIX shell, so it avoids extensions provided
-# by Bash, Ksh, etc; in particular arrays are avoided.
-#
-# The "traditional" practice of packing multiple parameters into a
-# space-separated string is a well documented source of bugs and security
-# problems, so this is (mostly) avoided, by progressively accumulating
-# options in "$@", and eventually passing that to Java.
-#
-# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-# see the in-line comments for details.
-#
-# There are tweaks for specific operating systems such as AIX, CygWin,
-# Darwin, MinGW, and NonStop.
-#
-# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-# within the Gradle project.
-#
-# You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
- APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
- [ -h "$app_path" ]
-do
- ls=$( ls -ld "$app_path" )
- link=${ls#*' -> '}
- case $link in #(
- /*) app_path=$link ;; #(
- *) app_path=$APP_HOME$link ;;
- esac
-done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
- echo "$*"
-} >&2
-
-die () {
- echo
- echo "$*"
- echo
- exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in #(
- CYGWIN* ) cygwin=true ;; #(
- Darwin* ) darwin=true ;; #(
- MSYS* | MINGW* ) msys=true ;; #(
- NONSTOP* ) nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-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
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
- case $MAX_FD in #(
- max*)
- MAX_FD=$( ulimit -H -n ) ||
- warn "Could not query maximum file descriptor limit"
- esac
- case $MAX_FD in #(
- '' | soft) :;; #(
- *)
- ulimit -n "$MAX_FD" ||
- warn "Could not set maximum file descriptor limit to $MAX_FD"
- esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-# * args from the command line
-# * the main class name
-# * -classpath
-# * -D...appname settings
-# * --module-path (only if needed)
-# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
- APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
- CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
- JAVACMD=$( cygpath --unix "$JAVACMD" )
-
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- for arg do
- if
- case $arg in #(
- -*) false ;; # don't mess with options #(
- /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
- [ -e "$t" ] ;; #(
- *) false ;;
- esac
- then
- arg=$( cygpath --path --ignore --mixed "$arg" )
- fi
- # Roll the args list around exactly as many times as the number of
- # args, so each arg winds up back in the position where it started, but
- # possibly modified.
- #
- # NB: a `for` loop captures its iteration list before it begins, so
- # changing the positional parameters here affects neither the number of
- # iterations, nor the values presented in `arg`.
- shift # remove old arg
- set -- "$@" "$arg" # push replacement arg
- done
-fi
-
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
- "-Dorg.gradle.appname=$APP_BASE_NAME" \
- -classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
- "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-# set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
- printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
- xargs -n1 |
- sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
- tr '\n' ' '
- )" '"$@"'
-
-exec "$JAVACMD" "$@"

DELETE
smoke-tests/images/fake-backend/gradlew.bat
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

DELETE
smoke-tests/images/fake-backend/settings.gradle.kts
-rootProject.name = "smoke-test-fake-backend-images"

Integrate fake-backend project into main build. (#5828)