Skip to content

Commit

Permalink
Correctly indicate unstable elements
Browse files Browse the repository at this point in the history
- Match the requirements defined in open-telemetry#597
- Use v1development instead of v1 to match what we do for profiles: https://github.com/open-telemetry/opentelemetry-proto/tree/main/opentelemetry/proto/profiles/v1development
  • Loading branch information
tigrannajaryan committed Nov 14, 2024
1 parent 5997bf6 commit 681e3b8
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@

syntax = "proto3";

package opentelemetry.proto.collector.entities.v1;
package opentelemetry.proto.collector.entities.v1development;

import "opentelemetry/proto/entities/v1/entities.proto";
import "opentelemetry/proto/entities/v1development/entities.proto";

option csharp_namespace = "OpenTelemetry.Proto.Collector.Entities.V1";
option csharp_namespace = "OpenTelemetry.Proto.Collector.Entities.V1Development";
option java_multiple_files = true;
option java_package = "io.opentelemetry.proto.collector.entities.v1";
option java_package = "io.opentelemetry.proto.collector.entities.v1development";
option java_outer_classname = "EntitiesServiceProto";
option go_package = "go.opentelemetry.io/proto/otlp/collector/entities/v1";
option go_package = "go.opentelemetry.io/proto/otlp/collector/entities/v1development";

// Service that can be used to push entities between one Application instrumented with
// OpenTelemetry and a collector, or between a collector and a central collector (in this
Expand All @@ -35,7 +35,7 @@ service EntitiesService {

message ExportEntitiesServiceRequest {
// An array of ResourceEntities.
repeated opentelemetry.proto.entities.v1.ScopeEntities scope_entities = 1;
repeated opentelemetry.proto.entities.v1development.ScopeEntities scope_entities = 1;
}

message ExportEntitiesServiceResponse {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ type: google.api.Service
config_version: 3
http:
rules:
- selector: opentelemetry.proto.collector.entities.v1.EntitiesService.Export
post: /v1/entities
- selector: opentelemetry.proto.collector.entities.v1development.EntitiesService.Export
post: /v1development/entities
body: "*"
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@

syntax = "proto3";

package opentelemetry.proto.entities.v1;
package opentelemetry.proto.entities.v1development;

import "opentelemetry/proto/common/v1/common.proto";
import "opentelemetry/proto/resource/v1/resource.proto";

option csharp_namespace = "OpenTelemetry.Proto.Entities.V1";
option csharp_namespace = "OpenTelemetry.Proto.Entities.V1Development";
option java_multiple_files = true;
option java_package = "io.opentelemetry.proto.entities.v1";
option java_package = "io.opentelemetry.proto.entities.v1development";
option java_outer_classname = "EntitiesProto";
option go_package = "go.opentelemetry.io/proto/otlp/entities/v1";
option go_package = "go.opentelemetry.io/proto/otlp/entities/v1development";

// EntitiesData represents the entities data that can be stored in persistent storage,
// OR can be embedded by other protocols that transfer OTLP entities data but do not
Expand Down
4 changes: 3 additions & 1 deletion opentelemetry/proto/resource/v1/resource.proto
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ message Resource {
uint32 dropped_attributes_count = 2;

// Set of entities that participate in this Resource.
repeated ResourceEntityRef entities = 3;
// Status: [Development]
repeated ResourceEntityRef entity_refs = 3;
}

// Status: [Development]
message ResourceEntityRef {
// The Schema URL, if known. This is the identifier of the Schema that the entity data
// is recorded in. To learn more about Schema URL see
Expand Down

0 comments on commit 681e3b8

Please sign in to comment.