-
Notifications
You must be signed in to change notification settings - Fork 828
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.
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
Add instrumentation for graphql 20 that does not use deprecated methods #10779
Merged
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
21 changes: 0 additions & 21 deletions
21
instrumentation/graphql-java-12.0/javaagent/build.gradle.kts
This file was deleted.
Oops, something went wrong.
65 changes: 0 additions & 65 deletions
65
...ibrary/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphQLTelemetry.java
This file was deleted.
Oops, something went wrong.
File renamed without changes.
26 changes: 26 additions & 0 deletions
26
instrumentation/graphql-java/graphql-java-12.0/javaagent/build.gradle.kts
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,26 @@ | ||
| plugins { | ||
| id("otel.javaagent-instrumentation") | ||
| } | ||
|
|
||
| muzzle { | ||
| pass { | ||
| group.set("com.graphql-java") | ||
| module.set("graphql-java") | ||
| versions.set("[12,20)") | ||
| skip("230521-nf-execution") | ||
| assertInverse.set(true) | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation(project(":instrumentation:graphql-java:graphql-java-12.0:library")) | ||
| implementation(project(":instrumentation:graphql-java:graphql-java-common:library")) | ||
|
|
||
| library("com.graphql-java:graphql-java:12.0") | ||
|
|
||
| testInstrumentation(project(":instrumentation:graphql-java:graphql-java-20.0:javaagent")) | ||
|
|
||
| testImplementation(project(":instrumentation:graphql-java:graphql-java-common:testing")) | ||
|
|
||
| latestDepTestLibrary("com.graphql-java:graphql-java:19.+") | ||
| } |
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
31 changes: 31 additions & 0 deletions
31
...main/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlSingletons.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,31 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.javaagent.instrumentation.graphql.v12_0; | ||
|
|
||
| import graphql.execution.instrumentation.Instrumentation; | ||
| import io.opentelemetry.api.GlobalOpenTelemetry; | ||
| import io.opentelemetry.instrumentation.graphql.internal.InstrumentationUtil; | ||
| import io.opentelemetry.instrumentation.graphql.v12_0.GraphQLTelemetry; | ||
| import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; | ||
|
|
||
| public final class GraphqlSingletons { | ||
|
|
||
| private static final boolean QUERY_SANITIZATION_ENABLED = | ||
| InstrumentationConfig.get() | ||
| .getBoolean("otel.instrumentation.graphql.query-sanitizer.enabled", true); | ||
|
|
||
| private static final GraphQLTelemetry TELEMETRY = | ||
| GraphQLTelemetry.builder(GlobalOpenTelemetry.get()) | ||
| .setSanitizeQuery(QUERY_SANITIZATION_ENABLED) | ||
| .build(); | ||
|
|
||
| private GraphqlSingletons() {} | ||
|
|
||
| public static Instrumentation addInstrumentation(Instrumentation instrumentation) { | ||
| Instrumentation ourInstrumentation = TELEMETRY.newInstrumentation(); | ||
| return InstrumentationUtil.addInstrumentation(instrumentation, ourInstrumentation); | ||
| } | ||
| } |
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...ation/graphql-java-12.0/library/README.md → ...-java/graphql-java-12.0/library/README.md
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
10 changes: 10 additions & 0 deletions
10
instrumentation/graphql-java/graphql-java-12.0/library/build.gradle.kts
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,10 @@ | ||
| plugins { | ||
| id("otel.library-instrumentation") | ||
| } | ||
|
|
||
| dependencies { | ||
| library("com.graphql-java:graphql-java:12.0") | ||
| implementation(project(":instrumentation:graphql-java:graphql-java-common:library")) | ||
|
|
||
| testImplementation(project(":instrumentation:graphql-java:graphql-java-common:testing")) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need
latestDepTestLibrary, or that is not needed until next graphql release when the deprecated methods are removed?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll add it. Yes, currently it isn't needed because the tests pass with the latest version. I think this is the first time we have tried to fix the instrumentation before it actually breaks.