Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide Apollo dynamic configuration center implementation. fixes #2825 #2826

Merged
merged 44 commits into from
Jun 16, 2019
Merged

Provide Apollo dynamic configuration center implementation. fixes #2825 #2826

merged 44 commits into from
Jun 16, 2019

Conversation

kezhenxu94
Copy link
Member

Please answer these questions before submitting pull request

@kezhenxu94
Copy link
Member Author

checking dependency licenses

@coveralls
Copy link

coveralls commented Jun 5, 2019

Coverage Status

Coverage increased (+0.07%) to 17.361% when pulling 88213a2 on kezhenxu94:gh/2825 into 7f22770 on apache:master.

@kezhenxu94
Copy link
Member Author

kezhenxu94 commented Jun 5, 2019

@wu-sheng Here are the differences of dependencies between the dist package of my PR and the official dist 6.1.0 package (downloaded from the official website)

image

all the newly added dependencies are Apache 2.0 licenses, attachments are the dependencies names:

new.txt
old.txt

@JaredTan95 JaredTan95 added this to the 6.2.0 milestone Jun 5, 2019
@wu-sheng
Copy link
Member

wu-sheng commented Jun 5, 2019

I will follow this next week. Many new libs.

@wu-sheng wu-sheng removed this from the 6.2.0 milestone Jun 5, 2019
@kezhenxu94
Copy link
Member Author

I've updated the newly-added dependencies list in my original comment, there're fewer because last time I compared the master branch with the latest released version, and there're some dependencies that are introduced by other commits (e.g. dependency io.sundr:sundr-core:jar:0.9.2 is introduced by this PR as a transitive dependency of kubernetes):

image

@wu-sheng wu-sheng added feature New feature backend OAP backend related. plugin Plugin for agent or collector. Be used to extend the capabilities of default implementor. labels Jun 8, 2019
@wu-sheng
Copy link
Member

wu-sheng commented Jun 8, 2019

I am back online. For this pull request, please read this PR #2640 . Your #2817 is easy to merge because of that.

All dependency libs must be added to LICENSE file in dist folder. For Apache 2.0, NOTICE file content should be added to our NOTICE. Other licenses should be copied. These include the io.sundr:sundr-core:jar:0.9.2, if we missed that when we updated the k8s client version.

@kezhenxu94
Copy link
Member Author

These include the io.sundr:sundr-core:jar:0.9.2, if we missed that when we updated the k8s client version.

here is the differences between this PR (based on latest master branch) and the official release 6.1.0, and I'll base on the diff to add missing license or notice:

diff --git a/tmp/old.txt b/tmp/new.txt
index b814f5ce9..0d67fa4a7 100644
--- a/tmp/old.txt
+++ b/tmp/new.txt
@@ -4,25 +4,34 @@ aggs-matrix-stats-client-6.3.2.jar
 animal-sniffer-annotations-1.17.jar
 annotations-13.0.jar
 antlr4-runtime-4.7.1.jar
+aopalliance-1.0.jar
 apm-datacarrier-6.1.0.jar
 apm-network-6.1.0.jar
 apm-util-6.1.0.jar
+apollo-client-1.4.0.jar
+apollo-core-1.4.0.jar
 bcpkix-jdk15on-1.59.jar
 bcprov-ext-jdk15on-1.59.jar
 bcprov-jdk15on-1.59.jar
+builder-annotations-0.9.2.jar
 caffeine-2.6.2.jar
-client-java-2.0.0.jar
-client-java-api-2.0.0.jar
-client-java-proto-2.0.0.jar
+client-java-4.0.0.jar
+client-java-api-4.0.0.jar
+client-java-proto-4.0.0.jar
 cluster-consul-plugin-6.1.0.jar
 cluster-kubernetes-plugin-6.1.0.jar
+cluster-nacos-plugin-6.1.0.jar
 cluster-standalone-plugin-6.1.0.jar
 cluster-zookeeper-plugin-6.1.0.jar
 commons-codec-1.11.jar
+commons-compress-1.18.jar
 commons-dbcp-1.4.jar
 commons-io-2.6.jar
 commons-lang3-3.7.jar
 commons-pool-1.5.4.jar
+configuration-api-6.1.0.jar
+configuration-apollo-6.1.0.jar
+configuration-nacos-6.1.0.jar
 consul-client-1.2.6.jar
 converter-jackson-2.3.0.jar
 curator-client-4.0.1.jar
@@ -39,10 +48,12 @@ elasticsearch-x-content-6.3.2.jar
 envoy-metrics-receiver-plugin-6.1.0.jar
 error_prone_annotations-2.2.0.jar
 exporter-6.1.0.jar
+fastjson-1.2.47.jar
 generated-analysis-6.1.0.jar
 graphql-java-8.0.jar
 graphql-java-tools-5.2.3.jar
 groovy-2.4.5-indy.jar
+grpc-configuration-sync-6.1.0.jar
 grpc-context-1.15.1.jar
 grpc-core-1.15.1.jar
 grpc-netty-1.15.1.jar
@@ -51,6 +62,7 @@ grpc-protobuf-lite-1.15.1.jar
 grpc-stub-1.15.1.jar
 gson-2.8.1.jar
 guava-20.0.jar
+guice-4.1.0.jar
 h2-1.4.196.jar
 hppc-0.7.1.jar
 httpasyncclient-4.1.2.jar
@@ -70,6 +82,7 @@ jackson-mapper-asl-1.9.13.jar
 jackson-module-kotlin-2.8.8.jar
 jaeger-receiver-plugin-6.1.0.jar
 java-dataloader-2.0.2.jar
+javax.inject-1.jar
 javax.servlet-api-3.1.0.jar
 jcl-over-slf4j-1.7.25.jar
 jetty-http-9.4.2.v20170220.jar
@@ -80,6 +93,7 @@ jetty-servlet-9.4.2.v20170220.jar
 jetty-util-9.4.2.v20170220.jar
 jline-0.9.94.jar
 jna-4.5.1.jar
+joda-convert-1.2.jar
 joda-time-2.9.9.jar
 jopt-simple-4.6.jar
 jsr305-1.3.9.jar
@@ -111,6 +125,9 @@ lucene-spatial-7.3.1.jar
 lucene-spatial-extras-7.3.1.jar
 lucene-spatial3d-7.3.1.jar
 lucene-suggest-7.3.1.jar
+nacos-api-1.0.0.jar
+nacos-client-1.0.0.jar
+nacos-common-1.0.0.jar
 netty-3.10.5.Final.jar
 netty-buffer-4.1.27.Final.jar
 netty-codec-4.1.27.Final.jar
@@ -137,6 +154,7 @@ rank-eval-client-6.3.2.jar
 reactive-streams-1.0.2.jar
 receiver-proto-6.1.0.jar
 reflectasm-1.11.7.jar
+resourcecify-annotations-0.9.2.jar
 retrofit-2.3.0.jar
 server-alarm-plugin-6.1.0.jar
 server-core-6.1.0.jar
@@ -159,6 +177,8 @@ storage-elasticsearch-plugin-6.1.0.jar
 storage-jaeger-plugin-6.1.0.jar
 storage-jdbc-hikaricp-plugin-6.1.0.jar
 storage-zipkin-plugin-6.1.0.jar
+sundr-codegen-0.9.2.jar
+sundr-core-0.9.2.jar
 swagger-annotations-1.5.12.jar
 t-digest-3.2.jar
 telemetry-api-6.1.0.jar
                                                                              

@kezhenxu94
Copy link
Member Author

kezhenxu94 commented Jun 9, 2019

HI @wu-sheng

LICENCE: all the source code provided by AOP Alliance is Public Domain.

PUBLIC & NO NOTICE FILE (rsync -a a.cvs.sourceforge.net::cvsroot/aopalliance/)

  • apollo-client-1.4.0.jar and apollo-core-1.4.0.jar: Apache 2.0 & NO LICENSE FILE

  • builder-annotations-0.9.2.jar resourcecify-annotations-0.9.2.jar sundr-codegen-0.9.2.jar
    sundr-core-0.9.2.jar (https://github.com/sundrio/sundrio): Apache 2.0 & NO NOTICE FILE

  • commons-compress-1.18.jar: Apache 2.0 & NOTICE file contents are copied

  • fastjson-1.2.47.jar (EXISTS in 6.1.0 and LICENSE is added)

  • guice-4.1.0.jar: Apache 2.0 & NO NOTICE

  • javax.inject-1.jar: Apache 2.0 & NO NOTICE

  • joda-convert-1.2.jar: Apache 2.0 & NOTICE file contents are copied

  • nacos-api-1.0.0.jar nacos-client-1.0.0.jar nacos-common-1.0.0.jar: Apache 2.0 & NO NOTICE file

@wu-sheng
Copy link
Member

wu-sheng commented Jun 9, 2019

You need to cross check the difference between libs and existing license file.

@wu-sheng
Copy link
Member

@JaredTan95 Please review.

@kezhenxu94
Copy link
Member Author

kezhenxu94 commented Jun 15, 2019

@JaredTan95 Please review.

I've tested enough, I know @JaredTan95 you are one of the contributors of Apollo too , it would be appreciated if you could review this PR, thanks in advance 😄

Copy link
Member

@JaredTan95 JaredTan95 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wu-sheng
Copy link
Member

CI fail because of new changes.

@wu-sheng wu-sheng merged commit fac940c into apache:master Jun 16, 2019
@wu-sheng wu-sheng added this to the 6.2.0 milestone Jun 16, 2019
@wu-sheng wu-sheng removed the TBD To be decided later, need more discussion or input. label Jun 16, 2019
@kezhenxu94 kezhenxu94 deleted the gh/2825 branch June 16, 2019 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend OAP backend related. feature New feature plugin Plugin for agent or collector. Be used to extend the capabilities of default implementor.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants