Skip to content

fix: Switch instrumentation code to return version stored in DEFAULT_INSTRUMENTATION_VERSION #918

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

Merged
merged 5 commits into from
Nov 7, 2022
Merged

fix: Switch instrumentation code to return version stored in DEFAULT_INSTRUMENTATION_VERSION #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b667109
feat: Add support for instrumentation version annotations
losalex Nov 4, 2022
17ab431
Merge branch 'main' of https://github.com/googleapis/java-logging-log…
losalex Nov 4, 2022
a8afbbf
fix: Switch instrumentation code to return version stored in DEFAULT_…
losalex Nov 4, 2022
f2f7193
Add comment for release-please versions
losalex Nov 7, 2022
cb43e6e
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ If you are using Maven, add this to your pom.xml file:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging-logback</artifactId>
<version>0.128.0-alpha</version>
<version>0.129.0-alpha</version>
</dependency>
```

If you are using Gradle without BOM, add this to your dependencies:

```Groovy
implementation 'com.google.cloud:google-cloud-logging-logback:0.128.0-alpha'
implementation 'com.google.cloud:google-cloud-logging-logback:0.129.0-alpha'
```

If you are using SBT, add this to your dependencies:

```Scala
libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.128.0-alpha"
libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.129.0-alpha"
```

## Authentication
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/google/cloud/logging/logback/LoggingAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ public class LoggingAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
private static final List<LoggingEventEnhancer> DEFAULT_LOGGING_EVENT_ENHANCERS =
ImmutableList.<LoggingEventEnhancer>of(new MDCEventEnhancer());
public static final String JAVA_LOGBACK_LIBRARY_NAME = "java-logback";
// {x-version-update:google-cloud-logging-logback:current}
// Using release-please annotations to update DEFAULT_INSTRUMENTATION_VERSION with latest version.
// See
// https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files
// {x-version-update-start:google-cloud-logging-logback:current}
public static final String DEFAULT_INSTRUMENTATION_VERSION = "1.0.0";
// {x-version-update-end}
private static boolean instrumentationAdded = false;
Expand Down Expand Up @@ -348,7 +351,7 @@ protected void append(ILoggingEvent e) {
if (!setInstrumentationStatus(true)) {
entriesList.add(
Instrumentation.createDiagnosticEntry(
JAVA_LOGBACK_LIBRARY_NAME, Instrumentation.getLibraryVersion(LoggingAppender.class)));
JAVA_LOGBACK_LIBRARY_NAME, DEFAULT_INSTRUMENTATION_VERSION));
}
Iterable<LogEntry> entries = entriesList;
if (autoPopulateMetadata) {
Expand Down