Skip to content

Convert elasticsearch tests to java #12300

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

Merged
merged 6 commits into from
Sep 24, 2024
Merged

Convert elasticsearch tests to java #12300

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1bbbba4
Convert elasticsearch tests to java
laurit Sep 19, 2024
658fb58
reduce duplication
laurit Sep 23, 2024
61aacbb
make class package private
laurit Sep 23, 2024
a8e5e24
remove commented out code, fix latest dep test
laurit Sep 23, 2024
b187dbf
address review comment
laurit Sep 24, 2024
e575b10
address review comment
laurit Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .../elasticsearch/transport/v5_0/Elasticsearch5TransportExperimentalAttributesExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.v5_0;

import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.context.Context;
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticTransportRequest;
Expand All @@ -14,6 +15,11 @@
public class Elasticsearch5TransportExperimentalAttributesExtractor
extends ElasticsearchTransportExperimentalAttributesExtractor {

private static final AttributeKey<String> ELASTICSEARCH_REQUEST_WRITE_TYPE =
AttributeKey.stringKey("elasticsearch.request.write.type");
private static final AttributeKey<String> ELASTICSEARCH_REQUEST_WRITE_ROUTING =
AttributeKey.stringKey("elasticsearch.request.write.routing");

@Override
public void onStart(
AttributesBuilder attributes,
Expand All @@ -24,8 +30,8 @@ public void onStart(
Object request = transportRequest.getRequest();
if (request instanceof DocumentRequest) {
DocumentRequest<?> req = (DocumentRequest<?>) request;
attributes.put("elasticsearch.request.write.type", req.type());
attributes.put("elasticsearch.request.write.routing", req.routing());
attributes.put(ELASTICSEARCH_REQUEST_WRITE_TYPE, req.type());
attributes.put(ELASTICSEARCH_REQUEST_WRITE_ROUTING, req.routing());
}
}
}
309 changes: 0 additions & 309 deletions ...elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy
View file
Open in desktop

This file was deleted.

Loading
Loading