Skip to content

Commit 576f2da

Browse files
felixbarnyfelixbarny
committed
Merge remote-tracking branch 'origin/master' into timing-breakdown
2 parents dffbba0 + f6781c3 commit 576f2da

File tree

495 files changed

+7702
-4513
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

495 files changed

+7702
-4513
lines changed

‎CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,25 @@
11
# next (1.7.0)
22

33
## Features
4+
* Added the `trace_methods_duration_threshold` config option. When using the `trace_methods` config option with wild cards, this
5+
enables considerable reduction of overhead by limiting the number of spans captured and reported (see more details in config
6+
documentation).
7+
NOTE: Using wildcards is still not the recommended approach for the `trace_methods` feature
8+
## Bug Fixes
9+
10+
# 1.6.1
411

512
## Bug Fixes
13+
* Fixes transaction name for non-sampled transactions [#581](https://github.com/elastic/apm-agent-java/issues/581)
14+
* Makes log_file option work again [#594](https://github.com/elastic/apm-agent-java/issues/594)
15+
* Async context propagation fixes
16+
* Fixing some async mechanisms lifecycle issues [#605](https://github.com/elastic/apm-agent-java/issues/605)
17+
* Fixes exceptions when using WildFly managed executor services [#589](https://github.com/elastic/apm-agent-java/issues/589)
18+
* Exclude glassfish Executor which does not permit wrapped runnables [#596](https://github.com/elastic/apm-agent-java/issues/596)
19+
* Exclude DumbExecutor [#598](https://github.com/elastic/apm-agent-java/issues/598)
20+
* Fixes Manifest version reading error to support `jar:file` protocol [#601](https://github.com/elastic/apm-agent-java/issues/601)
21+
* Fixes transaction name for non-sampled transactions [#597](https://github.com/elastic/apm-agent-java/issues/597)
22+
* Fixes potential classloader deadlock by preloading `FileSystems.getDefault()` [#603](https://github.com/elastic/apm-agent-java/issues/603)
623

724
# 1.6.0
825

‎Jenkinsfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,21 @@ pipeline {
5757
/**
5858
Build on a linux environment.
5959
*/
60-
stage('build') {
60+
stage('Build') {
6161
steps {
6262
deleteDir()
6363
unstash 'source'
6464
dir("${BASE_DIR}"){
6565
sh """#!/bin/bash
6666
set -euxo pipefail
67-
./mvnw clean package -DskipTests=true -Dmaven.javadoc.skip=true
67+
./mvnw clean install -DskipTests=true -Dmaven.javadoc.skip=true
68+
./mvnw license:aggregate-third-party-report -Dlicense.excludedGroups=^co\\.elastic\\.
6869
"""
6970
}
7071
stash allowEmpty: true, name: 'build', useDefaultExcludes: false
7172
archiveArtifacts allowEmptyArchive: true,
72-
artifacts: "${BASE_DIR}/elastic-apm-agent/target/elastic-apm-agent-*.jar,${BASE_DIR}/apm-agent-attach/target/apm-agent-attach-*.jar",
73+
artifacts: "${BASE_DIR}/elastic-apm-agent/target/elastic-apm-agent-*.jar,${BASE_DIR}/apm-agent-attach/target/apm-agent-attach-*.jar,\
74+
${BASE_DIR}/target/site/aggregate-third-party-report.html",
7375
onlyIfSuccessful: true
7476
}
7577
}
@@ -156,8 +158,6 @@ pipeline {
156158
deleteDir()
157159
unstash 'build'
158160
dir("${BASE_DIR}"){
159-
dockerLogin(secret: "${DOCKERHUB_SECRET}", registry: "docker.io")
160-
sh(label: 'pull weblogic Docker image', script: 'docker pull store/oracle/weblogic:12.2.1.3-dev')
161161
sh './scripts/jenkins/smoketests-02.sh'
162162
}
163163
}

‎apm-agent-api/pom.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
3+
<properties>
4+
<apm-agent-parent.base.dir>${project.basedir}/..</apm-agent-parent.base.dir>
5+
</properties>
6+
37
<parent>
48
<artifactId>apm-agent-parent</artifactId>
59
<groupId>co.elastic.apm</groupId>
6-
<version>1.6.0-SNAPSHOT</version>
10+
<version>1.6.2-SNAPSHOT</version>
711
</parent>
812
<modelVersion>4.0.0</modelVersion>
913

‎apm-agent-api/src/main/java/co/elastic/apm/api/AbstractSpanImpl.java

+15-10
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
* %%
55
* Copyright (C) 2018 - 2019 Elastic and contributors
66
* %%
7-
* Licensed under the Apache License, Version 2.0 (the "License");
8-
* you may not use this file except in compliance with the License.
7+
* Licensed to Elasticsearch B.V. under one or more contributor
8+
* license agreements. See the NOTICE file distributed with
9+
* this work for additional information regarding copyright
10+
* ownership. Elasticsearch B.V. licenses this file to you under
11+
* the Apache License, Version 2.0 (the "License"); you may
12+
* not use this file except in compliance with the License.
913
* You may obtain a copy of the License at
10-
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
13-
* Unless required by applicable law or agreed to in writing, software
14-
* distributed under the License is distributed on an "AS IS" BASIS,
15-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
* See the License for the specific language governing permissions and
17-
* limitations under the License.
14+
*
15+
* http://www.apache.org/licenses/LICENSE-2.0
16+
*
17+
* Unless required by applicable law or agreed to in writing,
18+
* software distributed under the License is distributed on an
19+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20+
* KIND, either express or implied. See the License for the
21+
* specific language governing permissions and limitations
22+
* under the License.
1823
* #L%
1924
*/
2025
package co.elastic.apm.api;

‎apm-agent-api/src/main/java/co/elastic/apm/api/ApiMethodHandles.java

+15-10
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
* %%
55
* Copyright (C) 2018 - 2019 Elastic and contributors
66
* %%
7-
* Licensed under the Apache License, Version 2.0 (the "License");
8-
* you may not use this file except in compliance with the License.
7+
* Licensed to Elasticsearch B.V. under one or more contributor
8+
* license agreements. See the NOTICE file distributed with
9+
* this work for additional information regarding copyright
10+
* ownership. Elasticsearch B.V. licenses this file to you under
11+
* the Apache License, Version 2.0 (the "License"); you may
12+
* not use this file except in compliance with the License.
913
* You may obtain a copy of the License at
10-
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
13-
* Unless required by applicable law or agreed to in writing, software
14-
* distributed under the License is distributed on an "AS IS" BASIS,
15-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
* See the License for the specific language governing permissions and
17-
* limitations under the License.
14+
*
15+
* http://www.apache.org/licenses/LICENSE-2.0
16+
*
17+
* Unless required by applicable law or agreed to in writing,
18+
* software distributed under the License is distributed on an
19+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20+
* KIND, either express or implied. See the License for the
21+
* specific language governing permissions and limitations
22+
* under the License.
1823
* #L%
1924
*/
2025
package co.elastic.apm.api;

‎apm-agent-api/src/main/java/co/elastic/apm/api/CaptureSpan.java

+13-8
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
* %%
55
* Copyright (C) 2018 - 2019 Elastic and contributors
66
* %%
7-
* Licensed under the Apache License, Version 2.0 (the "License");
8-
* you may not use this file except in compliance with the License.
7+
* Licensed to Elasticsearch B.V. under one or more contributor
8+
* license agreements. See the NOTICE file distributed with
9+
* this work for additional information regarding copyright
10+
* ownership. Elasticsearch B.V. licenses this file to you under
11+
* the Apache License, Version 2.0 (the "License"); you may
12+
* not use this file except in compliance with the License.
913
* You may obtain a copy of the License at
1014
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
15+
* http://www.apache.org/licenses/LICENSE-2.0
1216
*
13-
* Unless required by applicable law or agreed to in writing, software
14-
* distributed under the License is distributed on an "AS IS" BASIS,
15-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
* See the License for the specific language governing permissions and
17-
* limitations under the License.
17+
* Unless required by applicable law or agreed to in writing,
18+
* software distributed under the License is distributed on an
19+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20+
* KIND, either express or implied. See the License for the
21+
* specific language governing permissions and limitations
22+
* under the License.
1823
* #L%
1924
*/
2025
package co.elastic.apm.api;

‎apm-agent-api/src/main/java/co/elastic/apm/api/CaptureTransaction.java

+13-8
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
* %%
55
* Copyright (C) 2018 - 2019 Elastic and contributors
66
* %%
7-
* Licensed under the Apache License, Version 2.0 (the "License");
8-
* you may not use this file except in compliance with the License.
7+
* Licensed to Elasticsearch B.V. under one or more contributor
8+
* license agreements. See the NOTICE file distributed with
9+
* this work for additional information regarding copyright
10+
* ownership. Elasticsearch B.V. licenses this file to you under
11+
* the Apache License, Version 2.0 (the "License"); you may
12+
* not use this file except in compliance with the License.
913
* You may obtain a copy of the License at
1014
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
15+
* http://www.apache.org/licenses/LICENSE-2.0
1216
*
13-
* Unless required by applicable law or agreed to in writing, software
14-
* distributed under the License is distributed on an "AS IS" BASIS,
15-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
* See the License for the specific language governing permissions and
17-
* limitations under the License.
17+
* Unless required by applicable law or agreed to in writing,
18+
* software distributed under the License is distributed on an
19+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20+
* KIND, either express or implied. See the License for the
21+
* specific language governing permissions and limitations
22+
* under the License.
1823
* #L%
1924
*/
2025
package co.elastic.apm.api;

‎apm-agent-api/src/main/java/co/elastic/apm/api/ElasticApm.java

+15-10
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
* %%
55
* Copyright (C) 2018 - 2019 Elastic and contributors
66
* %%
7-
* Licensed under the Apache License, Version 2.0 (the "License");
8-
* you may not use this file except in compliance with the License.
7+
* Licensed to Elasticsearch B.V. under one or more contributor
8+
* license agreements. See the NOTICE file distributed with
9+
* this work for additional information regarding copyright
10+
* ownership. Elasticsearch B.V. licenses this file to you under
11+
* the Apache License, Version 2.0 (the "License"); you may
12+
* not use this file except in compliance with the License.
913
* You may obtain a copy of the License at
10-
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
13-
* Unless required by applicable law or agreed to in writing, software
14-
* distributed under the License is distributed on an "AS IS" BASIS,
15-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
* See the License for the specific language governing permissions and
17-
* limitations under the License.
14+
*
15+
* http://www.apache.org/licenses/LICENSE-2.0
16+
*
17+
* Unless required by applicable law or agreed to in writing,
18+
* software distributed under the License is distributed on an
19+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20+
* KIND, either express or implied. See the License for the
21+
* specific language governing permissions and limitations
22+
* under the License.
1823
* #L%
1924
*/
2025
package co.elastic.apm.api;

‎apm-agent-api/src/main/java/co/elastic/apm/api/HeaderExtractor.java

+15-10
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
* %%
55
* Copyright (C) 2018 - 2019 Elastic and contributors
66
* %%
7-
* Licensed under the Apache License, Version 2.0 (the "License");
8-
* you may not use this file except in compliance with the License.
7+
* Licensed to Elasticsearch B.V. under one or more contributor
8+
* license agreements. See the NOTICE file distributed with
9+
* this work for additional information regarding copyright
10+
* ownership. Elasticsearch B.V. licenses this file to you under
11+
* the Apache License, Version 2.0 (the "License"); you may
12+
* not use this file except in compliance with the License.
913
* You may obtain a copy of the License at
10-
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
13-
* Unless required by applicable law or agreed to in writing, software
14-
* distributed under the License is distributed on an "AS IS" BASIS,
15-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
* See the License for the specific language governing permissions and
17-
* limitations under the License.
14+
*
15+
* http://www.apache.org/licenses/LICENSE-2.0
16+
*
17+
* Unless required by applicable law or agreed to in writing,
18+
* software distributed under the License is distributed on an
19+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20+
* KIND, either express or implied. See the License for the
21+
* specific language governing permissions and limitations
22+
* under the License.
1823
* #L%
1924
*/
2025
package co.elastic.apm.api;

‎apm-agent-api/src/main/java/co/elastic/apm/api/HeaderInjector.java

+15-10
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
* %%
55
* Copyright (C) 2018 - 2019 Elastic and contributors
66
* %%
7-
* Licensed under the Apache License, Version 2.0 (the "License");
8-
* you may not use this file except in compliance with the License.
7+
* Licensed to Elasticsearch B.V. under one or more contributor
8+
* license agreements. See the NOTICE file distributed with
9+
* this work for additional information regarding copyright
10+
* ownership. Elasticsearch B.V. licenses this file to you under
11+
* the Apache License, Version 2.0 (the "License"); you may
12+
* not use this file except in compliance with the License.
913
* You may obtain a copy of the License at
10-
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
13-
* Unless required by applicable law or agreed to in writing, software
14-
* distributed under the License is distributed on an "AS IS" BASIS,
15-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
* See the License for the specific language governing permissions and
17-
* limitations under the License.
14+
*
15+
* http://www.apache.org/licenses/LICENSE-2.0
16+
*
17+
* Unless required by applicable law or agreed to in writing,
18+
* software distributed under the License is distributed on an
19+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20+
* KIND, either express or implied. See the License for the
21+
* specific language governing permissions and limitations
22+
* under the License.
1823
* #L%
1924
*/
2025
package co.elastic.apm.api;

‎apm-agent-api/src/main/java/co/elastic/apm/api/HeadersExtractor.java

+15-10
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
* %%
55
* Copyright (C) 2018 - 2019 Elastic and contributors
66
* %%
7-
* Licensed under the Apache License, Version 2.0 (the "License");
8-
* you may not use this file except in compliance with the License.
7+
* Licensed to Elasticsearch B.V. under one or more contributor
8+
* license agreements. See the NOTICE file distributed with
9+
* this work for additional information regarding copyright
10+
* ownership. Elasticsearch B.V. licenses this file to you under
11+
* the Apache License, Version 2.0 (the "License"); you may
12+
* not use this file except in compliance with the License.
913
* You may obtain a copy of the License at
10-
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
13-
* Unless required by applicable law or agreed to in writing, software
14-
* distributed under the License is distributed on an "AS IS" BASIS,
15-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
* See the License for the specific language governing permissions and
17-
* limitations under the License.
14+
*
15+
* http://www.apache.org/licenses/LICENSE-2.0
16+
*
17+
* Unless required by applicable law or agreed to in writing,
18+
* software distributed under the License is distributed on an
19+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20+
* KIND, either express or implied. See the License for the
21+
* specific language governing permissions and limitations
22+
* under the License.
1823
* #L%
1924
*/
2025
package co.elastic.apm.api;

‎apm-agent-api/src/main/java/co/elastic/apm/api/NoopScope.java

+13-8
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
* %%
55
* Copyright (C) 2018 - 2019 Elastic and contributors
66
* %%
7-
* Licensed under the Apache License, Version 2.0 (the "License");
8-
* you may not use this file except in compliance with the License.
7+
* Licensed to Elasticsearch B.V. under one or more contributor
8+
* license agreements. See the NOTICE file distributed with
9+
* this work for additional information regarding copyright
10+
* ownership. Elasticsearch B.V. licenses this file to you under
11+
* the Apache License, Version 2.0 (the "License"); you may
12+
* not use this file except in compliance with the License.
913
* You may obtain a copy of the License at
1014
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
15+
* http://www.apache.org/licenses/LICENSE-2.0
1216
*
13-
* Unless required by applicable law or agreed to in writing, software
14-
* distributed under the License is distributed on an "AS IS" BASIS,
15-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
* See the License for the specific language governing permissions and
17-
* limitations under the License.
17+
* Unless required by applicable law or agreed to in writing,
18+
* software distributed under the License is distributed on an
19+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20+
* KIND, either express or implied. See the License for the
21+
* specific language governing permissions and limitations
22+
* under the License.
1823
* #L%
1924
*/
2025
package co.elastic.apm.api;

‎apm-agent-api/src/main/java/co/elastic/apm/api/NoopSpan.java

+15-10
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
* %%
55
* Copyright (C) 2018 - 2019 Elastic and contributors
66
* %%
7-
* Licensed under the Apache License, Version 2.0 (the "License");
8-
* you may not use this file except in compliance with the License.
7+
* Licensed to Elasticsearch B.V. under one or more contributor
8+
* license agreements. See the NOTICE file distributed with
9+
* this work for additional information regarding copyright
10+
* ownership. Elasticsearch B.V. licenses this file to you under
11+
* the Apache License, Version 2.0 (the "License"); you may
12+
* not use this file except in compliance with the License.
913
* You may obtain a copy of the License at
10-
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
13-
* Unless required by applicable law or agreed to in writing, software
14-
* distributed under the License is distributed on an "AS IS" BASIS,
15-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
* See the License for the specific language governing permissions and
17-
* limitations under the License.
14+
*
15+
* http://www.apache.org/licenses/LICENSE-2.0
16+
*
17+
* Unless required by applicable law or agreed to in writing,
18+
* software distributed under the License is distributed on an
19+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20+
* KIND, either express or implied. See the License for the
21+
* specific language governing permissions and limitations
22+
* under the License.
1823
* #L%
1924
*/
2025
package co.elastic.apm.api;

0 commit comments

Comments
 (0)