Bump otel version and add sdkversionstring to telemetry (Azure#25162)

* initial commit

* Convert asserts to assertj

* Some updates

* Read otel version

* Oops

* More oops

* More oops

* address comments

* fix indentation

* make tests accessible

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Author: kryalama

sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/AzureMonitorTraceExporter.java

@@ -14,7 +14,8 @@
 import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryExceptionData;
 import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryExceptionDetails;
 import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem;
-import com.azure.monitor.opentelemetry.exporter.utils.FormattedDuration;
+import com.azure.monitor.opentelemetry.exporter.implementation.FormattedDuration;
+import com.azure.monitor.opentelemetry.exporter.implementation.VersionGenerator;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanId;
@@ -691,7 +692,8 @@ private void initTelemetry(TelemetryItem telemetry, MonitorDomain data, String t
         telemetry.setName(telemetryName);
         telemetry.setInstrumentationKey(instrumentationKey);
         telemetry.setTags(new HashMap<>());
-
+        // Set AI Internal SDK Version
+        telemetry.getTags().put(ContextTagKeys.AI_INTERNAL_SDK_VERSION.toString(), VersionGenerator.getSdkVersion());
         data.setVersion(2);
 
         MonitorBase monitorBase = new MonitorBase();

…ry/exporter/utils/FormattedDuration.java …er/implementation/FormattedDuration.javasdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/utils/FormattedDuration.java renamed to sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/FormattedDuration.java sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/utils/FormattedDuration.java renamed to sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/FormattedDuration.java

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.monitor.opentelemetry.exporter.utils;
+package com.azure.monitor.opentelemetry.exporter.implementation;
 
 import static java.util.concurrent.TimeUnit.DAYS;
 import static java.util.concurrent.TimeUnit.HOURS;

sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/VersionGenerator.java

@@ -0,0 +1,77 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.monitor.opentelemetry.exporter.implementation;
+
+import com.azure.core.util.CoreUtils;
+import java.util.Map;
+
+/**
+ * This class contains several utility functions to populate sdk version string
+ */
+public final class VersionGenerator {
+    private static final String UNKNOWN_VERSION_VALUE = "unknown";
+
+    private static final String artifactName;
+    private static final String artifactVersion;
+
+    private static final String sdkVersionString;
+
+    static {
+        Map<String, String> properties =
+            CoreUtils.getProperties("azure-monitor-opentelemetry-exporter.properties");
+
+        artifactName = properties.get("name");
+        artifactVersion = properties.get("version");
+
+        sdkVersionString = "java" +
+            getJavaVersion() +
+            ":" +
+            "ot" + getOpenTelemetryApiVersion() +
+            ":" +
+            "ext" + artifactVersion;
+    }
+
+    /**
+     * This method returns artifact name.
+     * @return artifactName.
+     */
+    public static String getArtifactName() {
+        return artifactName;
+    }
+
+    /**
+     * This method returns artifact version.
+     * @return artifactVersion.
+     */
+    public static String getArtifactVersion() {
+        return artifactVersion;
+    }
+
+    /**
+     * This method returns sdk version string as per the below format
+     * javaX:otelY:extZ
+     * X = Java version, Y = opentelemetry version, Z = exporter version
+     * @return sdkVersionString.
+     */
+    public static String getSdkVersion() {
+        return sdkVersionString;
+    }
+
+    private static String getJavaVersion() {
+        return System.getProperty("java.version");
+    }
+
+    private static String getOpenTelemetryApiVersion() {
+        Map<String, String> properties =
+            CoreUtils.getProperties("io/opentelemetry/api/version.properties");
+        if (properties == null) {
+            return UNKNOWN_VERSION_VALUE;
+        }
+        String version = properties.get("sdk.version");
+        return version != null ? version : UNKNOWN_VERSION_VALUE;
+    }
+
+    private VersionGenerator() {
+    }
+}

sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/utils/package-info.java

@@ -15,7 +15,7 @@
 import com.azure.monitor.opentelemetry.exporter.implementation.models.MonitorDomain;
 import com.azure.monitor.opentelemetry.exporter.implementation.models.RequestData;
 import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem;
-import com.azure.monitor.opentelemetry.exporter.utils.FormattedDuration;
+import com.azure.monitor.opentelemetry.exporter.implementation.FormattedDuration;
 
 import java.time.Duration;
 import java.time.OffsetDateTime;

sdk/monitor/azure-monitor-opentelemetry-exporter/src/test/java/com/azure/monitor/opentelemetry/exporter/MonitorExporterClientTestBase.java

@@ -1,40 +1,39 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.monitor.opentelemetry.exporter;
+package com.azure.monitor.opentelemetry.exporter.implementation;
 
-import com.azure.monitor.opentelemetry.exporter.utils.FormattedDuration;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FormattedDurationTest {
     @Test
-    void testGetFormattedDurationMilliSeconds() {
+    public void testGetFormattedDurationMilliSeconds() {
         String formattedDuration = FormattedDuration.getFormattedDuration(42657024);
         assertEquals("00:00:00.042657", formattedDuration);
     }
 
     @Test
-    void testGetFormattedDurationSeconds() {
+    public void testGetFormattedDurationSeconds() {
         String formattedDuration = FormattedDuration.getFormattedDuration(42657024000L);
         assertEquals("00:00:42.657024", formattedDuration);
     }
 
     @Test
-    void testGetFormattedDurationMinutes() {
+    public void testGetFormattedDurationMinutes() {
         String formattedDuration = FormattedDuration.getFormattedDuration(426570240000L);
         assertEquals("00:07:06.570240", formattedDuration);
     }
 
     @Test
-    void testGetFormattedDurationHours() {
+    public void testGetFormattedDurationHours() {
         String formattedDuration = FormattedDuration.getFormattedDuration(4265702400000L);
         assertEquals("01:11:05.702400", formattedDuration);
     }
 
     @Test
-    void testGetFormattedDurationDays() {
+    public void testGetFormattedDurationDays() {
         String formattedDuration = FormattedDuration.getFormattedDuration(426570240000000L);
         assertEquals("4.22:29:30.240000", formattedDuration);
     }

…etry/exporter/FormattedDurationTest.java …mplementation/FormattedDurationTest.javasdk/monitor/azure-monitor-opentelemetry-exporter/src/test/java/com/azure/monitor/opentelemetry/exporter/FormattedDurationTest.java renamed to sdk/monitor/azure-monitor-opentelemetry-exporter/src/test/java/com/azure/monitor/opentelemetry/exporter/implementation/FormattedDurationTest.java sdk/monitor/azure-monitor-opentelemetry-exporter/src/test/java/com/azure/monitor/opentelemetry/exporter/FormattedDurationTest.java renamed to sdk/monitor/azure-monitor-opentelemetry-exporter/src/test/java/com/azure/monitor/opentelemetry/exporter/implementation/FormattedDurationTest.java

@@ -0,0 +1,25 @@
+package com.azure.monitor.opentelemetry.exporter.implementation;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class VersionTest {
+    @Test
+    public void testArtifactName() {
+        assertEquals("azure-monitor-opentelemetry-exporter", VersionGenerator.getArtifactName());
+    }
+
+    @Test
+    public void testArtifactVersion() {
+        assertTrue(VersionGenerator.getArtifactVersion().matches("[0-9].[0-9].[0-9].*"));
+    }
+
+    @Test
+    public void testSdkVersion() {
+        // OpenTelemetry added version.properties files in 1.3.0
+        // but testing against OpenTelemetry 1.0.0, so it's unknown in this test
+        assertTrue(VersionGenerator.getSdkVersion().matches("java[0-9._]+:ot([0-9.]+|unknown):ext[0-9.]+.*"));
+    }
+}