Skip to content

Commit

Permalink
合并官方master分支
Browse files Browse the repository at this point in the history
* remotes/upstream/master: (539 commits)
  [#noissue] Change agent info text color.
  [pinpoint-apm#4849]  Update popup for mongo plugin.
  [#noissue] Change code highlight library.
  [pinpoint-apm#4849] Update popup for mongo plugin.
  [pinpoint-apm#4843] Add LettucePlugin
  [pinpoint-apm#4849] Mongo Plugin update for Front-End
  [#noissue] Add IOUtils  - move to common module
  [pinpoint-apm#4841] Change the version of hbase client library
  [pinpoint-apm#4827] Cleanup ClassScannerFactory
  [pinpoint-apm#4839] Version up angular 7 - add hbase image
  [#noissue] Add IOUtils
  [pinpoint-apm#4737] remove unnecessary dependency
  [pinpoint-apm#4737] refactor agent-it test
  [pinpoint-apm#4737] remove business logic from StringStringValue class
  [pinpoint-apm#4737] add writeconcern mapper for performance
  [pinpoint-apm#4737] separate mongo collection data
  [pinpoint-apm#4737] update configs
  [pinpoint-apm#4737] remove mongo code from common
  [pinpoint-apm#4597] change default config in flinkCheckJob
  [pinpoint-apm#4827] Add scanner based on ProtectionDomain
  ...

# Conflicts:
#	collector/src/main/java/com/navercorp/pinpoint/collector/receiver/DispatchWorker.java
#	collector/src/main/java/com/navercorp/pinpoint/collector/receiver/tcp/AgentBaseDataReceiver.java
#	collector/src/main/resources/applicationContext-collector.xml
#	pom.xml
#	rpc/src/main/java/com/navercorp/pinpoint/rpc/server/PinpointServerAcceptor.java
  • Loading branch information
youzhihao committed Feb 21, 2019
2 parents 98136cb + 84f2c8a commit c5ae30e
Show file tree
Hide file tree
Showing 1,207 changed files with 37,638 additions and 21,768 deletions.
19 changes: 12 additions & 7 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,31 @@ about: Create a report to help us improve

---

**What version of pinpoint are you using?**
#### Prerequisites
Please check the [FAQ](http://naver.github.io/pinpoint/faq.html), and search existing [issues](https://github.com/naver/pinpoint/issues) for similar questions before creating a new issue.**YOU MAY DELETE THIS PREREQUISITES SECTION.**

- [ ] I have checked the [FAQ](http://naver.github.io/pinpoint/faq.html), and [issues](https://github.com/naver/pinpoint/issues) and found no answer.

#### What version of pinpoint are you using?
master/v1.7.3/v1.7.2 etc.

**Describe the bug**
#### Describe the bug
A clear and concise description of what the bug is.

**What did you do to trigger the bug?**
#### What did you do to trigger the bug?
Steps to reproduce, for example:
1. Ran '...' with agent attached
2. '...' method invoked
3. '...' interceptor threw '...' exception

**Expected behavior**
#### Expected behavior
A clear and concise description of what you expected to happen.

**Screenshots**
#### Screenshots
If applicable, add screenshots to help explain your problem.

**Logs**
#### Logs
If applicable, please attach agent/collector/web DEBUG log that includes the code execution that led to the bug. In case of agents, including the start-up log may be of great help.

**Additional context**
#### Additional context
Add any other context about the problem here, such as affected library for agents, how your collector/web/hbase is set up if applicable.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ about: Questions

---

#### Prerequisites
Please check the [FAQ](http://naver.github.io/pinpoint/faq.html), and search existing [issues](https://github.com/naver/pinpoint/issues) for similar questions before creating a new issue.**YOU MAY DELETE THIS PREREQUISITES SECTION.**

- [ ] I have checked the [FAQ](http://naver.github.io/pinpoint/faq.html), and [issues](https://github.com/naver/pinpoint/issues) and found no answer.

<!--
Please be as detailed as possible so that we can help answer your question as quickly as possible.
-->
17 changes: 11 additions & 6 deletions .github/ISSUE_TEMPLATE/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,29 @@ about: For when something doesn't work

---

**What version of pinpoint are you using?**
#### Prerequisites
Please check the [FAQ](http://naver.github.io/pinpoint/faq.html), and search existing [issues](https://github.com/naver/pinpoint/issues) for similar questions before creating a new issue.**YOU MAY DELETE THIS PREREQUISITES SECTION.**

- [ ] I have checked the [FAQ](http://naver.github.io/pinpoint/faq.html), and [issues](https://github.com/naver/pinpoint/issues) and found no answer.

#### What version of pinpoint are you using?
master/v1.7.3/v1.7.2 etc.

**Describe your problem**
#### Describe your problem**
A clear and concise description of what is not working.

**What have you done?**
#### What have you done?
Steps you have taken to trigger the problem, for example:
1. Launched '...' with agent
2. Tried tracing '...' (see agent log below)
3. Collector outputs trace log (see collector log below)
4. No trace shows up in the web UI (see web log below)

**Screenshots**
#### Screenshots
If applicable, add screenshots to help explain your problem.

**Logs**
#### Logs
If applicable, please attach agent/collector/web DEBUG log that includes the part where you have encountered the problem. In case of agents, including the start-up log may be of great help.

**Additional context**
#### Additional context
Add any other context about the problem here, such as affected library for agents, how your collector/web/hbase is set up if applicable.
37 changes: 20 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@

Pinpoint has started to support application written in PHP. [Check-out our php-agent repository](https://github.com/naver/pinpoint-c-agent).

## Latest Release (2018/09/14)
## Latest Release (2019/01/02)

We're happy to announce the release of Pinpoint v1.8.0.
Please check the release note at (https://github.com/naver/pinpoint/releases/tag/1.8.0).
We're happy to announce the release of Pinpoint v1.8.1.
Please check the release note at (https://github.com/naver/pinpoint/releases/tag/1.8.1).

The current stable version is [v1.8.0](https://github.com/naver/pinpoint/releases/tag/1.8.0).
The current stable version is [v1.8.1](https://github.com/naver/pinpoint/releases/tag/1.8.1).

## About Pinpoint

Expand Down Expand Up @@ -56,16 +56,16 @@ For a more intimate guide, please check out our *[Introduction to Pinpoint](http

## Supported Modules
* JDK 6+
* Tomcat 6/7/8, [Jetty 8/9](https://github.com/naver/pinpoint/tree/master/plugins/jetty), [JBoss EAP 6](https://github.com/naver/pinpoint/tree/master/plugins/jboss), [Resin 4](https://github.com/naver/pinpoint/tree/master/plugins/resin), [Websphere 6/7/8](https://github.com/naver/pinpoint/tree/master/plugins/websphere), [Vertx 3.3/3.4/3.5](https://github.com/naver/pinpoint/tree/master/plugins/vertx)
* Spring, Spring Boot (Embedded Tomcat, Jetty)
* Apache HTTP Client 3.x/4.x, JDK HttpConnector, GoogleHttpClient, OkHttpClient, NingAsyncHttpClient
* Thrift Client, Thrift Service, DUBBO PROVIDER, DUBBO CONSUMER
* ActiveMQ, RabbitMQ
* MySQL, Oracle, MSSQL(jtds), CUBRID,POSTGRESQL, MARIA
* Arcus, Memcached, Redis, CASSANDRA
* [Tomcat 6/7/8/9](https://github.com/naver/pinpoint/tree/master/plugins/tomcat), [Jetty 8/9](https://github.com/naver/pinpoint/tree/master/plugins/jetty), [JBoss EAP 6/7](https://github.com/naver/pinpoint/tree/master/plugins/jboss), [Resin 4](https://github.com/naver/pinpoint/tree/master/plugins/resin), [Websphere 6/7/8](https://github.com/naver/pinpoint/tree/master/plugins/websphere), [Vertx 3.3/3.4/3.5](https://github.com/naver/pinpoint/tree/master/plugins/vertx), [Weblogic 10/11g/12c](https://github.com/naver/pinpoint/tree/master/plugins/weblogic), [Undertow](https://github.com/naver/pinpoint/tree/master/plugins/undertow)
* Spring, Spring Boot (Embedded Tomcat, Jetty, Undertow), Spring asynchronous communication
* Apache HTTP Client 3.x/4.x, JDK HttpConnector, GoogleHttpClient, OkHttpClient, NingAsyncHttpClient, Akka-http, Apache CXF
* Thrift Client, Thrift Service, DUBBO PROVIDER, DUBBO CONSUMER, GRPC
* ActiveMQ, RabbitMQ, Kafka
* MySQL, Oracle, MSSQL(jtds), CUBRID, POSTGRESQL, MARIA
* Arcus, Memcached, Redis([Jedis](https://github.com/naver/pinpoint/blob/master/plugins/redis), [Lettuce](https://github.com/naver/pinpoint/tree/master/plugins/redis-lettuce)), CASSANDRA, MongoDB, Hbase
* iBATIS, MyBatis
* DBCP, DBCP2, HIKARICP
* gson, Jackson, Json Lib
* DBCP, DBCP2, HIKARICP, DRUID
* gson, Jackson, Json Lib, Fastjson
* log4j, Logback

## Compatibility
Expand All @@ -79,7 +79,8 @@ Pinpoint Version | Agent | Collector | Web
1.5.x | 6-8 | 7-8 | 7-8
1.6.x | 6-8 | 7-8 | 7-8
1.7.x | 6-8 | 8 | 8
1.8.x | 6-10 | 8 | 8
1.8.0 | 6-10 | 8 | 8
1.8.1+ | 6-11 | 8 | 8

HBase compatibility table:

Expand All @@ -105,9 +106,11 @@ Agent Version | Collector 1.0.x | Collector 1.1.x | Collector 1.5.x | Collector

Flink compatibility table:

Pinpoint Version | flink 1.3.X | flink 1.4.X
---------------- | ----------- | -----------
1.7.x | yes | no |
Pinpoint Version | flink 1.3.X | flink 1.4.X | flink 1.5.X | flink 1.6.X | flink 1.7.X
---------------- | ----------- | ----------- | ----------- | ----------- | -----------
1.7.x | yes | yes | no | no | no |
1.8.x | yes | yes | no | no | no |
1.9.x | yes | yes | yes | yes | yes |

## User Group
For Q/A and discussion [here](https://groups.google.com/forum/#!forum/pinpoint_user).
Expand Down
70 changes: 67 additions & 3 deletions agent-it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,19 @@
<parent>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pinpoint</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.9.0-SNAPSHOT</version>
</parent>

<artifactId>pinpoint-agent-it</artifactId>
<name>pinpoint-agent-it</name>

<packaging>jar</packaging>

<properties>
<grpc.version>1.14.0</grpc.version>
<protoc.version>3.5.1-1</protoc.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -71,7 +76,7 @@
<!-- plug-ins -->
<dependency>
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pinpoint-plugins</artifactId>
<artifactId>pinpoint-plugins-assembly</artifactId>
<type>pom</type>
<scope>runtime</scope>
</dependency>
Expand Down Expand Up @@ -365,6 +370,40 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>9.2.11.v20150529</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
<scope>test</scope>
</dependency>
<!-- netty.io -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<!-- Use 'netty-all' for 4.0 or above -->
<version>4.1.28.Final</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand All @@ -383,6 +422,14 @@
</resource>
</resources>

<extensions>
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>1.5.0.Final</version>
</extension>
</extensions>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -437,7 +484,24 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.5.1</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
<executions>
<execution>
<goals>
<goal>test-compile</goal>
<goal>test-compile-custom</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,6 @@
*/
package com.navercorp.pinpoint.plugin.google.httpclient;

import java.io.IOException;
import java.lang.reflect.Method;
import java.util.concurrent.Callable;
import java.util.concurrent.Executor;

import com.navercorp.pinpoint.plugin.AgentPath;
import com.navercorp.pinpoint.plugin.WebServer;
import com.navercorp.pinpoint.test.plugin.PinpointAgent;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;

import com.google.api.client.http.GenericUrl;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpRequestFactory;
Expand All @@ -38,8 +25,20 @@
import com.navercorp.pinpoint.bootstrap.plugin.test.Expectations;
import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifier;
import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifierHolder;
import com.navercorp.pinpoint.plugin.AgentPath;
import com.navercorp.pinpoint.plugin.WebServer;
import com.navercorp.pinpoint.test.plugin.Dependency;
import com.navercorp.pinpoint.test.plugin.PinpointAgent;
import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;

import java.io.IOException;
import java.lang.reflect.Method;
import java.util.concurrent.Callable;
import java.util.concurrent.Executor;

/**
* @author jaehong.kim
Expand All @@ -48,7 +47,7 @@
@PinpointAgent(AgentPath.PATH)
// guava dependency issue
// google-http-client 1.26.0 does not include repackaged guava
@Dependency({ "com.google.http-client:google-http-client:[1.19.0],[1.20.0,)", "com.google.guava:guava:20.0", "org.nanohttpd:nanohttpd:2.3.1"})
@Dependency({ "com.google.http-client:google-http-client:[1.19.0],[1.20.0,1.27.0]", "com.google.guava:guava:20.0", "org.nanohttpd:nanohttpd:2.3.1"})
public class HttpRequestIT {

private static WebServer webServer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ public void hystrixCommand_execute_timeout() throws Exception {
verifier.verifyTrace(event("HYSTRIX_COMMAND_INTERNAL", "com.netflix.hystrix.HystrixCommand.getFallbackObservable()"));

// execution
verifier.awaitTraceCount(3, 20, 3000);
verifier.verifyTrace(event(ServiceType.ASYNC.getName(), "Asynchronous Invocation"));
Method getExecutionObservable = HystrixCommand.class.getDeclaredMethod("getExecutionObservable");
verifier.verifyTrace(event("HYSTRIX_COMMAND_INTERNAL", getExecutionObservable));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ public void hystrixCommand_execute_timeout() throws Exception {
verifier.verifyTrace(event("HYSTRIX_COMMAND_INTERNAL", "com.netflix.hystrix.HystrixCommand.getFallbackObservable()"));

// execution
verifier.awaitTraceCount(3, 20, 3000);
verifier.verifyTrace(event(ServiceType.ASYNC.getName(), "Asynchronous Invocation"));
Method getExecutionObservable = HystrixCommand.class.getDeclaredMethod("getExecutionObservable");
verifier.verifyTrace(event("HYSTRIX_COMMAND_INTERNAL", getExecutionObservable));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ public void hystrixObservableCommand_observe_timeout() throws Exception {
verifier.verifyTrace(event("HYSTRIX_COMMAND_INTERNAL", "com.netflix.hystrix.HystrixObservableCommand.getFallbackObservable()"));

// execution
verifier.awaitTraceCount(2, 20, 3000);
verifier.verifyTrace(event(ServiceType.ASYNC.getName(), "Asynchronous Invocation"));
Method helloMethod = HelloRepository.class.getDeclaredMethod("hello", String.class, long.class);
verifier.verifyTrace(event(ServiceType.INTERNAL_METHOD.getName(), helloMethod, HystrixTestHelper.INTERRUPTED_EXCEPTION_DUE_TO_TIMEOUT));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ public void hystrixObservableCommand_observe_timeout() throws Exception {
verifier.verifyTrace(event("HYSTRIX_COMMAND_INTERNAL", "com.netflix.hystrix.HystrixObservableCommand.getFallbackObservable()"));

// execution
verifier.awaitTraceCount(2, 20, 3000);
verifier.verifyTrace(event(ServiceType.ASYNC.getName(), "Asynchronous Invocation"));
Method helloMethod = HelloRepository.class.getDeclaredMethod("hello", String.class, long.class);
verifier.verifyTrace(event(ServiceType.INTERNAL_METHOD.getName(), helloMethod, HystrixTestHelper.INTERRUPTED_EXCEPTION_DUE_TO_TIMEOUT));
Expand Down Expand Up @@ -255,6 +256,8 @@ public void hystrixObservableCommand_toObservable_timeout() throws Exception {
fallbackCauseAnnotation, exceptionAnnotation));
verifier.verifyTrace(event("HYSTRIX_COMMAND_INTERNAL", "com.netflix.hystrix.HystrixObservableCommand.getFallbackObservable()"));

verifier.awaitTraceCount(2, 10, 3000);

// execution
verifier.verifyTrace(event(ServiceType.ASYNC.getName(), "Asynchronous Invocation"));
Method helloMethod = HelloRepository.class.getDeclaredMethod("hello", String.class, long.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
@RunWith(PinpointPluginTestSuite.class)
@PinpointAgent(AgentPath.PATH)
// 2.7.0, 2.7.1 has JDK6 compatibility issue - https://github.com/FasterXML/jackson-databind/issues/1134
@Dependency({"com.fasterxml.jackson.core:jackson-databind:[2.0.6],[2.1.5],[2.2.4],[2.3.4],[2.4.6],[2.5.4,2.6.max],[2.7.2,)"})
@Dependency({"com.fasterxml.jackson.core:jackson-databind:[2.0.6],[2.1.5],[2.2.4],[2.3.4],[2.4.6],[2.5.4,2.6.max],[2.7.2,2.7.max]"})
public class ObjectMapperIT {

private static final Charset UTF_8 = Charset.forName("UTF-8");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
@RunWith(PinpointPluginTestSuite.class)
@PinpointAgent(AgentPath.PATH)
// 2.7.0, 2.7.1 has JDK6 compatibility issue - https://github.com/FasterXML/jackson-databind/issues/1134
@Dependency({"com.fasterxml.jackson.core:jackson-databind:[2.0.6],[2.1.5],[2.2.4],[2.3.4],[2.4.6],[2.5.4,2.6.max],[2.7.2,)"})
@Dependency({"com.fasterxml.jackson.core:jackson-databind:[2.0.6],[2.1.5],[2.2.4],[2.3.4],[2.4.6],[2.5.4,2.6.max],[2.7.2,2.7.max]"})
public class ObjectReaderIT {

private static final Charset UTF_8 = Charset.forName("UTF-8");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
@RunWith(PinpointPluginTestSuite.class)
@PinpointAgent(AgentPath.PATH)
@JvmVersion(7) // 1.6.2+ works with Java 6, but since the IT includes 1.6.0 and 1.6.1 just run on Java 7
@Dependency({ "org.mariadb.jdbc:mariadb-java-client:[1.6.0,2.0.min)", "ch.vorburger.mariaDB4j:mariaDB4j:2.2.2" })
public class MariaDB_1_6_x_to_2_0_0_IT extends MariaDB_IT_Base {
@Dependency({ "org.mariadb.jdbc:mariadb-java-client:[1.6.0,1.8.0)", "ch.vorburger.mariaDB4j:mariaDB4j:2.2.2" })
public class MariaDB_1_6_x_to_1_8_0_IT extends MariaDB_IT_Base {

// see CallableParameterMetaData#queryMetaInfos
private static final String CALLABLE_QUERY_META_INFOS_QUERY = "select param_list, returns, db, type from mysql.proc where name=? and db=DATABASE()";
Expand Down Expand Up @@ -95,8 +95,8 @@ public void testPreparedStatement() throws Exception {
verifier.verifyTrace(event("MARIADB", prepareStatement, null, URL, DATABASE_NAME, sql(PREPARED_STATEMENT_QUERY, null)));

// MariaDbPreparedStatementClient#executeQuery
Class<?> mariaDbServerPreparedStatementClass = Class.forName("org.mariadb.jdbc.MariaDbPreparedStatementClient");
Method executeQuery = mariaDbServerPreparedStatementClass.getDeclaredMethod("executeQuery");
Class<?> mariaDbPreparedStatementClientClass = Class.forName("org.mariadb.jdbc.MariaDbPreparedStatementClient");
Method executeQuery = mariaDbPreparedStatementClientClass.getDeclaredMethod("executeQuery");
verifier.verifyTrace(event("MARIADB_EXECUTE_QUERY", executeQuery, null, URL, DATABASE_NAME, sql(PREPARED_STATEMENT_QUERY, null, "3")));
}

Expand Down
Loading

0 comments on commit c5ae30e

Please sign in to comment.