[SCB-171] report type/version when register to SC #460

weichao666 · 2017-12-23T09:27:21Z

Follow this checklist to help us incorporate your contribution quickly and easily:

Make sure there is a JIRA issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes.
Each commit in the pull request should have a meaningful subject line and body.
Format the pull request title like [JAV-XXX] Fixes bug in ApproximateQuantiles, where you replace JAV-XXX with the appropriate JIRA issue.
Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
Run mvn clean install to make sure basic checks pass. A more thorough check will be performed on your pull request automatically.
If this contribution is large, please file an Apache Individual Contributor License Agreement.

1、SDK report their framework type and version when register to SC
2、Each service with specific version has a certain framework+version
3、Present the type/version information in console in Service+Version level
4、In gov service, send the different command to CC according to the type/version when doing
management

coveralls · 2017-12-23T09:43:53Z

Coverage increased (+0.02%) to 87.147% when pulling 17b1c77 on weichao666:JAV566CSE769modify into dcee409 on apache:master.

WillemJiang · 2017-12-23T11:08:19Z

...ry/src/main/java/io/servicecomb/serviceregistry/api/registry/GetFrameworkVersionFromXml.java

+    try {
+        prop.load(in);
+    } catch (Exception e) {
+        e.printStackTrace();


Please log the error and throw the exception out.

Instead of using mavenVersionFor

WillemJiang · 2017-12-23T11:09:59Z

service-registry/src/test/java/io/servicecomb/serviceregistry/api/registry/TestFramework.java

+  public void testInitializedValues() {
+    initFramework(); //Initialize the Values
+    Assert.assertEquals("JAVA-CHASSIS", framework.getName());
+    Assert.assertEquals("0.6.0", framework.getVersion());


Do we need to change the version once we release java-chassis 0.6.0？

please make it automatically.

WillemJiang · 2017-12-23T11:10:56Z

service-registry/src/test/resources/config/frameworkVersion.properties

@@ -0,0 +1 @@
+FRAMEWORK_VERSION=0.6.0


How about change the version to xxx-test?

The new modification deletes this file,replace with pom.properties

wujimin · 2017-12-24T02:26:43Z

...ry/src/main/java/io/servicecomb/serviceregistry/api/registry/GetFrameworkVersionFromXml.java

+/**
+ * Created by on 2017/12/22.
+ */
+public class GetFrameworkVersionFromXml {


xml???
properties?

wujimin · 2017-12-24T02:28:35Z

...ry/src/main/java/io/servicecomb/serviceregistry/api/registry/GetFrameworkVersionFromXml.java

+  }
+
+  private static void loadProperties() {
+    InputStream in =


no need to close inputStream?

replace with mavenVersionFor

wujimin · 2017-12-24T02:29:17Z

...ry/src/main/java/io/servicecomb/serviceregistry/api/registry/GetFrameworkVersionFromXml.java

+ * Created by on 2017/12/22.
+ */
+public class GetFrameworkVersionFromXml {
+  private static Properties prop;


why need this field?

wujimin · 2017-12-24T02:36:27Z

...ry/src/main/java/io/servicecomb/serviceregistry/api/registry/GetFrameworkVersionFromXml.java

+
+  private static void loadProperties() {
+    InputStream in =
+      GetFrameworkVersionFromXml.class.getResourceAsStream("/config/frameworkVersion.properties");


found that maven will put \META-INF\maven{groupId}{artifactId}\pom.properties and pom.xml into jar automatically
we no need to create a new properties.

you can read code: com.fasterxml.jackson.core.util.VersionUtil.mavenVersionFor(ClassLoader, String, String)

wujimin

i did not find the confirm: will we use ServiceComb or cse version?
have i missed some information?

coveralls · 2017-12-25T13:14:46Z

Coverage decreased (-0.04%) to 87.086% when pulling a251d63 on weichao666:JAV566CSE769modify into dcee409 on apache:master.

wujimin · 2017-12-30T01:12:22Z

service-registry/src/main/resources/META-INF/maven/io/servicecomb/java-chassis/pom.properties

@@ -0,0 +1,3 @@
+groupId=io.servicecomb


why we need this file ?

in mavenVersionFor's source code，it need to read pom.properties,
public static Version mavenVersionFor(ClassLoader classLoader, String groupId, String artifactId) {
InputStream pomPoperties = classLoader.getResourceAsStream("META-INF/maven/" +
groupId.replaceAll("\.", "/") + "/" + artifactId + "/pom.properties");

i remember this file will be generated automatically.

yes,when mvn package,this file will be generated automatically, i'll delete it

coveralls · 2018-01-02T07:18:41Z

Coverage increased (+0.3%) to 87.381% when pulling 59ad3b5 on weichao666:JAV566CSE769modify into dcee409 on apache:master.

weichao666 · 2018-01-04T10:37:09Z

After discussion, use ServiceComb version

coveralls · 2018-01-04T10:52:13Z

Coverage increased (+0.3%) to 87.451% when pulling 0f3d9cf on weichao666:JAV566CSE769modify into dcee409 on apache:master.

wujimin · 2018-01-04T13:52:14Z

pom.xml

        </plugin>
      </plugins>
    </pluginManagement>
+    <resources>


what's this?
to generate pom.properties?

it seems that no need to do this.

wujimin · 2018-01-04T13:53:41Z

...istry/src/test/java/io/servicecomb/serviceregistry/api/registry/TestGetFrameworkVersion.java

+
+public class TestGetFrameworkVersion {
+
+  ClassLoader classLoader = null;


what's the field purpose?

delete it now

wujimin · 2018-01-04T13:54:58Z

...istry/src/test/java/io/servicecomb/serviceregistry/api/registry/TestGetFrameworkVersion.java

+  @Test
+  public void test() {
+    @SuppressWarnings("deprecation")
+	Version version = VersionUtil.mavenVersionFor(classLoader, "io.servicecomb", "java-chassis");


your test target is "GetFrameworkVersion"
but where is your target instance?

done,GetFrameworkVersion have been deleted

wujimin · 2018-01-04T13:55:39Z

...-registry/src/main/java/io/servicecomb/serviceregistry/api/registry/GetFrameworkVersion.java

+/**
+ * Created by on 2017/12/22.
+ */
+public class GetFrameworkVersion {


your class name is getXXXX????

done,delete it now,use default value first

wujimin · 2018-01-04T13:57:49Z

service-registry/src/main/java/io/servicecomb/serviceregistry/api/registry/Microservice.java

+  private Framework framework;
+
+  @JsonProperty(value = "registerBy")
+  private String registeredBy;


use the original name
i remember wrote comment, class Microservice not only describe self, but also describe others

why did not do any response?

wujimin · 2018-01-04T13:59:36Z

service-registry/src/test/java/io/servicecomb/serviceregistry/api/registry/TestFramework.java

+
+public class TestFramework {
+
+  Framework framework = null;


do you think 27~37 equals

Framework framework = new Framework();

wujimin · 2018-01-04T14:18:11Z

service-registry/src/main/java/io/servicecomb/serviceregistry/api/Const.java

+
+  public static final String GROUPID = "io.servicecomb";
+
+  public static final String ARTIFACTID = "java-chassis";


are you sure you can read version by this artifactid?

when mvn package, the version can be read,

wujimin · 2018-01-04T18:02:58Z

maybe this is simpler and not depend on jackson Deprecated method:

      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
        <configuration>
          <archive>
            <manifest>
              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
            </manifest>
          </archive>
        </configuration>
      </plugin>

xxxClass.class.getPackage().getImplementationVersion()

but you need to do more test at least include:
1.web container, eg: tomcat
2.maybe openjdk

coveralls · 2018-01-08T09:26:29Z

Coverage increased (+0.3%) to 87.47% when pulling a31b494 on weichao666:JAV566CSE769modify into dcee409 on apache:master.

coveralls · 2018-01-08T09:39:16Z

Coverage increased (+0.3%) to 87.47% when pulling a31b494 on weichao666:JAV566CSE769modify into dcee409 on apache:master.

wujimin · 2018-01-09T03:37:54Z

...ndation-common/src/main/java/io/servicecomb/foundation/common/base/ServiceCombConstants.java

+
+  String CONFIG_FRAMEWORK_DEFAULT_NAME = "servicecomb-java-chassis";
+
+  String CONFIG_FRAMEWORK_DEFAULT_VERSION = "1.0";


fake "1.0" is not good

set version to empty now

coveralls · 2018-01-09T04:03:09Z

Coverage increased (+0.04%) to 87.521% when pulling 3a4171d on weichao666:JAV566CSE769modify into e812ad7 on apache:master.

[JAV-566] report type/version when register to SC

17b1c77

WillemJiang reviewed Dec 23, 2017

View reviewed changes

WillemJiang requested changes Dec 23, 2017

View reviewed changes

wujimin reviewed Dec 24, 2017

View reviewed changes

laijianbin and others added 5 commits December 25, 2017 17:14

[JAV-566] report type/version when register to SC

355b005

Update pom.xml

c3b20b8

Delete GetFrameworkVersionFromXml.java

0f6c3c2

[JAV-566] report type/version when register to SC

40353a8

[JAV-566] report type/version when register to SC

a251d63

WillemJiang approved these changes Dec 28, 2017

View reviewed changes

wujimin reviewed Dec 30, 2017

View reviewed changes

[JAV-566] report type/version when register to SC

59ad3b5

[JAV-566] report type/version when register to SC

0f3d9cf

wujimin reviewed Jan 4, 2018

View reviewed changes

weichao666 changed the title ~~[JAV-566] report type/version when register to SC~~ [SCB-171] report type/version when register to SC Jan 5, 2018

laijianbin added 2 commits January 8, 2018 17:06

fix review comments and leave configuration items in default first

c81632c

beautify ut

a31b494

liubao68 approved these changes Jan 8, 2018

View reviewed changes

wujimin reviewed Jan 9, 2018

View reviewed changes

currently set version to empty(unknown)

3a4171d

WillemJiang merged commit 1fb0be2 into apache:master Jan 9, 2018

		@@ -0,0 +1 @@
		FRAMEWORK_VERSION=0.6.0 No newline at end of file


		public class TestGetFrameworkVersion {

		ClassLoader classLoader = null;


		public static final String GROUPID = "io.servicecomb";

		public static final String ARTIFACTID = "java-chassis";


		String CONFIG_FRAMEWORK_DEFAULT_NAME = "servicecomb-java-chassis";

		String CONFIG_FRAMEWORK_DEFAULT_VERSION = "1.0";

[SCB-171] report type/version when register to SC #460

[SCB-171] report type/version when register to SC #460

Uh oh!

Conversation

weichao666 commented Dec 23, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coveralls commented Dec 23, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wujimin Dec 24, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wujimin left a comment

Choose a reason for hiding this comment

Uh oh!

coveralls commented Dec 25, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

coveralls commented Jan 2, 2018

Uh oh!

weichao666 commented Jan 4, 2018

Uh oh!

coveralls commented Jan 4, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wujimin Jan 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

weichao666 commented Dec 23, 2017 •

edited

Loading

wujimin Dec 24, 2017 •

edited

Loading

wujimin Jan 4, 2018 •

edited

Loading