Skip to content

Commit

Permalink
feat: improvements to OpenTelemetry metrics
Browse files Browse the repository at this point in the history
Co-Authored-By: Ewan Harris <[email protected]>
  • Loading branch information
evansims and ewanharris committed Aug 9, 2024
1 parent b1e03e5 commit 229495e
Show file tree
Hide file tree
Showing 30 changed files with 1,107 additions and 181 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ updates:
dependencies:
patterns:
- "*"
- package-ecosystem: "gradle"
directory: "/example/example1"
schedule:
interval: "monthly"
groups:
dependencies:
patterns:
- "*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ VERSION.txt
# JetBrains IDEs
.idea/
*.iml

# VSCode IDE
/.vscode
20 changes: 20 additions & 0 deletions .openapi-generator/FILES
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ src/main/java/dev/openfga/sdk/api/configuration/Configuration.java
src/main/java/dev/openfga/sdk/api/configuration/ConfigurationOverride.java
src/main/java/dev/openfga/sdk/api/configuration/Credentials.java
src/main/java/dev/openfga/sdk/api/configuration/CredentialsMethod.java
src/main/java/dev/openfga/sdk/api/configuration/TelemetryConfiguration.java
src/main/java/dev/openfga/sdk/api/model/AbortedMessageResponse.java
src/main/java/dev/openfga/sdk/api/model/AbstractOpenApiSchema.java
src/main/java/dev/openfga/sdk/api/model/Any.java
Expand Down Expand Up @@ -272,6 +273,15 @@ src/main/java/dev/openfga/sdk/errors/FgaApiValidationError.java
src/main/java/dev/openfga/sdk/errors/FgaError.java
src/main/java/dev/openfga/sdk/errors/FgaInvalidParameterException.java
src/main/java/dev/openfga/sdk/errors/HttpStatusCode.java
src/main/java/dev/openfga/sdk/telemetry/Attribute.java
src/main/java/dev/openfga/sdk/telemetry/Attributes.java
src/main/java/dev/openfga/sdk/telemetry/Counter.java
src/main/java/dev/openfga/sdk/telemetry/Counters.java
src/main/java/dev/openfga/sdk/telemetry/Histogram.java
src/main/java/dev/openfga/sdk/telemetry/Histograms.java
src/main/java/dev/openfga/sdk/telemetry/Metric.java
src/main/java/dev/openfga/sdk/telemetry/Metrics.java
src/main/java/dev/openfga/sdk/telemetry/Telemetry.java
src/main/java/dev/openfga/sdk/util/Pair.java
src/main/java/dev/openfga/sdk/util/StringUtil.java
src/main/java/dev/openfga/sdk/util/Validation.java
Expand All @@ -290,4 +300,14 @@ src/test/java/dev/openfga/sdk/api/client/ApiClientTest.java
src/test/java/dev/openfga/sdk/api/client/OpenFgaClientTest.java
src/test/java/dev/openfga/sdk/api/configuration/ClientCredentialsTest.java
src/test/java/dev/openfga/sdk/api/configuration/ConfigurationTest.java
src/test/java/dev/openfga/sdk/api/configuration/TelemetryConfigurationTest.java
src/test/java/dev/openfga/sdk/telemetry/AttributeTest.java
src/test/java/dev/openfga/sdk/telemetry/AttributesTest.java
src/test/java/dev/openfga/sdk/telemetry/CounterTest.java
src/test/java/dev/openfga/sdk/telemetry/CountersTest.java
src/test/java/dev/openfga/sdk/telemetry/HistogramTest.java
src/test/java/dev/openfga/sdk/telemetry/HistogramsTest.java
src/test/java/dev/openfga/sdk/telemetry/MetricTest.java
src/test/java/dev/openfga/sdk/telemetry/MetricsTest.java
src/test/java/dev/openfga/sdk/telemetry/TelemetryTest.java
src/test/java/dev/openfga/sdk/util/StringUtilTest.java
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ This is an autogenerated Java SDK for OpenFGA. It provides a wrapper around the
- [Retries](#retries)
- [API Endpoints](#api-endpoints)
- [Models](#models)
- [OpenTelemetry](#opentelemetry)
- [Contributing](#contributing)
- [Issues](#issues)
- [Pull Requests](#pull-requests)
Expand Down Expand Up @@ -1060,6 +1061,10 @@ public class Example {



### OpenTelemetry

This SDK supports producing metrics that can be consumed as part of an [OpenTelemetry](https://opentelemetry.io/) setup. For more information, please see [the documentation](https://github.com/openfga/java-sdk/blob/main/docs/opentelemetry.md)

## Contributing

### Issues
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ ext {
}

dependencies {
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation "com.google.code.findbugs:jsr305:3.0.+"
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "org.openapitools:jackson-databind-nullable:0.2.6"
implementation platform("io.opentelemetry:opentelemetry-bom:1.40.0")
implementation "org.openapitools:jackson-databind-nullable:0.2.+"
implementation platform("io.opentelemetry:opentelemetry-bom:1.40.+")
implementation "io.opentelemetry:opentelemetry-api"
}

Expand All @@ -80,7 +80,7 @@ testing {
implementation "org.junit.jupiter:junit-jupiter:$junit_version"
implementation "org.mockito:mockito-core:5.+"
runtimeOnly "org.junit.platform:junit-platform-launcher"
implementation "org.wiremock:wiremock:3.8.0"
implementation "org.wiremock:wiremock:3.8.+"

// This test-only dependency is convenient but not widely used.
// Review project activity before updating the version here.
Expand All @@ -106,8 +106,8 @@ testing {
dependencies {
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
implementation "org.testcontainers:junit-jupiter:1.19.8"
implementation "org.testcontainers:openfga:1.19.8"
implementation "org.testcontainers:junit-jupiter:1.19.+"
implementation "org.testcontainers:openfga:1.19.+"
implementation project()
}

Expand Down
4 changes: 2 additions & 2 deletions example/example1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ repositories {
}

ext {
jacksonVersion = "2.16.0"
jacksonVersion = "2.17.1"
}

dependencies {
implementation("dev.openfga:openfga-sdk:0.4.+")
implementation("dev.openfga:openfga-sdk:0.5.0")

// Serialization
implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
Expand Down
Loading

0 comments on commit 229495e

Please sign in to comment.