Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix observability support and bump connector version #5

Merged
merged 3 commits into from
Mar 26, 2024
Merged

Fix observability support and bump connector version #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4c1e2e
Fix issues in Ballerina.toml
NipunaRanasinghe Mar 26, 2024
4baa1c4
[Automated] Update the toml files
NipunaRanasinghe Mar 26, 2024
db6db6d
Bump connector version
NipunaRanasinghe Mar 26, 2024
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
7 changes: 2 additions & 5 deletions ballerina/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@
distribution = "2201.8.6"
org = "ballerinax"
name = "zendesk"
version = "1.0.0"
version = "2.0.0"
license = ["Apache-2.0"]
authors = ["Ballerina"]
keywords = ["zendesk", "CRM", "CSM", "Support/Customer Support", "Cost/Freemium"]
icon = "icon.png"
repository = "https://github.com/ballerina-platform/module-ballerinax-zendesk"

[build-options]
observabilityIncluded = false

[platform.java17]
graalvmCompatible = true
observabilityIncluded = true
17 changes: 15 additions & 2 deletions ballerina/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,16 +299,29 @@ modules = [
{org = "ballerina", packageName = "url", moduleName = "url"}
]

[[package]]
org = "ballerinai"
name = "observe"
version = "0.0.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "observe"}
]
modules = [
{org = "ballerinai", packageName = "observe", moduleName = "observe"}
]

[[package]]
org = "ballerinax"
name = "zendesk"
version = "1.0.0"
version = "0.1.0"
dependencies = [
{org = "ballerina", name = "http"},
{org = "ballerina", name = "log"},
{org = "ballerina", name = "os"},
{org = "ballerina", name = "test"},
{org = "ballerina", name = "url"}
{org = "ballerina", name = "url"},
{org = "ballerinai", name = "observe"}
]
modules = [
{org = "ballerinax", packageName = "zendesk", moduleName = "zendesk"}
Expand Down
1 change: 1 addition & 0 deletions ballerina/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,4 @@ clean {
build.dependsOn "generatePomFileForMavenPublication"
publishToMavenLocal.dependsOn build
publish.dependsOn build

5 changes: 1 addition & 4 deletions build-config/resources/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,4 @@ icon = "icon.png"
repository = "https://github.com/ballerina-platform/module-ballerinax-zendesk"

[build-options]
observabilityIncluded = false

[platform.java17]
graalvmCompatible = true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why have we set graalvmCompatible flag to false ?

Copy link
Contributor Author

@NipunaRanasinghe NipunaRanasinghe Mar 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ayeshLK Just to clarify, I haven't set the graalVM compatibility to false in here.

here I've simply removed the graalvm property, because all pure ballerina connectors (which does not require any native dependencies) should get detected as graalVM compatible by default.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIR we have marked other connectors with this flag. @ThisaruGuruge any idea ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ayeshLK Just to clarify, I haven't set the graalVM compatibility to false in here.

here I've simply removed the graalvm property, because all pure ballerina connectors (which does not require any native dependencies) should get detected as graalVM compatible by default.

@TharmiganK appreciate if you can verify

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIR we have marked other connectors with this flag. @ThisaruGuruge any idea ?

If the platform is any (i.e. there are no Java dependencies), the GraalVM compatibility should be inferred from the dependency graph. So in this case, I don't think we need this. We don't have to provide anything under the platform.java17 field in the toml, if the package is platform.any, as I understand it.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this flag is not set then the GraalVM compatiblity is inferred from the package and its dependencies. So if the package is a pure ballerina package then, it is GraalVM compatible if and only if the dependencies are GraalVM compatible. If the dependencies are from ballerina platform, then all of them are are GraalVM compatible. In that case this flag is not required.

The standard approach is to mark the ballerina package as GraalVM compatible true/false only when we have java dependencies/native code. If you have pure ballerina package skip this flag so that the bal tool and central will infer it from the dependencies.

observabilityIncluded = true
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org.gradle.caching=true
group=io.ballerina.lib
version=0.1.0-SNAPSHOT
version=2.0.0-SNAPSHOT

checkstylePluginVersion=10.12.0
spotbugsPluginVersion=5.0.14
Expand Down
Loading