-
Notifications
You must be signed in to change notification settings - Fork 4.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds an SdkHarnessOption that controls whether logging is redirected …
…through the FnApi (#33418) * Add an SdkHarnessOption that controls whether logging is redirected through the FnApi logging service. Redirection through the logging service is enabled by default. * Add an SdkHarnessOption that controls whether logging is redirected through the FnApi logging service. Redirection through the FnApi is enabled by default. * include license in new files * fix ManagedChannel dep * fix invalid conversions * fix missing imports * fix type mismatch * fix up tests * continue to use anyOf when logViaFnApi is enabled * More comments on the new SdkHarnessOption. DataflowRunner.run() forces the option to 'enabled'.
- Loading branch information
Showing
8 changed files
with
118 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
sdks/java/harness/src/main/java/org/apache/beam/fn/harness/logging/LoggingClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.beam.fn.harness.logging; | ||
|
|
||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| public interface LoggingClient extends AutoCloseable { | ||
|
|
||
| CompletableFuture<?> terminationFuture(); | ||
| } |
59 changes: 59 additions & 0 deletions
59
sdks/java/harness/src/main/java/org/apache/beam/fn/harness/logging/LoggingClientFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.beam.fn.harness.logging; | ||
|
|
||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.function.Function; | ||
| import org.apache.beam.model.pipeline.v1.Endpoints; | ||
| import org.apache.beam.sdk.options.PipelineOptions; | ||
| import org.apache.beam.sdk.options.SdkHarnessOptions; | ||
| import org.apache.beam.vendor.grpc.v1p60p1.io.grpc.ManagedChannel; | ||
|
|
||
| /** | ||
| * A factory for {@link LoggingClient}s. Provides {@link BeamFnLoggingClient} if the logging service | ||
| * is enabled, otherwise provides a no-op client. | ||
| */ | ||
| public class LoggingClientFactory { | ||
|
|
||
| private LoggingClientFactory() {} | ||
|
|
||
| /** | ||
| * A factory for {@link LoggingClient}s. Provides {@link BeamFnLoggingClient} if the logging | ||
| * service is enabled, otherwise provides a no-op client. | ||
| */ | ||
| public static LoggingClient createAndStart( | ||
| PipelineOptions options, | ||
| Endpoints.ApiServiceDescriptor apiServiceDescriptor, | ||
| Function<Endpoints.ApiServiceDescriptor, ManagedChannel> channelFactory) { | ||
| if (options.as(SdkHarnessOptions.class).getEnableLogViaFnApi()) { | ||
| return BeamFnLoggingClient.createAndStart(options, apiServiceDescriptor, channelFactory); | ||
| } else { | ||
| return new NoOpLoggingClient(); | ||
| } | ||
| } | ||
|
|
||
| static final class NoOpLoggingClient implements LoggingClient { | ||
| @Override | ||
| public CompletableFuture<?> terminationFuture() { | ||
| return CompletableFuture.completedFuture(new Object()); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws Exception {} | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters