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

Closes #1284 - Agent command allows retrieving the latest logs #1332

Merged
merged 21 commits into from
Mar 3, 2022

Conversation

Henning-Schulz
Copy link
Member

@Henning-Schulz Henning-Schulz commented Mar 2, 2022

This change is Reviewable

@Henning-Schulz Henning-Schulz linked an issue Mar 2, 2022 that may be closed by this pull request
@Henning-Schulz Henning-Schulz marked this pull request as draft March 2, 2022 07:00
@codecov
Copy link

codecov bot commented Mar 2, 2022

Codecov Report

Merging #1332 (587a0f0) into master (d37a7dc) will decrease coverage by 2.10%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #1332      +/-   ##
============================================
- Coverage     83.00%   80.91%   -2.10%     
- Complexity     1736     2051     +315     
============================================
  Files           174      207      +33     
  Lines          5366     6542    +1176     
  Branches        650      780     +130     
============================================
+ Hits           4454     5293     +839     
- Misses          675      950     +275     
- Partials        237      299      +62     
Impacted Files Coverage Δ
...spectit/ocelot/core/utils/WeakMethodReference.java 0.00% <0.00%> (-77.27%) ⬇️
...strap/correlation/noop/NoopLogTraceCorrelator.java 28.57% <0.00%> (-42.86%) ⬇️
...ial/ScheduledExecutorContextPropagationSensor.java 82.05% <0.00%> (-12.39%) ⬇️
...pectit/ocelot/config/loaders/ConfigFileLoader.java 82.61% <0.00%> (-8.70%) ⬇️
...lot/bootstrap/context/noop/NoopContextManager.java 10.00% <0.00%> (-6.67%) ⬇️
...core/instrumentation/InstrumentationTriggerer.java 85.19% <0.00%> (-5.63%) ⬇️
...rocks/inspectit/ocelot/config/utils/CaseUtils.java 90.48% <0.00%> (-4.98%) ⬇️
...t/ocelot/core/instrumentation/hook/MethodHook.java 95.35% <0.00%> (-4.65%) ⬇️
...del/metrics/definition/ViewDefinitionSettings.java 45.45% <0.00%> (-4.55%) ⬇️
...t/ocelot/config/validation/PropertyPathHelper.java 76.67% <0.00%> (-3.95%) ⬇️
... and 102 more

@Henning-Schulz Henning-Schulz marked this pull request as ready for review March 2, 2022 07:38
@MariusBrill MariusBrill self-assigned this Mar 2, 2022
MariusBrill
MariusBrill previously approved these changes Mar 3, 2022
Copy link
Member

@MariusBrill MariusBrill left a comment

Choose a reason for hiding this comment

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

Reviewed 4 of 11 files at r1, 1 of 10 files at r2, 1 of 6 files at r3, 18 of 18 files at r4, 1 of 1 files at r5, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @Henning-Schulz)

Copy link
Member

@MariusBrill MariusBrill left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r6, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @Henning-Schulz)

@MariusBrill MariusBrill merged commit b0332a5 into master Mar 3, 2022
heiko-holz pushed a commit that referenced this pull request Mar 14, 2022
* Closes  #1291: Extend the Configuration UI to display Configuration Documentation (#1317)

Co-authored-by: Marius Oehler <marius.oehler@novatec-gmbh.de>

* Minor documentation fix (#1328)

* Closes #1318 - Only accept Maps as Config-Yaml content (#1320)

* Closes #1319 - Add filter for inspectit.env path in autocompletion (#1339)

* Add filter for inspectit.env path in autocompletion

* Update tests

* Closes #1329 - Fix parsing of Config-Yaml with unknown properties for Config-Docs (#1330)

* Closes #1159 - Close resources (#1160)

Co-authored-by: Marius Oehler <marius.oehler@novatec-gmbh.de>

* Closes #1284 - Agent command allows retrieving the latest logs (#1332)

* added logs method - actual functionality missing

* safe for the day

* added extractlogsappender

* add test case for config loading, basic fixes, and comments

* externalise preloaded logs into LogPreloader and add tests; rename ExtractLogsAppender into LogPreloadingAppender

* add comments what to do next

* add test case describing expected behavior of LogsCommandExecutor

* edited configuration for ´log output'

* debug prototype finished

* filter preloaded messages by log level and highlight open issues

* make the log preloader a DynamicallyActivatableService

* change config path to inspectit.log-preloading

* make logback initializer react to changes to self-monitoring or log-preloading

* format logs and rename command result attribute to logs

* adjust and fix test cases

* add default configuration and documentation

* cosmetic fixes

* further cosmetic stuff

* use correct mockito method

* add validation annotations to log preloading settings

* Merge branch 'master' into ocelot_debug_feature

* Closes #1248 - Refactor enabled field for exporters (#1303)

* Disable all exporters by default

* Update Documentation

* Test logging warnings

* Refactor enabled into enum

* Set log-level to warning

* Add changes to EUM server

* Unifrom javadoc for enabled field

* Add converter to support old configurations

* Fix log-level in EUM server

* Update breaking-changes.md

* Small fix to JavaDoc

* Re-add Info log

* Fix Attachment Test

* Fix agent_test.yml

* Fix agent_test.yml

* feat(exporter): [#1248] Minor refactoring of ExporterEnabledState.java and related exporter services; minor text/comment adjustment

* Small fixes to documentation

* Fix documentation in default config

* Fix agent_test.yml

* Debug attachment test

* Debug attachment test

* Debug attachment test

* Fix Attachment Test

* Remove Attachment Test debugging code

* Add Documentation to Converter

* Small fixes to Documentation

* Simplify tests

* feat(exporter): [#1248] small refactor  in `*ExporterServiceIntTest.java`

* Test TraceExportersConfiguration Annotations

* Fix TraceExportersConfiguration Test

* Fix EumExportersSettings

* Update TraceExportersConfigurationTest.java

* Added some Docs explaining the new test

* Add docs for metrics field in EumExportersSettings

Co-authored-by: Heiko Holz <heiko.holz@novatec-gmbh.de>

* feat(ui): reload documentation when configuration files are changed (#1340)

Refs: #1288

* feat(ui): ability to filter configuration docs (#1341)

* [skip ci] Publish documentation v1.15.0

* fix(config-docs) - Handle old Boolean style for enabled property (#1343)

Co-authored-by: Marius Oehler <marius.oehler@novatec-gmbh.de>

* [skip ci] Publish documentation v1.15.1

* fix(EUM-server): update Beacon Exporter enabled (#1344)

* fix(EUM-Server): Addition to Beacon exporter fix (#1345)

* fix(EUM-Server): Addition to Beacon exporter fix

* Small fixes to other exporter tests

* Add test for beacon exporter-related annotations

* fix(EUM-server): Add conversion-service to EUM server (#1346)

* Add conversionService to EUM-Server

* Refactor Conditional annotations

* Merge remote-tracking branch 'origin/master' into feature/opentelemetry-migration

# Conflicts:
#	components/inspectit-ocelot-configurationserver/src/test/java/rocks/inspectit/ocelot/autocomplete/autocompleterimpl/ModelAutoCompleterTest.java
#	inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/exporter/JaegerExporterService.java
#	inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/exporter/OpenCensusAgentMetricsExporterService.java
#	inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/exporter/OpenCensusAgentTraceExporterService.java
#	inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/exporter/PrometheusExporterService.java
#	inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/exporter/ZipkinExporterService.java
#	inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/JaegerExporterServiceIntTest.java
#	inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/OpenCensusAgentMetricsExporterServiceIntTest.java
#	inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/OpenCensusAgentTraceExporterServiceIntTest.java
#	inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/PrometheusExporterServiceIntTest.java
#	inspectit-ocelot-core/src/test/java/rocks/inspectit/ocelot/core/exporter/ZipkinExporterServiceIntTest.java
#	inspectit-ocelot-documentation/docs/metrics/metric-exporters.md
#	inspectit-ocelot-documentation/docs/tracing/trace-exporters.md
@MariusBrill MariusBrill deleted the ocelot_debug_feature branch March 31, 2022 14:45
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.

Agent command allows retrieving the latest logs
3 participants