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

Broker Side Tracing (alpha) #126

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
59c2422
poc, take 1
dlg99 Apr 12, 2024
91e5186
various renamings and tweaks
dlg99 Apr 12, 2024
ea91420
traces as json
dlg99 Apr 12, 2024
40f4784
refactoring, cache some of configuration
dlg99 Apr 12, 2024
2246bc4
more config caching
dlg99 Apr 12, 2024
4f84dc7
couple of tests
dlg99 Apr 13, 2024
ffc604e
feedback
dlg99 Apr 15, 2024
4585bca
fixes, tweaks
dlg99 Apr 15, 2024
5e9094a
actually trace commands; 'message' changed to 'eventType'
dlg99 Apr 15, 2024
f43457f
Fix test
eolivelli Apr 16, 2024
1d5e7b8
add pulsar-jms-tracing to the release and upgrade the Nifi-plugin
eolivelli Apr 16, 2024
7c87503
fix build
eolivelli Apr 16, 2024
58f1183
fix build
eolivelli Apr 16, 2024
cbe3a5b
limit command output, separate event reason option for commands
dlg99 Apr 16, 2024
7e480aa
more configuration parameters to reduce verbosity
dlg99 Apr 29, 2024
7e9811c
Merge branch 'master' into tracing
dlg99 Apr 29, 2024
0a42c1f
updated version to match master / merged poms
dlg99 Apr 29, 2024
9c1ad66
more message id details, when available
dlg99 Apr 29, 2024
a9d74f8
Trace levels for producer/consumer can be set via topic properties; a…
dlg99 Apr 30, 2024
e910fa6
async refresh for caches
dlg99 May 1, 2024
b1df8d8
part of the feedback addressed, only one level of onfo(still too verb…
dlg99 May 2, 2024
8e8c866
resolve hostname of the client
dlg99 May 2, 2024
f16ac60
parse payload out of the ByteBuf
dlg99 May 3, 2024
277e0b4
fix test, some wording
dlg99 May 3, 2024
87c6408
WIP reduce verbosity
dlg99 May 3, 2024
398fa3f
reduced traces verbosity, added some details
dlg99 May 6, 2024
c74a95b
tweaks, servlet tracing
dlg99 May 8, 2024
70a8288
jmsTracingLevel as a master off switch; reworked categories, renamed …
dlg99 May 8, 2024
a447548
PAYLOAD trace levele for messages, port for the host, tweaks for details
dlg99 May 9, 2024
db0ad0c
deduped messages, aded stats etc
dlg99 May 11, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ jobs:
run: mvn -B package -DskipTests
- uses: ncipollo/release-action@v1
with:
artifacts: "pulsar-jms-all/target/pulsar-jms-all-*.jar,resource-adapter/target/pulsarra-rar.rar,pulsar-jms-filters/target/pulsar-jms*.nar,pulsar-jms-cli/target/jms-cli.jar,pulsar-jms-admin-ext/target/pulsar-jms*.nar"
artifacts: "pulsar-jms-all/target/pulsar-jms-all-*.jar,resource-adapter/target/pulsarra-rar.rar,pulsar-jms-filters/target/pulsar-jms*.nar,pulsar-jms-cli/target/jms-cli.jar,pulsar-jms-admin-ext/target/pulsar-jms*.nar,pulsar-jms-tracing/target/pulsar-jms*.nar"
token: ${{ secrets.GITHUB_TOKEN }}
generateReleaseNotes: true
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<modules>
<module>activemq-filters</module>
<module>pulsar-jms-filters</module>
<module>pulsar-jms-tracing</module>
<module>pulsar-jms-admin-api</module>
<module>pulsar-jms</module>
<module>resource-adapter</module>
Expand Down Expand Up @@ -64,6 +65,7 @@
<surefire.version>3.1.0</surefire.version>
<jackson.version>2.14.2</jackson.version>
<gson.version>2.8.9</gson.version>
<guava.version>32.1.2-jre</guava.version>
<commons-compress.version>1.21</commons-compress.version>
<awaitility.version>4.0.3</awaitility.version>
<maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version>
Expand Down Expand Up @@ -106,6 +108,11 @@
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-jms-admin-ext/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<plugin>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-maven-plugin</artifactId>
<version>1.3.2</version>
<version>1.5.1</version>
<extensions>true</extensions>
<configuration>
<finalName>pulsar-jms-admin-${project.version}</finalName>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-jms-filters/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<plugin>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-maven-plugin</artifactId>
<version>1.3.2</version>
<version>1.5.1</version>
<extensions>true</extensions>
<configuration>
<finalName>pulsar-jms-${project.version}</finalName>
Expand Down
4 changes: 2 additions & 2 deletions pulsar-jms-integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@
<configuration>
<target>
<echo>copy filters</echo>
<mkdir dir="${project.build.outputDirectory}/filters" />
<copy verbose="true" file="${basedir}/../pulsar-jms-filters/target/pulsar-jms-${project.version}-nar.nar" tofile="${project.build.outputDirectory}/filters/jms-filter.nar" />
<mkdir dir="${project.build.outputDirectory}/filters"/>
<copy verbose="true" file="${basedir}/../pulsar-jms-filters/target/pulsar-jms-${project.version}-nar.nar" tofile="${project.build.outputDirectory}/filters/jms-filter.nar"/>
</target>
</configuration>
</execution>
Expand Down
90 changes: 90 additions & 0 deletions pulsar-jms-tracing/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright DataStax, Inc.

Licensed 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.

-->
<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">
<parent>
<artifactId>pulsar-jms-parent</artifactId>
<groupId>com.datastax.oss</groupId>
<version>4.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pulsar-jms-tracing</artifactId>
<packaging>jar</packaging>
<name>DataStax Starlight for JMS - Broker Side Filters</name>
<properties>
<build.dir>${project.build.directory}</build.dir>
</properties>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${pulsar.groupId}</groupId>
<artifactId>pulsar-broker</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-maven-plugin</artifactId>
<version>1.5.1</version>
<extensions>true</extensions>
<configuration>
<finalName>pulsar-jms-tracing-${project.version}</finalName>
<classifier>nar</classifier>
</configuration>
<executions>
<execution>
<id>default-nar</id>
<phase>package</phase>
<goals>
<goal>nar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading
Loading