Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/central-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/daily-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/graalvm-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
38 changes: 13 additions & 25 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
org = "ballerinax"
name = "newrelic"
version = "@toml.version@"
distribution = "2201.8.2"
distribution = "2201.10.0"

[platform.java17]
graalvmCompatible = true
Expand Down Expand Up @@ -66,52 +66,40 @@ artifactId = "kotlin-stdlib"
version = "@kotlinStdlib.version@"

[[platform.java17.dependency]]
path = "./lib/opentelemetry-api-@opentelemetry.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-api"
version = "@opentelemetry.version@"

[[platform.java17.dependency]]
path = "./lib/opentelemetry-api-metrics-@openTelemetryAlpha.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-api-metrics"
version = "@openTelemetryAlpha.version@"

[[platform.java17.dependency]]
path = "./lib/opentelemetry-sdk-trace-@opentelemetry.version@.jar"
path = "./lib/opentelemetry-sdk-trace-@opentelemetrySDK.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-sdk-trace"
version = "@opentelemetry.version@"
version = "@opentelemetrySDK.version@"

[[platform.java17.dependency]]
path = "./lib/opentelemetry-sdk-common-@opentelemetry.version@.jar"
path = "./lib/opentelemetry-sdk-common-@opentelemetrySDK.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-sdk-common"
version = "@opentelemetry.version@"
version = "@opentelemetrySDK.version@"

[[platform.java17.dependency]]
path = "./lib/opentelemetry-semconv-@openTelemetryAlpha.version@.jar"
path = "./lib/opentelemetry-semconv-@opentelemetrySemconv.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-semconv"
version = "@openTelemetryAlpha.version@"
version = "@opentelemetrySemconv.version@"

[[platform.java17.dependency]]
path = "./lib/opentelemetry-proto-@openTelemetryAlpha.version@.jar"
path = "./lib/opentelemetry-proto-@opentelemetryProto.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-proto"
version = "@openTelemetryAlpha.version@"
version = "@opentelemetryProto.version@"

[[platform.java17.dependency]]
path = "./lib/opentelemetry-exporter-otlp-trace-@opentelemetry.version@.jar"
path = "./lib/opentelemetry-exporter-otlp-trace-@opentelemetryExporter.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-exporter-otlp-trace"
version = "@opentelemetry.version@"
version = "@opentelemetryExporter.version@"

[[platform.java17.dependency]]
path = "./lib/opentelemetry-exporter-otlp-common-@opentelemetry.version@.jar"
path = "./lib/opentelemetry-exporter-otlp-common-@opentelemetryExporter.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-exporter-otlp-common"
version = "@opentelemetry.version@"
version = "@opentelemetryExporter.version@"

[[platform.java17.dependency]]
path = "./lib/opentelemetry-extension-trace-propagators-@opentelemetry.version@.jar"
Expand Down
10 changes: 5 additions & 5 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand All @@ -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"},
Expand All @@ -49,7 +49,7 @@ modules = [
[[package]]
org = "ballerina"
name = "observe"
version = "1.2.0"
version = "1.3.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand All @@ -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"},
Expand Down
23 changes: 14 additions & 9 deletions ballerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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

Expand All @@ -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)
Expand Down
14 changes: 8 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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

9 changes: 4 additions & 5 deletions native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
Expand Down Expand Up @@ -107,7 +107,7 @@

return tracerProviderBuilder.setResource(
Resource.create(Attributes.of(SERVICE_NAME, serviceName)))
.build().get(TRACER_NAME);
.build().get("jaeger");

Check warning on line 110 in native/src/main/java/io/ballerina/observe/trace/newrelic/NewRelicTracerProvider.java

View check run for this annotation

Codecov / codecov/patch

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

Added line #L110 was not covered by tests
}

@Override
Expand Down
Loading
Loading