Skip to content

Conversation

@laullon
Copy link
Contributor

@laullon laullon commented Mar 31, 2023

@laullon laullon changed the base branch from master to dev March 31, 2023 16:33
format proxyCheckInScheduler to pass maven build
@joannatk
Copy link
Contributor

joannatk commented Apr 4, 2023

@laullon , I'm seeing

Failed to execute goal com.cosium.code:git-code-format-maven-plugin:3.3:validate-code-format (default-cli) on project 
proxy: /home/runner/work/wavefront-proxy/wavefront-
proxy/proxy/src/main/java/com/wavefront/agent/ProxySendConfigScheduler.java is not correctly formatted ! 

on java11 build, even after reformatting. This is causing the java 11 build to fail.

Copy link
Contributor

@joannatk joannatk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@sbhakta-vmware sbhakta-vmware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@joannatk joannatk merged commit 5b19946 into dev Apr 5, 2023
joannatk added a commit that referenced this pull request Apr 5, 2023
* Monit 34005: Fix crash on bad URL config (#837)
laullon added a commit that referenced this pull request May 10, 2023
* dev: (37 commits)
  MONIT-30797: CVE-2021-20293 (6.1) - wavefront-proxy (resteasy-jaxrs) (#844)
  [release] prepare for next development iteration
  [release] prepare release for proxy-12.4
  update open_source_licenses.txt for release 12.4
  update open_source_licenses.txt for release 12.4
  MONIT-34326: Remove preprocessor rules returned from server (#848)
  MONIT-34487: Force GZIP on server api requests (#849)
  MONIT-34300: Hide sensible config option (token) from the Proxy log (#845)
  MONIT-33770: Proxy Ingest without Admin Auth (#842)
  [release] prepare for next development iteration
  [release] prepare release for proxy-12.3
  update open_source_licenses.txt for release 12.3
  Merge dev to 12.x branch (#841)
  Monit 34005: Fix crash on bad URL config (#837)
  Merge dev to 12.x branch (#840)
  MONIT-34093 - Upgrade to snakeyaml 2.0 for CVE-2022-1471 (#839)
  [release] prepare for next development iteration
  [release] prepare release for proxy-12.2
  update open_source_licenses.txt for release 12.2
  Fix failing HttpEndtoEndTest (#835)
  ...

# Conflicts:
#	proxy/pom.xml
#	proxy/src/main/java/com/wavefront/agent/AbstractAgent.java
#	proxy/src/main/java/com/wavefront/agent/ProxyCheckInScheduler.java
#	proxy/src/main/java/com/wavefront/agent/ProxyConfig.java
#	proxy/src/main/java/com/wavefront/agent/PushAgent.java
#	proxy/src/main/java/com/wavefront/agent/api/APIContainer.java
#	proxy/src/main/java/com/wavefront/agent/api/NoopProxyV2API.java
#	proxy/src/main/java/com/wavefront/agent/config/ReportableConfig.java
#	proxy/src/main/java/com/wavefront/agent/core/handlers/DeltaCounterAccumulationHandlerImpl.java
#	proxy/src/main/java/com/wavefront/agent/core/handlers/HistogramAccumulationHandlerImpl.java
#	proxy/src/main/java/com/wavefront/agent/core/handlers/ReportPointHandlerImpl.java
#	proxy/src/main/java/com/wavefront/agent/core/handlers/SpanHandlerImpl.java
#	proxy/src/main/java/com/wavefront/agent/data/LogDataSubmissionTask.java
#	proxy/src/main/java/com/wavefront/agent/handlers/AbstractReportableEntityHandler.java
#	proxy/src/main/java/com/wavefront/agent/handlers/EventHandlerImpl.java
#	proxy/src/main/java/com/wavefront/agent/handlers/ReportLogHandlerImpl.java
#	proxy/src/main/java/com/wavefront/agent/handlers/ReportSourceTagHandlerImpl.java
#	proxy/src/main/java/com/wavefront/agent/handlers/SpanLogsHandlerImpl.java
#	proxy/src/main/java/com/wavefront/agent/listeners/AbstractLineDelimitedHandler.java
#	proxy/src/main/java/com/wavefront/agent/listeners/RelayPortUnificationHandler.java
#	proxy/src/main/java/com/wavefront/agent/listeners/WavefrontPortUnificationHandler.java
#	proxy/src/main/java/com/wavefront/agent/logsharvesting/InteractiveLogsTester.java
#	proxy/src/main/java/com/wavefront/agent/preprocessor/InteractivePreprocessorTester.java
#	proxy/src/main/java/com/wavefront/agent/preprocessor/PreprocessorConfigManager.java
#	proxy/src/test/java/com/wavefront/agent/ProxyConfigTest.java
#	proxy/src/test/java/com/wavefront/agent/PushAgentTest.java
#	proxy/src/test/java/com/wavefront/agent/histogram/PointHandlerDispatcherTest.java
#	proxy/src/test/java/com/wavefront/agent/logsharvesting/LogsIngesterTest.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants