Skip to content

Commit 1eb89be

Browse files
mziccardmziccard
committed
Update Logging examples, snippets and READMEs to use renamed getters/setters/builders
1 parent aede65b commit 1eb89be

File tree

15 files changed

+64
-64
lines changed

15 files changed

+64
-64
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,9 @@ import java.util.Iterator;
412412
LoggingOptions options = LoggingOptions.defaultInstance();
413413
try(Logging logging = options.service()) {
414414
415-
LogEntry firstEntry = LogEntry.builder(StringPayload.of("message"))
416-
.logName("test-log")
417-
.resource(MonitoredResource.builder("global")
415+
LogEntry firstEntry = LogEntry.newBuilder(StringPayload.of("message"))
416+
.setLogName("test-log")
417+
.setResource(MonitoredResource.builder("global")
418418
.addLabel("project_id", options.projectId())
419419
.build())
420420
.build();

‎TESTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ uses the `RemoteLoggingHelper` to create a metric.
163163
```java
164164
RemoteLoggingHelper loggingHelper =
165165
RemoteLoggingHelper.create(PROJECT_ID, new FileInputStream("/path/to/my/JSON/key.json"));
166-
Logging logging = loggingHelper.options().service();
166+
Logging logging = loggingHelper.getOptions().service();
167167
// Pick a name for the resource with low probability of clashing
168168
String metricName = RemoteLoggingHelper.formatForTest("test-metric");
169169
MetricInfo metricInfo = MetricInfo.of(name, "logName:syslog");

‎google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,9 @@ SinkInfo parse(String... args) throws Exception {
353353
default:
354354
throw new IllegalArgumentException("Second argument must be bucket|dataset|topic.");
355355
}
356-
SinkInfo.Builder builder = SinkInfo.builder(name, destination);
356+
SinkInfo.Builder builder = SinkInfo.newBuilder(name, destination);
357357
if (args.length == 4) {
358-
builder.filter(args[3]);
358+
builder.setFilter(args[3]);
359359
}
360360
return builder.build();
361361
}
@@ -395,10 +395,10 @@ private static class WriteEntryAction extends LoggingAction<LogEntry> {
395395

396396
@Override
397397
public void run(Logging logging, LogEntry entry) {
398-
MonitoredResource resource = MonitoredResource.builder("global")
398+
MonitoredResource resource = MonitoredResource.newBuilder("global")
399399
.addLabel("project_id", logging.options().projectId())
400400
.build();
401-
LogEntry entryWithResource = entry.toBuilder().resource(resource).build();
401+
LogEntry entryWithResource = entry.toBuilder().setResource(resource).build();
402402
logging.write(Collections.singleton(entryWithResource));
403403
System.out.printf("Written entry %s%n", entryWithResource);
404404
}
@@ -416,10 +416,10 @@ LogEntry parse(String... args) throws Exception {
416416
for (int i = 3; i < args.length; i += 2) {
417417
labels.put(args[i], args[i + 1]);
418418
}
419-
return LogEntry.builder(StringPayload.of(message))
420-
.logName(logName)
421-
.severity(severity)
422-
.labels(labels)
419+
return LogEntry.newBuilder(StringPayload.of(message))
420+
.setLogName(logName)
421+
.setSeverity(severity)
422+
.setLabels(labels)
423423
.build();
424424
} else {
425425
throw new IllegalArgumentException("Missing required arguments.");

‎google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public static void main(String... args) throws Exception {
3939
try(Logging logging = LoggingOptions.defaultInstance().service()) {
4040

4141
// Create a metric
42-
MetricInfo metricInfo = MetricInfo.builder("test-metric", "severity >= ERROR")
43-
.description("Log entries with severity higher or equal to ERROR")
42+
MetricInfo metricInfo = MetricInfo.newBuilder("test-metric", "severity >= ERROR")
43+
.setDescription("Log entries with severity higher or equal to ERROR")
4444
.build();
4545
logging.create(metricInfo);
4646

‎google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public static void main(String... args) throws Exception {
3939
try(Logging logging = LoggingOptions.defaultInstance().service()) {
4040

4141
// Create a sink to back log entries to a BigQuery dataset
42-
SinkInfo sinkInfo = SinkInfo.builder("test-sink", DatasetDestination.of("test-dataset"))
43-
.filter("severity >= ERROR")
42+
SinkInfo sinkInfo = SinkInfo.newBuilder("test-sink", DatasetDestination.of("test-dataset"))
43+
.setFilter("severity >= ERROR")
4444
.build();
4545
logging.create(sinkInfo);
4646

‎google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ public Sink createSinkAsync(String sinkName, String datasetName)
9797
// [VARIABLE "my_dataset"]
9898
public Sink updateSink(String sinkName, String datasetName) {
9999
// [START updateSink]
100-
SinkInfo sinkInfo = SinkInfo.builder(sinkName, DatasetDestination.of(datasetName))
101-
.versionFormat(SinkInfo.VersionFormat.V2)
102-
.filter("severity>=ERROR")
100+
SinkInfo sinkInfo = SinkInfo.newBuilder(sinkName, DatasetDestination.of(datasetName))
101+
.setVersionFormat(SinkInfo.VersionFormat.V2)
102+
.setFilter("severity>=ERROR")
103103
.build();
104104
Sink sink = logging.update(sinkInfo);
105105
// [END updateSink]
@@ -115,9 +115,9 @@ public Sink updateSink(String sinkName, String datasetName) {
115115
public Sink updateSinkAsync(String sinkName, String datasetName)
116116
throws ExecutionException, InterruptedException {
117117
// [START updateSinkAsync]
118-
SinkInfo sinkInfo = SinkInfo.builder(sinkName, DatasetDestination.of(datasetName))
119-
.versionFormat(SinkInfo.VersionFormat.V2)
120-
.filter("severity>=ERROR")
118+
SinkInfo sinkInfo = SinkInfo.newBuilder(sinkName, DatasetDestination.of(datasetName))
119+
.setVersionFormat(SinkInfo.VersionFormat.V2)
120+
.setFilter("severity>=ERROR")
121121
.build();
122122
Future<Sink> future = logging.updateAsync(sinkInfo);
123123
// ...
@@ -337,8 +337,8 @@ public Metric createMetricAsync(String metricName)
337337
// [VARIABLE "my_metric_name"]
338338
public Metric updateMetric(String metricName) {
339339
// [START updateMetric]
340-
MetricInfo metricInfo = MetricInfo.builder(metricName, "severity>=ERROR")
341-
.description("new description")
340+
MetricInfo metricInfo = MetricInfo.newBuilder(metricName, "severity>=ERROR")
341+
.setDescription("new description")
342342
.build();
343343
Metric metric = logging.update(metricInfo);
344344
// [END updateMetric]
@@ -353,8 +353,8 @@ public Metric updateMetric(String metricName) {
353353
public Metric updateMetricAsync(String metricName)
354354
throws ExecutionException, InterruptedException {
355355
// [START updateMetricAsync]
356-
MetricInfo metricInfo = MetricInfo.builder(metricName, "severity>=ERROR")
357-
.description("new description")
356+
MetricInfo metricInfo = MetricInfo.newBuilder(metricName, "severity>=ERROR")
357+
.setDescription("new description")
358358
.build();
359359
Future<Metric> future = logging.updateAsync(metricInfo);
360360
// ...
@@ -480,7 +480,7 @@ public void write(String logName) {
480480
entries.add(LogEntry.of(JsonPayload.of(jsonMap)));
481481
logging.write(entries,
482482
WriteOption.logName(logName),
483-
WriteOption.resource(MonitoredResource.builder("global").build()));
483+
WriteOption.resource(MonitoredResource.newBuilder("global").build()));
484484
// [END write]
485485
}
486486

@@ -500,7 +500,7 @@ public Future<Void> writeAsync(String logName) {
500500
Future<Void> future = logging.writeAsync(
501501
entries,
502502
WriteOption.logName(logName),
503-
WriteOption.resource(MonitoredResource.builder("global").build()));
503+
WriteOption.resource(MonitoredResource.newBuilder("global").build()));
504504
// [END writeAsync]
505505
return future;
506506
}

‎google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/MetricSnippets.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public Metric reloadAsync() throws ExecutionException, InterruptedException {
7575
public Metric update() {
7676
// [START update]
7777
Metric updatedMetric = metric.toBuilder()
78-
.description("A more detailed description")
78+
.setDescription("A more detailed description")
7979
.build()
8080
.update();
8181
// [END update]
@@ -89,7 +89,7 @@ public Metric update() {
8989
public Metric updateAsync() throws ExecutionException, InterruptedException {
9090
// [START updateAsync]
9191
Future<Metric> future = metric.toBuilder()
92-
.description("A more detailed description")
92+
.setDescription("A more detailed description")
9393
.build()
9494
.updateAsync();
9595
// ...

‎google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/SinkSnippets.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public Sink reloadAsync() throws ExecutionException, InterruptedException {
7575
public Sink update() {
7676
// [START update]
7777
Sink updatedSink = sink.toBuilder()
78-
.filter("severity<=ERROR")
78+
.setFilter("severity<=ERROR")
7979
.build()
8080
.update();
8181
// [END update]
@@ -89,7 +89,7 @@ public Sink update() {
8989
public Sink updateAsync() throws ExecutionException, InterruptedException {
9090
// [START updateAsync]
9191
Future<Sink> future = sink.toBuilder()
92-
.filter("severity<=ERROR")
92+
.setFilter("severity<=ERROR")
9393
.build()
9494
.updateAsync();
9595
// ...

‎google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ public static void main(String... args) throws Exception {
4242
try(Logging logging = options.service()) {
4343

4444
// Create a log entry
45-
LogEntry firstEntry = LogEntry.builder(StringPayload.of("message"))
46-
.logName("test-log")
47-
.resource(MonitoredResource.builder("global")
45+
LogEntry firstEntry = LogEntry.newBuilder(StringPayload.of("message"))
46+
.setLogName("test-log")
47+
.setResource(MonitoredResource.newBuilder("global")
4848
.addLabel("project_id", options.projectId())
4949
.build())
5050
.build();

‎google-cloud-logging/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ import com.google.cloud.logging.MetricInfo;
112112
Then, to create the metric, use the following code:
113113

114114
```java
115-
MetricInfo metricInfo = MetricInfo.builder("test-metric", "severity >= ERROR")
116-
.description("Log entries with severity higher or equal to ERROR")
115+
MetricInfo metricInfo = MetricInfo.newBuilder("test-metric", "severity >= ERROR")
116+
.setDescription("Log entries with severity higher or equal to ERROR")
117117
.build();
118118
logging.create(metricInfo);
119119
```
@@ -131,9 +131,9 @@ import java.util.Collections;
131131
```
132132
Then, to write the log entries, use the following code:
133133
```java
134-
LogEntry firstEntry = LogEntry.builder(StringPayload.of("message"))
135-
.logName("test-log")
136-
.resource(MonitoredResource.builder("global")
134+
LogEntry firstEntry = LogEntry.newBuilder(StringPayload.of("message"))
135+
.setLogName("test-log")
136+
.setResource(MonitoredResource.builder("global")
137137
.addLabel("project_id", options.projectId())
138138
.build())
139139
.build();

‎google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@ public static EntryListOption filter(String filter) {
234234
* <pre> {@code
235235
* String sinkName = "my_sink_name";
236236
* String datasetName = "my_dataset";
237-
* SinkInfo sinkInfo = SinkInfo.builder(sinkName, DatasetDestination.of(datasetName))
238-
* .versionFormat(SinkInfo.VersionFormat.V2)
239-
* .filter("severity>=ERROR")
237+
* SinkInfo sinkInfo = SinkInfo.newBuilder(sinkName, DatasetDestination.of(datasetName))
238+
* .setVersionFormat(SinkInfo.VersionFormat.V2)
239+
* .setFilter("severity>=ERROR")
240240
* .build();
241241
* Sink sink = logging.update(sinkInfo);
242242
* }</pre>
@@ -255,9 +255,9 @@ public static EntryListOption filter(String filter) {
255255
* <pre> {@code
256256
* String sinkName = "my_sink_name";
257257
* String datasetName = "my_dataset";
258-
* SinkInfo sinkInfo = SinkInfo.builder(sinkName, DatasetDestination.of(datasetName))
259-
* .versionFormat(SinkInfo.VersionFormat.V2)
260-
* .filter("severity>=ERROR")
258+
* SinkInfo sinkInfo = SinkInfo.newBuilder(sinkName, DatasetDestination.of(datasetName))
259+
* .setVersionFormat(SinkInfo.VersionFormat.V2)
260+
* .setFilter("severity>=ERROR")
261261
* .build();
262262
* Future<Sink> future = logging.updateAsync(sinkInfo);
263263
* // ...
@@ -274,7 +274,7 @@ public static EntryListOption filter(String filter) {
274274
* <pre> {@code
275275
* String sinkName = "my_sink_name";
276276
* Sink sink = logging.getSink(sinkName);
277-
* if (sink != null) {
277+
* if (sink == null) {
278278
* // sink was not found
279279
* }
280280
* }</pre>
@@ -293,7 +293,7 @@ public static EntryListOption filter(String filter) {
293293
* Future<Sink> future = logging.getSinkAsync(sinkName);
294294
* // ...
295295
* Sink sink = future.get();
296-
* if (sink != null) {
296+
* if (sink == null) {
297297
* // sink was not found
298298
* }
299299
* }</pre>
@@ -501,8 +501,8 @@ Future<AsyncPage<MonitoredResourceDescriptor>> listMonitoredResourceDescriptorsA
501501
* <p>Example of updating a metric.
502502
* <pre> {@code
503503
* String metricName = "my_metric_name";
504-
* MetricInfo metricInfo = MetricInfo.builder(metricName, "severity>=ERROR")
505-
* .description("new description")
504+
* MetricInfo metricInfo = MetricInfo.newBuilder(metricName, "severity>=ERROR")
505+
* .setDescription("new description")
506506
* .build();
507507
* Metric metric = logging.update(metricInfo);
508508
* }</pre>
@@ -520,8 +520,8 @@ Future<AsyncPage<MonitoredResourceDescriptor>> listMonitoredResourceDescriptorsA
520520
* <p>Example of asynchronously updating a metric.
521521
* <pre> {@code
522522
* String metricName = "my_metric_name";
523-
* MetricInfo metricInfo = MetricInfo.builder(metricName, "severity>=ERROR")
524-
* .description("new description")
523+
* MetricInfo metricInfo = MetricInfo.newBuilder(metricName, "severity>=ERROR")
524+
* .setDescription("new description")
525525
* .build();
526526
* Future<Metric> future = logging.updateAsync(metricInfo);
527527
* // ...
@@ -538,7 +538,7 @@ Future<AsyncPage<MonitoredResourceDescriptor>> listMonitoredResourceDescriptorsA
538538
* <pre> {@code
539539
* String metricName = "my_metric_name";
540540
* Metric metric = logging.getMetric(metricName);
541-
* if (metric != null) {
541+
* if (metric == null) {
542542
* // metric was not found
543543
* }
544544
* }</pre>
@@ -557,7 +557,7 @@ Future<AsyncPage<MonitoredResourceDescriptor>> listMonitoredResourceDescriptorsA
557557
* Future<Metric> future = logging.getMetricAsync(metricName);
558558
* // ...
559559
* Metric metric = future.get();
560-
* if (metric != null) {
560+
* if (metric == null) {
561561
* // metric was not found
562562
* }
563563
* }</pre>
@@ -662,7 +662,7 @@ Future<AsyncPage<MonitoredResourceDescriptor>> listMonitoredResourceDescriptorsA
662662
* entries.add(LogEntry.of(JsonPayload.of(jsonMap)));
663663
* logging.write(entries,
664664
* WriteOption.logName(logName),
665-
* WriteOption.resource(MonitoredResource.builder("global").build()));
665+
* WriteOption.resource(MonitoredResource.newBuilder("global").build()));
666666
* }</pre>
667667
*
668668
*/
@@ -688,7 +688,7 @@ Future<AsyncPage<MonitoredResourceDescriptor>> listMonitoredResourceDescriptorsA
688688
* Future<Void> future = logging.writeAsync(
689689
* entries,
690690
* WriteOption.logName(logName),
691-
* WriteOption.resource(MonitoredResource.builder("global").build()));
691+
* WriteOption.resource(MonitoredResource.newBuilder("global").build()));
692692
* }</pre>
693693
*
694694
*/

‎google-cloud-logging/src/main/java/com/google/cloud/logging/Metric.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public Future<Metric> reloadAsync() {
233233
* <p>Example of updating the metric's information.
234234
* <pre> {@code
235235
* Metric updatedMetric = metric.toBuilder()
236-
* .description("A more detailed description")
236+
* .setDescription("A more detailed description")
237237
* .build()
238238
* .update();
239239
* }</pre>
@@ -253,7 +253,7 @@ public Metric update() {
253253
* <p>Example of asynchronously updating the metric's information.
254254
* <pre> {@code
255255
* Future<Metric> future = metric.toBuilder()
256-
* .description("A more detailed description")
256+
* .setDescription("A more detailed description")
257257
* .build()
258258
* .updateAsync();
259259
* // ...

‎google-cloud-logging/src/main/java/com/google/cloud/logging/Sink.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public Future<Sink> reloadAsync() {
252252
* <p>Example of updating the sink's information.
253253
* <pre> {@code
254254
* Sink updatedSink = sink.toBuilder()
255-
* .filter("severity<=ERROR")
255+
* .setFilter("severity<=ERROR")
256256
* .build()
257257
* .update();
258258
* }</pre>
@@ -272,7 +272,7 @@ public Sink update() {
272272
* <p>Example of asynchronously updating the sink's information.
273273
* <pre> {@code
274274
* Future<Sink> future = sink.toBuilder()
275-
* .filter("severity<=ERROR")
275+
* .setFilter("severity<=ERROR")
276276
* .build()
277277
* .updateAsync();
278278
* // ...

‎google-cloud-logging/src/main/java/com/google/cloud/logging/package-info.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
* LoggingOptions options = LoggingOptions.defaultInstance();
2626
* try(Logging logging = options.service()) {
2727
*
28-
* LogEntry firstEntry = LogEntry.builder(StringPayload.of("message"))
29-
* .logName("test-log")
30-
* .resource(MonitoredResource.builder("global")
28+
* LogEntry firstEntry = LogEntry.newBuilder(StringPayload.of("message"))
29+
* .setLogName("test-log")
30+
* .setResource(MonitoredResource.builder("global")
3131
* .addLabel("project_id", options.projectId())
3232
* .build())
3333
* .build();

‎google-cloud-logging/src/main/java/com/google/cloud/logging/testing/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* <p>Before the test:
2323
* <pre> {@code
2424
* RemoteLoggingHelper helper = RemoteLoggingHelper.create();
25-
* Logging logging = helper.options().service();
25+
* Logging logging = helper.getOptions().service();
2626
* } </pre>
2727
*
2828
* <p>Format resource names to avoid name clashes:

0 commit comments

Comments
 (0)