Remove "semver" prefix from instrumentation library version (open-telemetry#2180)

arminru · web-flow · commit 5585e736111d · 2020-12-02T10:29:11.000-08:00
diff --git a/QUICKSTART.md b/QUICKSTART.md
@@ -43,7 +43,7 @@ monitored. More information is available in the specification chapter [Obtaining
 
 ```java
 Tracer tracer =
-    OpenTelemetry.getGlobalTracer("instrumentation-library-name","semver:1.0.0");
+    OpenTelemetry.getGlobalTracer("instrumentation-library-name", "1.0.0");
 ```
 
 ### Create basic Span
@@ -262,7 +262,7 @@ The following is an example of counter usage:
 
 ```java
 // Gets or creates a named meter instance
-Meter meter = OpenTelemetry.getGlobalMeter("instrumentation-library-name","semver:1.0.0");
+Meter meter = OpenTelemetry.getGlobalMeter("instrumentation-library-name", "1.0.0");
 
 // Build counter e.g. LongCounter 
 LongCounter counter = meter
diff --git a/api/src/main/java/io/opentelemetry/api/OpenTelemetry.java b/api/src/main/java/io/opentelemetry/api/OpenTelemetry.java
@@ -85,8 +85,7 @@ static Tracer getGlobalTracer(String instrumentationName) {
    *
    * @param instrumentationName The name of the instrumentation library, not the name of the
    *     instrument*ed* library (e.g., "io.opentelemetry.contrib.mongodb"). Must not be null.
-   * @param instrumentationVersion The version of the instrumentation library (e.g.,
-   *     "semver:1.0.0").
+   * @param instrumentationVersion The version of the instrumentation library (e.g., "1.0.0").
    * @return a tracer instance.
    */
   static Tracer getGlobalTracer(String instrumentationName, String instrumentationVersion) {
diff --git a/api/src/main/java/io/opentelemetry/api/trace/TracerProvider.java b/api/src/main/java/io/opentelemetry/api/trace/TracerProvider.java
@@ -41,8 +41,7 @@ static TracerProvider getDefault() {
    *
    * @param instrumentationName The name of the instrumentation library, not the name of the
    *     instrument*ed* library (e.g., "io.opentelemetry.contrib.mongodb"). Must not be null.
-   * @param instrumentationVersion The version of the instrumentation library (e.g.,
-   *     "semver:1.0.0").
+   * @param instrumentationVersion The version of the instrumentation library (e.g., "1.0.0").
    * @return a tracer instance.
    */
   Tracer get(String instrumentationName, String instrumentationVersion);
diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/common/InstrumentationLibraryInfo.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/InstrumentationLibraryInfo.java
@@ -24,7 +24,7 @@ public abstract class InstrumentationLibraryInfo {
    *
    * @param name name of the instrumentation library (e.g., "io.opentelemetry.contrib.mongodb"),
    *     must not be null
-   * @param version version of the instrumentation library (e.g., "semver:1.0.0"), might be null
+   * @param version version of the instrumentation library (e.g., "1.0.0"), might be null
    * @return the new instance
    */
   public static InstrumentationLibraryInfo create(String name, @Nullable String version) {
diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/common/InstrumentationLibraryInfoTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/InstrumentationLibraryInfoTest.java
@@ -22,8 +22,6 @@ void emptyLibraryInfo() {
   @Test
   void nullName() {
     assertThrows(
-        NullPointerException.class,
-        () -> InstrumentationLibraryInfo.create(null, "semver:1.0.0"),
-        "name");
+        NullPointerException.class, () -> InstrumentationLibraryInfo.create(null, "1.0.0"), "name");
   }
 }
diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/TracerSdkTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/TracerSdkTest.java
@@ -33,7 +33,7 @@ class TracerSdkTest {
   private static final String SPAN_NAME = "span_name";
   private static final String INSTRUMENTATION_LIBRARY_NAME =
       "io.opentelemetry.sdk.trace.TracerSdkTest";
-  private static final String INSTRUMENTATION_LIBRARY_VERSION = "semver:0.2.0";
+  private static final String INSTRUMENTATION_LIBRARY_VERSION = "0.2.0";
   private static final InstrumentationLibraryInfo instrumentationLibraryInfo =
       InstrumentationLibraryInfo.create(
           INSTRUMENTATION_LIBRARY_NAME, INSTRUMENTATION_LIBRARY_VERSION);

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public abstract class InstrumentationLibraryInfo {`
`24`	`24`	`*`
`25`	`25`	`* @param name name of the instrumentation library (e.g., "io.opentelemetry.contrib.mongodb"),`
`26`	`26`	`* must not be null`
`27`		`- * @param version version of the instrumentation library (e.g., "semver:1.0.0"), might be null`
	`27`	`+ * @param version version of the instrumentation library (e.g., "1.0.0"), might be null`
`28`	`28`	`* @return the new instance`
`29`	`29`	`*/`
`30`	`30`	`public static InstrumentationLibraryInfo create(String name, @Nullable String version) {`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@ void emptyLibraryInfo() {`
`22`	`22`	`@Test`
`23`	`23`	`void nullName() {`
`24`	`24`	`assertThrows(`
`25`		`- NullPointerException.class,`
`26`		`- () -> InstrumentationLibraryInfo.create(null, "semver:1.0.0"),`
`27`		`- "name");`
	`25`	`+ NullPointerException.class, () -> InstrumentationLibraryInfo.create(null, "1.0.0"), "name");`
`28`	`26`	`}`
`29`	`27`	`}`