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.

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

5.0.0 rc release #1

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
6753478
Added OpenAPM Badge to the readme file (#1493)
AlexanderWert Jul 26, 2018
d7fd23f
Update use cases (#1503)
wu-sheng Jul 27, 2018
4788ebd
add Architecture-CN.md doc. (#1499)
JaredTan95 Jul 30, 2018
eed6fa1
add gzip support (#1506)
jjtyro Jul 30, 2018
a5d2610
Fix #1488: Fix NPE when the targetAop class is null (#1507)
ascrutae Jul 31, 2018
c10fc67
Fix typo (#1514)
wu-sheng Aug 2, 2018
20cee98
Update ServiceNameService.java (#1515)
terranhu Aug 3, 2018
1d39614
[Agent] Add plugin for ActiveMQ 5.x (#1513)
withlin Aug 4, 2018
789cdce
Update ActiveMQProducerInterceptor.java (#1522)
withlin Aug 4, 2018
29c0a97
Update ActiveMQConsumerInterceptor.java (#1523)
withlin Aug 5, 2018
9820012
add ActiveMQ support (#1524)
withlin Aug 5, 2018
d1684a7
Add Abstract-CN.md (#1501)
xinzhuxiansheng Aug 5, 2018
42028e6
Fix operation name is empty issue (#1525)
ascrutae Aug 6, 2018
6db0d08
optimize code structure to economize computing resources (#1536)
Aug 9, 2018
ae00944
Update uses-list.md (#1537)
mgsheng Aug 10, 2018
86da565
Update users (#1540)
wu-sheng Aug 12, 2018
6798686
Typo:fix docs. (#1551)
JaredTan95 Aug 16, 2018
4d00324
Change file name. (#1553)
wu-sheng Aug 17, 2018
8302bbf
add new user (#1557)
jinlongwang Aug 18, 2018
a29a8d7
Fix NPE in alarm content generation. (#1558)
IanCao Aug 19, 2018
dd942d1
FIX NPE in tomcat plugin ForwardInterceptor (#1562)
IanCao Aug 20, 2018
513b8d6
add components for nodejs agent (#1565)
ascrutae Aug 21, 2018
0162fdd
Fix #1549 (#1568)
ascrutae Aug 21, 2018
46c0e76
Fix the timeBucket equal to 0 problem (#1570)
beckhampu Aug 21, 2018
18d2d35
Fix bug stop stopSpan when not createSpan in Spring Callback (#1572)
IanCao Aug 22, 2018
1c8431c
Support ojdbc8 (#1571)
ascrutae Aug 22, 2018
d0b9516
Moves to Maven wrapper to stabilize the version in use (#1569)
adriancole Aug 22, 2018
b395920
[Agent] Provide plugin for Elasticsearch 5.x (#1500)
Aug 22, 2018
15fed8c
Remove jar from source (#1574)
wu-sheng Aug 22, 2018
26f88ba
Re-adds maven wrapper downloader so users won't crash if wget is miss…
adriancole Aug 23, 2018
31e4ceb
change the agent log level to millisecond (#1580)
IanCao Aug 23, 2018
59fdc3b
Submodule/ui (#1581)
hanahmily Aug 23, 2018
999762e
Moved hardcoded dependency versions to properties tag in pom.xml (#1582)
FatihErdem Aug 23, 2018
15263bc
Moved hardcoded dependency versions to properties tag in pom.xml (#1583)
FatihErdem Aug 24, 2018
6e6e13b
add the function of the specified agent config (#1584)
IanCao Aug 25, 2018
d9384cd
Submodule/ui (#1587)
hanahmily Aug 26, 2018
af03e92
RC CHANGES (#1560)
wu-sheng Aug 26, 2018
f259ba6
Remove tests for release.
wu-sheng Aug 27, 2018
52ac062
[maven-release-plugin] prepare release v5.0.0-RC
wu-sheng Aug 27, 2018
2ba62e6
[maven-release-plugin] prepare for next development iteration
wu-sheng Aug 27, 2018
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ packages/
**/dependency-reduced-pom.xml
/skywalking-agent/
/dist/
.mvn/wrapper/*.jar
110 changes: 110 additions & 0 deletions .mvn/wrapper/MavenWrapperDownloader.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF 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.
*/

import java.net.*;
import java.io.*;
import java.nio.channels.*;
import java.util.Properties;

public class MavenWrapperDownloader {

/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL =
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";

/**
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
* use instead of the default one.
*/
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
".mvn/wrapper/maven-wrapper.properties";

/**
* Path where the maven-wrapper.jar will be saved to.
*/
private static final String MAVEN_WRAPPER_JAR_PATH =
".mvn/wrapper/maven-wrapper.jar";

/**
* Name of the property which should be used to override the default download url for the wrapper.
*/
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";

public static void main(String args[]) {
System.out.println("- Downloader started");
File baseDirectory = new File(args[0]);
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());

// If the maven-wrapper.properties exists, read it and check if it contains a custom
// wrapperUrl parameter.
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
String url = DEFAULT_DOWNLOAD_URL;
if(mavenWrapperPropertyFile.exists()) {
FileInputStream mavenWrapperPropertyFileInputStream = null;
try {
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
Properties mavenWrapperProperties = new Properties();
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
} catch (IOException e) {
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
} finally {
try {
if(mavenWrapperPropertyFileInputStream != null) {
mavenWrapperPropertyFileInputStream.close();
}
} catch (IOException e) {
// Ignore ...
}
}
}
System.out.println("- Downloading from: : " + url);

File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
if(!outputFile.getParentFile().exists()) {
if(!outputFile.getParentFile().mkdirs()) {
System.out.println(
"- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
}
}
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
try {
downloadFileFromURL(url, outputFile);
System.out.println("Done");
System.exit(0);
} catch (Throwable e) {
System.out.println("- Error downloading");
e.printStackTrace();
System.exit(1);
}
}

private static void downloadFileFromURL(String urlString, File destination) throws Exception {
URL website = new URL(urlString);
ReadableByteChannel rbc;
rbc = Channels.newChannel(website.openStream());
FileOutputStream fos = new FileOutputStream(destination);
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
fos.close();
rbc.close();
}

}
1 change: 1 addition & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ before_install:

install:
- jdk_switcher use oraclejdk8
- mvn clean install -Ptravis-ci-submodule --quiet jacoco:report coveralls:report
- mvn clean javadoc:javadoc -Dmaven.test.skip=true --quiet
- ./mvnw clean install -Ptravis-ci-submodule --quiet jacoco:report coveralls:report
- ./mvnw clean javadoc:javadoc -Dmaven.test.skip=true --quiet

38 changes: 38 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,44 @@ Changes by Version
==================
Release Notes.

5.0.0-RC
------------------

#### Agent Changes
- Support ActiveMQ 5.x
- Support RuntimeContext used out of TracingContext.
- Support Oracle ojdbc8 Plugin.
- Support ElasticSearch client transport 5.2-5.6 Plugin
- Support using agent.config with given path through system properties.
- Add a new way to transmit the Request and Response, to avoid bugs in Hytrix scenarios.
- Fix HTTPComponent client v4 operation name is empty.
- Fix 2 possible NPEs in Spring plugin.
- Fix a possible span leak in SpringMVC plugin.
- Fix NPE in Spring callback plugin.

#### Collector Changes
- Add GZip support for Zipkin receiver.
- Add new component IDs for nodejs.
- Fix Zipkin span receiver may miss data in request.
- Optimize codes in heatmap calculation. Reduce unnecessary divide.
- Fix NPE in Alarm content generation.
- Fix the precision lost in `ServiceNameService#startTimeMillis`.
- Fix GC count is 0.
- Fix topology breaks when RPC client uses the async thread call.

#### UI Changes
- Fix UI port can't be set by startup script in Windows.
- Fix Topology self link error.
- Fix stack color mismatch label color in gc time chart.

#### Documents
- Add users list.
- Fix several document typo.
- Sync the Chinese documents.
- Add OpenAPM badge.
- Add icon/font documents to NOTICE files.


5.0.0-beta2
------------------

Expand Down
22 changes: 14 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Apache SkyWalking

<img src="https://skywalkingtest.github.io/page-resources/3.0/skywalking.png" alt="Sky Walking logo" height="90px" align="right" />

**SkyWalking**: APM (application performance monitor) tool for distributed systems, especially designed for
**SkyWalking**: APM (application performance monitor) tool for distributed systems, especially designed for
microservices, cloud native and container-based (Docker, Kubernetes, Mesos) architectures.

[![GitHub stars](https://img.shields.io/github/stars/apache/incubator-skywalking.svg?style=for-the-badge&label=Stars&logo=github)](https://github.com/apache/incubator-skywalking)
Expand All @@ -16,7 +16,7 @@ microservices, cloud native and container-based (Docker, Kubernetes, Mesos) arch
[![OpenTracing-1.x Badge](https://img.shields.io/badge/OpenTracing--1.x-enabled-blue.svg)](http://opentracing.io)

# Abstract
**SkyWalking** started as a distributed tracing system in 2015. From 5.x, it evolved to the fully functional [Application Performance Management](https://en.wikipedia.org/wiki/Application_performance_management)
**SkyWalking** started as a distributed tracing system in 2015. From 5.x, it evolved to the fully functional [Application Performance Management](https://en.wikipedia.org/wiki/Application_performance_management)
system. It is used for tracing, monitoring, diagnose distributed systems, especially based on microservices, cloud native and container,
including:
- Distributed tracing and context propagation
Expand All @@ -28,22 +28,22 @@ including:
- Performance optimization

# Core features
- Multiple languages instrumentation agent or libraries
- Multiple languages instrumentation agent or libraries
- Native Java auto instrumentation agent. Trace and monitor your cluster without changing any source codes
- Community instrumentation agent or libraries
* [.NET Core](https://github.com/OpenSkywalking/skywalking-netcore)
* [.NET Core](https://github.com/OpenSkywalking/skywalking-netcore)
* [Node.js](https://github.com/OpenSkywalking/skywalking-nodejs)
- Multiple storage backends: ElasticSearch, H2
- [OpenTracing](http://opentracing.io/) compatible
- Native Java auto instrumentation agent could work with OpenTracing APIs in the same context
- Lightweight and powerful backend aggregation and analysis capabilities
- Modern and cool Web UI
- Log integration
- Alarm for slow or unstable(low SLA) application, instance and service
- Alarm for slow or unstable(low SLA) application, instance and service
- [**Incubating**] Support accepting other tracer data formats.
- Zipkin JSON, Thrift, Protobuf v1 and v2 formats, powered by [OpenZipkin](https://github.com/openzipkin/zipkin) libs
- Jaeger in [Zipkin Thrift or JSON v1/v2 formats](https://github.com/jaegertracing/jaeger#backwards-compatibility-with-zipkin)

# Announcement
After SkyWalking 5.0.0-beta2 released, all core features have been provided. For 5 series, we are trying to make them stable from now. At the same time, we have already begun our works for 6 series, in branch `6.0`. It will be a long way to have the first alpha release for it. So if you want to take part in the challengeable works, welcome, but don't consider to use that. Please read the [6.0 documents](https://github.com/apache/incubator-skywalking/blob/6.0/docs/README.md) first.

Expand Down Expand Up @@ -78,9 +78,15 @@ Follow this [document](https://github.com/apache/incubator-skywalking/blob/maste
* QQ Group: 392443393

# Users
<img src="https://skywalkingtest.github.io/page-resources/users/users-2018-06-07.png"/>
<img src="https://skywalkingtest.github.io/page-resources/users/users-2018-08-12.png"/>

- [Users list](docs/users.md)
- [Submit new user to us.](https://github.com/apache/incubator-skywalking/issues/443)

[Submit new user case to us.](https://github.com/apache/incubator-skywalking/issues/443)
<p align="center">
<a href="https://openapm.io"><img src="https://openapm.io/static/media/openapm_logo.svg" width="100"/></a>
<br/>Our project enriches the <a href="https://openapm.io">OpenAPM Landscape!</a>
</p>

# License
[Apache 2.0 License.](/LICENSE)
9 changes: 5 additions & 4 deletions README_ZH.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Apache SkyWalking | [English](README.md)
- 多语言探针或类库
- Java自动探针,追踪和监控程序时,不需要修改源码。
- 社区提供的其他多语言探针
* [.NET Core](https://github.com/OpenSkywalking/skywalking-netcore)
* [.NET Core](https://github.com/OpenSkywalking/skywalking-netcore)
* [Node.js](https://github.com/OpenSkywalking/skywalking-nodejs)
- 多种后端存储: ElasticSearch, H2
- 支持[OpenTracing](http://opentracing.io/)
Expand All @@ -39,7 +39,7 @@ Apache SkyWalking | [English](README.md)
- 日志集成
- 应用、实例和服务的告警
- [**Incubating**]支持接口其他探针的数据
- 接受Zipkin v1 v2格式数据,采用JSON, Thrift, Protobuf序列化方式。Powered by [OpenZipkin](https://github.com/openzipkin/zipkin) libs
- 接受Zipkin v1 v2格式数据,采用JSON, Thrift, Protobuf序列化方式。Powered by [OpenZipkin](https://github.com/openzipkin/zipkin) libs
- 接受Jaeger 使用 [Zipkin Thrift 或 JSON v1/v2 格式](https://github.com/jaegertracing/jaeger#backwards-compatibility-with-zipkin)

# Document
Expand Down Expand Up @@ -74,9 +74,10 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU
* QQ群: 392443393

# Users
<img src="https://skywalkingtest.github.io/page-resources/users/users-2018-06-07.png"/>
<img src="https://skywalkingtest.github.io/page-resources/users/users-2018-08-12.png"/>

[报告新的用户案例](https://github.com/apache/incubator-skywalking/issues/443)
- [用户案例](docs/users.md)
- [报告新的用户案例](https://github.com/apache/incubator-skywalking/issues/443)


# License
Expand Down
30 changes: 6 additions & 24 deletions apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,40 +21,22 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-RC-SNAPSHOT</version>
<version>5.0.0-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>apm-toolkit-log4j-1.x</artifactId>

<properties>
<log4j.version>1.2.17</log4j.version>
</properties>

<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>


<build>
<plugins>
<plugin>
<!-- 源码插件 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<!-- 发布时自动将源码同时发布的配置 -->
<executions>
<execution>
<id>attach-sources</id>
<phase>none</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<version>2.4</version>
</plugin>
</plugins>
</build>
</project>
31 changes: 6 additions & 25 deletions apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,41 +21,22 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-RC-SNAPSHOT</version>
<version>5.0.0-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>apm-toolkit-log4j-2.x</artifactId>

<properties>
<log4j-core.version>2.7</log4j-core.version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.7</version>
<version>${log4j-core.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>


<build>
<plugins>
<plugin>
<!-- 源码插件 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<!-- 发布时自动将源码同时发布的配置 -->
<executions>
<execution>
<id>attach-sources</id>
<phase>none</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<version>2.4</version>
</plugin>
</plugins>
</build>

</project>
Loading