Skip to content

Commit

Permalink
feat: add ocagent exporter to shaded jars to allow customers more fle… (
Browse files Browse the repository at this point in the history
#3683)

…xibility for clientside metrics

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-bigtable-hbase/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes #<issue_number_goes_here> ☕️

If you write sample code, please follow the [samples format](
https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
  • Loading branch information
igorbernstein2 committed Jul 13, 2022
1 parent b67c790 commit 25b2af8
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 1 deletion.
24 changes: 24 additions & 0 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,30 @@ limitations under the License.
<groupId>io.opencensus</groupId>
<artifactId>opencensus-exporter-trace-stackdriver</artifactId>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-exporter-metrics-ocagent</artifactId>
<version>${opencensus.version}</version>
<exclusions>
<!-- we already use netty-shaded -->
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-exporter-trace-ocagent</artifactId>
<version>${opencensus.version}</version>
<exclusions>
<!-- we already use netty-shaded -->
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- grpc-census needed alongside opencensus-exporter-stats-stackdriver for GRPC stats exports to work -->
<dependency>
<groupId>io.grpc</groupId>
Expand Down
25 changes: 25 additions & 0 deletions bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,31 @@ limitations under the License.
<groupId>io.opencensus</groupId>
<artifactId>opencensus-exporter-trace-stackdriver</artifactId>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-exporter-metrics-ocagent</artifactId>
<version>${opencensus.version}</version>
<exclusions>
<!-- we already use netty-shaded -->
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-exporter-trace-ocagent</artifactId>
<version>${opencensus.version}</version>
<exclusions>
<!-- we already use netty-shaded -->
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- grpc-census needed alongside opencensus-exporter-stats-stackdriver for GRPC stats exports to work -->
<dependency>
<groupId>io.grpc</groupId>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ limitations under the License.
<guava.version>31.1-jre</guava.version>
<gcs-guava.version>29.0-jre</gcs-guava.version>
<beam-slf4j.version>1.7.30</beam-slf4j.version>
<opencensus.version>0.28.0</opencensus.version>

<!-- Benchmarks related dependencies -->
<jmh.version>1.35</jmh.version>
Expand Down Expand Up @@ -318,7 +319,7 @@ limitations under the License.
<!-- gax-grpc transitvely brings in opencensus-proto, which the latest version is 0.2.0-->
<!-- Only allow 0.2.0 for opencensus-proto and then the latest version (currently 0.28.0) for all other modules-->
<!-- this will need to be updated whenever the opencensus version gets updated -->
<dependency>io.opencensus:*:[0.28.0]</dependency>
<dependency>io.opencensus:*:[${opencensus.version}]</dependency>
<dependency>io.opencensus:opencensus-proto:[0.2.0]</dependency>
</includes>
</bannedDependencies>
Expand Down

0 comments on commit 25b2af8

Please sign in to comment.