Remove java files and move proto files to root dir (#26)
Signed-off-by: Pavol Loffay <ploffay@redhat.com>pull/27/head^2
Pavol Loffay
5 years ago
committed by
Bogdan Drutu
parent
8bce1c43b7
commit
827013a1d2
19 changed files with 42 additions and 446 deletions
@ -1,20 +1,9 @@ |
||||
sudo: required |
||||
dist: xenial |
||||
language: go |
||||
|
||||
matrix: |
||||
include: |
||||
- language: java |
||||
jdk: openjdk8 |
||||
install: |
||||
- ./install-proto.sh |
||||
|
||||
script: |
||||
- ./gradlew clean assemble --stacktrace |
||||
- ./gradlew check --stacktrace |
||||
|
||||
before_cache: |
||||
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock |
||||
|
||||
cache: |
||||
directories: |
||||
- $HOME/.gradle |
||||
- $HOME/.gradle/caches/ |
||||
- $HOME/.gradle/wrapper/ |
||||
- ./java_build.sh |
||||
|
||||
@ -1 +1,5 @@ |
||||
# Language Independent Interface Types For OpenTelemetry |
||||
|
||||
The proto files can be consumed as GIT submodule or copied over and build directly in the consumer project. |
||||
|
||||
The compiled files are published to central repositories (Maven, NPM...) from OpenTelemetry client libraries. |
||||
|
||||
@ -1,168 +0,0 @@ |
||||
description = 'OpenTelemetry Proto' |
||||
|
||||
apply plugin: 'idea' |
||||
apply plugin: 'java' |
||||
apply plugin: 'com.google.protobuf' |
||||
apply plugin: 'maven' |
||||
apply plugin: "signing" |
||||
|
||||
group = "io.opentelemetry" |
||||
version = "0.1.0-SNAPSHOT" // CURRENT_OPENTELEMETRY_PROTO_VERSION |
||||
|
||||
sourceCompatibility = 1.6 |
||||
targetCompatibility = 1.6 |
||||
|
||||
repositories { |
||||
maven { url "https://plugins.gradle.org/m2/" } |
||||
} |
||||
|
||||
jar.manifest { |
||||
attributes('Implementation-Title': name, |
||||
'Implementation-Version': version, |
||||
'Built-By': System.getProperty('user.name'), |
||||
'Built-JDK': System.getProperty('java.version'), |
||||
'Source-Compatibility': sourceCompatibility, |
||||
'Target-Compatibility': targetCompatibility) |
||||
} |
||||
|
||||
def protobufVersion = '3.7.0' |
||||
def protocVersion = '3.7.0' |
||||
def grpcVersion = "1.19.0" // CURRENT_GRPC_VERSION |
||||
def javaxAnnotationVersion = '1.3.2' |
||||
|
||||
buildscript { |
||||
repositories { |
||||
maven { url "https://plugins.gradle.org/m2/" } |
||||
} |
||||
dependencies { |
||||
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.8" |
||||
} |
||||
} |
||||
|
||||
sourceSets { |
||||
main { |
||||
proto { |
||||
srcDir 'src' |
||||
} |
||||
} |
||||
} |
||||
|
||||
dependencies { |
||||
compile "com.google.protobuf:protobuf-java:${protobufVersion}", |
||||
"io.grpc:grpc-protobuf:${grpcVersion}", |
||||
"io.grpc:grpc-stub:${grpcVersion}" |
||||
|
||||
compileOnly "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}" |
||||
} |
||||
|
||||
protobuf { |
||||
protoc { |
||||
// The artifact spec for the Protobuf Compiler |
||||
artifact = "com.google.protobuf:protoc:${protocVersion}" |
||||
} |
||||
plugins { |
||||
grpc { |
||||
artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" |
||||
} |
||||
} |
||||
generateProtoTasks { |
||||
all()*.plugins { |
||||
grpc {} |
||||
} |
||||
ofSourceSet('main') |
||||
} |
||||
} |
||||
|
||||
// Disable all java warnings for proto generated files build |
||||
compileJava { |
||||
options.compilerArgs += ["-Xlint:none"] |
||||
options.encoding = "UTF-8" |
||||
} |
||||
|
||||
clean { |
||||
delete protobuf.generatedFilesBaseDir |
||||
} |
||||
|
||||
// IntelliJ complains that the generated classes are not found, ask IntelliJ to include the |
||||
// generated Java directories as source folders. |
||||
idea { |
||||
module { |
||||
sourceDirs += file("${protobuf.generatedFilesBaseDir}/main/java"); |
||||
sourceDirs += file("${protobuf.generatedFilesBaseDir}/main/grpc"); |
||||
// If you have additional sourceSets and/or codegen plugins, add all of them |
||||
} |
||||
} |
||||
|
||||
signing { |
||||
required false |
||||
sign configurations.archives |
||||
} |
||||
|
||||
javadoc.options { |
||||
encoding = 'UTF-8' |
||||
links 'https://docs.oracle.com/javase/8/docs/api/' |
||||
} |
||||
|
||||
task javadocJar(type: Jar) { |
||||
classifier = 'javadoc' |
||||
from javadoc |
||||
} |
||||
|
||||
task sourcesJar(type: Jar) { |
||||
classifier = 'sources' |
||||
from sourceSets.main.allSource |
||||
} |
||||
|
||||
artifacts { |
||||
archives javadocJar, sourcesJar |
||||
} |
||||
|
||||
uploadArchives { |
||||
repositories { |
||||
mavenDeployer { |
||||
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } |
||||
|
||||
def configureAuth = { |
||||
if (rootProject.hasProperty('ossrhUsername') && rootProject.hasProperty('ossrhPassword')) { |
||||
authentication(userName:rootProject.ossrhUsername, password: rootProject.ossrhPassword) |
||||
} |
||||
} |
||||
|
||||
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/", configureAuth) |
||||
|
||||
snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/", configureAuth) |
||||
|
||||
pom.project { |
||||
name "OpenTelemetry" |
||||
packaging 'jar' |
||||
description project.description |
||||
url 'https://github.com/open-telemetry/opentelemetry-proto' |
||||
|
||||
scm { |
||||
connection 'scm:svn:https://github.com/open-telemetry/opentelemetry-proto' |
||||
developerConnection 'scm:git:git@github.com/open-telemetry/opentelemetry-proto' |
||||
url 'https://github.com/open-telemetry/opentelemetry-proto' |
||||
} |
||||
|
||||
licenses { |
||||
license { |
||||
name 'The Apache License, Version 2.0' |
||||
url 'http://www.apache.org/licenses/LICENSE-2.0.txt' |
||||
} |
||||
} |
||||
|
||||
developers { |
||||
developer { |
||||
id 'io.opentelemetry' |
||||
name 'OpenTelemetry Contributors' |
||||
email 'opentelemetry-community@lists.cncf.io' |
||||
url 'opentelemetry.io' |
||||
// https://issues.gradle.org/browse/GRADLE-2719 |
||||
organization = 'OpenTelemetry Authors' |
||||
organizationUrl 'https://www.opentelemetry.io' |
||||
} |
||||
} |
||||
} |
||||
} |
||||
} |
||||
} |
||||
Binary file not shown.
@ -1,5 +0,0 @@ |
||||
distributionBase=GRADLE_USER_HOME |
||||
distributionPath=wrapper/dists |
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip |
||||
zipStoreBase=GRADLE_USER_HOME |
||||
zipStorePath=wrapper/dists |
||||
@ -1,172 +0,0 @@ |
||||
#!/usr/bin/env sh |
||||
|
||||
############################################################################## |
||||
## |
||||
## Gradle start up script for UN*X |
||||
## |
||||
############################################################################## |
||||
|
||||
# Attempt to set APP_HOME |
||||
# Resolve links: $0 may be a link |
||||
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 |
||||
SAVED="`pwd`" |
||||
cd "`dirname \"$PRG\"`/" >/dev/null |
||||
APP_HOME="`pwd -P`" |
||||
cd "$SAVED" >/dev/null |
||||
|
||||
APP_NAME="Gradle" |
||||
APP_BASE_NAME=`basename "$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"' |
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value. |
||||
MAX_FD="maximum" |
||||
|
||||
warn () { |
||||
echo "$*" |
||||
} |
||||
|
||||
die () { |
||||
echo |
||||
echo "$*" |
||||
echo |
||||
exit 1 |
||||
} |
||||
|
||||
# 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 |
||||
;; |
||||
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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then |
||||
MAX_FD_LIMIT=`ulimit -H -n` |
||||
if [ $? -eq 0 ] ; then |
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then |
||||
MAX_FD="$MAX_FD_LIMIT" |
||||
fi |
||||
ulimit -n $MAX_FD |
||||
if [ $? -ne 0 ] ; then |
||||
warn "Could not set maximum file descriptor limit: $MAX_FD" |
||||
fi |
||||
else |
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" |
||||
fi |
||||
fi |
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock |
||||
if $darwin; then |
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" |
||||
fi |
||||
|
||||
# For Cygwin, switch paths to Windows format before running java |
||||
if $cygwin ; then |
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"` |
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` |
||||
JAVACMD=`cygpath --unix "$JAVACMD"` |
||||
|
||||
# We build the pattern for arguments to be converted via cygpath |
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` |
||||
SEP="" |
||||
for dir in $ROOTDIRSRAW ; do |
||||
ROOTDIRS="$ROOTDIRS$SEP$dir" |
||||
SEP="|" |
||||
done |
||||
OURCYGPATTERN="(^($ROOTDIRS))" |
||||
# Add a user-defined pattern to the cygpath arguments |
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then |
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" |
||||
fi |
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh |
||||
i=0 |
||||
for arg in "$@" ; do |
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` |
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option |
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition |
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` |
||||
else |
||||
eval `echo args$i`="\"$arg\"" |
||||
fi |
||||
i=$((i+1)) |
||||
done |
||||
case $i in |
||||
(0) set -- ;; |
||||
(1) set -- "$args0" ;; |
||||
(2) set -- "$args0" "$args1" ;; |
||||
(3) set -- "$args0" "$args1" "$args2" ;; |
||||
(4) set -- "$args0" "$args1" "$args2" "$args3" ;; |
||||
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; |
||||
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; |
||||
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; |
||||
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; |
||||
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; |
||||
esac |
||||
fi |
||||
|
||||
# Escape application args |
||||
save () { |
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done |
||||
echo " " |
||||
} |
||||
APP_ARGS=$(save "$@") |
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules |
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" |
||||
|
||||
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong |
||||
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then |
||||
cd "$(dirname "$0")" |
||||
fi |
||||
|
||||
exec "$JAVACMD" "$@" |
||||
@ -1,84 +0,0 @@ |
||||
@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 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" |
||||
|
||||
@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 init |
||||
|
||||
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 init |
||||
|
||||
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 |
||||
|
||||
:init |
||||
@rem Get command-line arguments, handling Windows variants |
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args |
||||
|
||||
:win9xME_args |
||||
@rem Slurp the command line arguments. |
||||
set CMD_LINE_ARGS= |
||||
set _SKIP=2 |
||||
|
||||
:win9xME_args_slurp |
||||
if "x%~1" == "x" goto execute |
||||
|
||||
set CMD_LINE_ARGS=%* |
||||
|
||||
: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 %CMD_LINE_ARGS% |
||||
|
||||
: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 |
||||
@ -0,0 +1,14 @@ |
||||
#!/usr/bin/env bash |
||||
|
||||
set -e |
||||
|
||||
DIR="${DIR:-/tmp}" |
||||
cd ${DIR} |
||||
|
||||
wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v1.9.6/protoc-gen-swagger-v1.9.6-linux-x86_64 \ |
||||
&& chmod +x protoc-gen-swagger-v1.9.6-linux-x86_64 \ |
||||
&& sudo ln -s ${DIR}/protoc-gen-swagger-v1.9.6-linux-x86_64 /usr/bin/protoc-gen-swagger |
||||
|
||||
wget https://github.com/protocolbuffers/protobuf/releases/download/v3.9.1/protoc-3.9.1-linux-x86_64.zip \ |
||||
&& unzip protoc-3.9.1-linux-x86_64.zip \ |
||||
&& sudo ln -s ${DIR}/bin/protoc /usr/bin/protoc |
||||
@ -0,0 +1,20 @@ |
||||
#!/usr/bin/env bash |
||||
|
||||
set -e |
||||
|
||||
OUTDIR="./build/gen-java" |
||||
rm -rf $OUTDIR |
||||
mkdir -p $OUTDIR |
||||
|
||||
protoc --java_out=${OUTDIR} opentelemetry/proto/resource/v1/resource.proto \ |
||||
&& protoc --java_out=${OUTDIR} opentelemetry/proto/trace/v1/trace_config.proto \ |
||||
&& protoc --proto_path=./ --java_out=${OUTDIR} opentelemetry/proto/trace/v1/trace.proto \ |
||||
&& protoc --proto_path=./ --java_out=${OUTDIR} opentelemetry/proto/metrics/v1/metrics.proto \ |
||||
&& protoc --proto_path=./ --java_out=${OUTDIR} opentelemetry/proto/agent/common/v1/common.proto \ |
||||
&& protoc --proto_path=./ --java_out=${OUTDIR} opentelemetry/proto/agent/metrics/v1/metrics_service.proto \ |
||||
&& protoc --proto_path=./ --java_out=${OUTDIR} opentelemetry/proto/agent/trace/v1/trace_service.proto |
||||
|
||||
OPENAPI_OUTDIR="./build/gen-openapi" |
||||
|
||||
mkdir -p $OPENAPI_OUTDIR |
||||
protoc --plugin=protoc-gen-swagger=/usr/bin/protoc-gen-swagger --swagger_out=logtostderr=true,grpc_api_configuration=opentelemetry/proto/agent/trace/v1/trace_service_http.yaml:$OPENAPI_OUTDIR opentelemetry/proto/agent/trace/v1/trace_service.proto |
||||
@ -1,2 +0,0 @@ |
||||
rootProject.name = "opentelemetry-proto" |
||||
|
||||
Loading…
Reference in new issue