Skip to content

Commit d3d2370

Browse files
yoshi-automationchingor13
yoshi-automation
and
chingor13
authored
feat!: remove Start/EndTime from LogSink, Metadata from LogEntry, implement multipattern resource names (#174)
* Integrate Python GAPIC Microgenerator in googleapis. This PR uses using documentai as an example. Depends on googleapis/gapic-generator-python#402 PiperOrigin-RevId: 309824146 Source-Author: Google APIs <noreply@google.com> Source-Date: Mon May 4 15:06:44 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: e0f9d9e1f9de890db765be46f45ca8490723e3eb Source-Link: googleapis/googleapis@e0f9d9e * fix: restore GAPIC v2 retry configs Restores GAPIC v2 retry config overrides that were mistakenly removed during migration. PiperOrigin-RevId: 312088359 Source-Author: Google APIs <noreply@google.com> Source-Date: Mon May 18 08:57:12 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 5a90d467aa65e7f038f87585e8fbb45d74475e7c Source-Link: googleapis/googleapis@5a90d46 * bazel: update protobuf, rules_go, gazelle, and gapic-generator-go versions - protobuf v3.12.1 - rules_go v0.23.0 - gazelle v0.21.0 - gapic-generator-go v0.14.1 PiperOrigin-RevId: 313460921 Source-Author: Google APIs <noreply@google.com> Source-Date: Wed May 27 14:10:16 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: c4e37010d74071851ff24121f522e802231ac86e Source-Link: googleapis/googleapis@c4e3701 * fix!: remove unused resource names * fix: fix LogMetricName usage * chore: allow breaking changes * chore: fix formatting Co-authored-by: Jeff Ching <chingor@google.com>
1 parent 0db74a5 commit d3d2370

File tree

178 files changed

+16301
-12171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+16301
-12171
lines changed

‎google-cloud-logging/clirr-ignored-differences.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<!-- TODO: remove after 2.0.0 released -->
5+
<difference>
6+
<differenceType>7005</differenceType>
7+
<className>com/google/cloud/logging/v2/ConfigClient</className>
8+
<method>* *(com.google.logging.v2.*Name*)</method>
9+
<to>* *(com.google.logging.v2.*Name*)</to>
10+
</difference>
11+
<difference>
12+
<differenceType>7005</differenceType>
13+
<className>com/google/cloud/logging/v2/MetricsClient</className>
14+
<method>* *LogMetric*(com.google.logging.v2.*Name*)</method>
15+
<to>* *LogMetric*(com.google.logging.v2.*Name*)</to>
16+
</difference>
17+
<difference>
18+
<differenceType>7005</differenceType>
19+
<className>com/google/cloud/logging/v2/LoggingClient</className>
20+
<method>* listLogs(com.google.logging.v2.ParentName)</method>
21+
<to>* listLogs(com.google.logging.v2.ProjectName)</to>
22+
</difference>
23+
</differences>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.google.common.collect.ImmutableMap;
2525
import com.google.logging.v2.LogEntryOperation;
2626
import com.google.logging.v2.LogEntrySourceLocation;
27-
import com.google.logging.v2.ProjectLogName;
27+
import com.google.logging.v2.LogName;
2828
import com.google.protobuf.Timestamp;
2929
import java.io.Serializable;
3030
import java.util.HashMap;
@@ -466,7 +466,7 @@ com.google.logging.v2.LogEntry toPb(String projectId) {
466466
com.google.logging.v2.LogEntry.Builder builder = payload.toPb();
467467
builder.putAllLabels(labels);
468468
if (logName != null) {
469-
builder.setLogName(ProjectLogName.of(projectId, logName).toString());
469+
builder.setLogName(LogName.ofProjectLogName(projectId, logName).toString());
470470
}
471471
if (resource != null) {
472472
builder.setResource(resource.toPb());
@@ -525,7 +525,7 @@ static LogEntry fromPb(com.google.logging.v2.LogEntry entryPb) {
525525
builder.setLabels(entryPb.getLabelsMap());
526526
builder.setSeverity(Severity.fromPb(entryPb.getSeverity()));
527527
if (!entryPb.getLogName().equals("")) {
528-
builder.setLogName(ProjectLogName.parse(entryPb.getLogName()).getLog());
528+
builder.setLogName(LogName.parse(entryPb.getLogName()).getLog());
529529
}
530530
if (!entryPb.getResource().equals(com.google.api.MonitoredResource.getDefaultInstance())) {
531531
builder.setResource(MonitoredResource.fromPb(entryPb.getResource()));

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

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,7 @@
4646
import com.google.common.collect.Maps;
4747
import com.google.common.util.concurrent.MoreExecutors;
4848
import com.google.common.util.concurrent.Uninterruptibles;
49-
import com.google.logging.v2.CreateLogMetricRequest;
50-
import com.google.logging.v2.CreateSinkRequest;
51-
import com.google.logging.v2.DeleteLogMetricRequest;
52-
import com.google.logging.v2.DeleteLogRequest;
53-
import com.google.logging.v2.DeleteSinkRequest;
54-
import com.google.logging.v2.GetLogMetricRequest;
55-
import com.google.logging.v2.GetSinkRequest;
56-
import com.google.logging.v2.ListLogEntriesRequest;
57-
import com.google.logging.v2.ListLogEntriesResponse;
58-
import com.google.logging.v2.ListLogMetricsRequest;
59-
import com.google.logging.v2.ListLogMetricsResponse;
60-
import com.google.logging.v2.ListMonitoredResourceDescriptorsRequest;
61-
import com.google.logging.v2.ListMonitoredResourceDescriptorsResponse;
62-
import com.google.logging.v2.ListSinksRequest;
63-
import com.google.logging.v2.ListSinksResponse;
64-
import com.google.logging.v2.ProjectLogName;
65-
import com.google.logging.v2.ProjectMetricName;
66-
import com.google.logging.v2.ProjectName;
67-
import com.google.logging.v2.ProjectSinkName;
68-
import com.google.logging.v2.UpdateLogMetricRequest;
69-
import com.google.logging.v2.UpdateSinkRequest;
70-
import com.google.logging.v2.WriteLogEntriesRequest;
71-
import com.google.logging.v2.WriteLogEntriesResponse;
49+
import com.google.logging.v2.*;
7250
import com.google.protobuf.Empty;
7351
import java.util.ArrayList;
7452
import java.util.List;
@@ -254,7 +232,9 @@ public Sink update(SinkInfo sink) {
254232
public ApiFuture<Sink> updateAsync(SinkInfo sink) {
255233
UpdateSinkRequest request =
256234
UpdateSinkRequest.newBuilder()
257-
.setSinkName(ProjectSinkName.of(getOptions().getProjectId(), sink.getName()).toString())
235+
.setSinkName(
236+
LogSinkName.ofProjectSinkName(getOptions().getProjectId(), sink.getName())
237+
.toString())
258238
.setSink(sink.toPb(getOptions().getProjectId()))
259239
.build();
260240
return transform(rpc.update(request), Sink.fromPbFunction(this));
@@ -269,7 +249,8 @@ public Sink getSink(String sink) {
269249
public ApiFuture<Sink> getSinkAsync(String sink) {
270250
GetSinkRequest request =
271251
GetSinkRequest.newBuilder()
272-
.setSinkName(ProjectSinkName.of(getOptions().getProjectId(), sink).toString())
252+
.setSinkName(
253+
LogSinkName.ofProjectSinkName(getOptions().getProjectId(), sink).toString())
273254
.build();
274255
return transform(rpc.get(request), Sink.fromPbFunction(this));
275256
}
@@ -333,7 +314,8 @@ public boolean deleteSink(String sink) {
333314
public ApiFuture<Boolean> deleteSinkAsync(String sink) {
334315
DeleteSinkRequest request =
335316
DeleteSinkRequest.newBuilder()
336-
.setSinkName(ProjectSinkName.of(getOptions().getProjectId(), sink).toString())
317+
.setSinkName(
318+
LogSinkName.ofProjectSinkName(getOptions().getProjectId(), sink).toString())
337319
.build();
338320
return transform(rpc.delete(request), EMPTY_TO_BOOLEAN_FUNCTION);
339321
}
@@ -345,7 +327,7 @@ public boolean deleteLog(String log) {
345327
public ApiFuture<Boolean> deleteLogAsync(String log) {
346328
DeleteLogRequest request =
347329
DeleteLogRequest.newBuilder()
348-
.setLogName(ProjectLogName.of(getOptions().getProjectId(), log).toString())
330+
.setLogName(LogName.ofProjectLogName(getOptions().getProjectId(), log).toString())
349331
.build();
350332
return transform(rpc.delete(request), EMPTY_TO_BOOLEAN_FUNCTION);
351333
}
@@ -441,7 +423,7 @@ public ApiFuture<Metric> updateAsync(MetricInfo metric) {
441423
UpdateLogMetricRequest request =
442424
UpdateLogMetricRequest.newBuilder()
443425
.setMetricName(
444-
ProjectMetricName.of(getOptions().getProjectId(), metric.getName()).toString())
426+
LogMetricName.of(getOptions().getProjectId(), metric.getName()).toString())
445427
.setMetric(metric.toPb())
446428
.build();
447429
return transform(rpc.update(request), Metric.fromPbFunction(this));
@@ -456,7 +438,7 @@ public Metric getMetric(String metric) {
456438
public ApiFuture<Metric> getMetricAsync(String metric) {
457439
GetLogMetricRequest request =
458440
GetLogMetricRequest.newBuilder()
459-
.setMetricName(ProjectMetricName.of(getOptions().getProjectId(), metric).toString())
441+
.setMetricName(LogMetricName.of(getOptions().getProjectId(), metric).toString())
460442
.build();
461443
return transform(rpc.get(request), Metric.fromPbFunction(this));
462444
}
@@ -520,7 +502,7 @@ public boolean deleteMetric(String metric) {
520502
public ApiFuture<Boolean> deleteMetricAsync(String metric) {
521503
DeleteLogMetricRequest request =
522504
DeleteLogMetricRequest.newBuilder()
523-
.setMetricName(ProjectMetricName.of(getOptions().getProjectId(), metric).toString())
505+
.setMetricName(LogMetricName.of(getOptions().getProjectId(), metric).toString())
524506
.build();
525507
return transform(rpc.delete(request), EMPTY_TO_BOOLEAN_FUNCTION);
526508
}
@@ -533,7 +515,7 @@ private static WriteLogEntriesRequest writeLogEntriesRequest(
533515
WriteLogEntriesRequest.Builder builder = WriteLogEntriesRequest.newBuilder();
534516
String logName = LOG_NAME.get(options);
535517
if (logName != null) {
536-
builder.setLogName(ProjectLogName.of(projectId, logName).toString());
518+
builder.setLogName(LogName.ofProjectLogName(projectId, logName).toString());
537519
}
538520
MonitoredResource resource = RESOURCE.get(options);
539521
if (resource != null) {

0 commit comments

Comments
 (0)