Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move OTel wrappers to the modules defining corresponding interfaces #7423

Merged
merged 1 commit into from
Aug 25, 2023
Merged

Move OTel wrappers to the modules defining corresponding interfaces #7423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ nessie-ui = { module = "org.projectnessie.nessie.ui:nessie-ui", version = "0.63.
openapi-generator-cli = { module = "org.openapitools:openapi-generator-cli", version = "6.6.0" }
opentelemetry-bom = { module = "io.opentelemetry:opentelemetry-bom", version.ref = "opentelemetry" }
opentelemetry-bom-alpha = { module = "io.opentelemetry:opentelemetry-bom-alpha", version.ref = "opentelemetryAlpha" }
opentelemetry-instrumentation-bom-alpha = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha", version.ref = "opentelemetryAlpha" }
opentracing-api = { module = "io.opentracing:opentracing-api", version.ref = "opentracing" }
opentracing-mock = { module = "io.opentracing:opentracing-mock", version.ref = "opentracing" }
opentracing-util = { module = "io.opentracing:opentracing-util", version.ref = "opentracing" }
Expand Down
29 changes: 29 additions & 0 deletions ...on/src/main/java/org/projectnessie/quarkus/providers/storage/QuarkusObservingPersist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
* Copyright (C) 2023 Dremio
*
* Licensed 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.projectnessie.quarkus.providers.storage;

import jakarta.inject.Singleton;
import org.projectnessie.quarkus.providers.NotObserved;
import org.projectnessie.versioned.storage.common.persist.ObservingPersist;
import org.projectnessie.versioned.storage.common.persist.Persist;

/** CDI bean for {@link ObservingPersist}. */
@Singleton
public class QuarkusObservingPersist extends ObservingPersist {
public QuarkusObservingPersist(@NotObserved Persist delegate) {
super(delegate);
}
}
29 changes: 29 additions & 0 deletions ...n/java/org/projectnessie/quarkus/providers/versionstore/QuarkusObservingVersionStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
* Copyright (C) 2023 Dremio
*
* Licensed 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.projectnessie.quarkus.providers.versionstore;

import jakarta.inject.Singleton;
import org.projectnessie.quarkus.providers.NotObserved;
import org.projectnessie.versioned.ObservingVersionStore;
import org.projectnessie.versioned.VersionStore;

/** CDI bean for {@link ObservingVersionStore}. */
@Singleton
public class QuarkusObservingVersionStore extends ObservingVersionStore {
public QuarkusObservingVersionStore(@NotObserved VersionStore delegate) {
super(delegate);
}
}
4 changes: 4 additions & 0 deletions versioned/spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ dependencies {
annotationProcessor(libs.immutables.value.processor)
compileOnly(libs.microprofile.openapi)

compileOnly(platform(libs.opentelemetry.instrumentation.bom.alpha))
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations")
compileOnly(libs.micrometer.core)

implementation(platform(libs.jackson.bom))
compileOnly("com.fasterxml.jackson.core:jackson-annotations")

Expand Down
31 changes: 2 additions & 29 deletions ...s/versionstore/ObservingVersionStore.java → ...ssie/versioned/ObservingVersionStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.projectnessie.quarkus.providers.versionstore;
package org.projectnessie.versioned;

import com.google.errorprone.annotations.MustBeClosed;
import io.micrometer.core.annotation.Counted;
import io.micrometer.core.annotation.Timed;
import io.opentelemetry.instrumentation.annotations.SpanAttribute;
import io.opentelemetry.instrumentation.annotations.WithSpan;
import jakarta.inject.Singleton;
import java.util.Collection;
import java.util.List;
import java.util.Map;
Expand All @@ -33,34 +32,8 @@
import org.projectnessie.model.ContentKey;
import org.projectnessie.model.IdentifiedContentKey;
import org.projectnessie.model.RepositoryConfig;
import org.projectnessie.quarkus.providers.NotObserved;
import org.projectnessie.versioned.BranchName;
import org.projectnessie.versioned.Commit;
import org.projectnessie.versioned.CommitResult;
import org.projectnessie.versioned.ContentResult;
import org.projectnessie.versioned.Diff;
import org.projectnessie.versioned.GetNamedRefsParams;
import org.projectnessie.versioned.Hash;
import org.projectnessie.versioned.KeyEntry;
import org.projectnessie.versioned.MergeResult;
import org.projectnessie.versioned.NamedRef;
import org.projectnessie.versioned.Operation;
import org.projectnessie.versioned.Ref;
import org.projectnessie.versioned.RefLogDetails;
import org.projectnessie.versioned.RefLogNotFoundException;
import org.projectnessie.versioned.ReferenceAlreadyExistsException;
import org.projectnessie.versioned.ReferenceAssignedResult;
import org.projectnessie.versioned.ReferenceConflictException;
import org.projectnessie.versioned.ReferenceCreatedResult;
import org.projectnessie.versioned.ReferenceDeletedResult;
import org.projectnessie.versioned.ReferenceInfo;
import org.projectnessie.versioned.ReferenceNotFoundException;
import org.projectnessie.versioned.RelativeCommitSpec;
import org.projectnessie.versioned.RepositoryInformation;
import org.projectnessie.versioned.VersionStore;
import org.projectnessie.versioned.paging.PaginationIterator;

@Singleton
public class ObservingVersionStore implements VersionStore {
private final VersionStore delegate;

Expand All @@ -74,7 +47,7 @@ public class ObservingVersionStore implements VersionStore {
private static final String TAG_FROM = "from";
private static final String TAG_TO = "to";

public ObservingVersionStore(@NotObserved VersionStore delegate) {
public ObservingVersionStore(VersionStore delegate) {
this.delegate = delegate;
}

Expand Down
4 changes: 4 additions & 0 deletions versioned/storage/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ dependencies {
compileOnly(libs.jakarta.annotation.api)
compileOnly(libs.findbugs.jsr305)

compileOnly(platform(libs.opentelemetry.instrumentation.bom.alpha))
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations")
compileOnly(libs.micrometer.core)

compileOnly(libs.errorprone.annotations)
implementation(libs.agrona)
implementation(libs.guava)
Expand Down
15 changes: 3 additions & 12 deletions ...s/providers/storage/ObservingPersist.java → ...rage/common/persist/ObservingPersist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.projectnessie.quarkus.providers.storage;
package org.projectnessie.versioned.storage.common.persist;

import io.micrometer.core.annotation.Counted;
import io.micrometer.core.annotation.Timed;
import io.opentelemetry.instrumentation.annotations.WithSpan;
import jakarta.inject.Singleton;
import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.projectnessie.quarkus.providers.NotObserved;
import org.projectnessie.versioned.storage.common.config.StoreConfig;
import org.projectnessie.versioned.storage.common.exceptions.ObjNotFoundException;
import org.projectnessie.versioned.storage.common.exceptions.ObjTooLargeException;
import org.projectnessie.versioned.storage.common.exceptions.RefAlreadyExistsException;
import org.projectnessie.versioned.storage.common.exceptions.RefConditionFailedException;
import org.projectnessie.versioned.storage.common.exceptions.RefNotFoundException;
import org.projectnessie.versioned.storage.common.persist.CloseableIterator;
import org.projectnessie.versioned.storage.common.persist.Obj;
import org.projectnessie.versioned.storage.common.persist.ObjId;
import org.projectnessie.versioned.storage.common.persist.ObjType;
import org.projectnessie.versioned.storage.common.persist.Persist;
import org.projectnessie.versioned.storage.common.persist.Reference;

@Singleton

public class ObservingPersist implements Persist {
private final Persist delegate;

private static final String PREFIX = "nessie.storage.persist";

public ObservingPersist(@NotObserved Persist delegate) {
public ObservingPersist(Persist delegate) {
this.delegate = delegate;
}

Expand Down