Skip to content

Commit

Permalink
Merge branch 'ballerina-platform:master' into issue_37699
Browse files Browse the repository at this point in the history
  • Loading branch information
pcnfernando authored Dec 22, 2023
2 parents 74819bf + d54abae commit 99101ac
Show file tree
Hide file tree
Showing 2,113 changed files with 202,995 additions and 18,905 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/automate_issue_labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
GITHUB_TOKEN: ${{ secrets.BALLERINA_BOT_TOKEN }}
ISSUE: ${{ github.event.issue.number }}

- name: Check for Standard Library related issue
if: ${{ contains(github.event.issue.body, '-> Standard Library') }}
run: gh issue transfer $ISSUE "ballerina-platform/ballerina-standard-library"
- name: Check for Ballerina Library related issue
if: ${{ contains(github.event.issue.body, '-> Ballerina Library') }}
run: gh issue transfer $ISSUE "ballerina-platform/ballerina-library"
env:
GITHUB_TOKEN: ${{ secrets.BALLERINA_BOT_TOKEN }}
ISSUE: ${{ github.event.issue.number }}
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:

- name: Check for GRPC Tool related issue
if: ${{ contains(github.event.issue.body, '-> gRPC Tool') }}
run: gh issue transfer $ISSUE "ballerina-platform/ballerina-standard-library"
run: gh issue transfer $ISSUE "ballerina-platform/ballerina-library"
env:
GITHUB_TOKEN: ${{ secrets.BALLERINA_BOT_TOKEN }}
ISSUE: ${{ github.event.issue.number }}
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/pull_request_ubuntu_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ jobs:
run: |
export DISPLAY=':99.0'
/usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
./gradlew build -Pnative.test --max-workers=2 --scan --no-daemon
find ~/.gradle/caches/ -name "*.lock" -type f -delete
./gradlew build -Pnative.test --max-workers=2 --scan --no-daemon
- name: Generate Jacoco report
if: github.event_name == 'pull_request'
Expand Down Expand Up @@ -138,7 +137,6 @@ jobs:
export DISPLAY=':99.0'
/usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
./gradlew build sonarqube --info -x test -x check --max-workers=2 --scan --no-daemon
find ~/.gradle/caches/ -name "*.lock" -type f -delete
- name: Print log message
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ velocity.log
/composer/modules/web/dist-electron
extractedDistribution
misc/testerina/modules/report-tools/node_modules/
tests/jballerina-integration-test/src/test/resources/profiler/profiler

# gradle
.gradle
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. When sendin

### Language

-
- [Add getAllDependents and getAllDependencies method to the DependencyGraph class](https://github.com/ballerina-platform/ballerina-lang/pull/41561)
-
-
-
Expand Down
32 changes: 12 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@

# The Ballerina programming language

[Ballerina](https://ballerina.io/) is a statically typed, open-source cloud-native programming language developed
and supported by [WSO2](https://wso2.com/).
[Ballerina](https://ballerina.io/) is an open-source cloud-native programming language optimized for integration. It is developed and supported by [WSO2](https://wso2.com/).

With Ballerina, you could easily develop microservices, API endpoints and integrations,
and any other application for the cloud. Additionally, Ballerina has all the general-purpose
Expand All @@ -34,18 +33,6 @@ Extensible metadata enables easy integration of Ballerina programs with cloud pl
You could directly generate Docker and Kubernetes artifacts straight away from
the source code.

## Get started

You can use one of the following options to try out Ballerina.

* [Set up Ballerina](https://ballerina.io/learn/get-started/)
* [Ballerina Playground](https://play.ballerina.io/)

You can use following resources to learn Ballerina.

* [Ballerina by Example](https://ballerina.io/learn/by-example/)
* [Ballerina learn pages and guides](https://ballerina.io/learn/)

## Download and install

For instructions on downloading and installing, see [Ballerina Downloads](https://ballerina.io/downloads/).
Expand All @@ -58,18 +45,24 @@ For more installation options, see [Installation options](https://ballerina.io/d

Try out Ballerina's development capabilities using the [Ballerina extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=WSO2.ballerina).

## Get started

You can use the following resources to learn Ballerina.

* [Ballerina by Example](https://ballerina.io/learn/by-example/)
* [Ballerina learn pages and guides](https://ballerina.io/learn/)

## Report issues and security flaws

>**Tip:** If you are unsure whether you have found a bug, search the existing issues in the GitHub repo and raise it in the [Ballerina Discord](https://discord.com/invite/wAJYFbMrG2) or [Stack Overflow](https://stackoverflow.com/questions/tagged/ballerina).
- Language, Tooling, Standard Library, Website: <a href="https://github.com/ballerina-platform/ballerina-lang/issues">ballerina-lang</a> repo
- Extended library: <a href="https://github.com/ballerina-platform/ballerina-extended-library/issues">ballerina-extended-library</a> repo
- Security flaw: send an email to security@ballerina.io. For details, see the <a href="https://ballerina.io/security/">security policy</a>.

- Language, Tooling, Website: <a href="https://github.com/ballerina-platform/ballerina-lang/issues">ballerina-lang</a> repo
- Ballerina library: <a href="https://github.com/ballerina-platform/ballerina-standard-library/issues">ballerina-library</a> repo
- Security flaw: send an email to security@ballerina.io. For details, see the <a href="https://ballerina.io/security-policy/">security policy</a>.

## Contribute to Ballerina

As an open source project, Ballerina welcomes contributions from the community. To start contributing, read these [contribution guidelines](https://github.com/ballerina-platform/ballerina-lang/blob/master/CONTRIBUTING.md) for information on how you should go about contributing to our project.
As an open-source project, Ballerina welcomes contributions from the community. To start contributing, read these [contribution guidelines](https://github.com/ballerina-platform/ballerina-lang/blob/master/CONTRIBUTING.md) for information on how you should go about contributing to our project.

We look forward to receiving your contributions.

Expand All @@ -79,7 +72,6 @@ Ballerina code is distributed under [Apache license 2.0](https://github.com/ball

## Useful links

* Join [Ballerina-Dev](https://groups.google.com/g/ballerina-dev) group for technical discussions related to the Ballerina project.
* Chat live with us on our [Discord community](https://discord.com/invite/wAJYFbMrG2).
* Post technical questions on the Stack Overflow with the [#ballerina](https://stackoverflow.com/questions/tagged/ballerina) tag.
* For more details on how to engage with the community, see [Community](https://ballerina.io/community/).
2 changes: 1 addition & 1 deletion ballerina-shell/modules/shell-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ group = 'io.ballerina'
dependencies {
implementation project(":ballerina-shell:shell-core")
implementation project(':ballerina-parser')
implementation('org.jline:jline:3.11.0')
implementation("org.jline:jline:${project.jlineVersion}")
implementation project(':ballerina-lang')
implementation project(':ballerina-tools-api')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
requires io.ballerina.shell;
requires io.ballerina.parser;
requires io.ballerina.lang;
requires jline;
requires org.jline;
requires com.google.gson;
requires io.ballerina.tools.api;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{
"description": "Query stream evaluation - get value.",
"code": "reportListStream",
"expr": "stream <stream<map<(any|error)>>>"
"expr": "stream<map<(any|error)>>"
},
{
"description": "String from query evaluation.",
Expand Down
50 changes: 50 additions & 0 deletions bvm/ballerina-profiler/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com) All Rights Reserved.
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

apply from: "$rootDir/gradle/javaProject.gradle"

dependencies {
implementation "org.ow2.asm:asm:${project.ow2AsmVersion}"
implementation "org.ow2.asm:asm-commons:${project.ow2AsmCommonsVersion}"
implementation "com.google.code.gson:gson:${project.gsonVersion}"
implementation "commons-io:commons-io:${project.commonsIoVersion}"
implementation project(':identifier-util')
implementation project(':ballerina-runtime')
}

version = 1.0

jar {
dependsOn(':identifier-util:jar')
dependsOn(':ballerina-runtime:jar')
from(sourceSets.main.output)
from(sourceSets.main.java) {
include "**/*.java"
}

from(configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }) {
exclude "META-INF/*.SF"
exclude "META-INF/*.DSA"
exclude "META-INF/*.RSA"
}
duplicatesStrategy = DuplicatesStrategy.EXCLUDE

manifest {
attributes 'Main-Class': 'io.ballerina.runtime.profiler.Main'
}
}
27 changes: 27 additions & 0 deletions bvm/ballerina-profiler/spotbugs-exclude.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!--
~ Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com) All Rights Reserved.
~
~ WSO2 LLC. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<FindBugsFilter>
<Match>
<Class name="io.ballerina.runtime.profiler.Profiler"/>
<Bug pattern="DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED"/>
</Match>
<Match>
<Class name="io.ballerina.runtime.profiler.ui.JsonParser$Data"/>
<Bug pattern="URF_UNREAD_FIELD"/>
</Match>
</FindBugsFilter>
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com) All Rights Reserved.
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package io.ballerina.runtime.profiler;

import io.ballerina.runtime.profiler.util.ProfilerException;

import java.util.concurrent.TimeUnit;

/**
* This class is used to as the main class of the Ballerina profiler.
*
* @since 2201.8.0
*/
public class Main {
private static Profiler profiler;

public static void main(String[] args) throws ProfilerException {
profiler = new Profiler(TimeUnit.MILLISECONDS.convert(System.nanoTime(), TimeUnit.NANOSECONDS));
profiler.start(args);
}

public static void incrementBalFunctionCount() {
profiler.incrementBalFunctionCount();
}

public static String getBalJarArgs() {
return profiler.getBalJarArgs();
}
}
Loading

0 comments on commit 99101ac

Please sign in to comment.