Merge pull request #15 from Anoukh/master

Update pom files for pipeline build
ballerina-attic · Jun 6, 2018 · 66d7d33 · 66d7d33
2 parents e9bb129 + 81c48e8
commit 66d7d33
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 78 deletions.
diff --git a/metrics-extensions/modules/ballerina-micrometer-extension/pom.xml b/metrics-extensions/modules/ballerina-micrometer-extension/pom.xml
@@ -19,9 +19,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.ballerinalang.observability</groupId>
+        <groupId>org.ballerinalang</groupId>
         <artifactId>metrics-extensions</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.972.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/metrics-extensions/modules/ballerina-micrometer-extension/src/main/assembly/dist.xml b/metrics-extensions/modules/ballerina-micrometer-extension/src/main/assembly/dist.xml
@@ -27,7 +27,7 @@
             <outputDirectory></outputDirectory>
             <scope>runtime</scope>
             <includes>
-                <include>org.ballerinalang.observability:ballerina-micrometer-extension:jar</include>
+                <include>org.ballerinalang:ballerina-micrometer-extension:jar</include>
                 <include>io.micrometer:micrometer-core</include>
                 <include>org.hdrhistogram:HdrHistogram</include>
                 <include>org.latencyutils:LatencyUtils</include>

diff --git a/metrics-extensions/modules/ballerina-prometheus-extension/pom.xml b/metrics-extensions/modules/ballerina-prometheus-extension/pom.xml
@@ -19,9 +19,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.ballerinalang.observability</groupId>
+        <groupId>org.ballerinalang</groupId>
         <artifactId>metrics-extensions</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.972.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
             <artifactId>ballerina-config</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ballerinalang.observability</groupId>
+            <groupId>org.ballerinalang</groupId>
             <artifactId>ballerina-micrometer-extension</artifactId>
         </dependency>
         <dependency>

diff --git a/metrics-extensions/modules/ballerina-prometheus-extension/src/main/assembly/dist.xml b/metrics-extensions/modules/ballerina-prometheus-extension/src/main/assembly/dist.xml
@@ -27,7 +27,7 @@
             <outputDirectory></outputDirectory>
             <scope>runtime</scope>
             <includes>
-                <include>org.ballerinalang.observability:ballerina-prometheus-extension:jar</include>
+                <include>org.ballerinalang:ballerina-prometheus-extension:jar</include>
                 <include>io.micrometer:micrometer-registry-prometheus</include>
                 <include>io.prometheus:simpleclient</include>
                 <include>io.prometheus:simpleclient_common</include>

diff --git a/metrics-extensions/pom.xml b/metrics-extensions/pom.xml
@@ -18,9 +18,9 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>org.ballerinalang.observability</groupId>
+        <groupId>org.ballerinalang</groupId>
         <artifactId>ballerina-observability-parent</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.972.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -19,20 +19,26 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.ballerinalang.observability</groupId>
+    <parent>
+        <groupId>io.ballerina</groupId>
+        <artifactId>ballerina</artifactId>
+        <version>0.970.0-beta5</version>
+    </parent>
+
+    <groupId>org.ballerinalang</groupId>
     <artifactId>ballerina-observability-parent</artifactId>
+    <version>0.972.1-SNAPSHOT</version>
+    <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>Ballerina Observability - Parent</name>
+    <name>Ballerina - Observability Parent</name>
 
     <description>
         This contains various (tracing, metrics, logging) extensions that can be used with Ballerina Observability.
     </description>
-    <url>http://ballerinalang.org/</url>
+    <url>http://ballerina.io/</url>
     <organization>
         <name>WSO2</name>
-        <url>http://www.wso2.org/</url>
+        <url>http://wso2.org/</url>
     </organization>
     <licenses>
         <license>
@@ -196,9 +202,9 @@
                 <version>${prometheus.simple.client.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.ballerinalang.observability</groupId>
+                <groupId>org.ballerinalang</groupId>
                 <artifactId>ballerina-micrometer-extension</artifactId>
-                <version>${ballerina.observability.version}</version>
+                <version>${ballerina.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.opentracing</groupId>
@@ -440,8 +446,7 @@
     </build>
 
     <properties>
-        <ballerina.observability.version>0.1.0-SNAPSHOT</ballerina.observability.version>
-        <ballerina.version>0.970.0-beta5-SNAPSHOT</ballerina.version>
+        <ballerina.version>0.972.1-SNAPSHOT</ballerina.version>
         <project.scm.id>my-scm-server</project.scm.id>
         <maven.wagon.ssh.version>2.1</maven.wagon.ssh.version>
         <maven.release.plugin.version>2.5.3</maven.release.plugin.version>

diff --git a/tracing-extensions/modules/ballerina-jaeger-extension/README.md b/tracing-extensions/modules/ballerina-jaeger-extension/README.md
@@ -5,36 +5,25 @@
 - Start Jaeger. You can use their docker image using following command. `docker run -d -p5775:5775/udp 
 -p6831:6831/udp -p6832:6832/udp -p5778:5778 -p16686:16686 -p14268:14268 
 jaegertracing/all-in-one:latest`.
-- Build `ballerina-jaeger-extension` and put it in `bre/lib/` directory.
-- Download following jar files and place them in `bre/lib/` directory.
-  - [jaeger-core-0.24.0.jar] [1]
-  - [jaeger-thrift-0.24.0.jar] [2]
-  - [libthrift-0.11.0.jar] [3]
-  - [okhttp-3.9.1.jar] [4]
-  - [okio-1.13.0.jar] [5]
-- Create a `trace-config.yaml` with following properties.
-```yaml
-tracers:
-  - name: jaeger
-    enabled: true
-    className: org.ballerinalang.observe.trace.extension.jaeger.OpenTracingExtension
-    configuration:
-      sampler.type: const
-      sampler.param: 1
-      reporter.log.spans: true
-      reporter.hostname: localhost
-      reporter.port: 5775
-      reporter.flush.interval.ms: 1000
-      reporter.max.buffer.spans: 1000
+- Build `ballerina-jaeger-extension` and copy the jar files found in `<ballerina-jaeger-extension>/target/distribution/`
+ into the `bre/lib/` directory of the ballerina distribution.
+- Create a `ballerina.conf` file with following properties.
+```toml
+[b7a.observability.tracing]
+enabled=true
+name="jaeger"
+
+[b7a.observability.tracing.jaeger]
+reporter.hostname="localhost"
+reporter.port=5775
+sampler.param=1.0
+sampler.type="const"
+reporter.flush.interval.ms=2000
+reporter.log.spans=true
+reporter.max.buffer.spans=1000
 ```
-- Create a `ballerina.conf` file with `trace.config` property, which points to the above `trace-config.yaml`.
+
 - Run your Ballerina service with that `ballerina.conf` file.
   - Either place `ballerina.conf` in your applications directory.
   - Or use `-Bballerina.conf=path/to/ballerina.conf`
 - Once everything is up and running, you can use jaeger dashboard to view traces.
-
-[1]: http://central.maven.org/maven2/com/uber/jaeger/jaeger-core/0.24.0/jaeger-core-0.24.0.jar
-[2]: http://central.maven.org/maven2/com/uber/jaeger/jaeger-thrift/0.24.0/jaeger-thrift-0.24.0.jar
-[3]: http://central.maven.org/maven2/org/apache/thrift/libthrift/0.11.0/libthrift-0.11.0.jar
-[4]: http://central.maven.org/maven2/com/squareup/okhttp3/okhttp/3.9.1/okhttp-3.9.1.jar
-[5]: http://central.maven.org/maven2/com/squareup/okio/okio/1.13.0/okio-1.13.0.jar
diff --git a/tracing-extensions/modules/ballerina-jaeger-extension/pom.xml b/tracing-extensions/modules/ballerina-jaeger-extension/pom.xml
@@ -19,9 +19,9 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.ballerinalang.observability</groupId>
+        <groupId>org.ballerinalang</groupId>
         <artifactId>tracing-extensions</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.972.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/tracing-extensions/modules/ballerina-jaeger-extension/src/main/assembly/dist.xml b/tracing-extensions/modules/ballerina-jaeger-extension/src/main/assembly/dist.xml
@@ -27,7 +27,7 @@
             <outputDirectory></outputDirectory>
             <scope>runtime</scope>
             <includes>
-                <include>org.ballerinalang.observability:ballerina-jaeger-extension:jar</include>
+                <include>org.ballerinalang:ballerina-jaeger-extension:jar</include>
                 <include>com.uber.jaeger:jaeger-core</include>
                 <include>com.uber.jaeger:jaeger-thrift</include>
                 <include>org.apache.thrift:libthrift</include>

diff --git a/tracing-extensions/modules/ballerina-noop-extension/README.md b/tracing-extensions/modules/ballerina-noop-extension/README.md
@@ -3,16 +3,12 @@
 ##### Install Guide
 
 - Build `ballerina-noop-extension` and put it in `bre/lib/` directory.
-- Create a `trace-config.yaml` with following properties.
-```yaml
-tracers:
- - name: noop
-   enabled: true
-   className: org.ballerinalang.observe.trace.extension.noop.OpenTracingExtension
-   configuration:
-     reporter.hostname: localhost
+- Create a `ballerina.conf` file with following properties.
+```toml
+[b7a.observability.tracing]
+enabled=true
+name="noop"
 ```
-- Create a `ballerina.conf` file with `trace.config` property, which points to the above `trace-config.yaml`.
 - Run your Ballerina service with that `ballerina.conf` file.
   - Either place `ballerina.conf` in your applications directory.
   - Or use `-Bballerina.conf=path/to/ballerina.conf`
diff --git a/tracing-extensions/modules/ballerina-noop-extension/pom.xml b/tracing-extensions/modules/ballerina-noop-extension/pom.xml
@@ -19,9 +19,9 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.ballerinalang.observability</groupId>
+        <groupId>org.ballerinalang</groupId>
         <artifactId>tracing-extensions</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.972.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/tracing-extensions/modules/ballerina-noop-extension/src/main/assembly/dist.xml b/tracing-extensions/modules/ballerina-noop-extension/src/main/assembly/dist.xml
@@ -27,7 +27,7 @@
             <outputDirectory></outputDirectory>
             <scope>runtime</scope>
             <includes>
-                <include>org.ballerinalang.observability:ballerina-noop-extension:jar</include>
+                <include>org.ballerinalang:ballerina-noop-extension:jar</include>
             </includes>
         </dependencySet>
     </dependencySets>

diff --git a/tracing-extensions/modules/ballerina-zipkin-extension/README.md b/tracing-extensions/modules/ballerina-zipkin-extension/README.md
@@ -3,21 +3,19 @@
 ##### Install Guide
 
 - Start Zipkin. You can use their docker image using following command. `docker run -d -p 9411:9411 openzipkin/zipkin`.
-- Build `ballerina-zipkin-extension` and copy the jar files found in <ballerina-zipkin-extension>/target/distribution/
+- Build `ballerina-zipkin-extension` and copy the jar files found in `<ballerina-zipkin-extension>/target/distribution/`
  into the `bre/lib/` directory of the ballerina distribution.
 
-- Create a `trace-config.yaml` with following properties.
-```yaml
-tracers:
-  - name: zipkin
-    enabled: true
-    className: org.ballerinalang.observe.trace.extension.zipkin.OpenTracingExtension
-    configuration:
-      reporter.hostname: localhost
-      reporter.port: 9411
+- Create a `ballerina.conf` file with following properties.
+```toml
+[b7a.observability.tracing]
+enabled=true
+name="zipkin"
 
+[b7a.observability.tracing.zipkin]
+reporter.hostname="localhost"
+reporter.port=9411
 ```
-- Create a `ballerina.conf` file with `trace.config` property, which points to the above `trace-config.yaml`.
 - Run your Ballerina service with that `ballerina.conf` file.
   - Either place `ballerina.conf` in your applications directory.
   - Or use `-Bballerina.conf=path/to/ballerina.conf`

diff --git a/tracing-extensions/modules/ballerina-zipkin-extension/pom.xml b/tracing-extensions/modules/ballerina-zipkin-extension/pom.xml
@@ -19,9 +19,9 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.ballerinalang.observability</groupId>
+        <groupId>org.ballerinalang</groupId>
         <artifactId>tracing-extensions</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.972.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/tracing-extensions/modules/ballerina-zipkin-extension/src/main/assembly/dist.xml b/tracing-extensions/modules/ballerina-zipkin-extension/src/main/assembly/dist.xml
@@ -27,7 +27,7 @@
             <outputDirectory></outputDirectory>
             <scope>runtime</scope>
             <includes>
-                <include>org.ballerinalang.observability:ballerina-zipkin-extension:jar</include>
+                <include>org.ballerinalang:ballerina-zipkin-extension:jar</include>
                 <include>io.opentracing.brave:brave-opentracing</include>
                 <include>io.zipkin.brave:brave</include>
                 <include>io.zipkin.reporter2:zipkin-reporter</include>

diff --git a/tracing-extensions/pom.xml b/tracing-extensions/pom.xml
@@ -18,9 +18,9 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>org.ballerinalang.observability</groupId>
+        <groupId>org.ballerinalang</groupId>
         <artifactId>ballerina-observability-parent</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.972.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>