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

Solr System Logging Receiver #360

Merged
merged 2 commits into from
Feb 9, 2022
Merged

Solr System Logging Receiver #360

merged 2 commits into from
Feb 9, 2022

Conversation

StefanKurek
Copy link
Collaborator

@StefanKurek StefanKurek commented Jan 26, 2022

Adds ability to receive Solr logs

Scope doc

Example Ingested Log

{
  "insertId": "mre8o5flln44h",
  "jsonPayload": {
    "message": "Logging initialized @1292ms to org.eclipse.jetty.util.log.Slf4jLog",
    "thread": "main",
    "source": "o.e.j.u.log"
  },
  "resource": {
    "type": "gce_instance",
    "labels": {
      "instance_id": "3811867359076886516",
      "project_id": "otel-agent-dev",
      "zone": "us-central1-a"
    }
  },
  "timestamp": "2022-02-08T16:52:37.756Z",
  "severity": "INFO",
  "logName": "projects/otel-agent-dev/logs/solr_system",
  "receiveTimestamp": "2022-02-08T16:54:24.047382748Z"
}

@StefanKurek StefanKurek added the kokoro:force-run Forces kokoro to run integration tests on a CL label Jan 26, 2022
@kokoro-team kokoro-team removed kokoro:force-run Forces kokoro to run integration tests on a CL labels Jan 26, 2022
@StefanKurek StefanKurek added the kokoro:force-run Forces kokoro to run integration tests on a CL label Jan 31, 2022
@kokoro-team kokoro-team removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Jan 31, 2022
@StefanKurek StefanKurek marked this pull request as ready for review February 4, 2022 16:50
@StefanKurek StefanKurek added the kokoro:force-run Forces kokoro to run integration tests on a CL label Feb 4, 2022
@StefanKurek
Copy link
Collaborator Author

@qingling128 Hello. This should be in a good state to review now. Thanks!

@kokoro-team kokoro-team removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Feb 4, 2022
@StefanKurek StefanKurek changed the title Adds Solr System Logging Receiver Solr System Logging Receiver Feb 4, 2022
Copy link
Contributor

@qingling128 qingling128 left a comment

Choose a reason for hiding this comment

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

Left a minor comment.

Can you also attached a sample ingested log entry (Can be retrieved from the Log Viewer UI) in the description of this PR?

docs/solr.md Show resolved Hide resolved
@qingling128
Copy link
Contributor

Adding @ridwanmsharif and @jefferbrecht for shadowing

apps/solr.go Outdated Show resolved Hide resolved
docs/solr.md Show resolved Hide resolved
apps/solr.go Show resolved Hide resolved
@StefanKurek StefanKurek added the kokoro:force-run Forces kokoro to run integration tests on a CL label Feb 8, 2022
@kokoro-team kokoro-team removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Feb 8, 2022
@qingling128
Copy link
Contributor

Can you also attached a sample ingested log entry (Can be retrieved from the Log Viewer UI) in the description of this PR?

@StefanKurek
Copy link
Collaborator Author

Left a minor comment.

Can you also attached a sample ingested log entry (Can be retrieved from the Log Viewer UI) in the description of this PR?

@lidizheng yep, I was just reinstalling and then I will do this.

@StefanKurek StefanKurek added the kokoro:force-run Forces kokoro to run integration tests on a CL label Feb 8, 2022
@kokoro-team kokoro-team removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Feb 8, 2022
Copy link
Contributor

@qingling128 qingling128 left a comment

Choose a reason for hiding this comment

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

LGTM

Waiting for the integration tests to pass before merging.

BTW, just FYI that we recently adjusted the GitHub settings to require a sync to HEAD prior to merging any PRs in order to catch unexpected golden file changes that affect only the unit tests.

So if the integration tests passed already for a 3rd party app PR, which only touches isolated files that are specific to that PR, you don't have to re-trigger the integration tests after rebasing. Just leave a comment in the PR history with the commit that passed the integration tests in the past so the reviewers are aware that the integration tests passed already.

The main signal we are trying to catch is whether the unit tests still pass after a rebasing.

When it comes to this PR, since there are already a set of integration tests that are running, and so far the failures do not seem related to this PR:

--- FAIL: TestThirdPartyApps (0.00s)
    --- FAIL: TestThirdPartyApps/debian-10 (0.00s)
        --- PASS: TestThirdPartyApps/debian-10/redis (158.65s)
        --- PASS: TestThirdPartyApps/debian-10/memcached (159.28s)
        --- PASS: TestThirdPartyApps/debian-10/couchdb (162.94s)
        --- PASS: TestThirdPartyApps/debian-10/apache (176.94s)
        --- PASS: TestThirdPartyApps/debian-10/mongodb (178.46s)
        --- PASS: TestThirdPartyApps/debian-10/postgresql (182.67s)
        --- PASS: TestThirdPartyApps/debian-10/mysql (201.76s)
        --- PASS: TestThirdPartyApps/debian-10/jvm (208.39s)
        --- PASS: TestThirdPartyApps/debian-10/cassandra (218.80s)
        --- PASS: TestThirdPartyApps/debian-10/elasticsearch (220.87s)
        --- PASS: TestThirdPartyApps/debian-10/nginx (222.43s)
        --- PASS: TestThirdPartyApps/debian-10/solr (229.66s)
        --- FAIL: TestThirdPartyApps/debian-10/tomcat (275.10s)

--- FAIL: TestThirdPartyApps (0.00s)
    --- FAIL: TestThirdPartyApps/sles-12 (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/redis (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/mysql (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/jvm (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/couchdb (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/apache (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/nginx (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/cassandra (0.00s)
        --- PASS: TestThirdPartyApps/sles-12/mongodb (905.08s)
        --- FAIL: TestThirdPartyApps/sles-12/memcached (906.38s)
        --- PASS: TestThirdPartyApps/sles-12/solr (930.99s)
        --- PASS: TestThirdPartyApps/sles-12/elasticsearch (986.31s)
        --- PASS: TestThirdPartyApps/sles-12/tomcat (1004.00s)
        --- PASS: TestThirdPartyApps/sles-12/postgresql (1194.91s)

We can wait for it to finish, record the integration test results, rebase, wait for the unit tests only (do not need to trigger another set of integration tests), and merge.

@StefanKurek
Copy link
Collaborator Author

@qingling128

Ops Agent Integration Test (SLES 15)

Failure, but doesn't appear to have Solr Related Issues

third party apps integration test (Debian)

Failure, but Solr Tests good

--- FAIL: TestThirdPartyApps (0.00s)
    --- FAIL: TestThirdPartyApps/debian-10 (0.00s)
        --- PASS: TestThirdPartyApps/debian-10/redis (158.65s)
        --- PASS: TestThirdPartyApps/debian-10/memcached (159.28s)
        --- PASS: TestThirdPartyApps/debian-10/couchdb (162.94s)
        --- PASS: TestThirdPartyApps/debian-10/apache (176.94s)
        --- PASS: TestThirdPartyApps/debian-10/mongodb (178.46s)
        --- PASS: TestThirdPartyApps/debian-10/postgresql (182.67s)
        --- PASS: TestThirdPartyApps/debian-10/mysql (201.76s)
        --- PASS: TestThirdPartyApps/debian-10/jvm (208.39s)
        --- PASS: TestThirdPartyApps/debian-10/cassandra (218.80s)
        --- PASS: TestThirdPartyApps/debian-10/elasticsearch (220.87s)
        --- PASS: TestThirdPartyApps/debian-10/nginx (222.43s)
        --- PASS: TestThirdPartyApps/debian-10/solr (229.66s)
        --- FAIL: TestThirdPartyApps/debian-10/tomcat (275.10s)

third party integration test (SLES 12)

Failed, but Solr Tests good

--- FAIL: TestThirdPartyApps (0.00s)
    --- FAIL: TestThirdPartyApps/sles-12 (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/redis (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/mysql (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/jvm (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/couchdb (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/apache (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/nginx (0.00s)
        --- SKIP: TestThirdPartyApps/sles-12/cassandra (0.00s)
        --- PASS: TestThirdPartyApps/sles-12/mongodb (905.08s)
        --- FAIL: TestThirdPartyApps/sles-12/memcached (906.38s)
        --- PASS: TestThirdPartyApps/sles-12/solr (930.99s)
        --- PASS: TestThirdPartyApps/sles-12/elasticsearch (986.31s)
        --- PASS: TestThirdPartyApps/sles-12/tomcat (1004.00s)
        --- PASS: TestThirdPartyApps/sles-12/postgresql (1194.91s)

@qingling128
Copy link
Contributor

OK to merge. But it looks like something got merged before I got to this, so it needs rebasing again. (Maybe we should revisit the GitHub settings...

@qingling128 qingling128 merged commit 1a3bf2c into GoogleCloudPlatform:master Feb 9, 2022
martijnvans pushed a commit that referenced this pull request Feb 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants