Skip to content

grpc: factor out base classes for gRPC based drivers#5174

Merged
HofiOne merged 26 commits intosyslog-ng:developfrom
HofiOne:grpc-factor-out-common-classes
Feb 26, 2025
Merged

grpc: factor out base classes for gRPC based drivers#5174
HofiOne merged 26 commits intosyslog-ng:developfrom
HofiOne:grpc-factor-out-common-classes

Conversation

@HofiOne
Copy link
Collaborator

@HofiOne HofiOne commented Nov 22, 2024

Slightly modified backport of #276 by @alltilla

@HofiOne HofiOne force-pushed the grpc-factor-out-common-classes branch 2 times, most recently from 0fd3338 to 272f973 Compare November 23, 2024 17:43
@HofiOne HofiOne mentioned this pull request Nov 25, 2024
HofiOne added a commit to HofiOne/syslog-ng that referenced this pull request Nov 25, 2024
@HofiOne HofiOne force-pushed the grpc-factor-out-common-classes branch 2 times, most recently from 15366d2 to da1c361 Compare November 25, 2024 10:50
HofiOne pushed a commit to HofiOne/syslog-ng that referenced this pull request Nov 25, 2024
@HofiOne HofiOne force-pushed the grpc-factor-out-common-classes branch from da1c361 to 1965ecc Compare November 25, 2024 10:52
HofiOne pushed a commit to HofiOne/syslog-ng that referenced this pull request Nov 25, 2024
@HofiOne HofiOne force-pushed the grpc-factor-out-common-classes branch from 1965ecc to c75e95c Compare November 25, 2024 13:41
HofiOne pushed a commit to HofiOne/syslog-ng that referenced this pull request Nov 25, 2024
@HofiOne HofiOne force-pushed the grpc-factor-out-common-classes branch from c75e95c to b48a8c3 Compare February 13, 2025 12:19
HofiOne pushed a commit to HofiOne/syslog-ng that referenced this pull request Feb 13, 2025
HofiOne pushed a commit to HofiOne/syslog-ng that referenced this pull request Feb 21, 2025
@HofiOne HofiOne force-pushed the grpc-factor-out-common-classes branch from b48a8c3 to 75a9e0f Compare February 21, 2025 14:32
@github-actions
Copy link
Contributor

github-actions bot commented Feb 21, 2025

This Pull Request introduces config grammar changes

syslog-ng/9eeadc5090ec183f4fd42f49d4b862ae82939bed -> HofiOne/grpc-factor-out-common-classes

Details
--- a/destination
+++ b/destination

 bigquery(
+    KW_AUTH(
+        KW_ADC(<empty>)
+        KW_ALTS(
+            <empty>
+            KW_TARGET_SERVICE_ACCOUNTS(
+                <empty>
+                <string>
+            )
+        )
+        KW_INSECURE(<empty>)
+        KW_TLS(
+            <empty>
+            KW_CA_FILE(<string>)
+            KW_CERT_FILE(<string>)
+            KW_KEY_FILE(<string>)
+        )
+    )
+    KW_BATCH_BYTES(<positive-integer>)
+    KW_CHANNEL_ARGS(
+        <empty>
+        <string> => <number>
+        <string> => <string>
+    )
+    KW_COMPRESSION(<yesno>)
+    KW_HEADERS(
+        <empty>
+        <string> => <string>
+    )
+    KW_KEEP_ALIVE(
+        <empty>
+        KW_MAX_PINGS_WITHOUT_DATA(<nonnegative-integer>)
+        KW_TIME(<nonnegative-integer>)
+        KW_TIMEOUT(<nonnegative-integer>)
+    )
+    KW_URL(<string>)
-    batch-bytes(<positive-integer>)
-    channel-args(
-        <empty>
-        <string> => <number>
-        <string> => <string>
-    )
-    compression(<yesno>)
-    headers(
-        <empty>
-        <string> => <string>
-    )
-    keep-alive(
-        <empty>
-        max-pings-without-data(<nonnegative-integer>)
-        time(<nonnegative-integer>)
-        timeout(<nonnegative-integer>)
-    )
-    url(<string>)
 )

 loki(
+    KW_AUTH(
+        KW_ADC(<empty>)
+        KW_ALTS(
+            <empty>
+            KW_TARGET_SERVICE_ACCOUNTS(
+                <empty>
+                <string>
+            )
+        )
+        KW_INSECURE(<empty>)
+        KW_TLS(
+            <empty>
+            KW_CA_FILE(<string>)
+            KW_CERT_FILE(<string>)
+            KW_KEY_FILE(<string>)
+        )
+    )
+    KW_BATCH_BYTES(<positive-integer>)
+    KW_CHANNEL_ARGS(
+        <empty>
+        <string> => <number>
+        <string> => <string>
+    )
+    KW_COMPRESSION(<yesno>)
+    KW_HEADERS(
+        <empty>
+        <string> => <string>
+    )
+    KW_KEEP_ALIVE(
+        <empty>
+        KW_MAX_PINGS_WITHOUT_DATA(<nonnegative-integer>)
+        KW_TIME(<nonnegative-integer>)
+        KW_TIMEOUT(<nonnegative-integer>)
+    )
+    KW_URL(<string>)
-    auth(
-        adc(<empty>)
-        alts(
-            <empty>
-            target-service-accounts(
-                <empty>
-                <string>
-            )
-        )
-        insecure(<empty>)
-        tls(
-            <empty>
-            ca-file(<string>)
-            cert-file(<string>)
-            key-file(<string>)
-        )
-    )
-    channel-args(
-        <empty>
-        <string> => <number>
-        <string> => <string>
-    )
-    headers(
-        <empty>
-        <string> => <string>
-    )
-    keep-alive(
-        <empty>
-        max-pings-without-data(<nonnegative-integer>)
-        time(<nonnegative-integer>)
-        timeout(<nonnegative-integer>)
-    )
-    url(<string>)
 )

 opentelemetry(
+    KW_AUTH(
+        KW_ADC(<empty>)
+        KW_ALTS(
+            <empty>
+            KW_TARGET_SERVICE_ACCOUNTS(
+                <empty>
+                <string>
+            )
+        )
+        KW_INSECURE(<empty>)
+        KW_TLS(
+            <empty>
+            KW_CA_FILE(<string>)
+            KW_CERT_FILE(<string>)
+            KW_KEY_FILE(<string>)
+        )
+    )
+    KW_BATCH_BYTES(<positive-integer>)
+    KW_CHANNEL_ARGS(
+        <empty>
+        <string> => <number>
+        <string> => <string>
+    )
+    KW_COMPRESSION(<yesno>)
+    KW_HEADERS(
+        <empty>
+        <string> => <string>
+    )
+    KW_KEEP_ALIVE(
+        <empty>
+        KW_MAX_PINGS_WITHOUT_DATA(<nonnegative-integer>)
+        KW_TIME(<nonnegative-integer>)
+        KW_TIMEOUT(<nonnegative-integer>)
+    )
+    KW_URL(<string>)
-    auth(
-        adc(<empty>)
-        alts(
-            <empty>
-            target-service-accounts(
-                <empty>
-                <string>
-            )
-        )
-        insecure(<empty>)
-        tls(
-            <empty>
-            ca-file(<string>)
-            cert-file(<string>)
-            key-file(<string>)
-        )
-    )
-    batch-bytes(<positive-integer>)
-    channel-args(
-        <empty>
-        <string> => <number>
-        <string> => <string>
-    )
-    compression(<yesno>)
-    headers(
-        <empty>
-        <string> => <string>
-    )
-    url(<string>)
 )

 syslog-ng-otlp(
+    KW_AUTH(
+        KW_ADC(<empty>)
+        KW_ALTS(
+            <empty>
+            KW_TARGET_SERVICE_ACCOUNTS(
+                <empty>
+                <string>
+            )
+        )
+        KW_INSECURE(<empty>)
+        KW_TLS(
+            <empty>
+            KW_CA_FILE(<string>)
+            KW_CERT_FILE(<string>)
+            KW_KEY_FILE(<string>)
+        )
+    )
+    KW_BATCH_BYTES(<positive-integer>)
+    KW_CHANNEL_ARGS(
+        <empty>
+        <string> => <number>
+        <string> => <string>
+    )
+    KW_COMPRESSION(<yesno>)
+    KW_HEADERS(
+        <empty>
+        <string> => <string>
+    )
+    KW_KEEP_ALIVE(
+        <empty>
+        KW_MAX_PINGS_WITHOUT_DATA(<nonnegative-integer>)
+        KW_TIME(<nonnegative-integer>)
+        KW_TIMEOUT(<nonnegative-integer>)
+    )
+    KW_URL(<string>)
-    auth(
-        adc(<empty>)
-        alts(
-            <empty>
-            target-service-accounts(
-                <empty>
-                <string>
-            )
-        )
-        insecure(<empty>)
-        tls(
-            <empty>
-            ca-file(<string>)
-            cert-file(<string>)
-            key-file(<string>)
-        )
-    )
-    batch-bytes(<positive-integer>)
-    channel-args(
-        <empty>
-        <string> => <number>
-        <string> => <string>
-    )
-    compression(<yesno>)
-    headers(
-        <empty>
-        <string> => <string>
-    )
-    url(<string>)
 )

--- a/source
+++ b/source

 opentelemetry(
+    KW_AUTH(
+        KW_ALTS(<empty>)
+        KW_INSECURE(<empty>)
+        KW_TLS(
+            <empty>
+            KW_CA_FILE(<string>)
+            KW_CERT_FILE(<string>)
+            KW_KEY_FILE(<string>)
+            KW_PEER_VERIFY(
+                KW_OPTIONAL_TRUSTED
+                KW_OPTIONAL_UNTRUSTED
+                KW_REQUIRED_TRUSTED
+                KW_REQUIRED_UNTRUSTED
+            )
+        )
+    )
+    KW_CHANNEL_ARGS(
+        <empty>
+        <string> => <number>
+        <string> => <string>
+    )
+    KW_CONCURRENT_REQUESTS(<positive-integer>)
+    KW_PORT(<positive-integer>)
-    auth(
-        alts(<empty>)
-        insecure(<empty>)
-        tls(
-            <empty>
-            ca-file(<string>)
-            cert-file(<string>)
-            key-file(<string>)
-            peer-verify(
-                optional-trusted
-                optional-untrusted
-                required-trusted
-                required-untrusted
-            )
-        )
-    )
-    channel-args(
-        <empty>
-        <string> => <number>
-        <string> => <string>
-    )
-    concurrent-requests(<positive-integer>)
-    port(<string-or-number>)
 )

 syslog-ng-otlp(
+    KW_AUTH(
+        KW_ALTS(<empty>)
+        KW_INSECURE(<empty>)
+        KW_TLS(
+            <empty>
+            KW_CA_FILE(<string>)
+            KW_CERT_FILE(<string>)
+            KW_KEY_FILE(<string>)
+            KW_PEER_VERIFY(
+                KW_OPTIONAL_TRUSTED
+                KW_OPTIONAL_UNTRUSTED
+                KW_REQUIRED_TRUSTED
+                KW_REQUIRED_UNTRUSTED
+            )
+        )
+    )
+    KW_CHANNEL_ARGS(
+        <empty>
+        <string> => <number>
+        <string> => <string>
+    )
+    KW_CONCURRENT_REQUESTS(<positive-integer>)
+    KW_PORT(<positive-integer>)
-    auth(
-        alts(<empty>)
-        insecure(<empty>)
-        tls(
-            <empty>
-            ca-file(<string>)
-            cert-file(<string>)
-            key-file(<string>)
-            peer-verify(
-                optional-trusted
-                optional-untrusted
-                required-trusted
-                required-untrusted
-            )
-        )
-    )
-    channel-args(
-        <empty>
-        <string> => <number>
-        <string> => <string>
-    )
-    concurrent-requests(<positive-integer>)
-    port(<string-or-number>)
 )

@HofiOne HofiOne changed the base branch from master to develop February 21, 2025 15:30
Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
alltilla and others added 15 commits February 26, 2025 09:15
Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
With this a grammar file can load additional grammar files
for declarations to use.

Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
Signed-off-by: Attila Szakacs <[email protected]>
Signed-off-by: Hofi <[email protected]>
@HofiOne HofiOne force-pushed the grpc-factor-out-common-classes branch from 75a9e0f to 72ef2e3 Compare February 26, 2025 08:15
@HofiOne HofiOne merged commit 2af605a into syslog-ng:develop Feb 26, 2025
29 checks passed
@HofiOne HofiOne deleted the grpc-factor-out-common-classes branch February 26, 2025 09:20
HofiOne pushed a commit to HofiOne/syslog-ng that referenced this pull request Feb 26, 2025
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.

3 participants