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

fix(logging): fix so trace id is included in log #11

Draft
wants to merge 28 commits into
base: main
Choose a base branch
from

Conversation

zhumin8
Copy link
Collaborator

@zhumin8 zhumin8 commented Jun 6, 2023

Possibly registered more than enough. Look for cleanup.

log entry written by sample:

{
insertId: "1c08xcxf1v07m9"
jsonPayload: {
message: "This line was also written to the log with the same Trace ID."
}
labels: {3}
logName: "projects/[project-id]/logs/spring.log"
receiveTimestamp: "2023-06-06T14:15:08.236653291Z"
resource: {2}
severity: "INFO"
timestamp: "2023-06-06T14:15:08.122Z"
trace: "projects/[project-id]/traces/trace-id-to-show-1234"
}

But integration test in sample fails.

bijukunjummen and others added 28 commits May 19, 2023 20:12
…GoogleCloudPlatform#1412)

Fixes GoogleCloudPlatform#944 

Conditional for Spanner is based on missing beans of type SpannerTransactionManager instead of PlatformTransactionManager, this way it always gets created if Spanner libs are pulled in 

Conditional for Datastore is based on missing beans of type DatastoreTransactionManager instead of PlatformTransactionManager, this way it gets created if Datastore libs are pulled in.

It is the user's responsibility to designate the transaction's right transaction manager:

```
@transactional(transactionManager = "spannerTransactionManager")
```

```
@transactional(transactionManager = "datastoreTransactionManager")
```
GoogleCloudPlatform#1848)

This pr adds an integration test to `spring-cloud-gcp-data-multi-sample` for the scenario of both Datastore and Spanner Transaction manager working in the same app.
It is a followup on GoogleCloudPlatform#1412
…#1883)

* fix: pull-endpoint setting for async subscribers

* add integration test and fix fqn subscription usage

Fixes: GoogleCloudPlatform#1882.
…form#1896)

* Removes duplicated test helper classes that were copied to the spring generator module, with gapic-generator-java 2.20.0 now providing a testlib jar
…gleCloudPlatform#1900)

This fixes the compile error in iap-sample and firebase-sample and should unblock Spring Boot 3.1.0 GoogleCloudPlatform#1874. 

However, iap sample does not run as described in [README](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/blob/main/spring-cloud-gcp-samples/spring-cloud-gcp-security-iap-sample/README.adoc?plain=1#L52-L64) for me.
firebase sample also not working as expected.

Neither sample come with test and may have been broken before this change. Need to be further investigated.
Filed GoogleCloudPlatform#1860 to track.
…ogleCloudPlatform#1905)

Bumps `gapic-generator-java-bom.version` from 2.20.0 to 2.20.1.

Updates `gapic-generator-java-bom` from 2.20.0 to 2.20.1
- [Release notes](https://github.com/googleapis/sdk-platform-java/releases)
- [Changelog](https://github.com/googleapis/sdk-platform-java/blob/main/CHANGELOG.md)
- [Commits](googleapis/sdk-platform-java@v2.20.0...v2.20.1)

Updates `gapic-generator-java` from 2.20.0 to 2.20.1
- [Release notes](https://github.com/googleapis/sdk-platform-java/releases)
- [Changelog](https://github.com/googleapis/sdk-platform-java/blob/main/CHANGELOG.md)
- [Commits](googleapis/sdk-platform-java@v2.20.0...v2.20.1)

---
updated-dependencies:
- dependency-name: com.google.api:gapic-generator-java-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.api:gapic-generator-java:testlib
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…eCloudPlatform#1904)

Bumps [spring-cloud-dependencies](https://github.com/spring-cloud/spring-cloud-release) from 2022.0.2 to 2022.0.3.
- [Commits](spring-cloud/spring-cloud-release@v2022.0.2...v2022.0.3)

---
updated-dependencies:
- dependency-name: org.springframework.cloud:spring-cloud-dependencies
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…loudPlatform#1891)

Bumps [requests](https://github.com/psf/requests) from 2.28.2 to 2.31.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.28.2...v2.31.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…atform#1889)

Bumps [maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.2.2 to 3.3.0.
- [Commits](apache/maven-checkstyle-plugin@maven-checkstyle-plugin-3.2.2...maven-checkstyle-plugin-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…rm#1886)

Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.2.1 to 3.3.0.
- [Commits](apache/maven-source-plugin@maven-source-plugin-3.2.1...maven-source-plugin-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-source-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps commons-io from 2.11.0 to 2.12.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
….0 (main) (GoogleCloudPlatform#1918)

* fix(deps): update dependency com.google.cloud:libraries-bom to v26.16.0

* chore: update starter modules in spring-cloud-previews

---------

Co-authored-by: Cloud Java Bot <[email protected]>
* chore(main): release 4.4.0

* chore(main): release 4.4.0

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
* chore(main): release 4.4.1-SNAPSHOT

* chore(main): release 4.4.1-SNAPSHOT

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
@zhumin8 zhumin8 force-pushed the graalvm-logging-support branch from d72f78c to be77d6d Compare June 7, 2023 18:32
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.

5 participants