Skip to content

Commit 4624556

Browse files
authored
Merge pull request #14 from newrelic-experimental/fix_zip_problem
Fix zip problem
2 parents 07f964f + 542baa0 commit 4624556

File tree

7 files changed

+19
-158
lines changed

7 files changed

+19
-158
lines changed

.github/workflows/CHANGELOG.tpl.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
{{.SECTION}}### $title{{.SECTION}}
3+
{{.COMMITS}}- $commit{{.COMMITS}}

README.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
# New Relic Java Instrumentation for RxJava
1919

20-
Instrumentation for the RxJava Framework (https://github.com/ReactiveX/RxJava). There are two sets of instrumentation, one for RxJava1 and the other for RxJava2.
20+
Instrumentation for the RxJava Framework (https://github.com/ReactiveX/RxJava). There are three sets of instrumentation, one for RxJava1 one for RxJava2 and one for RxJava3.
2121

2222
## Installation
2323

@@ -38,15 +38,28 @@ The rxjava1-finder extension will find methods which return an RxJava1 object (C
3838
Tracks Completable, Flowable, Maybe, Observable and Single. For objects with onNext, the method call will be linked back to the original transaction. For all objects the link is expired and linked with the object completes or an error is recorded.
3939
The rxjava2-finder extension will find methods which return an RxJava1 object (Completable, Flowable, Maybe, Observable, Single) and include them in the transaction trace. Methods in the io.reactivex package (and subpackages) are ignored.
4040
#### RxJava2 Segments
41-
The RxJava2 instrumentation uses a New Relic Java Agent segment (https://docs.newrelic.com/docs/agents/java-agent/async-instrumentation/java-agent-api-asynchronous-applications/#segments) to track the time from when the object is subscribed to until the object is completed or throws an error. This feature is turned on by default. To turn this feature off:
41+
The RxJava2 instrumentation uses a New Relic Java Agent segment (https://docs.newrelic.com/docs/agents/java-agent/async-instrumentation/java-agent-api-asynchronous-applications/#segments) to track the time from when the object is subscribed to until the object is completed or throws an error. It is reported as RxJava2/*rxType*/TotalTime/*rx Class simple name* This feature is turned on by default. Additional you can choose not to track certain RxJava Object by configuring a comma separated list of the simple class names that you wish to ignore. Due to the logic used with the From methods (e.g. fromCallable) it is not possible to use segments to track from and hence they are not tracked via segments.
42+
43+
To turn this feature off:
4244
1. Edit newrelic.yml
4345
2. Insert the following text into the file. It can be placed anywhere in the file but the preferred place is right before the **labels:** stanza. Please note that spaces matter so first two lines has two space at the beginning and the third has four spaces.
4446

4547
  \# Used to toggle the use of segments in RxJava2 objects
4648
  RxJava2:
4749
    useSegments: false
50+
51+
To ignore certain Rx objects add the rxType and simple class name to the above configuration. For example to stop using segments to track with the name RxJava2/Flowable/TotalTime/FlowableFlatMap, use the following configuration:
52+
  RxJava2:
53+
    useSegments: true
54+
    Flowable:
55+
      ignores: FlowableFlatMap
56+
4857
### RxJava3
49-
Support for RxJava3 is the same as the RxJava2. Requires different extension jars due to changes to package names
58+
Support for RxJava3 is the same as the RxJava2. Requires different extension jars due to changes to package names
59+
60+
### Finder Extensions
61+
There are three finder extensions included with this instrumentation, one for each RxJava version. The purpose of these extensions to to track methods outside of those in RxJava that return one of the RxJava objects. This allows you to track your methods that return an RxJava object.
62+
5063
## Building
5164
Building the extension requires that Gradle is installed.
5265
To build the extension jars from source, follow these steps:

rxjava2-2.0/src/test/java/com/newrelic/instrumentation/labs/test/rxjava2/MyCallable.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

rxjava2-2.0/src/test/java/com/newrelic/instrumentation/labs/test/rxjava2/MyCompletedAction.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

rxjava2-2.0/src/test/java/com/newrelic/instrumentation/labs/test/rxjava2/MyErrorConsumer.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

rxjava2-2.0/src/test/java/com/newrelic/instrumentation/labs/test/rxjava2/MyStringConsumer.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

rxjava2-2.0/src/test/java/com/newrelic/instrumentation/labs/test/rxjava2/RxJava2Tests.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)