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.

Sign up for GitHub

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

Jump to bottom

add logprocessor to agent #1713

Merged
merged 6 commits into from
Jun 5, 2021
Merged

add logprocessor to agent #1713

merged 6 commits into from
Jun 5, 2021

Conversation

kryalama
Copy link
Contributor

@kryalama kryalama commented May 27, 2021 •
edited by trask
Loading

add log processor to agent.

attaching SNAPSHOT build for testing: applicationinsights-agent-3.1.1-BETA.5-SNAPSHOT.jar.zip

@kryalama kryalama requested a review from trask May 27, 2021 14:55
@kryalama kryalama requested review from heyams and xiao-lix as code owners May 27, 2021 14:56
heyams
heyams reviewed May 28, 2021
View reviewed changes
...rc/main/java/com/microsoft/applicationinsights/agent/internal/processors/AgentProcessor.java Outdated Show resolved Hide resolved
...rc/main/java/com/microsoft/applicationinsights/agent/internal/processors/AgentProcessor.java Outdated Show resolved Hide resolved
...rc/main/java/com/microsoft/applicationinsights/agent/internal/processors/AgentProcessor.java Outdated Show resolved Hide resolved
...rc/main/java/com/microsoft/applicationinsights/agent/internal/processors/AgentProcessor.java Outdated Show resolved Hide resolved
...va/com/microsoft/applicationinsights/agent/internal/processors/ExporterWithLogProcessor.java Outdated Show resolved Hide resolved
...va/com/microsoft/applicationinsights/agent/internal/processors/ExporterWithLogProcessor.java Outdated Show resolved Hide resolved
...a/com/microsoft/applicationinsights/agent/internal/processors/ExporterWithSpanProcessor.java Outdated Show resolved Hide resolved
...src/main/java/com/microsoft/applicationinsights/agent/internal/processors/ProcessorUtil.java Show resolved Hide resolved
...a/com/microsoft/applicationinsights/agent/internal/wasbootstrap/OpenTelemetryConfigurer.java Outdated Show resolved Hide resolved
@heyams
Copy link
Contributor

heyams commented May 28, 2021

note: missing copyrights for new classes.

trask
trask reviewed Jun 1, 2021
View reviewed changes
...m/microsoft/applicationinsights/agent/internal/processors/ExporterWithSpanProcessorTest.java
spans.add(spanData);
exampleExporter.export(spans);

// verify that resulting spans are not modified
Copy link
Member

Choose a reason for hiding this comment

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

👍

...om/microsoft/applicationinsights/agent/internal/processors/ExporterWithLogProcessorTest.java
spans.add(spanData);
exampleExporter.export(spans);

// verify that resulting logs are not modified
Copy link
Member

Choose a reason for hiding this comment

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

👍

...rc/main/java/com/microsoft/applicationinsights/agent/internal/processors/AgentProcessor.java Outdated Show resolved Hide resolved
@trask trask force-pushed the kryalama/logprocessor branch from 5b7eed4 to 3561f01 Compare June 1, 2021 21:38
@trask trask changed the base branch from aad to main June 1, 2021 21:39
@trask trask closed this Jun 1, 2021
@trask trask reopened this Jun 1, 2021
@kryalama kryalama requested review from trask, ramthi and heyams June 2, 2021 02:36
@kryalama kryalama requested review from trask and heyams June 4, 2021 20:40
@kryalama kryalama requested a review from trask June 4, 2021 23:58
trask
trask approved these changes Jun 5, 2021
View reviewed changes
Copy link
Member

@trask trask left a comment

Choose a reason for hiding this comment

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

thanks @kryalama! ❤️

...ssors/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java
Comment on lines +32 to +33
MessageData md1 = logs.get(0);
assertEquals("smoketestappcontroller::INFO",md1.getMessage());
Copy link
Member

Choose a reason for hiding this comment

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

👍

test/smoke/appServers/global-resources/telemetryprocessors_applicationinsights.json Outdated
Comment on lines 92 to 86
"name": {
"body": {
"fromAttributes": [
"applicationinsights.internal.logger_name","applicationinsights.internal.log_level"
],
Copy link
Member

Choose a reason for hiding this comment

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

it would be nice to instead test the PII data redaction scenario, but we can do that in follow-up PR later

.../src/main/java/com/microsoft/applicationinsights/agent/internal/processors/LogProcessor.java
}

//fromAttributes represents the attribute keys to pull the values from to generate the new span name.
public SpanData processFromAttributes(SpanData log) {
Copy link
Member

Choose a reason for hiding this comment

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

probably could have avoided some of the copy paste here by extracting out another common method into ProcessorUtil, but let's do that later in follow-up PR

@kryalama kryalama merged commit 8c4d65e into main Jun 5, 2021
@kryalama kryalama deleted the kryalama/logprocessor branch June 5, 2021 01:00
trask added a commit that referenced this pull request Jun 7, 2021
@kryalama @trask
add logprocessor to agent (#1713)
6e0db82 
* add logprocessor to agent

* comments addressed, added smoketest for log processor, fixed bug in telemetryprocessorOpenTelemetryConfigurer

* StringBuffer -> StringBuilder

* addressing comments

* removed lognames, fixed smoke test

* replace name with body in log processor, address comments

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
heyams added a commit that referenced this pull request Jun 8, 2021
@trask @johnoliver
@heyams @kryalama
Merge main into aad (#1729)
4b730d0 
* Support agentmain (#1687)

* Use ProfilerEndpoint from connection string (#1694)

* Add test to make sure no non-daemon threads (#1695)

* Better EventHubs support (#1698)

* Reduce spammy error (#1701)

* Emit Profiler start/stop events (#1706)

* 2.x SDK explicit operation id / operation parent id should take precedence (#1708)

* Support explicit operation id/parentId from 2.x

* Test

* Release 3.1.1-BETA.2 (#1709)

* Prepare for a new beta release

* Fix a typo

* Reword

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

* Hide super advanced feature.

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

* Better Azure Service Bus support (#1710)

* Use main as the default branch from now on (#1715)

* Retry webflux tests 3 times when it's failing (#1712)

* Retry webflux 3 times when it's failing

* print stack trace when the final retry fails

* Reword

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

* Update to latest OTel (#1719)

* Update OTel

* Suppress 2.x request name handler

* Remove retry

* Suppress CDS Profile endpoint warning in smoke tests

* Bump timeout to avoid sporadic failures

* Prepare 3.1.1-BETA.3 release (#1723)

* Fix App Map display of unknown dependencies (#1716)

* Fix App Map display of unknown dependencies

* Add net peer mapping to target also

* Add clarifying comment

* Fix agent jar size (#1724)

* Fix agent jar size

* Bump version

* Add roleName to profile metadata (#1725)

* add a unique id for GC events so that events from a single JVM can be grouped (#1721)

* Fix 2.x interop of timestamps (#1726)

* Fix 2.x interop of timestamps

* Add smoke test

* Bump version

* add logprocessor to agent (#1713)

* add logprocessor to agent

* comments addressed, added smoketest for log processor, fixed bug in telemetryprocessorOpenTelemetryConfigurer

* StringBuffer -> StringBuilder

* addressing comments

* removed lognames, fixed smoke test

* replace name with body in log processor, address comments

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Co-authored-by: John Oliver <1615532+johnoliver@users.noreply.github.com>
Co-authored-by: Helen Y <56097766+heyams@users.noreply.github.com>
Co-authored-by: kryalama <66494519+kryalama@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trask trask trask approved these changes

@xiao-lix xiao-lix Awaiting requested review from xiao-lix

@ramthi ramthi Awaiting requested review from ramthi ramthi is a code owner

@heyams heyams Awaiting requested review from heyams heyams is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kryalama @heyams @trask @ramthi