Merge pull request #16 from NipunaMadhushan/update-otlp-version

Update otlp version

.github/workflows/build-main.yml

@@ -6,13 +6,13 @@ on:
       ballerina_version:
         description: 'Ballerina version'
         required: true
-        default: '2201.8.3'
+        default: '2201.10.3'
   push:
     branches:
       - main
 
 env:
-  BALLERINA_DISTRIBUTION_VERSION: 2201.8.3    # Update this with the latest Ballerina version
+  BALLERINA_DISTRIBUTION_VERSION: 2201.10.3    # Update this with the latest Ballerina version
 
 jobs:
   build:

.github/workflows/central-publish.yml

@@ -6,7 +6,7 @@ on:
       ballerina_version:
         description: 'Ballerina version'
         required: true
-        default: '2201.8.3'
+        default: '2201.10.3'
       environment:
         type: choice
         description: Select environment
@@ -40,7 +40,7 @@ jobs:
         uses: aquasecurity/trivy-action@master
         with:
           scan-type: 'rootfs'
-          scan-ref: '/github/workspace/ballerina/lib'
+          scan-ref: "${{ github.workspace }}/ballerina/lib"
           format: 'table'
           timeout: '10m0s'
           exit-code: '1'

.github/workflows/daily-build.yml

@@ -8,10 +8,10 @@ on:
       ballerina_version:
         description: 'Ballerina version'
         required: true
-        default: '2201.8.3'
+        default: '2201.10.3'
 
 env:
-  BALLERINA_DISTRIBUTION_VERSION: 2201.8.3    # Update this with the latest Ballerina version
+  BALLERINA_DISTRIBUTION_VERSION: 2201.10.3    # Update this with the latest Ballerina version
 
 jobs:
   build:
@@ -45,7 +45,7 @@ jobs:
         uses: aquasecurity/trivy-action@master
         with:
           scan-type: 'rootfs'
-          scan-ref: '/github/workspace/ballerina/lib'
+          scan-ref: "${{ github.workspace }}/ballerina/lib"
           format: 'table'
           timeout: '10m0s'
           exit-code: '1'

.github/workflows/graalvm-check.yml

@@ -8,10 +8,10 @@ on:
       ballerina_version:
         description: 'Ballerina version'
         required: true
-        default: '2201.8.3'
+        default: '2201.10.3'
 
 env:
-  BALLERINA_DISTRIBUTION_VERSION: 2201.8.3   # Update this with the latest Ballerina version
+  BALLERINA_DISTRIBUTION_VERSION: 2201.10.3   # Update this with the latest Ballerina version
 
 jobs:
   build:

.github/workflows/publish-release.yml

@@ -6,7 +6,7 @@ on:
       ballerina_version:
         description: 'Ballerina distribution version (e.g.; 2201.8.4)'
         required: true
-        default: '2201.8.4'
+        default: '2201.10.3'
 
 jobs:
   publish-release:
@@ -49,7 +49,7 @@ jobs:
         uses: aquasecurity/trivy-action@master
         with:
           scan-type: 'rootfs'
-          scan-ref: '/github/workspace/ballerina/lib'
+          scan-ref: "${{ github.workspace }}/ballerina/lib"
           format: 'table'
           timeout: '10m0s'
           exit-code: '1'

.github/workflows/pull-request.yml

@@ -3,7 +3,7 @@ name: Validate Pull Request
 on: pull_request
 
 env:
-  BALLERINA_DISTRIBUTION_VERSION: 2201.8.3   # Update this with the latest Ballerina version
+  BALLERINA_DISTRIBUTION_VERSION: 2201.10.3   # Update this with the latest Ballerina version
 
 jobs:
   ubuntu-build:

ballerina/Ballerina.toml

@@ -18,7 +18,7 @@
 org = "ballerinax"
 name = "newrelic"
 version = "@toml.version@"
-distribution = "2201.8.2"
+distribution = "2201.10.0"
 
 [platform.java17]
 graalvmCompatible = true
@@ -66,52 +66,40 @@ artifactId = "kotlin-stdlib"
 version = "@kotlinStdlib.version@"
 
 [[platform.java17.dependency]]
-path = "./lib/[email protected]@.jar"
-groupId = "io.opentelemetry"
-artifactId = "opentelemetry-api"
-version = "@opentelemetry.version@"
-
-[[platform.java17.dependency]]
-path = "./lib/[email protected]@.jar"
-groupId = "io.opentelemetry"
-artifactId = "opentelemetry-api-metrics"
-version = "@openTelemetryAlpha.version@"
-
-[[platform.java17.dependency]]
-path = "./lib/[email protected]@.jar"
+path = "./lib/[email protected]@.jar"
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-sdk-trace"
-version = "@opentelemetry.version@"
+version = "@opentelemetrySDK.version@"
 
 [[platform.java17.dependency]]
-path = "./lib/opentelemetry-sdk-common-@opentelemetry[email protected]"
+path = "./lib/opentelemetry-sdk-common-@opentelemetrySDK[email protected]"
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-sdk-common"
-version = "@opentelemetry.version@"
+version = "@opentelemetrySDK.version@"
 
 [[platform.java17.dependency]]
-path = "./lib/opentelemetry-semconv-@openTelemetryAlpha[email protected]"
+path = "./lib/opentelemetry-semconv-@opentelemetrySemconv[email protected]"
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-semconv"
-version = "@openTelemetryAlpha.version@"
+version = "@opentelemetrySemconv.version@"
 
 [[platform.java17.dependency]]
-path = "./lib/opentelemetry-proto-@openTelemetryAlpha[email protected]"
+path = "./lib/opentelemetry-proto-@opentelemetryProto[email protected]"
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-proto"
-version = "@openTelemetryAlpha.version@"
+version = "@opentelemetryProto.version@"
 
 [[platform.java17.dependency]]
-path = "./lib/opentelemetry-exporter-otlp-trace-@opentelemetry[email protected]"
+path = "./lib/opentelemetry-exporter-otlp-trace-@opentelemetryExporter[email protected]"
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-exporter-otlp-trace"
-version = "@opentelemetry.version@"
+version = "@opentelemetryExporter.version@"
 
 [[platform.java17.dependency]]
-path = "./lib/opentelemetry-exporter-otlp-common-@opentelemetry[email protected]"
+path = "./lib/opentelemetry-exporter-otlp-common-@opentelemetryExporter[email protected]"
 groupId = "io.opentelemetry"
 artifactId = "opentelemetry-exporter-otlp-common"
-version = "@opentelemetry.version@"
+version = "@opentelemetryExporter.version@"
 
 [[platform.java17.dependency]]
 path = "./lib/[email protected]@.jar"

ballerina/Dependencies.toml

@@ -5,12 +5,12 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.8.4"
+distribution-version = "2201.10.0"
 
 [[package]]
 org = "ballerina"
 name = "io"
-version = "1.6.0"
+version = "1.6.3"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.value"}
@@ -35,7 +35,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "log"
-version = "2.9.0"
+version = "2.10.0"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -49,7 +49,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.2.0"
+version = "1.3.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -73,7 +73,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "newrelic"
-version = "0.7.2"
+version = "0.8.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "log"},

ballerina/build.gradle

@@ -43,14 +43,13 @@ dependencies {
     externalJars "org.jetbrains.kotlin:kotlin-runtime:${kotlinVersion}"
     externalJars "org.jetbrains.kotlin:kotlin-stdlib:${kotlinStdlibVersion}"
     externalJars "io.opentelemetry:opentelemetry-api:${openTelemetryVersion}"
-    externalJars "io.opentelemetry:opentelemetry-api-metrics:${openTelemetryAlphaVersion}"
     externalJars "io.opentelemetry:opentelemetry-context:${openTelemetryVersion}"
-    externalJars "io.opentelemetry:opentelemetry-sdk-trace:${openTelemetryVersion}"
-    externalJars "io.opentelemetry:opentelemetry-sdk-common:${openTelemetryVersion}"
-    externalJars "io.opentelemetry:opentelemetry-semconv:${openTelemetryAlphaVersion}"
-    externalJars "io.opentelemetry:opentelemetry-proto:${openTelemetryAlphaVersion}"
-    externalJars "io.opentelemetry:opentelemetry-exporter-otlp-trace:${openTelemetryVersion}"
-    externalJars "io.opentelemetry:opentelemetry-exporter-otlp-common:${openTelemetryVersion}"
+    externalJars "io.opentelemetry:opentelemetry-sdk-trace:${openTelemetrySDKVersion}"
+    externalJars "io.opentelemetry:opentelemetry-sdk-common:${openTelemetrySDKVersion}"
+    externalJars "io.opentelemetry:opentelemetry-semconv:${openTelemetrySemconvVersion}"
+    externalJars "io.opentelemetry:opentelemetry-proto:${openTelemetryProtoVersion}"
+    externalJars "io.opentelemetry:opentelemetry-exporter-otlp-trace:${openTelemetryExporterVersion}"
+    externalJars "io.opentelemetry:opentelemetry-exporter-otlp-common:${openTelemetryExporterVersion}"
     externalJars "io.opentelemetry:opentelemetry-extension-trace-propagators:${openTelemetryVersion}"
     externalJars "io.grpc:grpc-api:${grpcVersion}"
     externalJars "io.grpc:grpc-context:${grpcVersion}"
@@ -117,9 +116,12 @@ task updateTomlVersions {
         def kotlinVersion = project.kotlinVersion
         def kotlinStdlibVersion = project.kotlinStdlibVersion
         def openTelemetryVersion = project.openTelemetryVersion
+        def openTelemetryExporterVersion = project.openTelemetryExporterVersion
+        def openTelemetrySDKVersion = project.openTelemetrySDKVersion
+        def openTelemetrySemconvVersion = project.openTelemetrySemconvVersion
+        def openTelemetryProtoVersion = project.openTelemetryProtoVersion
         def grpcVersion = project.grpcVersion
         def perfmarkVersion = project.perfmarkVersion
-        def openTelemetryAlphaVersion = project.openTelemetryAlphaVersion
         def guavaVersion = project.guavaVersion
         def failureAccessVersion = project.failureAccessVersion
 
@@ -131,7 +133,10 @@ task updateTomlVersions {
         newConfig = newConfig.replace("@kotlin.version@", kotlinVersion)
         newConfig = newConfig.replace("@kotlinStdlib.version@", kotlinStdlibVersion)
         newConfig = newConfig.replace("@opentelemetry.version@", openTelemetryVersion)
-        newConfig = newConfig.replace("@openTelemetryAlpha.version@", openTelemetryAlphaVersion)
+        newConfig = newConfig.replace("@opentelemetryExporter.version@", openTelemetryExporterVersion)
+        newConfig = newConfig.replace("@opentelemetrySDK.version@", openTelemetrySDKVersion)
+        newConfig = newConfig.replace("@opentelemetrySemconv.version@", openTelemetrySemconvVersion)
+        newConfig = newConfig.replace("@opentelemetryProto.version@", openTelemetryProtoVersion)
         newConfig = newConfig.replace("@grpc.version@", grpcVersion)
         newConfig = newConfig.replace("@perfmark.version@", perfmarkVersion)
         newConfig = newConfig.replace("@guava.version@", guavaVersion)

gradle.properties

@@ -15,8 +15,8 @@
 # under the License.
 
 group=org.ballerinalang
-version=0.7.3-SNAPSHOT
-ballerinaLangVersion=2201.8.2
+version=0.8.0-SNAPSHOT
+ballerinaLangVersion=2201.10.0
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
@@ -28,11 +28,13 @@ okioVersion=3.5.0
 okhttpVersion=4.11.0
 kotlinVersion=1.2.71
 kotlinStdlibVersion=1.8.22
-openTelemetryVersion=1.0.0
-openTelemetryAlphaVersion=1.0.0-alpha
+openTelemetryVersion=1.32.0
+openTelemetryExporterVersion=1.14.0
+openTelemetrySDKVersion=1.32.0
+openTelemetrySemconvVersion=1.21.0-alpha
+openTelemetryProtoVersion=1.7.1-alpha
 grpcVersion=1.60.0
 protobufVersion=3.25.5
 perfmarkVersion=0.23.0
-guavaVersion=32.1.2-jre
+guavaVersion=33.2.0-jre
 failureAccessVersion=1.0.1
-

native/build.gradle

@@ -27,12 +27,11 @@ dependencies {
     implementation "com.newrelic.telemetry:telemetry-all:${newrelicTelemetryVersion}"
     implementation "com.newrelic.telemetry:telemetry-http-okhttp:${newrelicTelemetryVersion}"
     implementation "io.opentelemetry:opentelemetry-api:${openTelemetryVersion}"
-    implementation "io.opentelemetry:opentelemetry-api-metrics:${openTelemetryAlphaVersion}"
     implementation "io.opentelemetry:opentelemetry-context:${openTelemetryVersion}"
-    implementation "io.opentelemetry:opentelemetry-sdk-trace:${openTelemetryVersion}"
-    implementation "io.opentelemetry:opentelemetry-sdk-common:${openTelemetryVersion}"
-    implementation "io.opentelemetry:opentelemetry-semconv:${openTelemetryAlphaVersion}"
-    implementation "io.opentelemetry:opentelemetry-exporter-otlp-trace:${openTelemetryVersion}"
+    implementation "io.opentelemetry:opentelemetry-sdk-trace:${openTelemetrySDKVersion}"
+    implementation "io.opentelemetry:opentelemetry-sdk-common:${openTelemetrySDKVersion}"
+    implementation "io.opentelemetry.semconv:opentelemetry-semconv:${openTelemetrySemconvVersion}"
+    implementation "io.opentelemetry:opentelemetry-exporter-otlp-trace:${openTelemetryExporterVersion}"
     implementation "io.opentelemetry:opentelemetry-extension-trace-propagators:${openTelemetryVersion}"
     implementation("com.google.guava:guava:${guavaVersion}") {
         exclude group: 'com.google.code.findbugs', module: 'jsr305'

native/src/main/java/io/ballerina/observe/trace/newrelic/NewRelicTracerProvider.java

@@ -39,7 +39,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME;
+import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME;
 
 /**
  * This is the New Relic tracing extension class for {@link TracerProvider}.
@@ -107,7 +107,7 @@ public Tracer getTracer(String serviceName) {
 
         return tracerProviderBuilder.setResource(
                         Resource.create(Attributes.of(SERVICE_NAME, serviceName)))
-                .build().get(TRACER_NAME);
+                .build().get("jaeger");
     }
 
     @Override